diff options
| author | Brijeshcr | 2017-07-08 20:18:17 +0530 |
|---|---|---|
| committer | GitHub | 2017-07-08 20:18:17 +0530 |
| commit | bd03b38be0918837e147e969c6bb2014900009db (patch) | |
| tree | 2cd9b7b1c15092e1367ed15e81aa71ccc9e05190 /macros/Scilab-Arduino | |
| parent | 97d1c6847a05bdb93557553a6bdcfd0f15feda99 (diff) | |
| download | scilab2c-bd03b38be0918837e147e969c6bb2014900009db.tar.gz scilab2c-bd03b38be0918837e147e969c6bb2014900009db.tar.bz2 scilab2c-bd03b38be0918837e147e969c6bb2014900009db.zip | |
Revert "SCi2cDeps updated, Windows compatibility resolved"
Diffstat (limited to 'macros/Scilab-Arduino')
| -rw-r--r-- | macros/Scilab-Arduino/GetArduinoFunctions.sci | 4 | ||||
| -rw-r--r-- | macros/Scilab-Arduino/GetArduinoSetupFunctions.sci | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/macros/Scilab-Arduino/GetArduinoFunctions.sci b/macros/Scilab-Arduino/GetArduinoFunctions.sci index bd532374..eff61fe6 100644 --- a/macros/Scilab-Arduino/GetArduinoFunctions.sci +++ b/macros/Scilab-Arduino/GetArduinoFunctions.sci @@ -31,10 +31,6 @@ 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 f5c64bc9..d310648e 100644 --- a/macros/Scilab-Arduino/GetArduinoSetupFunctions.sci +++ b/macros/Scilab-Arduino/GetArduinoSetupFunctions.sci @@ -25,11 +25,7 @@ ArduinoSetupFunctions = [ "cmd_dcmotor_setup" "cmd_servo_attach" "cmd_servo_detach" -<<<<<<< HEAD "i2c_dev"]; -======= - "cmd_i2c_dev"]; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction |