Skip to content

Commit bb114f5

Browse files
paulobarcelospaulobarcelos
committed
Merge branch 'release/0.5.1'
2 parents 3851c97 + 299a606 commit bb114f5

7 files changed

Lines changed: 48 additions & 18 deletions

File tree

‎avr/libraries/quirkbot-protothreads/src/protothreads.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@
33

44
/**
55
* ADDED BY STRAWBEES
6-
* Provide a simplied interface to Protothreads, avoid the need to repeat
6+
* Provides a simplied interface to Protothreads.
77
*/
88
#define PT_POINTER_VAR(name) pt_##name##_pointer
99
#define PT_THREAD_VAR(name) pt_##name##_thread
1010

11-
#define ptDefine(name)\
11+
#define ptDefine(name, ...)\
1212
static struct pt PT_POINTER_VAR(name);\
13-
static PT_THREAD (PT_THREAD_VAR(name)(struct pt* __pt__));
14-
#define ptDeclare(name) static PT_THREAD (PT_THREAD_VAR(name)(struct pt* __pt__))
13+
static PT_THREAD (PT_THREAD_VAR(name)(struct pt* __pt__, ##__VA_ARGS__));
14+
#define ptDeclare(name, ...) static PT_THREAD (PT_THREAD_VAR(name)(struct pt* __pt__, ##__VA_ARGS__))
1515
#define ptInit(name) PT_INIT(&PT_POINTER_VAR(name))
1616
#define ptBegin() PT_BEGIN(__pt__)
1717
#define ptSleep(ms) PT_SLEEP(__pt__, ms)
1818
#define ptWaitUntil(condition) PT_WAIT_UNTIL(__pt__, condition)
1919
#define ptWaitWhile(condition) PT_WAIT_WHILE(__pt__, condition)
20-
#define ptWaitThread(name) PT_WAIT_THREAD(__pt__, PT_THREAD_VAR(name)(&PT_POINTER_VAR(name)))
20+
#define ptWaitThread(name, ...) PT_WAIT_THREAD(__pt__, PT_THREAD_VAR(name)(&PT_POINTER_VAR(name), ##__VA_ARGS__))
2121
#define ptYield() PT_YIELD(__pt__)
2222
#define ptYieldUntil(condition) PT_YIELD_UNTIL(__pt__, condition)
23-
#define ptSpawn(name) PT_SPAWN(__pt__, &PT_POINTER_VAR(name), PT_THREAD_VAR(name)(&PT_POINTER_VAR(name)))
23+
#define ptSpawn(name, ...) PT_SPAWN(__pt__, &PT_POINTER_VAR(name), PT_THREAD_VAR(name)(&PT_POINTER_VAR(name), ##__VA_ARGS__))
2424
#define ptRestart() PT_RESTART(__pt__)
2525
#define ptExit() PT_EXIT(__pt__)
2626
#define ptEnd() PT_END(__pt__)
27-
#define ptSchedule(name) PT_SCHEDULE(PT_THREAD_VAR(name)(&PT_POINTER_VAR(name)))
27+
#define ptSchedule(name, ...) PT_SCHEDULE(PT_THREAD_VAR(name)(&PT_POINTER_VAR(name), ##__VA_ARGS__))

‎avr/version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.5.0
1+
0.5.1

‎index.template.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"packages": [
33
{
4-
"name": "quirkbot",
5-
"maintainer": "Quirkbot",
4+
"name": "strawbees-quirkbot",
5+
"maintainer": "Strawbees",
66
"websiteURL": "https://github.com/Quirkbot/QuirkbotArduinoHardware",
7-
"email": "support@quirkbot.com",
7+
"email": "support@strawbees.com",
88
"help": {
99
"online": "https://github.com/Quirkbot/QuirkbotArduinoHardware/issues"
1010
},

‎index_platform.template.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "Quirkbot AVR Boards",
2+
"name": "Strawbees Quirkbot AVR Boards",
33
"architecture": "avr",
44
"version": "{{VERSION}}",
55
"category": "Contributed",
@@ -12,7 +12,7 @@
1212
},
1313
"boards": [
1414
{
15-
"name": "Quirkbot"
15+
"name": "Strawbees Quirkbot"
1616
}
1717
],
1818
"toolsDependencies": [

‎package-lock.json‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "quirkbot-arduino-hardware",
3-
"version": "0.5.0",
3+
"version": "0.5.1",
44
"description": "Quirkbot Arduino AVR Board",
55
"author": "Paulo Barcelos <[email protected]>",
66
"homepage": "https://github.com/Quirkbot/QuirkbotArduinoHardware",

‎package_quirkbot.com_index.json‎

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,44 @@
11
{
22
"packages": [
33
{
4-
"name": "quirkbot",
5-
"maintainer": "Quirkbot",
4+
"name": "strawbees-quirkbot",
5+
"maintainer": "Strawbees",
66
"websiteURL": "https://github.com/Quirkbot/QuirkbotArduinoHardware",
7-
"email": "support@quirkbot.com",
7+
"email": "support@strawbees.com",
88
"help": {
99
"online": "https://github.com/Quirkbot/QuirkbotArduinoHardware/issues"
1010
},
1111
"platforms": [
12+
{
13+
"name": "Strawbees Quirkbot AVR Boards",
14+
"architecture": "avr",
15+
"version": "0.5.1",
16+
"category": "Contributed",
17+
"url": "http://github.com/Quirkbot/QuirkbotArduinoHardware/releases/download/0.5.1/quirkbot-arduino-hardware-0.5.1.zip",
18+
"archiveFileName": "quirkbot-arduino-hardware-0.5.1.zip",
19+
"checksum": "SHA-256:4f8892ae40e7a11d614e4aa8801372c66348b083d36e588e70873aca0745fc04",
20+
"size": "996917",
21+
"help": {
22+
"online": "https://github.com/Quirkbot/QuirkbotArduinoHardware/issues"
23+
},
24+
"boards": [
25+
{
26+
"name": "Strawbees Quirkbot"
27+
}
28+
],
29+
"toolsDependencies": [
30+
{
31+
"packager": "arduino",
32+
"name": "avr-gcc",
33+
"version": "7.3.0-atmel3.6.1-arduino7"
34+
},
35+
{
36+
"packager": "arduino",
37+
"name": "avrdude",
38+
"version": "6.3.0-arduino17"
39+
}
40+
]
41+
},
1242
{
1343
"name": "Quirkbot AVR Boards",
1444
"architecture": "avr",

0 commit comments

Comments
 (0)