Merge branch 'release/0.5.2'

Author: paulobarcelos

avr/libraries/quirkbot-protothreads/keywords.txt

@@ -0,0 +1,25 @@
+PT_POINTER_VAR	KEYWORD2
+PT_THREAD_VAR	KEYWORD2
+ptDeclare	KEYWORD2
+ptDeclareThread	KEYWORD2
+ptDeclareProcedure	KEYWORD2
+ptDefine	KEYWORD2
+ptDefineThread	KEYWORD2
+ptDefineProcedure	KEYWORD2
+ptInit	KEYWORD2
+ptBegin	KEYWORD2
+ptSleep	KEYWORD2
+ptWaitUntil	KEYWORD2
+ptWaitWhile	KEYWORD2
+ptWaitThread	KEYWORD2
+ptYield	KEYWORD2
+ptYieldUntil	KEYWORD2
+ptSpaw	KEYWORD2
+ptRestart	KEYWORD2
+ptExit	KEYWORD2
+ptEnd	KEYWORD2
+ptSchedule	KEYWORD2
+ptBeginThread	KEYWORD2
+ptBeginProcedure	KEYWORD2
+ptEndThread	KEYWORD2
+ptEndProcedure	KEYWORD2

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

@@ -2,16 +2,22 @@
 #include "pt-sleep.h"
 
 /**
-* ADDED BY STRAWBEES
+* Simplifed interface
+* -------------------
+* Author: Strawbees
 * Provides a simplied interface to Protothreads.
 */
 #define PT_POINTER_VAR(name) pt_##name##_pointer
 #define PT_THREAD_VAR(name) pt_##name##_thread
 
-#define ptDefine(name, ...)\
+#define ptDeclare(name, ...)\
 	static struct pt PT_POINTER_VAR(name);\
-	static PT_THREAD (PT_THREAD_VAR(name)(struct pt* __pt__, ##__VA_ARGS__));
-#define ptDeclare(name, ...) static PT_THREAD (PT_THREAD_VAR(name)(struct pt* __pt__, ##__VA_ARGS__))
+	static PT_THREAD (PT_THREAD_VAR(name)(struct pt* __pt__, ##__VA_ARGS__))
+#define ptDeclareThread ptDeclare
+#define ptDeclareProcedure ptDeclare
+#define ptDefine(name, ...) static PT_THREAD (PT_THREAD_VAR(name)(struct pt* __pt__, ##__VA_ARGS__))
+#define ptDefineThread ptDefine
+#define ptDefineProcedure ptDefine
 #define ptInit(name) PT_INIT(&PT_POINTER_VAR(name))
 #define ptBegin() PT_BEGIN(__pt__)
 #define ptSleep(ms) PT_SLEEP(__pt__, ms)
@@ -25,3 +31,7 @@
 #define ptExit() PT_EXIT(__pt__)
 #define ptEnd() PT_END(__pt__)
 #define ptSchedule(name, ...) PT_SCHEDULE(PT_THREAD_VAR(name)(&PT_POINTER_VAR(name), ##__VA_ARGS__))
+#define ptBeginThread() ptBegin()
+#define ptBeginProcedure() ptBegin();ptYield()
+#define ptEndThread() ptYieldUntil(false);ptEnd()
+#define ptEndProcedure() ptExit();ptEnd()

avr/version.txt

@@ -1 +1 @@
-0.5.1
+0.5.2

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "quirkbot-arduino-hardware",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "Quirkbot Arduino AVR Board",
   "author": "Paulo Barcelos <paulo@quirkbot.com>",
   "homepage": "https://github.com/Quirkbot/QuirkbotArduinoHardware",

package.json

@@ -9,6 +9,36 @@
 				"online": "https://github.com/Quirkbot/QuirkbotArduinoHardware/issues"
 			},
 			"platforms": [
+				{
+					"name": "Strawbees Quirkbot AVR Boards",
+					"architecture": "avr",
+					"version": "0.5.2",
+					"category": "Contributed",
+					"url": "http://github.com/Quirkbot/QuirkbotArduinoHardware/releases/download/0.5.2/quirkbot-arduino-hardware-0.5.2.zip",
+					"archiveFileName": "quirkbot-arduino-hardware-0.5.2.zip",
+					"checksum": "SHA-256:5c5d78080e1ee96653be941764560da83859d0591a6e00841b2e336b1dfd7293",
+					"size": "997380",
+					"help": {
+						"online": "https://github.com/Quirkbot/QuirkbotArduinoHardware/issues"
+					},
+					"boards": [
+						{
+							"name": "Strawbees Quirkbot"
+						}
+					],
+					"toolsDependencies": [
+						{
+							"packager": "arduino",
+							"name": "avr-gcc",
+							"version": "7.3.0-atmel3.6.1-arduino7"
+						},
+						{
+							"packager": "arduino",
+							"name": "avrdude",
+							"version": "6.3.0-arduino17"
+						}
+					]
+				},
 				{
 					"name": "Strawbees Quirkbot AVR Boards",
 					"architecture": "avr",