diff options
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, 5 insertions, 0 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 f961719d..27f63c75 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,8 +15,13 @@ 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); } |