diff options
| author | yash1112 | 2017-07-07 22:03:16 +0530 |
|---|---|---|
| committer | yash1112 | 2017-07-07 22:03:16 +0530 |
| commit | 69c573fe2e59236f063aaa94dcd44b556f945cbc (patch) | |
| tree | 08fa381bec620e38c7a3d2a34448d30160d861eb /macros/Scilab-Arduino/GetArduinoFunctions.sci | |
| parent | 87823db220f4c3b8bee16c0b2e08027704de1efe (diff) | |
| parent | 3f52712f806fbd80d66dfdcaff401e5cf94dcca4 (diff) | |
| download | scilab2c-69c573fe2e59236f063aaa94dcd44b556f945cbc.tar.gz scilab2c-69c573fe2e59236f063aaa94dcd44b556f945cbc.tar.bz2 scilab2c-69c573fe2e59236f063aaa94dcd44b556f945cbc.zip | |
Scilab2C Arduino Updated
Diffstat (limited to 'macros/Scilab-Arduino/GetArduinoFunctions.sci')
| -rw-r--r-- | macros/Scilab-Arduino/GetArduinoFunctions.sci | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/macros/Scilab-Arduino/GetArduinoFunctions.sci b/macros/Scilab-Arduino/GetArduinoFunctions.sci index eff61fe6..bd532374 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 |