update adafruit services

Author: hathach

libraries/Bluefruit52Lib/examples/Peripheral/cplay_bluefruit/cplay_bluefruit.ino

@@ -23,23 +23,26 @@ BLEUart bleuart; // uart over ble
 BLEBas  blebas;  // battery
 
 /* All Adafruit Service/Characteristic UUID128 share the same
- * Base UUID : ADAF0000-C332-42A8-93BD-25E905756CB8
+ * Base UUID : ADAFxxx-C332-42A8-93BD-25E905756CB8
+ *
+ * Share Characteristics
+ *  - Measurement Period  0001 | int32_t | Read + Write | ms between measurements, -1: stop reading, 0: update when changes
  *
  * Temperature service    0100
  *  - Temperature         0101 | float    | Read + Notify | degree in Celsius
- *  - Measurement Period  0001 | uint32_t | Read + Write
+ *  - Measurement Period  0001
  *
  * Accelerometer service  0200
  *  - Accel Data          0201 | float (x, y, z) | Read + Notify | accel x, y, z
- *  - Measurement Period  0001 | uint32_t | Read + Write
+ *  - Measurement Period  0001
  *
  * Light sensor service   0300
- *  - Light Data          0301 | uint16_t | Read + Notify
- *  - Measurement Period  0001 | uint32_t | Read + Write
+ *  - Lux Data            0301 | uint16_t | Read + Notify
+ *  - Measurement Period  0001
  *
  * Sound sensor service   0400
  *  - Sound Data          0401 | int16_t  | Read + Notify
- *  - Measurement Period  0001 | uint32_t | Read + Write
+ *  - Measurement Period  0001
  *
  * Captouch service       0500
  *  - Sensitivity         0501 | uint32_t | difference that Capn should report immediately
@@ -55,7 +58,7 @@ BLEBas  blebas;  // battery
  * PIN I/O service        0700
  *  - Pin Dir             0701 | uint64_t | Read + Write | bit 1 is In, 0 is Out
  *  - Pin Data            0702 | uint64_t | Read + Write |
- *  - PWM Control         0710 | struct { uint8_t pin, uint16_t value, uint32_t period_ms} | as microbit value is 0-1024 for duty cycle
+ *  - PWM Control         0710 | struct { uint8_t pin, uint16_t value, uint32_t period_ms} | as microbit, value is 0-1024 for duty cycle
  *
  * PIN Analog             0800
  *  - A0                  0810 | uint16_t | Read + Notify
@@ -68,6 +71,17 @@ BLEBas  blebas;  // battery
  *   - Pixel Count        0902 | uint16_t | Read + Write
  *   - Pixel Type         0903 | uint16_t | Read + Write | NEO_RGB, NEO_GRB etc ..
  *   - Pixel Data         0904 | RGB array| Write
+ *
+ * Gamepad Service        0A00
+ *   - Gamepad Button     0A01 | uint16_t  | Write
+ *   - Left XY            0A02 | int8_t[2] | Write
+ *   - Right XY           0A03 | int8_t[2] | Write
+ *
+ * Image Service          0B00
+ *    - Format            0B01 | uint16_t[3] | Write | width + height + type, type is enum value e.g RGB_655, RGB_888, JPG, GIF etc ...
+ *    - Data              0B02 | pixel[]     | Write | will save to flash as `default_image`, and auto load on reset ?
+ *    - Fill              0B03 | uint8_t[3]  | Write | Fill with solid color
+ *    - Load File         0B04 | utf8_t      | Write | Load image from qspi flash ?
  */
 
 /* Adafruit NeoPixel Service

libraries/Bluefruit52Lib/src/BLEUuid.cpp

@@ -36,13 +36,11 @@
 
 #include "BLEUuid.h"
 
-//void reverse_uuid128(uint8_t const in[16], uint8_t out[16])
-//{
-//  for(uint8_t i=0; i<16; i++)
-//  {
-//    out[i] = in[15-i];
-//  }
-//}
+const uint8_t UUID128_CHR_ADAFRUIT_MEASUREMENT_PERIOD[16] =
+{
+  0xB8, 0x6c, 0x75, 0x05, 0xE9, 0x25, 0xBD, 0x93,
+  0xA8, 0x42, 0x32, 0xC3, 0x01, 0x00, 0xAF, 0xAD
+};
 
 void BLEUuid::set(uint16_t uuid16)
 {

libraries/Bluefruit52Lib/src/BLEUuid.h

@@ -72,6 +72,11 @@ class BLEUuid
     BLEUuid& operator=(ble_uuid_t uuid);
 };
 
+//--------------------------------------------------------------------+
+// Custom UUID Service
+//--------------------------------------------------------------------+
+extern const uint8_t UUID128_CHR_ADAFRUIT_MEASUREMENT_PERIOD[16];
+
 /*------------------------------------------------------------------*/
 /* Service UUID
  * https://www.bluetooth.com/specifications/gatt/services

libraries/Bluefruit52Lib/src/bluefruit.h

@@ -63,6 +63,7 @@
 #include "services/BLEAdafruitTemperature.h"
 #include "services/BLEAdafruitNeopixel.h"
 #include "services/BLEAdafruitAccel.h"
+#include "services/BLEAdafruitLightSensor.h"
 
 #include "clients/BLEAncs.h"
 #include "clients/BLEClientUart.h"

libraries/Bluefruit52Lib/src/services/BLEAdafruitAccel.cpp

@@ -29,35 +29,33 @@
 //--------------------------------------------------------------------+
 
 
-/* Adafruit Accelerometer Service
- * using micro:bit Accelerometer Service definition
- * https://lancaster-university.github.io/microbit-docs/resources/bluetooth/bluetooth_profile.html
+/* All Adafruit Service/Characteristic UUID128 share the same Base UUID:
+ *    ADAFxxx-C332-42A8-93BD-25E905756CB8
  *
- * - Service: E95D-0753-251D-470A-A062-FA1922DFA9A8
- *    - Data   : E95D-CA4B-251D-470A-A062-FA1922DFA9A8
- *    - Period : E95D-FB24-251D-470A-A062-FA1922DFA9A8
+ * Shared Characteristics
+ *  - Measurement Period  0001 | int32_t | Read + Write |
+ *    ms between measurements, -1: stop reading, 0: update when changes
+ *
+ * Accelerometer service  0200
+ *  - Accel                0201 | float[3] | Read + Notify | x, y, z
+ *  - Measurement Period  0001
  */
+
 const uint8_t BLEAdafruitAccel::UUID128_SERVICE[16] =
 {
-  0xA8, 0xA9, 0xDF, 0x22, 0x19, 0xFA, 0x62, 0xA0,
-  0x0A, 0x47, 0x1D, 0x25, 0x53, 0x07, 0x5D, 0xE9
+  0xB8, 0x6c, 0x75, 0x05, 0xE9, 0x25, 0xBD, 0x93,
+  0xA8, 0x42, 0x32, 0xC3, 0x00, 0x02, 0xAF, 0xAD
 };
 
 const uint8_t BLEAdafruitAccel::UUID128_CHR_DATA[16] =
 {
-  0xA8, 0xA9, 0xDF, 0x22, 0x19, 0xFA, 0x62, 0xA0,
-  0x0A, 0x47, 0x1D, 0x25, 0x4B, 0xCA, 0x5D, 0xE9
-};
-
-const uint8_t BLEAdafruitAccel::UUID128_CHR_PERIOD[16] =
-{
-  0xA8, 0xA9, 0xDF, 0x22, 0x19, 0xFA, 0x62, 0xA0,
-  0x0A, 0x47, 0x1D, 0x25, 0x24, 0xFB, 0x5D, 0xE9
+  0xB8, 0x6c, 0x75, 0x05, 0xE9, 0x25, 0xBD, 0x93,
+  0xA8, 0x42, 0x32, 0xC3, 0x01, 0x02, 0xAF, 0xAD
 };
 
 // Constructor
 BLEAdafruitAccel::BLEAdafruitAccel(void)
-  : BLEService(UUID128_SERVICE), Data(UUID128_CHR_DATA), Period(UUID128_CHR_PERIOD)
+  : BLEService(UUID128_SERVICE), Accel(UUID128_CHR_DATA), Period(UUID128_CHR_ADAFRUIT_MEASUREMENT_PERIOD)
 {
 
 }
@@ -68,19 +66,17 @@ err_t BLEAdafruitAccel::begin (void)
   VERIFY_STATUS( BLEService::begin() );
 
   // Add Characteristic
-  Data.setProperties(CHR_PROPS_READ | CHR_PROPS_NOTIFY);
-  Data.setPermission(SECMODE_OPEN, SECMODE_NO_ACCESS);
-  Data.setFixedLen(6);
-  Data.setUserDescriptor("Data");
-  VERIFY_STATUS( Data.begin() );
+  Accel.setProperties(CHR_PROPS_READ | CHR_PROPS_NOTIFY);
+  Accel.setPermission(SECMODE_OPEN, SECMODE_NO_ACCESS);
+  Accel.setFixedLen(4*3);
+  VERIFY_STATUS( Accel.begin() );
 
   // Add Characteristic
   Period.setProperties(CHR_PROPS_READ | CHR_PROPS_WRITE);
   Period.setPermission(SECMODE_OPEN, SECMODE_OPEN);
-  Period.setFixedLen(2);
-  Period.setUserDescriptor("Period");
+  Period.setFixedLen(4);
   VERIFY_STATUS( Period.begin() );
-  Period.write16(10);
+  Period.write32(10);
 
   return ERROR_NONE;
 }

libraries/Bluefruit52Lib/src/services/BLEAdafruitAccel.h

@@ -35,9 +35,8 @@ class BLEAdafruitAccel : public BLEService
   public:
     static const uint8_t UUID128_SERVICE[16];
     static const uint8_t UUID128_CHR_DATA[16];
-    static const uint8_t UUID128_CHR_PERIOD[16];
 
-    BLECharacteristic Data;
+    BLECharacteristic Accel;
     BLECharacteristic Period;
 
     BLEAdafruitAccel(void);

libraries/Bluefruit52Lib/src/services/BLEAdafruitNeopixel.cpp

@@ -77,15 +77,13 @@ err_t BLEAdafruitNeopixel::begin (void)
   Count.setProperties(CHR_PROPS_READ | CHR_PROPS_WRITE);
   Count.setPermission(SECMODE_OPEN, SECMODE_OPEN);
   Count.setFixedLen(2);
-  Count.setUserDescriptor("Count");
   VERIFY_STATUS( Count.begin() );
   Count.write16(0);
 
   // Add Characteristic
   Type.setProperties(CHR_PROPS_READ | CHR_PROPS_WRITE);
   Type.setPermission(SECMODE_OPEN, SECMODE_OPEN);
   Type.setFixedLen(2);
-  Type.setUserDescriptor("Type");
   VERIFY_STATUS( Type.begin() );
   Type.write16(0);
 
@@ -95,8 +93,6 @@ err_t BLEAdafruitNeopixel::begin (void)
   // Change to use VLOC STACK to USER due to lack of memroy
   // Data.setMaxLen(Bluefruit.getMaxMtu(BLE_GAP_ROLE_PERIPH));
   Data.setMaxLen(20);
-
-  Data.setUserDescriptor("Data");
   VERIFY_STATUS( Data.begin() );
 
   return ERROR_NONE;

libraries/Bluefruit52Lib/src/services/BLEAdafruitTemperature.cpp

@@ -28,24 +28,33 @@
 // MACRO TYPEDEF CONSTANT ENUM DECLARATION
 //--------------------------------------------------------------------+
 
-/* Adafruit Temperature Service
- * - Service: ADAF-0001-C332-42A8-93BD-25E905756CB8
- *    - Temperature Celsius  : 0x2A6E
- *    - Measurement Interval : 0x2A21
+/* All Adafruit Service/Characteristic UUID128 share the same Base UUID:
+ *    ADAFxxx-C332-42A8-93BD-25E905756CB8
  *
- * https://www.bluetooth.com/wp-content/uploads/Sitecore-Media-Library/Gatt/Xml/Characteristics/org.bluetooth.characteristic.temperature.xml
- * https://www.bluetooth.com/wp-content/uploads/Sitecore-Media-Library/Gatt/Xml/Characteristics/org.bluetooth.characteristic.measurement_interval.xml
+ * Shared Characteristics
+ *  - Measurement Period  0001 | int32_t | Read + Write |
+ *    ms between measurements, -1: stop reading, 0: update when changes
+ *
+ * Temperature service    0100
+ *  - Temperature         0101 | float   | Read + Notify | degree in Celsius
+ *  - Measurement Period  0001
  */
 
 const uint8_t BLEAdafruitTemperature::UUID128_SERVICE[16] =
 {
   0xB8, 0x6c, 0x75, 0x05, 0xE9, 0x25, 0xBD, 0x93,
-  0xA8, 0x42, 0x32, 0xC3, 0x01, 0x00, 0xAF, 0xAD
+  0xA8, 0x42, 0x32, 0xC3, 0x00, 0x01, 0xAF, 0xAD
+};
+
+const uint8_t BLEAdafruitTemperature::UUID128_CHR_TEMPERATURE[16] =
+{
+  0xB8, 0x6c, 0x75, 0x05, 0xE9, 0x25, 0xBD, 0x93,
+  0xA8, 0x42, 0x32, 0xC3, 0x01, 0x01, 0xAF, 0xAD
 };
 
 // Constructor
 BLEAdafruitTemperature::BLEAdafruitTemperature(void)
-  : BLEService(UUID128_SERVICE), Temperature(UUID16_CHR_TEMPERATURE), MeasurementInterval(UUID16_CHR_MEASUREMENT_INTERVAL)
+  : BLEService(UUID128_SERVICE), Temperature(UUID128_CHR_TEMPERATURE), Period(UUID128_CHR_ADAFRUIT_MEASUREMENT_PERIOD)
 {
 
 }
@@ -59,17 +68,15 @@ err_t BLEAdafruitTemperature::begin (void)
   Temperature.setProperties(CHR_PROPS_READ | CHR_PROPS_NOTIFY);
   Temperature.setPermission(SECMODE_OPEN, SECMODE_NO_ACCESS);
   Temperature.setFixedLen(2);
-  Temperature.setUserDescriptor("Temperature");
   VERIFY_STATUS( Temperature.begin() );
 
   // Add Measurement Interval Characteristic
-  MeasurementInterval.setProperties(CHR_PROPS_READ | CHR_PROPS_WRITE);
-  MeasurementInterval.setPermission(SECMODE_OPEN, SECMODE_OPEN);
-  MeasurementInterval.setFixedLen(2);
-  MeasurementInterval.setUserDescriptor("Measurement Interval");
-  VERIFY_STATUS( MeasurementInterval.begin() );
+  Period.setProperties(CHR_PROPS_READ | CHR_PROPS_WRITE);
+  Period.setPermission(SECMODE_OPEN, SECMODE_OPEN);
+  Period.setFixedLen(4);
+  VERIFY_STATUS( Period.begin() );
 
-  MeasurementInterval.write16(30); // measure every 30 seconds
+  Period.write32(30); // measure every 30 seconds
 
   return ERROR_NONE;
 }

libraries/Bluefruit52Lib/src/services/BLEAdafruitTemperature.h

@@ -34,9 +34,10 @@ class BLEAdafruitTemperature : public BLEService
 {
   public:
     static const uint8_t UUID128_SERVICE[16];
+    static const uint8_t UUID128_CHR_TEMPERATURE[16];
 
     BLECharacteristic Temperature;
-    BLECharacteristic MeasurementInterval;
+    BLECharacteristic Period;
 
     BLEAdafruitTemperature();
     virtual err_t begin(void);