updated with main repo

4 files changed, 34 insertions, 9 deletions

diff --git a/2.3-1/macros/findDeps/getAllHeaders.sci b/2.3-1/macros/findDeps/getAllHeaders.sci
index 9e633f6e..7788f2c4 100644
--- a/2.3-1/macros/findDeps/getAllHeaders.sci
+++ b/2.3-1/macros/findDeps/getAllHeaders.sci
@@ -212,7 +212,15 @@ function allHeaders = getAllHeaders(SharedInfo)
       //"src/c/scilab-arduino/includes/cmd_servo_attach.h"
       //"src/c/scilab-arduino/includes/cmd_servo_detach.h"
       //"src/c/scilab-arduino/includes/cmd_servo_move.h"
-      "src/c/scilab-arduino/includes/sleep.h"];
+      "src/c/scilab-arduino/includes/sleep.h"
+      "src/c/scilab-arduino/includes/cmd_analog_in_volt.h"
+	"src/c/scilab-arduino/includes/cmd_analog_out_volt.h"
+      "src/c/scilab-arduino/includes/cmd_dcmotor_release.h"
+      "src/c/scilab-arduino/includes/cmd_i2c_dev.h"
+      "src/c/scilab-arduino/includes/cmd_i2c_write.h"
+      "src/c/scilab-arduino/includes/cmd_i2c_read.h"
+      "src/c/scilab-arduino/includes/cmd_i2c_read_register.h"
+      "src/c/scilab-arduino/includes/cmd_i2c_write_register.h"];
 
   AVR_headers = [
       "src/c/hardware/avr/includes/AVRPeripheralGPIO.h"
@@ -254,4 +262,8 @@ function allHeaders = getAllHeaders(SharedInfo)
       allHeaders = cat(1,allHeaders,OpenCV_headers);
   end
 
+  if((mtlb_strcmp(part(SharedInfo.Includelist(1),1:5),'odefn') == %T))
+  	allHeaders = cat(1,allHeaders,"thirdparty/includes/GSL");
+  end
+
 endfunction
diff --git a/2.3-1/macros/findDeps/getAllInterfaces.sci b/2.3-1/macros/findDeps/getAllInterfaces.sci
index 42ed51d6..9086ba10 100644
--- a/2.3-1/macros/findDeps/getAllInterfaces.sci
+++ b/2.3-1/macros/findDeps/getAllInterfaces.sci
@@ -204,7 +204,14 @@ function allInterfaces = getAllInterfaces(SharedInfo)
       "src/c/scilab-arduino/interfaces/int_cmd_analog_in.h"
       "src/c/scilab-arduino/interfaces/int_cmd_dcmotor.h"
       "src/c/scilab-arduino/interfaces/int_cmd_servo.h"
-      "src/c/scilab-arduino/interfaces/int_sleep.h"];
+      "src/c/scilab-arduino/interfaces/int_sleep.h"
+      "src/c/scilab-arduino/interfaces/int_cmd_analog_in_volt.h"
+      "src/c/scilab-arduino/interfaces/int_cmd_analog_out_volt.h"
+      "src/c/scilab-arduino/interfaces/int_cmd_i2c_dev.h"
+      "src/c/scilab-arduino/interfaces/int_cmd_i2c_write.h"
+      "src/c/scilab-arduino/interfaces/int_cmd_i2c_read.h"
+      "src/c/scilab-arduino/interfaces/int_cmd_i2c_write_register.h"
+      "src/c/scilab-arduino/interfaces/int_cmd_i2c_read_register.h"];
 
   //Interface files required for "AVR" output
   AVR_interfaces = [
diff --git a/2.3-1/macros/findDeps/getAllSources.sci b/2.3-1/macros/findDeps/getAllSources.sci
index afa51194..0a724926 100644
--- a/2.3-1/macros/findDeps/getAllSources.sci
+++ b/2.3-1/macros/findDeps/getAllSources.sci
@@ -95,10 +95,6 @@ function allSources = getAllSources(SharedInfo)
       "src/c/matrixOperations/cat/dcats.c"
       "src/c/matrixOperations/cat/scata.c"
       "src/c/matrixOperations/cat/scats.c"
-      "src/c/matrixOperations/cat/zcata.c"
-      "src/c/matrixOperations/cat/zcats.c"
-      "src/c/matrixOperations/cat/ccata.c"
-      "src/c/matrixOperations/cat/ccats.c"
       "src/c/matrixOperations/cat/u8cats.c"
       "src/c/matrixOperations/cat/u8cata.c"
       "src/c/matrixOperations/cat/u16cats.c"
@@ -1215,7 +1211,15 @@ function allSources = getAllSources(SharedInfo)
       //"src/c/scilab-arduino/cmd_servo_attach/u8cmd_servo_attach.cpp"
       //"src/c/scilab-arduino/cmd_servo_detach/u8cmd_servo_detach.cpp"
       //"src/c/scilab-arduino/cmd_servo_move/u8cmd_servo_move.cpp"
-      "src/c/scilab-arduino/sleep/u16sleeps.c"];
+      "src/c/scilab-arduino/sleep/u16sleeps.c"
+      "src/c/scilab-arduino/cmd_analog_in_volt/u8cmd_analog_in_volts.c"
+      "src/c/scilab-arduino/cmd_analog_out_volt/u8cmd_analog_out_volts.c"
+      "src/c/scilab-arduino/cmd_dcmotor_release/u8cmd_dcmotor_releases.c"
+      "src/c/scilab-arduino/cmd_i2c_dev/u8cmd_i2c_devs.cpp"
+      "src/c/scilab-arduino/cmd_i2c_write/u8cmd_i2c_writes.cpp"
+      "src/c/scilab-arduino/cmd_i2c_read/u8cmd_i2c_reads.cpp"
+      "src/c/scilab-arduino/cmd_i2c_write_register/u8cmd_i2c_write_registers.cpp"
+      "src/c/scilab-arduino/cmd_i2c_read_register/u8cmd_i2c_read_registers.cpp"];
 
   //Files to be inserted only if output format selected is 'AVR'.
   AVR_files = [
@@ -1316,5 +1320,8 @@ function allSources = getAllSources(SharedInfo)
       allSources = cat(1,allSources,OpenCV_files);
   end
 
-
+ //"src/c/matrixOperations/cat/zcata.c"
+   //   "src/c/matrixOperations/cat/zcats.c"
+     // "src/c/matrixOperations/cat/ccata.c"
+      //"src/c/matrixOperations/cat/ccats.c"
 endfunction
diff --git a/2.3-1/macros/findDeps/getArduinoFiles.sci b/2.3-1/macros/findDeps/getArduinoFiles.sci
index aae8e500..97264575 100644
--- a/2.3-1/macros/findDeps/getArduinoFiles.sci
+++ b/2.3-1/macros/findDeps/getArduinoFiles.sci
@@ -23,6 +23,5 @@ function arduinoFiles = getArduinoFiles()
 
   arduinoFiles = [
 		"src/c/scilab-arduino/default_files/setup_arduino.h"
-		"src/c/scilab-arduino/default_files/Makefile"
 		"src/c/scilab-arduino/default_files/sci2c_arduino.ino"];
 endfunction