Scilab2C Arduino Updated

7 files changed, 55 insertions, 1 deletions

diff --git a/2.3-1/demos/analog_in_out_volt.dem.sce b/2.3-1/demos/analog_in_out_volt.dem.sce
new file mode 100644
index 00000000..ca6da611
--- /dev/null
+++ b/2.3-1/demos/analog_in_out_volt.dem.sce
@@ -0,0 +1,7 @@
+lines(0);
+
+global SCI2CHOME
+        
+scilab2c(SCI2CHOME+"/tests/unit_tests/testArduino/analog_in_check_volt.sci", TMPDIR, SCI2CHOME+"/tests/unit_tests/testArduino", "All", "make" ,"Arduino", "uno");
+
+editor([TMPDIR+"/setup_arduino.cpp";TMPDIR+"/loop_arduino.cpp"]);
diff --git a/2.3-1/demos/analog_out.dem.sce b/2.3-1/demos/analog_out.dem.sce
new file mode 100644
index 00000000..65a1e279
--- /dev/null
+++ b/2.3-1/demos/analog_out.dem.sce
@@ -0,0 +1,7 @@
+lines(0);
+
+global SCI2CHOME
+        
+scilab2c(SCI2CHOME+"/tests/unit_tests/testArduino/analog_check.sci", TMPDIR, SCI2CHOME+"/tests/unit_tests/testArduino", "All", "make" ,"Arduino", "uno");
+
+editor([TMPDIR+"/setup_arduino.cpp";TMPDIR+"/loop_arduino.cpp"]);
diff --git a/2.3-1/demos/blink.dem.sce b/2.3-1/demos/blink.dem.sce
new file mode 100644
index 00000000..b01d3dae
--- /dev/null
+++ b/2.3-1/demos/blink.dem.sce
@@ -0,0 +1,7 @@
+lines(0);
+
+global SCI2CHOME
+        
+scilab2c(SCI2CHOME+"/tests/unit_tests/testArduino/blink_13.sci", TMPDIR, SCI2CHOME+"/tests/unit_tests/testArduino", "All", "make" ,"Arduino", "uno");
+
+editor([TMPDIR+"/setup_arduino.cpp";TMPDIR+"/loop_arduino.cpp"]);
diff --git a/2.3-1/demos/dc_motor.dem.sce b/2.3-1/demos/dc_motor.dem.sce
new file mode 100644
index 00000000..36c0badd
--- /dev/null
+++ b/2.3-1/demos/dc_motor.dem.sce
@@ -0,0 +1,7 @@
+lines(0);
+
+global SCI2CHOME
+        
+scilab2c(SCI2CHOME+"/tests/unit_tests/testArduino/board_test_release2.sci", TMPDIR, SCI2CHOME+"/tests/unit_tests/testArduino", "All", "make" ,"Arduino", "uno");
+
+editor([TMPDIR+"/setup_arduino.cpp";TMPDIR+"/loop_arduino.cpp"]);
diff --git a/2.3-1/demos/digital_in.dem.sce b/2.3-1/demos/digital_in.dem.sce
new file mode 100644
index 00000000..2eb4c3a0
--- /dev/null
+++ b/2.3-1/demos/digital_in.dem.sce
@@ -0,0 +1,7 @@
+lines(0);
+
+global SCI2CHOME
+        
+scilab2c(SCI2CHOME+"/tests/unit_tests/testArduino/digital_in_check.sci", TMPDIR, SCI2CHOME+"/tests/unit_tests/testArduino", "All", "make" ,"Arduino", "uno");
+
+editor([TMPDIR+"/setup_arduino.cpp";TMPDIR+"/loop_arduino.cpp"]);
diff --git a/2.3-1/demos/master_write.dem.sce b/2.3-1/demos/master_write.dem.sce
new file mode 100644
index 00000000..cdf522db
--- /dev/null
+++ b/2.3-1/demos/master_write.dem.sce
@@ -0,0 +1,7 @@
+lines(0);
+
+global SCI2CHOME
+        
+scilab2c(SCI2CHOME+"/tests/unit_tests/testArduino/i2c_master.sci", TMPDIR, SCI2CHOME+"/tests/unit_tests/testArduino", "All", "make" ,"Arduino", "uno");
+
+editor([TMPDIR+"/setup_arduino.cpp";TMPDIR+"/loop_arduino.cpp"]);
diff --git a/2.3-1/demos/scilab2c.dem.gateway.sce b/2.3-1/demos/scilab2c.dem.gateway.sce
index 71372e25..e9a83bf0 100644
--- a/2.3-1/demos/scilab2c.dem.gateway.sce
+++ b/2.3-1/demos/scilab2c.dem.gateway.sce
@@ -16,6 +16,18 @@ subdemolist = ["Trigonometric Identity" , "TrigonometricIdentity.dem.sce";
               "Linear Regression" , "LinearRegression.dem.sce";
               "Symbols", "Symbols.dem.sce";
                "High Pass Filter", "Filter.dem.sce";
+<<<<<<< HEAD
               ];
 
-subdemolist(:,2) = demopath + subdemolist(:,2);
\ No newline at end of file
+subdemolist(:,2) = demopath + subdemolist(:,2);
+=======
+               "Arduino blink", "blink.dem.sce";
+	       "Arduino digital input", "digital_in.dem.sce";
+	       "Arduino analog voltage i/o", "analog_in_out_volt.dem.sce";
+	       "Arduino analog output", "analog_out.dem.sce";
+   	       "Arduino DC motor", "dc_motor.dem.sce";
+	       "Arduino Master write", "master_write.dem.sce";
+              ];
+
+subdemolist(:,2) = demopath + subdemolist(:,2);
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0