diff options
Diffstat (limited to 'macros/Scilab-Arduino/GetArduinoSetupFunctions.sci')
| -rw-r--r-- | macros/Scilab-Arduino/GetArduinoSetupFunctions.sci | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/macros/Scilab-Arduino/GetArduinoSetupFunctions.sci b/macros/Scilab-Arduino/GetArduinoSetupFunctions.sci index d310648e..f5c64bc9 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 |