summaryrefslogtreecommitdiff
path: root/demos/scilab2c.dem.gateway.sce
diff options
context:
space:
mode:
authoryash11122017-07-07 22:03:16 +0530
committeryash11122017-07-07 22:03:16 +0530
commit69c573fe2e59236f063aaa94dcd44b556f945cbc (patch)
tree08fa381bec620e38c7a3d2a34448d30160d861eb /demos/scilab2c.dem.gateway.sce
parent87823db220f4c3b8bee16c0b2e08027704de1efe (diff)
parent3f52712f806fbd80d66dfdcaff401e5cf94dcca4 (diff)
downloadScilab2C_fossee_old-69c573fe2e59236f063aaa94dcd44b556f945cbc.tar.gz
Scilab2C_fossee_old-69c573fe2e59236f063aaa94dcd44b556f945cbc.tar.bz2
Scilab2C_fossee_old-69c573fe2e59236f063aaa94dcd44b556f945cbc.zip
Scilab2C Arduino Updated
Diffstat (limited to 'demos/scilab2c.dem.gateway.sce')
-rw-r--r--demos/scilab2c.dem.gateway.sce14
1 files changed, 13 insertions, 1 deletions
diff --git a/demos/scilab2c.dem.gateway.sce b/demos/scilab2c.dem.gateway.sce
index 71372e2..e9a83bf 100644
--- a/demos/scilab2c.dem.gateway.sce
+++ b/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