From 02d130cbece220ee2dafeb8d2236a51806e5fac8 Mon Sep 17 00:00:00 2001 From: siddhu8990 Date: Tue, 15 Sep 2015 14:47:02 +0530 Subject: Working arduino digital input and output --- 2.3-1/includes/sci2clib.h | 4 ++++ .../CCodeGeneration/.fuse_hidden00001d2200000003 | Bin 0 -> 13696 bytes 2.3-1/macros/CCodeGeneration/C_FinalizeCode.bin | Bin 13696 -> 13696 bytes 2.3-1/macros/CCodeGeneration/C_GenerateMakefile.bin | Bin 17792 -> 17792 bytes 2.3-1/macros/CCodeGeneration/C_InitHeader.bin | Bin 13696 -> 13696 bytes 2.3-1/macros/CCodeGeneration/C_Type.bin | Bin 9600 -> 9600 bytes .../ToolInitialization/.fuse_hidden00002d5800000006 | Bin 407504 -> 0 bytes 2.3-1/macros/ToolInitialization/INIT_CreateDirs.bin | Bin 9600 -> 9600 bytes .../ToolInitialization/INIT_FillSCI2LibCDirs.sci | 10 ++++++++++ .../ToolInitialization/INIT_GenAnnFLFunctions.bin | Bin 9600 -> 9600 bytes .../macros/ToolInitialization/INIT_GenFileInfo.bin | Bin 13696 -> 13696 bytes .../macros/ToolInitialization/INIT_GenLibraries.bin | Bin 9600 -> 9600 bytes .../ToolInitialization/INIT_GenSharedInfo.bin | Bin 13696 -> 13696 bytes .../ToolInitialization/INIT_LoadLibraries.bin | Bin 9600 -> 9600 bytes 2.3-1/macros/ToolInitialization/INIT_RemoveDirs.bin | Bin 13696 -> 13696 bytes 2.3-1/macros/ToolInitialization/INIT_SCI2C.bin | Bin 21152 -> 21152 bytes .../ToolInitialization/INIT_SharedInfoEqual.bin | Bin 9600 -> 9600 bytes .../ToolInitialization/ManageNextConversion.bin | Bin 13696 -> 13696 bytes 2.3-1/macros/ToolInitialization/UpdateSCI2CInfo.bin | Bin 30256 -> 30256 bytes 2.3-1/macros/findDeps/getAllHeaders.bin | Bin 13696 -> 13696 bytes 2.3-1/macros/findDeps/getAllInterfaces.bin | Bin 13696 -> 13696 bytes 2.3-1/macros/findDeps/getAllSources.bin | Bin 89136 -> 89136 bytes 2.3-1/macros/findDeps/getArduinoFiles.bin | Bin 0 -> 9600 bytes 2.3-1/src/c/operations/interfaces/int_OpLogEq.h | 9 +++++++++ 2.3-1/src/c/scilab-arduino/default_files/Makefile | 4 ++-- .../scilab-arduino/interfaces/int_cmd_digital_out.h | 5 +++++ 26 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 2.3-1/macros/CCodeGeneration/.fuse_hidden00001d2200000003 delete mode 100644 2.3-1/macros/ToolInitialization/.fuse_hidden00002d5800000006 create mode 100644 2.3-1/macros/findDeps/getArduinoFiles.bin diff --git a/2.3-1/includes/sci2clib.h b/2.3-1/includes/sci2clib.h index b887ebbe..aa6a9cc6 100644 --- a/2.3-1/includes/sci2clib.h +++ b/2.3-1/includes/sci2clib.h @@ -332,8 +332,12 @@ /*Scilab-arduino toolbox*/ #include "int_cmd_digital_out.h" #include "cmd_digital_out.h" +#include "int_cmd_digital_in.h" +#include "cmd_digital_in.h" #include "int_cmd_analog_out.h" #include "cmd_analog_out.h" +#include "int_cmd_analog_in.h" +#include "cmd_analog_in.h" #include "int_sleep.h" #include "sleep.h" diff --git a/2.3-1/macros/CCodeGeneration/.fuse_hidden00001d2200000003 b/2.3-1/macros/CCodeGeneration/.fuse_hidden00001d2200000003 new file mode 100644 index 00000000..02f578ec Binary files /dev/null and b/2.3-1/macros/CCodeGeneration/.fuse_hidden00001d2200000003 differ diff --git a/2.3-1/macros/CCodeGeneration/C_FinalizeCode.bin b/2.3-1/macros/CCodeGeneration/C_FinalizeCode.bin index a2e3e129..133956eb 100644 Binary files a/2.3-1/macros/CCodeGeneration/C_FinalizeCode.bin and b/2.3-1/macros/CCodeGeneration/C_FinalizeCode.bin differ diff --git a/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.bin b/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.bin index bbb2ceaf..d4164e6b 100644 Binary files a/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.bin and b/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.bin differ diff --git a/2.3-1/macros/CCodeGeneration/C_InitHeader.bin b/2.3-1/macros/CCodeGeneration/C_InitHeader.bin index 01475765..0673399a 100644 Binary files a/2.3-1/macros/CCodeGeneration/C_InitHeader.bin and b/2.3-1/macros/CCodeGeneration/C_InitHeader.bin differ diff --git a/2.3-1/macros/CCodeGeneration/C_Type.bin b/2.3-1/macros/CCodeGeneration/C_Type.bin index 36a94585..424c6155 100644 Binary files a/2.3-1/macros/CCodeGeneration/C_Type.bin and b/2.3-1/macros/CCodeGeneration/C_Type.bin differ diff --git a/2.3-1/macros/ToolInitialization/.fuse_hidden00002d5800000006 b/2.3-1/macros/ToolInitialization/.fuse_hidden00002d5800000006 deleted file mode 100644 index 406f6f51..00000000 Binary files a/2.3-1/macros/ToolInitialization/.fuse_hidden00002d5800000006 and /dev/null differ diff --git a/2.3-1/macros/ToolInitialization/INIT_CreateDirs.bin b/2.3-1/macros/ToolInitialization/INIT_CreateDirs.bin index 2925a703..e180f6e0 100644 Binary files a/2.3-1/macros/ToolInitialization/INIT_CreateDirs.bin and b/2.3-1/macros/ToolInitialization/INIT_CreateDirs.bin differ diff --git a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci index eafc416a..792ef653 100644 --- a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci +++ b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci @@ -1375,6 +1375,15 @@ PrintStringInfo('z2d2'+ArgSeparator+'d2',ClassFileName,'file','y'); PrintStringInfo('d2z2'+ArgSeparator+'d2',ClassFileName,'file','y'); PrintStringInfo('s2c2'+ArgSeparator+'s2',ClassFileName,'file','y'); +PrintStringInfo('u80d0'+ArgSeparator+'u80',ClassFileName,'file','y'); +PrintStringInfo('i80d0'+ArgSeparator+'i80',ClassFileName,'file','y'); +PrintStringInfo('u160d0'+ArgSeparator+'u160',ClassFileName,'file','y'); +PrintStringInfo('i160d0'+ArgSeparator+'i160',ClassFileName,'file','y'); + +PrintStringInfo('d0u80'+ArgSeparator+'u80',ClassFileName,'file','y'); +PrintStringInfo('d0i80'+ArgSeparator+'i80',ClassFileName,'file','y'); +PrintStringInfo('d0u160'+ArgSeparator+'u160',ClassFileName,'file','y'); +PrintStringInfo('d0i160'+ArgSeparator+'i160',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'OpLogEq'; // BJ : Done AS : Float_Done @@ -3769,6 +3778,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); PrintStringInfo('d0d0d0'+ArgSeparator+'u80',ClassFileName,'file','y'); +PrintStringInfo('d0d0u80'+ArgSeparator+'u80',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'cmd_digital_out'; diff --git a/2.3-1/macros/ToolInitialization/INIT_GenAnnFLFunctions.bin b/2.3-1/macros/ToolInitialization/INIT_GenAnnFLFunctions.bin index 3f8981a0..b0cff95b 100644 Binary files a/2.3-1/macros/ToolInitialization/INIT_GenAnnFLFunctions.bin and b/2.3-1/macros/ToolInitialization/INIT_GenAnnFLFunctions.bin differ diff --git a/2.3-1/macros/ToolInitialization/INIT_GenFileInfo.bin b/2.3-1/macros/ToolInitialization/INIT_GenFileInfo.bin index 733ab516..e5a9ae29 100644 Binary files a/2.3-1/macros/ToolInitialization/INIT_GenFileInfo.bin and b/2.3-1/macros/ToolInitialization/INIT_GenFileInfo.bin differ diff --git a/2.3-1/macros/ToolInitialization/INIT_GenLibraries.bin b/2.3-1/macros/ToolInitialization/INIT_GenLibraries.bin index a1bf6f5a..de7d66e9 100644 Binary files a/2.3-1/macros/ToolInitialization/INIT_GenLibraries.bin and b/2.3-1/macros/ToolInitialization/INIT_GenLibraries.bin differ diff --git a/2.3-1/macros/ToolInitialization/INIT_GenSharedInfo.bin b/2.3-1/macros/ToolInitialization/INIT_GenSharedInfo.bin index 9c82bde9..28e3e322 100644 Binary files a/2.3-1/macros/ToolInitialization/INIT_GenSharedInfo.bin and b/2.3-1/macros/ToolInitialization/INIT_GenSharedInfo.bin differ diff --git a/2.3-1/macros/ToolInitialization/INIT_LoadLibraries.bin b/2.3-1/macros/ToolInitialization/INIT_LoadLibraries.bin index 35bc6a1b..65cd4c0e 100644 Binary files a/2.3-1/macros/ToolInitialization/INIT_LoadLibraries.bin and b/2.3-1/macros/ToolInitialization/INIT_LoadLibraries.bin differ diff --git a/2.3-1/macros/ToolInitialization/INIT_RemoveDirs.bin b/2.3-1/macros/ToolInitialization/INIT_RemoveDirs.bin index 5a3cc93b..4982a1ee 100644 Binary files a/2.3-1/macros/ToolInitialization/INIT_RemoveDirs.bin and b/2.3-1/macros/ToolInitialization/INIT_RemoveDirs.bin differ diff --git a/2.3-1/macros/ToolInitialization/INIT_SCI2C.bin b/2.3-1/macros/ToolInitialization/INIT_SCI2C.bin index 1c2b2d3e..b3a3aaaa 100644 Binary files a/2.3-1/macros/ToolInitialization/INIT_SCI2C.bin and b/2.3-1/macros/ToolInitialization/INIT_SCI2C.bin differ diff --git a/2.3-1/macros/ToolInitialization/INIT_SharedInfoEqual.bin b/2.3-1/macros/ToolInitialization/INIT_SharedInfoEqual.bin index 6737e64a..b0f6e77c 100644 Binary files a/2.3-1/macros/ToolInitialization/INIT_SharedInfoEqual.bin and b/2.3-1/macros/ToolInitialization/INIT_SharedInfoEqual.bin differ diff --git a/2.3-1/macros/ToolInitialization/ManageNextConversion.bin b/2.3-1/macros/ToolInitialization/ManageNextConversion.bin index 03565bd9..93114c67 100644 Binary files a/2.3-1/macros/ToolInitialization/ManageNextConversion.bin and b/2.3-1/macros/ToolInitialization/ManageNextConversion.bin differ diff --git a/2.3-1/macros/ToolInitialization/UpdateSCI2CInfo.bin b/2.3-1/macros/ToolInitialization/UpdateSCI2CInfo.bin index 2ee6b8df..142bfd78 100644 Binary files a/2.3-1/macros/ToolInitialization/UpdateSCI2CInfo.bin and b/2.3-1/macros/ToolInitialization/UpdateSCI2CInfo.bin differ diff --git a/2.3-1/macros/findDeps/getAllHeaders.bin b/2.3-1/macros/findDeps/getAllHeaders.bin index b0355de4..3cbeb650 100644 Binary files a/2.3-1/macros/findDeps/getAllHeaders.bin and b/2.3-1/macros/findDeps/getAllHeaders.bin differ diff --git a/2.3-1/macros/findDeps/getAllInterfaces.bin b/2.3-1/macros/findDeps/getAllInterfaces.bin index 1a0fedce..c01712f7 100644 Binary files a/2.3-1/macros/findDeps/getAllInterfaces.bin and b/2.3-1/macros/findDeps/getAllInterfaces.bin differ diff --git a/2.3-1/macros/findDeps/getAllSources.bin b/2.3-1/macros/findDeps/getAllSources.bin index a6894729..bf26b3ba 100644 Binary files a/2.3-1/macros/findDeps/getAllSources.bin and b/2.3-1/macros/findDeps/getAllSources.bin differ diff --git a/2.3-1/macros/findDeps/getArduinoFiles.bin b/2.3-1/macros/findDeps/getArduinoFiles.bin new file mode 100644 index 00000000..f63160ef Binary files /dev/null and b/2.3-1/macros/findDeps/getArduinoFiles.bin differ diff --git a/2.3-1/src/c/operations/interfaces/int_OpLogEq.h b/2.3-1/src/c/operations/interfaces/int_OpLogEq.h index 446b11cd..b693db65 100644 --- a/2.3-1/src/c/operations/interfaces/int_OpLogEq.h +++ b/2.3-1/src/c/operations/interfaces/int_OpLogEq.h @@ -31,6 +31,15 @@ #define c0s0OpLogEqs0(in1,in2) s0c0OpLogEqs0(in2,in1) #define z0d0OpLogEqd0(in1,in2) d0z0OpLogEqd0(in2,in1) +#define u80d0OpLogEqu80(in1,in2) (uint8) (in1 == (uint8)in2) +#define i80d0OpLogEqi80(in1,in2) (int8) (in1 == (int8)in2) +#define u160d0OpLogEqu160(in1,in2) (uint16) (in1 == (uint16)in2) +#define i160d0OpLogEqi160(in1,in2) (int16) (in1 == (int16)in2) + +#define d0u80OpLogEqu80(in1,in2) (uint8) ((uint8)in1 == in2) +#define d0i80OpLogEqi80(in1,in2) (int8) ((int8)in1 == in2) +#define d0u160OpLogEqu160(in1,in2) (uint16) ((uint16)in1 == in2) +#define d0i160OpLogEqi160(in1,in2) (int16) ((int16)in1 == in2) #define s2s0OpLogEqs2(in1,size,in2,out) {int i;\ diff --git a/2.3-1/src/c/scilab-arduino/default_files/Makefile b/2.3-1/src/c/scilab-arduino/default_files/Makefile index 7d74195e..2b888f05 100644 --- a/2.3-1/src/c/scilab-arduino/default_files/Makefile +++ b/2.3-1/src/c/scilab-arduino/default_files/Makefile @@ -3,8 +3,8 @@ ARDUINO_DIR = /usr/share/arduino ARDMK_DIR = /usr/share/arduino AVR_TOOLS_DIR = /usr -BOARD_TAG = atmega328 +BOARD_TAG = uno USER_LIB_PATH = ../../ ARDUINO_LIBS = src/c includes interfaces ../Temp -ARDUINO_PORT = /dev/ttyUSB0 +ARDUINO_PORT = /dev/ttyACM0 include /usr/share/arduino/Arduino.mk diff --git a/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_digital_out.h b/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_digital_out.h index a3d1eabd..fdc1728d 100644 --- a/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_digital_out.h +++ b/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_digital_out.h @@ -23,6 +23,11 @@ extern "C" { #define d0d0d0cmd_digital_outu80(in1,in2,in3) u8cmd_digital_outs((uint8)in1,\ (uint8)in2,(uint8)in3) +//Required when input from one pin is directed to other output pin. +#define d0d0u80cmd_digital_outu80(in1,in2,in3) u8cmd_digital_outs((uint8)in1,\ + (uint8)in2, in3) + + #ifdef __cplusplus } /* extern "C" */ #endif -- cgit