From 3121a1f5a8203bfd14d46f71930ac5cd22afdf7d 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 --- 2.3-1/macros/findDeps/Scilab2CDeps.bin | Bin 0 -> 101536 bytes 2.3-1/macros/findDeps/findDeps.bin | Bin 0 -> 5400 bytes 2.3-1/macros/findDeps/getAllHeaders.bin | Bin 0 -> 43228 bytes 2.3-1/macros/findDeps/getAllHeaders.sci | 10 +++++++++- 2.3-1/macros/findDeps/getAllInterfaces.bin | Bin 0 -> 45568 bytes 2.3-1/macros/findDeps/getAllInterfaces.sci | 9 ++++++++- 2.3-1/macros/findDeps/getAllLibraries.bin | Bin 0 -> 10396 bytes 2.3-1/macros/findDeps/getAllSources.bin | Bin 0 -> 250664 bytes 2.3-1/macros/findDeps/getAllSources.sci | 19 +++++++++++++------ 2.3-1/macros/findDeps/getArduinoFiles.bin | Bin 0 -> 1836 bytes 2.3-1/macros/findDeps/getArduinoFiles.sci | 1 - 2.3-1/macros/findDeps/lib | Bin 679 -> 608 bytes 12 files changed, 30 insertions(+), 9 deletions(-) create mode 100644 2.3-1/macros/findDeps/Scilab2CDeps.bin create mode 100644 2.3-1/macros/findDeps/findDeps.bin create mode 100644 2.3-1/macros/findDeps/getAllHeaders.bin create mode 100644 2.3-1/macros/findDeps/getAllInterfaces.bin create mode 100644 2.3-1/macros/findDeps/getAllLibraries.bin create mode 100644 2.3-1/macros/findDeps/getAllSources.bin create mode 100644 2.3-1/macros/findDeps/getArduinoFiles.bin (limited to '2.3-1/macros/findDeps') diff --git a/2.3-1/macros/findDeps/Scilab2CDeps.bin b/2.3-1/macros/findDeps/Scilab2CDeps.bin new file mode 100644 index 00000000..ae162ecb Binary files /dev/null and b/2.3-1/macros/findDeps/Scilab2CDeps.bin differ diff --git a/2.3-1/macros/findDeps/findDeps.bin b/2.3-1/macros/findDeps/findDeps.bin new file mode 100644 index 00000000..fb11e006 Binary files /dev/null and b/2.3-1/macros/findDeps/findDeps.bin differ diff --git a/2.3-1/macros/findDeps/getAllHeaders.bin b/2.3-1/macros/findDeps/getAllHeaders.bin new file mode 100644 index 00000000..8d67af36 Binary files /dev/null and b/2.3-1/macros/findDeps/getAllHeaders.bin differ diff --git a/2.3-1/macros/findDeps/getAllHeaders.sci b/2.3-1/macros/findDeps/getAllHeaders.sci index b7f26b33..85baef1a 100644 --- a/2.3-1/macros/findDeps/getAllHeaders.sci +++ b/2.3-1/macros/findDeps/getAllHeaders.sci @@ -205,7 +205,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" diff --git a/2.3-1/macros/findDeps/getAllInterfaces.bin b/2.3-1/macros/findDeps/getAllInterfaces.bin new file mode 100644 index 00000000..bf6007c8 Binary files /dev/null and b/2.3-1/macros/findDeps/getAllInterfaces.bin differ diff --git a/2.3-1/macros/findDeps/getAllInterfaces.sci b/2.3-1/macros/findDeps/getAllInterfaces.sci index c5c31165..e5c7e0a5 100644 --- a/2.3-1/macros/findDeps/getAllInterfaces.sci +++ b/2.3-1/macros/findDeps/getAllInterfaces.sci @@ -197,7 +197,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/getAllLibraries.bin b/2.3-1/macros/findDeps/getAllLibraries.bin new file mode 100644 index 00000000..098b51e6 Binary files /dev/null and b/2.3-1/macros/findDeps/getAllLibraries.bin differ diff --git a/2.3-1/macros/findDeps/getAllSources.bin b/2.3-1/macros/findDeps/getAllSources.bin new file mode 100644 index 00000000..1fc3ca3d Binary files /dev/null and b/2.3-1/macros/findDeps/getAllSources.bin differ diff --git a/2.3-1/macros/findDeps/getAllSources.sci b/2.3-1/macros/findDeps/getAllSources.sci index fd8b664c..826f670d 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" @@ -1202,7 +1198,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 = [ @@ -1303,5 +1307,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.bin b/2.3-1/macros/findDeps/getArduinoFiles.bin new file mode 100644 index 00000000..26fdb2e8 Binary files /dev/null and b/2.3-1/macros/findDeps/getArduinoFiles.bin differ 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 diff --git a/2.3-1/macros/findDeps/lib b/2.3-1/macros/findDeps/lib index a49dc793..22e8cc3b 100644 Binary files a/2.3-1/macros/findDeps/lib and b/2.3-1/macros/findDeps/lib differ -- cgit From 633deb856914bd374d62b3fb3b63447bd81bc03c Mon Sep 17 00:00:00 2001 From: siddhu8990 Date: Tue, 20 Jun 2017 15:26:40 +0530 Subject: Bug fixed for GSL library --- 2.3-1/macros/findDeps/getAllHeaders.sci | 4 ++++ 2.3-1/macros/findDeps/lib | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to '2.3-1/macros/findDeps') diff --git a/2.3-1/macros/findDeps/getAllHeaders.sci b/2.3-1/macros/findDeps/getAllHeaders.sci index b7f26b33..dd8b7e1c 100644 --- a/2.3-1/macros/findDeps/getAllHeaders.sci +++ b/2.3-1/macros/findDeps/getAllHeaders.sci @@ -247,4 +247,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/lib b/2.3-1/macros/findDeps/lib index a49dc793..d426d8cd 100644 --- a/2.3-1/macros/findDeps/lib +++ b/2.3-1/macros/findDeps/lib @@ -1,7 +1,7 @@ - + -- cgit