summaryrefslogtreecommitdiff
path: root/2.3-1/demos/scilab2c.dem.gateway.sce
diff options
context:
space:
mode:
authoryash11122017-07-07 22:03:16 +0530
committeryash11122017-07-07 22:03:16 +0530
commit640f9fcf3f64298c7958f4bde5a7e6a7602a690d (patch)
treef2d5c577e9c719190f2ce68c976a9acefd6611c6 /2.3-1/demos/scilab2c.dem.gateway.sce
parente9de337a34e123749927039f7011fb30fc96f7c9 (diff)
parent9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 (diff)
downloadScilab2C-640f9fcf3f64298c7958f4bde5a7e6a7602a690d.tar.gz
Scilab2C-640f9fcf3f64298c7958f4bde5a7e6a7602a690d.tar.bz2
Scilab2C-640f9fcf3f64298c7958f4bde5a7e6a7602a690d.zip
Scilab2C Arduino Updated
Diffstat (limited to '2.3-1/demos/scilab2c.dem.gateway.sce')
-rw-r--r--2.3-1/demos/scilab2c.dem.gateway.sce14
1 files changed, 13 insertions, 1 deletions
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