diff options
| author | Brijeshcr | 2017-07-08 20:18:46 +0530 |
|---|---|---|
| committer | GitHub | 2017-07-08 20:18:46 +0530 |
| commit | 26ab8620e89571314bc1a828bd9aca3d288eaede (patch) | |
| tree | e0f47fecb8b5d5e63491c7440d9ecc3072e5cd05 /2.3-1/src/c/scilab-arduino/cmd_analog_out_volt | |
| parent | 3adebb16388c6712f7d9c268b91849d164e696df (diff) | |
| parent | 39874e472e540ca1bb923b97b52900e1d60439cc (diff) | |
| download | Scilab2C-26ab8620e89571314bc1a828bd9aca3d288eaede.tar.gz Scilab2C-26ab8620e89571314bc1a828bd9aca3d288eaede.tar.bz2 Scilab2C-26ab8620e89571314bc1a828bd9aca3d288eaede.zip | |
Merge pull request #13 from FOSSEE/revert-12-master
Revert "SCi2cDeps updated, Windows compatibility resolved"
Diffstat (limited to '2.3-1/src/c/scilab-arduino/cmd_analog_out_volt')
| -rw-r--r-- | 2.3-1/src/c/scilab-arduino/cmd_analog_out_volt/u8cmd_analog_out_volts.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/2.3-1/src/c/scilab-arduino/cmd_analog_out_volt/u8cmd_analog_out_volts.c b/2.3-1/src/c/scilab-arduino/cmd_analog_out_volt/u8cmd_analog_out_volts.c index 19a73fcf..2dd82e41 100644 --- a/2.3-1/src/c/scilab-arduino/cmd_analog_out_volt/u8cmd_analog_out_volts.c +++ b/2.3-1/src/c/scilab-arduino/cmd_analog_out_volt/u8cmd_analog_out_volts.c @@ -15,14 +15,8 @@ void u8cmd_analog_out_volts(uint8 board_no, uint8 pin, float value) { -<<<<<<< HEAD int a; a = ((value*255)/5); analogWrite(pin,a); -======= - int a; //declaring variable - a = ((value*255)/5); //converting given voltage to duty cycle value (0 - 255) - analogWrite(pin,a); //passing pin no. and duty cycle value ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 } |