diff options
| author | Brijeshcr | 2017-07-08 20:18:17 +0530 |
|---|---|---|
| committer | GitHub | 2017-07-08 20:18:17 +0530 |
| commit | bd03b38be0918837e147e969c6bb2014900009db (patch) | |
| tree | 2cd9b7b1c15092e1367ed15e81aa71ccc9e05190 /src/c/scilab-arduino/cmd_analog_in_volt | |
| parent | 97d1c6847a05bdb93557553a6bdcfd0f15feda99 (diff) | |
| download | scilab2c-bd03b38be0918837e147e969c6bb2014900009db.tar.gz scilab2c-bd03b38be0918837e147e969c6bb2014900009db.tar.bz2 scilab2c-bd03b38be0918837e147e969c6bb2014900009db.zip | |
Revert "SCi2cDeps updated, Windows compatibility resolved"
Diffstat (limited to 'src/c/scilab-arduino/cmd_analog_in_volt')
| -rw-r--r-- | src/c/scilab-arduino/cmd_analog_in_volt/u8cmd_analog_in_volts.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/c/scilab-arduino/cmd_analog_in_volt/u8cmd_analog_in_volts.c b/src/c/scilab-arduino/cmd_analog_in_volt/u8cmd_analog_in_volts.c index 27f63c75..7018df2c 100644 --- a/src/c/scilab-arduino/cmd_analog_in_volt/u8cmd_analog_in_volts.c +++ b/src/c/scilab-arduino/cmd_analog_in_volt/u8cmd_analog_in_volts.c @@ -15,13 +15,8 @@ float u8cmd_analog_in_volts(uint8 board_no, uint8 pin) { -<<<<<<< HEAD float a; a = ((5*(float)analogRead(pin))/1023); -======= - float a; //declaration of variable - a = ((5*(float)analogRead(pin))/1023); //recieved 10 bit input from analog pin is convert to voltage(0 - 50 ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 return(a); } |