Skip to content

Commit 73d2ab8

Browse files
MomePPMomePP
committed
Merge branch 'release/version-1.3.0'
2 parents 5f8b315 + 961c1f3 commit 73d2ab8

5 files changed

Lines changed: 85 additions & 47 deletions

File tree

‎README.md‎

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,29 +24,34 @@ void loop() {}
2424

2525
### List of commands
2626

27-
| | Functions name | Parameter(s) | Return value |
28-
| ------------ | -------------------------------------------- | ------------------------- | -------------------------- |
29-
| **Sensor** | `readInput(`**param**`)` | port number (1,2,3,4) | sensor value (0-1023) |
27+
| | Functions name | Parameter(s) | Return value |
28+
| ------------ | -------------------------------------------- | ------------------------------ | -------------------------- |
29+
| **Sensor** | `readInput(`**param**`)` | port number (1,2,3,4) | sensor value (0-1023) |
3030
| |
31-
| **Servo** | `talkToServo(`**"param"**`)` | port name (1,2,3,4) | - |
32-
| | `setServoHead(`**param**`)` | servo angle (0-180) | - |
33-
| | `setServoThisWay(`**param**`)` | servo angle (0-180) | - |
34-
| | `setServoThatWay(`**param**`)` | servo angle (0-180) | - |
31+
| **Servo** | `talkToServo(`**"param"**`)` | port name (1,2,3,4) | - |
32+
| | `talkToServo(`**param**`)` | port number (1,2,3,4) | - |
33+
| | `setServoHead(`**param**`)` | servo angle (0-180) | - |
34+
| | `setServoThisWay(`**param**`)` | servo angle (0-180) | - |
35+
| | `setServoThatWay(`**param**`)` | servo angle (0-180) | - |
36+
| | `setServoPower(`**param**`)` | servo power (0-100) | - |
3537
| |
36-
| **Output** | `talkToOutput(`**"param"**`)` | port name (1,2,3,4) | - |
37-
| | `setOutputPower(`**param**`)` | power value (0-100) | - |
38-
| | `turnOutputON()` | - | - |
39-
| | `turnOutputOFF()` | - | - |
40-
| | `turnOutputThisWay()` | - | - |
41-
| | `turnOutputThatWay()` | - | - |
42-
| | `toggleOutputWay()` | - | - |
38+
| **Output** | `talkToOutput(`**"param"**`)` | port name (1,2,3,4) | - |
39+
| | `talkToOutput(`**param**`)` | port number (1,2,3,4) | - |
40+
| | `setOutputPower(`**param**`)` | power value (0-100) | - |
41+
| | `turnOutputON()` | - | - |
42+
| | `turnOutputOFF()` | - | - |
43+
| | `turnOutputONOFF(`**param**`)` | on-off status (1=on, 0=off) | - |
44+
| | `turnOutputThisWay()` | - | - |
45+
| | `turnOutputThatWay()` | - | - |
46+
| | `toggleOutputWay()` | - | - |
47+
| | `turnOutputDirection(`**param**`)` | direction number (1=CW, 0=CCW) | - |
4348
| |
44-
| **Sound** | `beep()` | - | - |
49+
| **Sound** | `beep()` | - | - |
4550
| |
46-
| **Gmessage** | `sendGmessage(`**"param"**`, `**param**`)` | key, number value | - |
47-
| | `sendGmessage(`**"param"**`, `**"param"**`)` | key, string value | - |
48-
| | `isGmessageAvailable(`**"param"**`)` | key | new message ? (true/false) |
49-
| | `Gmessage(`**"param"**`, `**"param"**`)` | key, default string value | string message |
51+
| **Gmessage** | `sendGmessage(`**"param"**`, `**param**`)` | key, number value | - |
52+
| | `sendGmessage(`**"param"**`, `**"param"**`)` | key, string value | - |
53+
| | `isGmessageAvailable(`**"param"**`)` | key | new message ? (true/false) |
54+
| | `Gmessage(`**"param"**`, `**"param"**`)` | key, default string value | string message |
5055

5156
---
5257

‎keywords.txt‎

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,30 @@
66
# Datatypes (KEYWORD1)
77
#######################################
88

9-
GoGoBoard KEYWORD1
10-
GoGoBoardArduino KEYWORD1
9+
GoGoBoard KEYWORD1
10+
GoGoBoardArduino KEYWORD1
1111

1212
#######################################
1313
# Methods and Functions (KEYWORD2)
1414
#######################################
1515

16-
begin KEYWORD2
17-
readInput KEYWORD2
18-
talkToServo KEYWORD2
19-
setServoHead KEYWORD2
20-
turnServoThisWay KEYWORD2
21-
turnServoThatWay KEYWORD2
22-
talkToOutput KEYWORD2
23-
setOutputPower KEYWORD2
24-
turnOutputON KEYWORD2
25-
turnOutputOFF KEYWORD2
26-
turnOutputThisWay KEYWORD2
27-
turnOutputThatWay KEYWORD2
28-
toggleOutputWay KEYWORD2
29-
beep KEYWORD2
30-
sendGmessage KEYWORD2
31-
isGmessageAvailable KEYWORD2
32-
Gmessage KEYWORD2
16+
begin KEYWORD2
17+
readInput KEYWORD2
18+
talkToServo KEYWORD2
19+
setServoHead KEYWORD2
20+
turnServoThisWay KEYWORD2
21+
turnServoThatWay KEYWORD2
22+
setServoPower KEYWORD2
23+
talkToOutput KEYWORD2
24+
setOutputPower KEYWORD2
25+
turnOutputON KEYWORD2
26+
turnOutputOFF KEYWORD2
27+
turnOutputONOFF KEYWORD2
28+
turnOutputThisWay KEYWORD2
29+
turnOutputThatWay KEYWORD2
30+
turnOutputDirection KEYWORD2
31+
toggleOutputWay KEYWORD2
32+
beep KEYWORD2
33+
sendGmessage KEYWORD2
34+
isGmessageAvailable KEYWORD2
35+
Gmessage KEYWORD2

‎library.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name=GoGoBoard Arduino Library
2-
version=1.2.1
3-
author=P.Pongpakatien
2+
version=1.3.0
3+
author=P.Pongpakatien, T.Phoeyphon
44
maintainer=LILCMU <peeranut32@gmail.com>
55
sentence=A library for built-in STM32 arduino core on GoGoBoard to enabled fully functional of hardware along with the used of students.
66
paragraph=Install this library to use GoGoBoard arduino core extension.

‎src/GoGoBoardArduino.cpp‎

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,17 @@ void GoGoBoard::talkToServo(String servo_port)
220220
sendCmdPacket(CMD_PACKET, CMD_SERVO_ACTIVE, servoBits, 0);
221221
}
222222

223+
void GoGoBoard::talkToServo(int servo_port)
224+
{
225+
uint8_t servoBits = 0;
226+
227+
if (servo_port < 1 || servo_port > 4)
228+
return;
229+
230+
bitSet(servoBits, servo_port);
231+
sendCmdPacket(CMD_PACKET, CMD_SERVO_ACTIVE, servoBits, 0);
232+
}
233+
223234
void GoGoBoard::setServoHead(int head_angle)
224235
{
225236
if (head_angle < 0 || head_angle > 180)
@@ -244,10 +255,17 @@ void GoGoBoard::turnServoThatWay(int ccw_angle)
244255
sendCmdPacket(CMD_PACKET, CMD_SERVO_THATWAY, 0, ccw_angle);
245256
}
246257

258+
void GoGoBoard::setServoPower(int power)
259+
{
260+
if (power < 0 || power > 100)
261+
return;
262+
263+
sendCmdPacket(CMD_PACKET, CMD_SERVO_POWER, 0, power);
264+
}
265+
247266
void GoGoBoard::talkToOutput(String output_port)
248267
{
249268
uint8_t motorBits = 0;
250-
output_port.toLowerCase();
251269

252270
if (output_port.length() < 1 || output_port.length() > 4)
253271
return;
@@ -274,6 +292,17 @@ void GoGoBoard::talkToOutput(String output_port)
274292
sendCmdPacket(CMD_PACKET, CMD_MOTOR_SET_ACTIVE, motorBits, 0);
275293
}
276294

295+
void GoGoBoard::talkToOutput(int output_port)
296+
{
297+
uint8_t motorBits = 0;
298+
299+
if (output_port < 1 || output_port > 4)
300+
return;
301+
302+
bitSet(motorBits, output_port);
303+
sendCmdPacket(CMD_PACKET, CMD_MOTOR_SET_ACTIVE, motorBits, 0);
304+
}
305+
277306
void GoGoBoard::setOutputPower(int power)
278307
{
279308
if (power < 0 || power > 100)

‎src/GoGoBoardArduino.h‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,7 @@
5656
#define CMD_SERVO_THATWAY 16
5757
#define CMD_SERVO_SET_ANGLE 17
5858
#define CMD_SERVO_TOGGLE_ACTIVE 18
59-
60-
//* relay
61-
#define CMD_SERVO_PWR 19
59+
#define CMD_SERVO_POWER 19
6260

6361
#define CMD_SYNC_RTC 50
6462
#define CMD_READ_RTC 51
@@ -128,25 +126,31 @@ class GoGoBoard
128126

129127
//* Servo functions
130128
//? set servos to interact with ..
129+
void talkToServo(int servo_port);
131130
void talkToServo(String servo_port);
132131
//? set servos head to input head_angle
133132
void setServoHead(int head_angle);
134133
//? turn servos clockwise by input angle
135134
void turnServoThisWay(int cw_angle);
136135
//? turn servos counter-clockwise by input angle
137136
void turnServoThatWay(int ccw_angle);
137+
//? set servos power (output servo ports with raw pwm duty)
138+
void setServoPower(int power);
138139

139140
//* Motor functions
140141
//? set output to interact with ..
142+
void talkToOutput(int output_port);
141143
void talkToOutput(String output_port);
142144
//? set output power
143145
void setOutputPower(int power);
144146
//? turn outputs on or off
145147
void turnOutputON(void);
146148
void turnOutputOFF(void);
149+
void turnOutputONOFF(int state);
147150
//? turn outputs direction
148151
void turnOutputThisWay(void);
149152
void turnOutputThatWay(void);
153+
void turnOutputDirection(int dir);
150154
void toggleOutputWay(void);
151155

152156
void beep(void);
@@ -178,9 +182,6 @@ class GoGoBoard
178182
static gmessage gmessage_list;
179183
static volatile bool isSerialAvailable;
180184

181-
void turnOutputONOFF(int state);
182-
void turnOutputDirection(int dir);
183-
184185
void sendCmdPacket(uint8_t categoryID, uint8_t cmdID, uint8_t targetVal = 0, int value = 0);
185186
void sendCmdPacket(uint8_t *data, uint8_t length);
186187

0 commit comments

Comments
 (0)