Merge branch 'master' into develop

hathach · hathach · commit 228b5ea722ad · 2019-05-29T15:45:22.000+07:00
diff --git a/.github/ISSUE_TEMPLATE/for-questions-please-use-our-forum-support.md b/.github/ISSUE_TEMPLATE/for-questions-please-use-our-forum-support.md
diff --git a/.github/ISSUE_TEMPLATE/questions-please-use-our-forum-support.md b/.github/ISSUE_TEMPLATE/questions-please-use-our-forum-support.md
@@ -1,6 +1,6 @@
 ---
 name: Questions please use our forum support
-about: Post your question at forums.adafruit.com
+about: Don't open issue, post your question at forums.adafruit.com
 title: ''
 labels: ''
 assignees: ''
diff --git a/cores/nRF5/utility/SoftwareTimer.h b/cores/nRF5/utility/SoftwareTimer.h
@@ -47,9 +47,9 @@ class SoftwareTimer
     SoftwareTimer()          { _handle = NULL; }
     virtual ~SoftwareTimer() { if(_handle != NULL) xTimerDelete(_handle, 0); }
 
-    void begin(uint32_t ms, TimerCallbackFunction_t callback)
+    void begin(uint32_t ms, TimerCallbackFunction_t callback, bool repeating = true)
     {
-      _handle = xTimerCreate(NULL, ms2tick(ms), true, NULL, callback);
+      _handle = xTimerCreate(NULL, ms2tick(ms), repeating, NULL, callback);
     }
 
     TimerHandle_t getHandle(void)
@@ -59,6 +59,28 @@ class SoftwareTimer
 
     void start(void) { xTimerStart(_handle, 0); }
     void stop (void) { xTimerStop (_handle, 0); }
+    void reset(void) { xTimerReset(_handle, 0); }
+
+    bool startFromISR(void) {
+      BaseType_t ret, xHigherPriorityTaskWoken = pdFALSE;
+      ret = xTimerStartFromISR(_handle, &xHigherPriorityTaskWoken);
+      portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
+      return (ret == pdPASS);
+    }
+
+    bool stopFromISR(void) {
+      BaseType_t ret, xHigherPriorityTaskWoken = pdFALSE;
+      ret = xTimerStopFromISR(_handle, &xHigherPriorityTaskWoken);
+      portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
+      return (ret == pdPASS);
+    }
+
+    bool resetFromISR(void) {
+      BaseType_t ret, xHigherPriorityTaskWoken = pdFALSE;
+      ret = xTimerResetFromISR(_handle, &xHigherPriorityTaskWoken);
+      portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
+      return (ret == pdPASS);
+    }
 
     void setPeriod(uint32_t ms)
     {
diff --git a/libraries/Bluefruit52Lib/keywords.txt b/libraries/Bluefruit52Lib/keywords.txt
@@ -531,14 +531,14 @@ ANCS_ACTION_NEGATIVE	LITERAL1
 ANCS_APP_ATTR_DISPLAY_NAME	LITERAL1
 
 #######################################
-# UUID128 Serivce Constants
+# UUID128 Service Constants
 #######################################
 
 BLEUART_UUID_SERVICE	LITERAL1
 BLEANCS_UUID_SERVICE	LITERAL1
 
 #######################################
-# UUID16 Serivce Constants
+# UUID16 Service Constants
 #######################################
 UUID16_SVC_ALERT_NOTIFICATION	LITERAL1
 UUID16_SVC_BATTERY	LITERAL1
@@ -547,6 +547,7 @@ UUID16_SVC_CURRENT_TIME	LITERAL1
 UUID16_SVC_CYCLING_SPEED_AND_CADENCE	LITERAL1
 UUID16_SVC_LOCATION_AND_NAVIGATION	LITERAL1
 UUID16_SVC_DEVICE_INFORMATION	LITERAL1
+UUID16_SVC_ENVIRONMENTAL_SENSING LITERAL1
 UUID16_SVC_GLUCOSE	LITERAL1
 UUID16_SVC_HEALTH_THERMOMETER	LITERAL1
 UUID16_SVC_HEART_RATE	LITERAL1
@@ -656,3 +657,4 @@ UUID16_PLX_FEATURES	LITERAL1
 
 
 
+UUID16_CHR_UV_INDEX LITERAL1
diff --git a/libraries/Bluefruit52Lib/src/BLEUuid.h b/libraries/Bluefruit52Lib/src/BLEUuid.h
@@ -84,6 +84,7 @@ class BLEUuid
 #define UUID16_SVC_CYCLING_POWER                              0x1818
 #define UUID16_SVC_LOCATION_AND_NAVIGATION                    0x1819
 #define UUID16_SVC_DEVICE_INFORMATION                         0x180A
+#define UUID16_SVC_ENVIRONMENTAL_SENSING                      0x181A
 #define UUID16_SVC_GLUCOSE                                    0x1808
 #define UUID16_SVC_HEALTH_THERMOMETER                         0x1809
 #define UUID16_SVC_HEART_RATE                                 0x180D
@@ -195,6 +196,7 @@ class BLEUuid
 #define UUID16_PLX_SPOT_CHECK_MEAS                            0x2A5E
 #define UUID16_PLX_CONTINUOUS_MEAS                            0x2A5F
 #define UUID16_PLX_FEATURES                                   0x2A60
+#define UUID16_CHR_UV_INDEX                                   0x2A76
 
 /*------------------------------------------------------------------*/
 /* Company UUID
diff --git a/libraries/Bluefruit52Lib/src/services/BLEHidAdafruit.cpp b/libraries/Bluefruit52Lib/src/services/BLEHidAdafruit.cpp
@@ -386,78 +386,78 @@ bool BLEHidAdafruit::mousePan(uint16_t conn_hdl, int8_t pan)
 //------------- Keyboard -------------//
 bool BLEHidAdafruit::keyboardReport(hid_keyboard_report_t* report)
 {
-  return keyboardReport(BLE_GATT_HANDLE_INVALID, report);
+  return keyboardReport(BLE_CONN_HANDLE_INVALID, report);
 }
 
 bool BLEHidAdafruit::keyboardReport(uint8_t modifier, uint8_t keycode[6])
 {
-  return keyboardReport(BLE_GATT_HANDLE_INVALID, modifier, keycode);
+  return keyboardReport(BLE_CONN_HANDLE_INVALID, modifier, keycode);
 }
 
 bool BLEHidAdafruit::keyPress(char ch)
 {
-  return keyPress(BLE_GATT_HANDLE_INVALID, ch);
+  return keyPress(BLE_CONN_HANDLE_INVALID, ch);
 }
 
 bool BLEHidAdafruit::keyRelease(void)
 {
-  return keyRelease(BLE_GATT_HANDLE_INVALID);
+  return keyRelease(BLE_CONN_HANDLE_INVALID);
 }
 
 bool BLEHidAdafruit::keySequence(const char* str, int interval)
 {
-  return keySequence(BLE_GATT_HANDLE_INVALID, str, interval);
+  return keySequence(BLE_CONN_HANDLE_INVALID, str, interval);
 }
 
 //------------- Consumer Media Keys -------------//
 bool BLEHidAdafruit::consumerReport(uint16_t usage_code)
 {
-  return consumerReport(BLE_GATT_HANDLE_INVALID, usage_code);
+  return consumerReport(BLE_CONN_HANDLE_INVALID, usage_code);
 }
 
 bool BLEHidAdafruit::consumerKeyPress(uint16_t usage_code)
 {
-  return consumerKeyPress(BLE_GATT_HANDLE_INVALID, usage_code);
+  return consumerKeyPress(BLE_CONN_HANDLE_INVALID, usage_code);
 }
 
 bool BLEHidAdafruit::consumerKeyRelease(void)
 {
-  return consumerKeyRelease(BLE_GATT_HANDLE_INVALID);
+  return consumerKeyRelease(BLE_CONN_HANDLE_INVALID);
 }
 
 //------------- Mouse -------------//
 bool BLEHidAdafruit::mouseReport(hid_mouse_report_t* report)
 {
-  return mouseReport(BLE_GATT_HANDLE_INVALID, report);
+  return mouseReport(BLE_CONN_HANDLE_INVALID, report);
 }
 
 bool BLEHidAdafruit::mouseReport(uint8_t buttons, int8_t x, int8_t y, int8_t wheel, int8_t pan)
 {
-  return mouseReport(BLE_GATT_HANDLE_INVALID, buttons, x, y, wheel, pan);
+  return mouseReport(BLE_CONN_HANDLE_INVALID, buttons, x, y, wheel, pan);
 }
 
 bool BLEHidAdafruit::mouseButtonPress(uint8_t buttons)
 {
-  return mouseButtonPress(BLE_GATT_HANDLE_INVALID, buttons);
+  return mouseButtonPress(BLE_CONN_HANDLE_INVALID, buttons);
 }
 
 bool BLEHidAdafruit::mouseButtonRelease(void)
 {
-  return mouseButtonRelease(BLE_GATT_HANDLE_INVALID);
+  return mouseButtonRelease(BLE_CONN_HANDLE_INVALID);
 }
 
 bool BLEHidAdafruit::mouseMove(int8_t x, int8_t y)
 {
-  return mouseMove(BLE_GATT_HANDLE_INVALID, x, y);
+  return mouseMove(BLE_CONN_HANDLE_INVALID, x, y);
 }
 
 bool BLEHidAdafruit::mouseScroll(int8_t scroll)
 {
-  return mouseScroll(BLE_GATT_HANDLE_INVALID, scroll);
+  return mouseScroll(BLE_CONN_HANDLE_INVALID, scroll);
 }
 
 bool BLEHidAdafruit::mousePan(int8_t pan)
 {
-  return mousePan(BLE_GATT_HANDLE_INVALID, pan);
+  return mousePan(BLE_CONN_HANDLE_INVALID, pan);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -386,78 +386,78 @@ bool BLEHidAdafruit::mousePan(uint16_t conn_hdl, int8_t pan)`
`386`	`386`	`//------------- Keyboard -------------//`
`387`	`387`	`bool BLEHidAdafruit::keyboardReport(hid_keyboard_report_t* report)`
`388`	`388`	`{`
`389`		`- return keyboardReport(BLE_GATT_HANDLE_INVALID, report);`
	`389`	`+ return keyboardReport(BLE_CONN_HANDLE_INVALID, report);`
`390`	`390`	`}`
`391`	`391`
`392`	`392`	`bool BLEHidAdafruit::keyboardReport(uint8_t modifier, uint8_t keycode[6])`
`393`	`393`	`{`
`394`		`- return keyboardReport(BLE_GATT_HANDLE_INVALID, modifier, keycode);`
	`394`	`+ return keyboardReport(BLE_CONN_HANDLE_INVALID, modifier, keycode);`
`395`	`395`	`}`
`396`	`396`
`397`	`397`	`bool BLEHidAdafruit::keyPress(char ch)`
`398`	`398`	`{`
`399`		`- return keyPress(BLE_GATT_HANDLE_INVALID, ch);`
	`399`	`+ return keyPress(BLE_CONN_HANDLE_INVALID, ch);`
`400`	`400`	`}`
`401`	`401`
`402`	`402`	`bool BLEHidAdafruit::keyRelease(void)`
`403`	`403`	`{`
`404`		`- return keyRelease(BLE_GATT_HANDLE_INVALID);`
	`404`	`+ return keyRelease(BLE_CONN_HANDLE_INVALID);`
`405`	`405`	`}`
`406`	`406`
`407`	`407`	`bool BLEHidAdafruit::keySequence(const char* str, int interval)`
`408`	`408`	`{`
`409`		`- return keySequence(BLE_GATT_HANDLE_INVALID, str, interval);`
	`409`	`+ return keySequence(BLE_CONN_HANDLE_INVALID, str, interval);`
`410`	`410`	`}`
`411`	`411`
`412`	`412`	`//------------- Consumer Media Keys -------------//`
`413`	`413`	`bool BLEHidAdafruit::consumerReport(uint16_t usage_code)`
`414`	`414`	`{`
`415`		`- return consumerReport(BLE_GATT_HANDLE_INVALID, usage_code);`
	`415`	`+ return consumerReport(BLE_CONN_HANDLE_INVALID, usage_code);`
`416`	`416`	`}`
`417`	`417`
`418`	`418`	`bool BLEHidAdafruit::consumerKeyPress(uint16_t usage_code)`
`419`	`419`	`{`
`420`		`- return consumerKeyPress(BLE_GATT_HANDLE_INVALID, usage_code);`
	`420`	`+ return consumerKeyPress(BLE_CONN_HANDLE_INVALID, usage_code);`
`421`	`421`	`}`
`422`	`422`
`423`	`423`	`bool BLEHidAdafruit::consumerKeyRelease(void)`
`424`	`424`	`{`
`425`		`- return consumerKeyRelease(BLE_GATT_HANDLE_INVALID);`
	`425`	`+ return consumerKeyRelease(BLE_CONN_HANDLE_INVALID);`
`426`	`426`	`}`
`427`	`427`
`428`	`428`	`//------------- Mouse -------------//`
`429`	`429`	`bool BLEHidAdafruit::mouseReport(hid_mouse_report_t* report)`
`430`	`430`	`{`
`431`		`- return mouseReport(BLE_GATT_HANDLE_INVALID, report);`
	`431`	`+ return mouseReport(BLE_CONN_HANDLE_INVALID, report);`
`432`	`432`	`}`
`433`	`433`
`434`	`434`	`bool BLEHidAdafruit::mouseReport(uint8_t buttons, int8_t x, int8_t y, int8_t wheel, int8_t pan)`
`435`	`435`	`{`
`436`		`- return mouseReport(BLE_GATT_HANDLE_INVALID, buttons, x, y, wheel, pan);`
	`436`	`+ return mouseReport(BLE_CONN_HANDLE_INVALID, buttons, x, y, wheel, pan);`
`437`	`437`	`}`
`438`	`438`
`439`	`439`	`bool BLEHidAdafruit::mouseButtonPress(uint8_t buttons)`
`440`	`440`	`{`
`441`		`- return mouseButtonPress(BLE_GATT_HANDLE_INVALID, buttons);`
	`441`	`+ return mouseButtonPress(BLE_CONN_HANDLE_INVALID, buttons);`
`442`	`442`	`}`
`443`	`443`
`444`	`444`	`bool BLEHidAdafruit::mouseButtonRelease(void)`
`445`	`445`	`{`
`446`		`- return mouseButtonRelease(BLE_GATT_HANDLE_INVALID);`
	`446`	`+ return mouseButtonRelease(BLE_CONN_HANDLE_INVALID);`
`447`	`447`	`}`
`448`	`448`
`449`	`449`	`bool BLEHidAdafruit::mouseMove(int8_t x, int8_t y)`
`450`	`450`	`{`
`451`		`- return mouseMove(BLE_GATT_HANDLE_INVALID, x, y);`
	`451`	`+ return mouseMove(BLE_CONN_HANDLE_INVALID, x, y);`
`452`	`452`	`}`
`453`	`453`
`454`	`454`	`bool BLEHidAdafruit::mouseScroll(int8_t scroll)`
`455`	`455`	`{`
`456`		`- return mouseScroll(BLE_GATT_HANDLE_INVALID, scroll);`
	`456`	`+ return mouseScroll(BLE_CONN_HANDLE_INVALID, scroll);`
`457`	`457`	`}`
`458`	`458`
`459`	`459`	`bool BLEHidAdafruit::mousePan(int8_t pan)`
`460`	`460`	`{`
`461`		`- return mousePan(BLE_GATT_HANDLE_INVALID, pan);`
	`461`	`+ return mousePan(BLE_CONN_HANDLE_INVALID, pan);`
`462`	`462`	`}`
`463`	`463`