Skip to content

Commit 7a2b411

Browse files
gbr1gbr1
committed
cleanup rgb
1 parent e8fbc2e commit 7a2b411

File tree

5 files changed

+81
-69
lines changed

5 files changed

+81
-69
lines changed

‎library.properties

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
name=Arduino_Robot_Firmware
2-
version=0.0.6
1+
name=Arduino Alvik Carrier
2+
version=0.1.0
33
author=Arduino, Giovanni di Dio Bruno, Lucio Rossi
44
maintainer=Arduino <[email protected]>
5-
sentence=Library and firmware for Arduino Alvik
6-
paragraph=This library is used to build the firmware used by Arduino Alvik, examples show you how to customize the firmware.
5+
sentence=Library and firmware for Arduino Alvik Carrier board
6+
paragraph=This library is used to build the firmware used by Arduino Alvik Carrier, examples show you how to customize the firmware.
77
category=Robotics
8-
url=https://github.com/gbr1/Arduino_Alvik_Firmware
8+
url=https://github.com/arduino-libraries/Arduino_AlvikCarrier
99
architectures=stm32
10-
includes=Arduino_Alvik_Firmware.h
10+
includes=Arduino_AlvikCarrier.h
1111
depends=Arduino_APDS9960, Arduino_MAX17332, STM32duino_LSM6DSO, STM32duino_MotionFX, STM32duino_VL53L7CX, AT42QT, ucPack

‎src/Arduino_AlvikCarrier.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ class Arduino_AlvikCarrier{
159159

160160
// Leds
161161
int beginLeds();
162-
void setLed_Builtin(const uint8_t value);
162+
void setLedBuiltin(const uint8_t value);
163163
void setLedLeft(const uint32_t color);
164164
void setLedLeft(const uint32_t red, const uint32_t green, const uint32_t blue);
165165
void setLedLeftRed(const uint32_t red);

‎src/definitions/robot_definitions.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ const float MOTOR_RATIO = MOTOR_CPR*MOTOR_GEAR_RATIO;
3939
#define MOTION_FX_FREQ 100U
4040
const float MOTION_FX_PERIOD = (1000U / MOTION_FX_FREQ);
4141
#define MOTION_FX_ENGINE_DELTATIME 0.01f
42-
//#define STATE_SIZE (size_t)(2432)
42+
#define STATE_SIZE (size_t)(2432)
4343
#define MOTION_FX_SAMPLETODISCARD 15
4444
#define GBIAS_ACC_TH_SC (2.0f*0.000765f)
4545
#define GBIAS_GYRO_TH_SC (2.0f*0.002f)

‎src/utilities/rgb_led.cpp

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
#include "rgb_led.h"
2+
3+
RGBled::RGBled(const uint8_t _Red, const uint8_t _Green, const uint8_t _Blue){
4+
R=_Red;
5+
G=_Green;
6+
B=_Blue;
7+
pinMode(R,OUTPUT);
8+
pinMode(G,OUTPUT);
9+
pinMode(B,OUTPUT);
10+
digitalWrite(R,LOW);
11+
digitalWrite(G,LOW);
12+
digitalWrite(B,LOW);
13+
}
14+
15+
void RGBled::setRed(const uint32_t red){
16+
digitalWrite(R, red);
17+
}
18+
19+
void RGBled::setGreen(const uint32_t green){
20+
digitalWrite(G, green);
21+
}
22+
23+
void RGBled::setBlue(const uint32_t blue){
24+
digitalWrite(B, blue);
25+
}
26+
27+
void RGBled::set(const uint32_t red, const uint32_t green, const uint32_t blue){
28+
setRed(red);
29+
setGreen(green);
30+
setBlue(blue);
31+
}
32+
33+
void RGBled::set(const uint32_t color){
34+
switch(color){
35+
case COLOR_RED:
36+
set(HIGH,LOW,LOW);
37+
break;
38+
case COLOR_GREEN:
39+
set(LOW,HIGH,LOW);
40+
break;
41+
case COLOR_BLUE:
42+
set(LOW,LOW,HIGH);
43+
break;
44+
case COLOR_ORANGE:
45+
set(HIGH,HIGH,LOW);
46+
break;
47+
case COLOR_VIOLET:
48+
set(HIGH,LOW,HIGH);
49+
break;
50+
case COLOR_TEAL:
51+
set(LOW,HIGH,HIGH);
52+
break;
53+
case COLOR_WHITE:
54+
set(HIGH,HIGH,HIGH);
55+
break;
56+
case COLOR_BLACK:
57+
default:
58+
set(LOW,LOW,LOW);
59+
}
60+
}
61+
62+
void RGBled::clear(){
63+
setRed(0);
64+
setGreen(0);
65+
setBlue(0);
66+
}

‎src/utilities/rgb_led.h

Lines changed: 7 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -30,70 +30,16 @@ class RGBled{
3030
uint8_t G;
3131
uint8_t B;
3232
public:
33-
RGBled(const uint8_t _Red, const uint8_t _Green, const uint8_t _Blue){
34-
R=_Red;
35-
G=_Green;
36-
B=_Blue;
37-
pinMode(R,OUTPUT);
38-
pinMode(G,OUTPUT);
39-
pinMode(B,OUTPUT);
40-
digitalWrite(R,LOW);
41-
digitalWrite(G,LOW);
42-
digitalWrite(B,LOW);
43-
}
33+
RGBled(const uint8_t _Red, const uint8_t _Green, const uint8_t _Blue);
4434

45-
void setRed(const uint32_t red){
46-
digitalWrite(R, red);
47-
}
35+
void setRed(const uint32_t red);
36+
void setGreen(const uint32_t green);
37+
void setBlue(const uint32_t blue);
4838

49-
void setGreen(const uint32_t green){
50-
digitalWrite(G, green);
51-
}
39+
void set(const uint32_t red, const uint32_t green, const uint32_t blue);
40+
void set(const uint32_t color);
5241

53-
void setBlue(const uint32_t blue){
54-
digitalWrite(B, blue);
55-
}
56-
57-
void set(const uint32_t red, const uint32_t green, const uint32_t blue){
58-
setRed(red);
59-
setGreen(green);
60-
setBlue(blue);
61-
}
62-
63-
void set(const uint32_t color){
64-
switch(color){
65-
case COLOR_RED:
66-
set(HIGH,LOW,LOW);
67-
break;
68-
case COLOR_GREEN:
69-
set(LOW,HIGH,LOW);
70-
break;
71-
case COLOR_BLUE:
72-
set(LOW,LOW,HIGH);
73-
break;
74-
case COLOR_ORANGE:
75-
set(HIGH,HIGH,LOW);
76-
break;
77-
case COLOR_VIOLET:
78-
set(HIGH,LOW,HIGH);
79-
break;
80-
case COLOR_TEAL:
81-
set(LOW,HIGH,HIGH);
82-
break;
83-
case COLOR_WHITE:
84-
set(HIGH,HIGH,HIGH);
85-
break;
86-
case COLOR_BLACK:
87-
default:
88-
set(LOW,LOW,LOW);
89-
}
90-
}
91-
92-
void clear(){
93-
setRed(0);
94-
setGreen(0);
95-
setBlue(0);
96-
}
42+
void clear();
9743
};
9844

9945

0 commit comments

Comments
 (0)