diff options
Diffstat (limited to 'macros/Scilab-Arduino')
| -rw-r--r-- | macros/Scilab-Arduino/GetArduinoFunctions.sci | 4 | ||||
| -rw-r--r-- | macros/Scilab-Arduino/GetArduinoSetupFunctions.sci | 4 | ||||
| -rw-r--r-- | macros/Scilab-Arduino/lib | bin | 736 -> 652 bytes |
3 files changed, 8 insertions, 0 deletions
diff --git a/macros/Scilab-Arduino/GetArduinoFunctions.sci b/macros/Scilab-Arduino/GetArduinoFunctions.sci index 69c4ab3..bd53237 100644 --- a/macros/Scilab-Arduino/GetArduinoFunctions.sci +++ b/macros/Scilab-Arduino/GetArduinoFunctions.sci @@ -31,6 +31,10 @@ ArduinoFunctions = [ "cmd_servo_attach" "cmd_servo_detach" "cmd_servo_move" +<<<<<<< HEAD + "i2c_dev"]; +======= "cmd_i2c_dev"]; +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction diff --git a/macros/Scilab-Arduino/GetArduinoSetupFunctions.sci b/macros/Scilab-Arduino/GetArduinoSetupFunctions.sci index 78bda03..f5c64bc 100644 --- a/macros/Scilab-Arduino/GetArduinoSetupFunctions.sci +++ b/macros/Scilab-Arduino/GetArduinoSetupFunctions.sci @@ -25,7 +25,11 @@ ArduinoSetupFunctions = [ "cmd_dcmotor_setup" "cmd_servo_attach" "cmd_servo_detach" +<<<<<<< HEAD + "i2c_dev"]; +======= "cmd_i2c_dev"]; +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction diff --git a/macros/Scilab-Arduino/lib b/macros/Scilab-Arduino/lib Binary files differindex 1887911..64a3fce 100644 --- a/macros/Scilab-Arduino/lib +++ b/macros/Scilab-Arduino/lib |