From 369c257b9ae0320621b43ca75b38ff66cc13f37b Mon Sep 17 00:00:00 2001
From: yash1112
Date: Mon, 19 Jun 2017 05:40:46 +0530
Subject: 1.3 new scilab-arduino functions added2. all functions have been
 tested on hardware 3. 5 i2c library functions added 4. Now generates code for
 27 Boards(arduino and lilypad). 5. New GUI

---
 .../cmd_analog_in_volt/u8cmd_analog_in_volts.c     | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 src/c/scilab-arduino/cmd_analog_in_volt/u8cmd_analog_in_volts.c

(limited to 'src/c/scilab-arduino/cmd_analog_in_volt')

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
new file mode 100644
index 00000000..7018df2c
--- /dev/null
+++ b/src/c/scilab-arduino/cmd_analog_in_volt/u8cmd_analog_in_volts.c
@@ -0,0 +1,22 @@
+/* Copyright (C) 2017 - IIT Bombay - FOSSEE
+
+ This file must be used under the terms of the CeCILL.
+ This source file is licensed as described in the file COPYING, which
+ you should have received as part of this distribution.  The terms
+ are also available at
+ http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ Author: Yash Pratap Singh Tomar
+ Organization: FOSSEE, IIT Bombay
+ Email: toolbox@scilab.in
+*/
+
+#include "cmd_analog_in_volt.h"
+#include "Arduino.h"
+
+float u8cmd_analog_in_volts(uint8 board_no, uint8 pin)
+{
+    float a;
+    a = ((5*(float)analogRead(pin))/1023);
+    return(a);
+}
+
-- 
cgit 


From 3f52712f806fbd80d66dfdcaff401e5cf94dcca4 Mon Sep 17 00:00:00 2001
From: yash1112
Date: Fri, 7 Jul 2017 21:20:49 +0530
Subject: sci2c arduino updated

---
 .../cmd_analog_in_volt/u8cmd_analog_in_volts.c     | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 src/c/scilab-arduino/cmd_analog_in_volt/u8cmd_analog_in_volts.c

(limited to 'src/c/scilab-arduino/cmd_analog_in_volt')

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
new file mode 100644
index 00000000..f961719d
--- /dev/null
+++ b/src/c/scilab-arduino/cmd_analog_in_volt/u8cmd_analog_in_volts.c
@@ -0,0 +1,22 @@
+/* Copyright (C) 2017 - IIT Bombay - FOSSEE
+
+ This file must be used under the terms of the CeCILL.
+ This source file is licensed as described in the file COPYING, which
+ you should have received as part of this distribution.  The terms
+ are also available at
+ http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ Author: Yash Pratap Singh Tomar
+ Organization: FOSSEE, IIT Bombay
+ Email: toolbox@scilab.in
+*/
+
+#include "cmd_analog_in_volt.h"
+#include "Arduino.h"
+
+float u8cmd_analog_in_volts(uint8 board_no, uint8 pin)
+{
+    float a;					//declaration of variable
+    a = ((5*(float)analogRead(pin))/1023);	//recieved 10 bit input from analog pin is convert to voltage(0 - 50
+    return(a);
+}
+
-- 
cgit 


From bd03b38be0918837e147e969c6bb2014900009db Mon Sep 17 00:00:00 2001
From: Brijeshcr
Date: Sat, 8 Jul 2017 20:18:17 +0530
Subject: Revert "SCi2cDeps updated, Windows compatibility resolved"

---
 src/c/scilab-arduino/cmd_analog_in_volt/u8cmd_analog_in_volts.c | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'src/c/scilab-arduino/cmd_analog_in_volt')

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);
 }
 
-- 
cgit 


From 49d8281d2da2f4c6bf0e62d148a8a7328d3bf970 Mon Sep 17 00:00:00 2001
From: yash1112
Date: Mon, 10 Jul 2017 17:08:48 +0530
Subject: Arduino toolbox error Resolved

---
 src/c/scilab-arduino/cmd_analog_in_volt/u8cmd_analog_in_volts.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/c/scilab-arduino/cmd_analog_in_volt')

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 7018df2c..f961719d 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,8 @@
 
 float u8cmd_analog_in_volts(uint8 board_no, uint8 pin)
 {
-    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
     return(a);
 }
 
-- 
cgit