Skip to content

Commit 887737b

Browse files
authored
Merge pull request #3 from arduino-libraries/servo
added RC servos in firmware_01 example
2 parents bb78c3c + 685d2c0 commit 887737b

File tree

2 files changed

+23
-7
lines changed

2 files changed

+23
-7
lines changed

examples/firmware_01/firmware_01.ino

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,18 @@ SensorTofMatrix tof(alvik.wire, EXT_GPIO3, EXT_GPIO2);
2323
ucPack packeter(200);
2424

2525
uint8_t code;
26+
uint8_t label;
27+
uint8_t control_type;
2628
uint8_t msg_size;
2729

30+
2831
unsigned long tmotor=0;
2932
unsigned long tsend=0;
3033
unsigned long tsensor=0;
3134
unsigned long timu=0;
3235

3336

34-
float left, right;
37+
float left, right, value;
3538
uint8_t leds;
3639

3740
uint8_t sensor_id = 0;
@@ -40,6 +43,7 @@ uint8_t sensor_id = 0;
4043
uint8_t pid;
4144
float kp, ki, kd;
4245

46+
uint8_t servo_A, servo_B;
4347

4448

4549
void setup(){
@@ -75,11 +79,24 @@ void loop(){
7579
packeter.unpacketC2F(code,left,right);
7680
alvik.setRpm(left, right);
7781
break;
78-
/*
82+
case 'W':
83+
packeter.unpacketC2B1F(code,label,control_type,value);
84+
if ((label == 'L') && (control_type == 'V')) {
85+
alvik.motor_control_left->setRPM(value);
86+
}
87+
else if ((label == 'R') && (control_type == 'V'))
88+
{
89+
alvik.motor_control_right->setRPM(value);
90+
}
91+
92+
break;
93+
7994
case 'S':
80-
alvik.setRpm(0,0);
95+
packeter.unpacketC2B(code,servo_A,servo_B);
96+
alvik.setServoA(servo_A);
97+
alvik.setServoB(servo_B);
8198
break;
82-
*/
99+
83100
case 'L':
84101
packeter.unpacketC1B(code,leds);
85102
alvik.setAllLeds(leds);
@@ -135,7 +152,6 @@ void loop(){
135152
if (millis()-tmotor>20){
136153
tmotor=millis();
137154
alvik.updateMotors();
138-
alvik.updateImu();
139155
msg_size = packeter.packetC2F('j', alvik.getRpmLeft(),alvik.getRpmRight());
140156
alvik.serial->write(packeter.msg,msg_size);
141157

library.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=Arduino Alvik Carrier
2-
version=0.1.0
2+
version=0.1.1
33
author=Arduino, Giovanni di Dio Bruno, Lucio Rossi
44
maintainer=Arduino <[email protected]>
55
sentence=Library and firmware for Arduino Alvik Carrier board
@@ -8,4 +8,4 @@ category=Robotics
88
url=https://github.com/arduino-libraries/Arduino_AlvikCarrier
99
architectures=stm32
1010
includes=Arduino_AlvikCarrier.h
11-
depends=Arduino_APDS9960, Arduino_MAX17332, STM32duino_LSM6DSO, STM32duino_MotionFX, STM32duino_VL53L7CX, AT42QT, ucPack
11+
depends=Arduino_APDS9960, Arduino_MAX17332, STM32duino_LSM6DSO, STM32duino_MotionFX, STM32duino_VL53L7CX, AT42QT, ucPack

0 commit comments

Comments
 (0)