summaryrefslogtreecommitdiff
path: root/2.3-1/src/c/scilab-arduino
diff options
context:
space:
mode:
Diffstat (limited to '2.3-1/src/c/scilab-arduino')
-rw-r--r--2.3-1/src/c/scilab-arduino/cmd_analog_out/u8cmd_analog_outs.c4
-rw-r--r--2.3-1/src/c/scilab-arduino/cmd_dcmotor_run/u8cmd_dcmotor_runs.c3
-rw-r--r--2.3-1/src/c/scilab-arduino/cmd_dcmotor_setup/u8cmd_dcmotor_setups.c3
-rw-r--r--2.3-1/src/c/scilab-arduino/cmd_digital_out/u8cmd_digital_outs.c4
-rw-r--r--2.3-1/src/c/scilab-arduino/cmd_servo_attach/u8cmd_servo_attachs.cpp (renamed from 2.3-1/src/c/scilab-arduino/cmd_servo_attach/u8cmd_servo_attach.cpp)3
-rw-r--r--2.3-1/src/c/scilab-arduino/cmd_servo_detach/u8cmd_servo_detachs.cpp (renamed from 2.3-1/src/c/scilab-arduino/cmd_servo_detach/u8cmd_servo_detach.cpp)5
-rw-r--r--2.3-1/src/c/scilab-arduino/cmd_servo_move/u8cmd_servo_moves.cpp (renamed from 2.3-1/src/c/scilab-arduino/cmd_servo_move/u8cmd_servo_move.cpp)3
-rw-r--r--2.3-1/src/c/scilab-arduino/includes/cmd_analog_out.h2
-rw-r--r--2.3-1/src/c/scilab-arduino/includes/cmd_dcmotor_run.h2
-rw-r--r--2.3-1/src/c/scilab-arduino/includes/cmd_dcmotor_setup.h2
-rw-r--r--2.3-1/src/c/scilab-arduino/includes/cmd_digital_out.h2
-rw-r--r--2.3-1/src/c/scilab-arduino/includes/cmd_servo_attach.h2
-rw-r--r--2.3-1/src/c/scilab-arduino/includes/cmd_servo_detach.h2
-rw-r--r--2.3-1/src/c/scilab-arduino/includes/cmd_servo_move.h2
-rw-r--r--2.3-1/src/c/scilab-arduino/includes/sleep.h2
-rw-r--r--2.3-1/src/c/scilab-arduino/interfaces/int_cmd_analog_out.h4
-rw-r--r--2.3-1/src/c/scilab-arduino/interfaces/int_cmd_dcmotor.h6
-rw-r--r--2.3-1/src/c/scilab-arduino/interfaces/int_cmd_digital_out.h4
-rw-r--r--2.3-1/src/c/scilab-arduino/interfaces/int_cmd_servo.h6
-rw-r--r--2.3-1/src/c/scilab-arduino/interfaces/int_sleep.h2
-rw-r--r--2.3-1/src/c/scilab-arduino/sleep/u16sleeps.c3
21 files changed, 30 insertions, 36 deletions
diff --git a/2.3-1/src/c/scilab-arduino/cmd_analog_out/u8cmd_analog_outs.c b/2.3-1/src/c/scilab-arduino/cmd_analog_out/u8cmd_analog_outs.c
index aa7dac06..07e1805c 100644
--- a/2.3-1/src/c/scilab-arduino/cmd_analog_out/u8cmd_analog_outs.c
+++ b/2.3-1/src/c/scilab-arduino/cmd_analog_out/u8cmd_analog_outs.c
@@ -13,9 +13,9 @@
#include "cmd_analog_out.h"
#include "Arduino.h"
-uint8 u8cmd_analog_outs(uint8 board_no, uint8 pin, uint8 value)
+void u8cmd_analog_outs(uint8 board_no, uint8 pin, uint8 value)
{
analogWrite(pin,value);
- return 0;
+
}
diff --git a/2.3-1/src/c/scilab-arduino/cmd_dcmotor_run/u8cmd_dcmotor_runs.c b/2.3-1/src/c/scilab-arduino/cmd_dcmotor_run/u8cmd_dcmotor_runs.c
index 07798aba..ff2f6e5f 100644
--- a/2.3-1/src/c/scilab-arduino/cmd_dcmotor_run/u8cmd_dcmotor_runs.c
+++ b/2.3-1/src/c/scilab-arduino/cmd_dcmotor_run/u8cmd_dcmotor_runs.c
@@ -13,7 +13,7 @@
#include "cmd_dcmotor_run.h"
#include "Arduino.h"
-uint8 u8cmd_dcmotor_runs(uint8 board_no, uint8 motor_no, int16 duty)
+void u8cmd_dcmotor_runs(uint8 board_no, uint8 motor_no, int16 duty)
{
uint8 direction = 1;
if(duty >= 0)
@@ -55,6 +55,5 @@ uint8 u8cmd_dcmotor_runs(uint8 board_no, uint8 motor_no, int16 duty)
}
}
- return 0;
}
diff --git a/2.3-1/src/c/scilab-arduino/cmd_dcmotor_setup/u8cmd_dcmotor_setups.c b/2.3-1/src/c/scilab-arduino/cmd_dcmotor_setup/u8cmd_dcmotor_setups.c
index d1d0fea8..194074e1 100644
--- a/2.3-1/src/c/scilab-arduino/cmd_dcmotor_setup/u8cmd_dcmotor_setups.c
+++ b/2.3-1/src/c/scilab-arduino/cmd_dcmotor_setup/u8cmd_dcmotor_setups.c
@@ -15,7 +15,7 @@
uint8 dcm_pin_1[4], dcm_pin_2[4], dcm_mode[4];
-uint8 u8cmd_dcmotor_setups(uint8 board_no, uint8 driver_type, uint8 motor_no,\
+void u8cmd_dcmotor_setups(uint8 board_no, uint8 driver_type, uint8 motor_no,\
uint8 pin_1, uint8 pin_2)
{
dcm_pin_1[motor_no] = pin_1;
@@ -38,6 +38,5 @@ uint8 u8cmd_dcmotor_setups(uint8 board_no, uint8 driver_type, uint8 motor_no,\
digitalWrite(pin_2,LOW);
}
- return 0;
}
diff --git a/2.3-1/src/c/scilab-arduino/cmd_digital_out/u8cmd_digital_outs.c b/2.3-1/src/c/scilab-arduino/cmd_digital_out/u8cmd_digital_outs.c
index 2e5c90d3..58e7a85d 100644
--- a/2.3-1/src/c/scilab-arduino/cmd_digital_out/u8cmd_digital_outs.c
+++ b/2.3-1/src/c/scilab-arduino/cmd_digital_out/u8cmd_digital_outs.c
@@ -14,9 +14,9 @@
#include "Arduino.h"
-uint8 u8cmd_digital_outs(uint8 board_no, uint8 pin, uint8 value)
+void u8cmd_digital_outs(uint8 board_no, uint8 pin, uint8 value)
{
digitalWrite(pin,value);
- return 0;
+
}
diff --git a/2.3-1/src/c/scilab-arduino/cmd_servo_attach/u8cmd_servo_attach.cpp b/2.3-1/src/c/scilab-arduino/cmd_servo_attach/u8cmd_servo_attachs.cpp
index a89363ba..ae2c68c5 100644
--- a/2.3-1/src/c/scilab-arduino/cmd_servo_attach/u8cmd_servo_attach.cpp
+++ b/2.3-1/src/c/scilab-arduino/cmd_servo_attach/u8cmd_servo_attachs.cpp
@@ -6,7 +6,7 @@
#include "Arduino.h"
#include<Servo.h>
Servo servo1,servo2;
-uint8 u8cmd_servo_attach(uint8 h,uint8 servo_no)
+void u8cmd_servo_attach(uint8 h,uint8 servo_no)
{
// h -> Board no. reserve for future use
// servo_no -> pin no.(9 and 10).
@@ -21,6 +21,5 @@ uint8 u8cmd_servo_attach(uint8 h,uint8 servo_no)
servo2.write(0);
}
- return 0;
}
diff --git a/2.3-1/src/c/scilab-arduino/cmd_servo_detach/u8cmd_servo_detach.cpp b/2.3-1/src/c/scilab-arduino/cmd_servo_detach/u8cmd_servo_detachs.cpp
index 95faf4cd..c8c5bebb 100644
--- a/2.3-1/src/c/scilab-arduino/cmd_servo_detach/u8cmd_servo_detach.cpp
+++ b/2.3-1/src/c/scilab-arduino/cmd_servo_detach/u8cmd_servo_detachs.cpp
@@ -5,7 +5,7 @@
#include "Arduino.h"
#include<Servo.h>
Servo servo1,servo2;
-uint8 u8cmd_servo_detach(uint8 h,uint8 servo_no)
+void u8cmd_servo_detach(uint8 h,uint8 servo_no)
{
// h -> Board no. reserve for future use
// servo_no -> pin no.(9 and 10).
@@ -18,7 +18,6 @@ uint8 u8cmd_servo_detach(uint8 h,uint8 servo_no)
{
servo2.detach();
}
-
- return 0;
+
}
diff --git a/2.3-1/src/c/scilab-arduino/cmd_servo_move/u8cmd_servo_move.cpp b/2.3-1/src/c/scilab-arduino/cmd_servo_move/u8cmd_servo_moves.cpp
index e8874766..94f35639 100644
--- a/2.3-1/src/c/scilab-arduino/cmd_servo_move/u8cmd_servo_move.cpp
+++ b/2.3-1/src/c/scilab-arduino/cmd_servo_move/u8cmd_servo_moves.cpp
@@ -6,7 +6,7 @@
#include "Arduino.h"
#include<Servo.h>
Servo servo1,servo2;
-uint8 u8cmd_servo_move(uint8 h,uint8 servo_no,uint8 val)
+void u8cmd_servo_move(uint8 h,uint8 servo_no,uint8 val)
{
// h -> Board no. reserve for future use
// servo_no -> pin no.(9 and 10).
@@ -22,6 +22,5 @@ uint8 u8cmd_servo_move(uint8 h,uint8 servo_no,uint8 val)
servo2.write(val);
}
}
- return 0;
}
diff --git a/2.3-1/src/c/scilab-arduino/includes/cmd_analog_out.h b/2.3-1/src/c/scilab-arduino/includes/cmd_analog_out.h
index a0da68e1..5f9e5272 100644
--- a/2.3-1/src/c/scilab-arduino/includes/cmd_analog_out.h
+++ b/2.3-1/src/c/scilab-arduino/includes/cmd_analog_out.h
@@ -19,7 +19,7 @@
extern "C" {
#endif
-uint8 u8cmd_analog_outs(uint8 board_no, uint8 pin, uint8 value);
+void u8cmd_analog_outs(uint8 board_no, uint8 pin, uint8 value);
#ifdef __cplusplus
} /* extern "C" */
diff --git a/2.3-1/src/c/scilab-arduino/includes/cmd_dcmotor_run.h b/2.3-1/src/c/scilab-arduino/includes/cmd_dcmotor_run.h
index 82df60ad..4bc1ccc3 100644
--- a/2.3-1/src/c/scilab-arduino/includes/cmd_dcmotor_run.h
+++ b/2.3-1/src/c/scilab-arduino/includes/cmd_dcmotor_run.h
@@ -22,7 +22,7 @@ extern "C" {
extern uint8 dcm_pin_1[4], dcm_pin_2[4], dcm_mode[4];
-uint8 u8cmd_dc_motor_runs(uint8 board_no, uint8 motor_no, int16 duty);
+void u8cmd_dc_motor_runs(uint8 board_no, uint8 motor_no, int16 duty);
#ifdef __cplusplus
} /* extern "C" */
diff --git a/2.3-1/src/c/scilab-arduino/includes/cmd_dcmotor_setup.h b/2.3-1/src/c/scilab-arduino/includes/cmd_dcmotor_setup.h
index 66fa04e9..e7de474c 100644
--- a/2.3-1/src/c/scilab-arduino/includes/cmd_dcmotor_setup.h
+++ b/2.3-1/src/c/scilab-arduino/includes/cmd_dcmotor_setup.h
@@ -22,7 +22,7 @@ extern "C" {
extern uint8 dcm_pin_1[4], dcm_pin_2[4], dcm_mode[4];
-uint8 u8cmd_dc_motor_setups(uint8 board_no, uint8 driver_type, uint8 motor_no,\
+void u8cmd_dc_motor_setups(uint8 board_no, uint8 driver_type, uint8 motor_no,\
uint8 pin_1, uint8 pin_2);
#ifdef __cplusplus
diff --git a/2.3-1/src/c/scilab-arduino/includes/cmd_digital_out.h b/2.3-1/src/c/scilab-arduino/includes/cmd_digital_out.h
index ee459d18..a0150ce5 100644
--- a/2.3-1/src/c/scilab-arduino/includes/cmd_digital_out.h
+++ b/2.3-1/src/c/scilab-arduino/includes/cmd_digital_out.h
@@ -20,7 +20,7 @@
extern "C" {
#endif
-uint8 u8cmd_digital_outs(uint8 board_no, uint8 pin, uint8 value);
+void u8cmd_digital_outs(uint8 board_no, uint8 pin, uint8 value);
#ifdef __cplusplus
} /* extern "C" */
diff --git a/2.3-1/src/c/scilab-arduino/includes/cmd_servo_attach.h b/2.3-1/src/c/scilab-arduino/includes/cmd_servo_attach.h
index 5dd3ed6b..87078330 100644
--- a/2.3-1/src/c/scilab-arduino/includes/cmd_servo_attach.h
+++ b/2.3-1/src/c/scilab-arduino/includes/cmd_servo_attach.h
@@ -14,7 +14,7 @@ extern "C" {
extern Servo servo1,servo2;
-uint8 u8cmd_servo_attach(uint8 h, uint8 servo_no );
+void u8cmd_servo_attach(uint8 h, uint8 servo_no );
#ifdef __cplusplus
} /* extern "C" */
diff --git a/2.3-1/src/c/scilab-arduino/includes/cmd_servo_detach.h b/2.3-1/src/c/scilab-arduino/includes/cmd_servo_detach.h
index ce74d62d..6ac5e2b4 100644
--- a/2.3-1/src/c/scilab-arduino/includes/cmd_servo_detach.h
+++ b/2.3-1/src/c/scilab-arduino/includes/cmd_servo_detach.h
@@ -15,7 +15,7 @@ extern "C" {
extern Servo servo1,servo2;
-uint8 u8cmd_servo_detach(uint8 h, uint8 servo_no );
+void u8cmd_servo_detach(uint8 h, uint8 servo_no );
#ifdef __cplusplus
} /* extern "C" */
diff --git a/2.3-1/src/c/scilab-arduino/includes/cmd_servo_move.h b/2.3-1/src/c/scilab-arduino/includes/cmd_servo_move.h
index 9013d3cc..7f9bc0d4 100644
--- a/2.3-1/src/c/scilab-arduino/includes/cmd_servo_move.h
+++ b/2.3-1/src/c/scilab-arduino/includes/cmd_servo_move.h
@@ -15,7 +15,7 @@ extern "C" {
extern Servo servo1,servo2;
-uint8 u8cmd_servo_move(uint8 h, uint8 servo_no,uint8 val);
+void u8cmd_servo_move(uint8 h, uint8 servo_no,uint8 val);
#ifdef __cplusplus
} /* extern "C" */
diff --git a/2.3-1/src/c/scilab-arduino/includes/sleep.h b/2.3-1/src/c/scilab-arduino/includes/sleep.h
index 4c8cbc29..8daab69a 100644
--- a/2.3-1/src/c/scilab-arduino/includes/sleep.h
+++ b/2.3-1/src/c/scilab-arduino/includes/sleep.h
@@ -19,7 +19,7 @@
extern "C" {
#endif
-uint8 u16sleeps(uint16 delay_ms);
+void u16sleeps(uint16 delay_ms);
#ifdef __cplusplus
} /* extern "C" */
diff --git a/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_analog_out.h b/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_analog_out.h
index ead26acd..24105232 100644
--- a/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_analog_out.h
+++ b/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_analog_out.h
@@ -20,10 +20,10 @@
extern "C" {
#endif
-#define d0d0d0cmd_analog_outu80(in1,in2,in3) u8cmd_analog_outs((uint8)in1,\
+#define d0d0d0cmd_analog_out(in1,in2,in3) u8cmd_analog_outs((uint8)in1,\
(uint8)in2,(uint8)in3)
-#define d0d0u80cmd_analog_outu80(in1,in2,in3) u8cmd_analog_outs((uint8)in1,\
+#define d0d0u80cmd_analog_out(in1,in2,in3) u8cmd_analog_outs((uint8)in1,\
(uint8)in2,(uint8)in3)
#ifdef __cplusplus
diff --git a/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_dcmotor.h b/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_dcmotor.h
index b35583d7..7f8db414 100644
--- a/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_dcmotor.h
+++ b/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_dcmotor.h
@@ -20,15 +20,15 @@
extern "C" {
#endif
-#define d0d0d0d0d0cmd_dcmotor_setupu80(in1,in2,in3,in4,in5)\
+#define d0d0d0d0d0cmd_dcmotor_setup(in1,in2,in3,in4,in5)\
u8cmd_dcmotor_setups((uint8)in1,(uint8)in2,(uint8)in3,\
(uint8)in4,(uint8)in5)
-#define d0d0d0cmd_dcmotor_runu80(in1,in2,in3) u8cmd_dcmotor_runs((uint8)in1,\
+#define d0d0d0cmd_dcmotor_run(in1,in2,in3) u8cmd_dcmotor_runs((uint8)in1,\
(uint8)in2, (int16)in3);
-#define d0d0u160cmd_dcmotor_runu80(in1,in2,in3) u8cmd_dcmotor_runs((uint8)in1,\
+#define d0d0u160cmd_dcmotor_run(in1,in2,in3) u8cmd_dcmotor_runs((uint8)in1,\
(uint8)in2, (int16)in3);
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 4585f12a..009ff7d4 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
@@ -20,11 +20,11 @@
extern "C" {
#endif
-#define d0d0d0cmd_digital_outu80(in1,in2,in3) u8cmd_digital_outs((uint8)in1,\
+#define d0d0d0cmd_digital_out(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,\
+#define d0d0u80cmd_digital_out(in1,in2,in3) u8cmd_digital_outs((uint8)in1,\
(uint8)in2, (uint8)in3)
diff --git a/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_servo.h b/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_servo.h
index d99a0444..3b482733 100644
--- a/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_servo.h
+++ b/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_servo.h
@@ -13,11 +13,11 @@ extern "C" {
#endif
-#define d0d0cmd_servo_attachu80(in1,in2) u8cmd_servo_attach((uint8)in1,(uint8)in2);
+#define d0d0cmd_servo_attach(in1,in2) u8cmd_servo_attach((uint8)in1,(uint8)in2);
-#define d0d0cmd_servo_detachu80(in1,in2) u8cmd_servo_detach((uint8)in1,(uint8)in2);
+#define d0d0cmd_servo_detach(in1,in2) u8cmd_servo_detach((uint8)in1,(uint8)in2);
-#define d0d0d0cmd_servo_moveu80(in1,in2,in3) u8cmd_servo_move((uint8)in1,(uint8)in2,(uint8)in3);
+#define d0d0d0cmd_servo_move(in1,in2,in3) u8cmd_servo_move((uint8)in1,(uint8)in2,(uint8)in3);
#ifdef __cplusplus
diff --git a/2.3-1/src/c/scilab-arduino/interfaces/int_sleep.h b/2.3-1/src/c/scilab-arduino/interfaces/int_sleep.h
index 8e2d0824..a0d3545d 100644
--- a/2.3-1/src/c/scilab-arduino/interfaces/int_sleep.h
+++ b/2.3-1/src/c/scilab-arduino/interfaces/int_sleep.h
@@ -20,7 +20,7 @@
extern "C" {
#endif
-#define d0sleepu80(in1) u16sleeps((uint16)in1)
+#define d0sleep(in1) u16sleeps((uint16)in1)
#ifdef __cplusplus
} /* extern "C" */
diff --git a/2.3-1/src/c/scilab-arduino/sleep/u16sleeps.c b/2.3-1/src/c/scilab-arduino/sleep/u16sleeps.c
index 14da0ba9..fc59ca8c 100644
--- a/2.3-1/src/c/scilab-arduino/sleep/u16sleeps.c
+++ b/2.3-1/src/c/scilab-arduino/sleep/u16sleeps.c
@@ -12,9 +12,8 @@
#include "sleep.h"
-uint8 u16sleeps(uint16 delay_ms)
+void u16sleeps(uint16 delay_ms)
{
delay(delay_ms);
- return 0;
}