diff options
| author | yash1112 | 2017-07-07 22:34:47 +0530 |
|---|---|---|
| committer | yash1112 | 2017-07-07 22:34:47 +0530 |
| commit | 2340409c98f9b15bb23944b991e97a1aa4e88ce0 (patch) | |
| tree | 8fa462e65aca52e5e933dee026a78c31baf0181c /src/c/scilab-arduino/cmd_analog_in_volt | |
| parent | f577f255fd5c1d30bc770e9b053823ada8684528 (diff) | |
| parent | 69c573fe2e59236f063aaa94dcd44b556f945cbc (diff) | |
| download | Scilab2C_fossee_old-2340409c98f9b15bb23944b991e97a1aa4e88ce0.tar.gz Scilab2C_fossee_old-2340409c98f9b15bb23944b991e97a1aa4e88ce0.tar.bz2 Scilab2C_fossee_old-2340409c98f9b15bb23944b991e97a1aa4e88ce0.zip | |
1.Sci2cDeps updated 2.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, 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 7018df2..27f63c7 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); } |