Merge branch 'master' into update-tinyusbcore-11d669b4d2a40eb2fc5e51b2a9707a6de9d42363

Author: hathach

.github/workflows/githubci.yml

@@ -47,15 +47,24 @@ jobs:
         arduino-cli core update-index
         arduino-cli core update-index --additional-urls $BSP_URL
         arduino-cli core install adafruit:nrf52 --additional-urls $BSP_URL
+
         # Repalce release BSP with our code
         BSP_VERSION=`eval ls $HOME/$BSP_PATH`
         rm -r $HOME/$BSP_PATH/*
         ln -s $GITHUB_WORKSPACE $HOME/$BSP_PATH/$BSP_VERSION
+
         # Install library dependency
-        arduino-cli lib install "Adafruit AHRS" "Adafruit APDS9960 Library" "Adafruit BMP280 Library" "Adafruit Circuit Playground" "Adafruit EPD" "Adafruit GFX Library" "Adafruit HX8357 Library" "Adafruit ILI9341" "Adafruit LIS3MDL" "Adafruit LSM6DS" "Adafruit NeoPixel" "Adafruit NeoMatrix" "Adafruit Sensor Calibration" "Adafruit SHT31 Library" "Adafruit SSD1306" "Adafruit ST7735 and ST7789 Library" "Firmata" "SdFat - Adafruit Fork"
-        
+        arduino-cli lib install "Adafruit AHRS" "Adafruit APDS9960 Library" "Adafruit BMP280 Library" "Adafruit Circuit Playground" "Adafruit EPD" "Adafruit GFX Library" "Adafruit HX8357 Library" "Adafruit ILI9341" "Adafruit LIS3MDL" "Adafruit LSM6DS" "Adafruit NeoPixel" "Adafruit NeoMatrix" "Adafruit Sensor Calibration" "Adafruit SHT31 Library" "Adafruit SSD1306" "Adafruit ST7735 and ST7789 Library" "SdFat - Adafruit Fork"
+
         # TODO update to support MIDI version 5 later on
         arduino-cli lib install "MIDI Library"@4.3.1
 
+        # TODO use firmata master to prevent build error with gcc v9 (should be remove after 2.5.9 is released)
+        # https://github.com/firmata/arduino/pull/438
+        git clone --depth 1 https://github.com/firmata/arduino.git $HOME/Arduino/libraries/firmata
+
+        # Library summary
+        arduino-cli lib list
+
     - name: Build examples
       run: python3 tools/build_all.py ${{ matrix.arduino-platform }}

libraries/BLEAdafruitService/src/services/BLEAdafruitSensor.cpp

@@ -36,7 +36,7 @@ BLEAdafruitSensor::BLEAdafruitSensor(BLEUuid service_uuid, BLEUuid data_uuid)
   _notify_cb = NULL;
 }
 
-err_t BLEAdafruitSensor::_begin(int32_t ms)
+err_t BLEAdafruitSensor::_begin(int ms)
 {
   // Invoke base class begin()
   VERIFY_STATUS( BLEService::begin() );
@@ -59,19 +59,19 @@ err_t BLEAdafruitSensor::_begin(int32_t ms)
   return ERROR_NONE;
 }
 
-err_t BLEAdafruitSensor::begin(measure_callback_t fp, int32_t ms)
+err_t BLEAdafruitSensor::begin(measure_callback_t fp, int ms)
 {
   _measure_cb = fp;
   return _begin(ms);
 }
 
-err_t BLEAdafruitSensor::begin(Adafruit_Sensor* sensor, int32_t ms)
+err_t BLEAdafruitSensor::begin(Adafruit_Sensor* sensor, int ms)
 {
   _sensor = sensor;
   return _begin(ms);
 }
 
-void BLEAdafruitSensor::setPeriod(int32_t period_ms)
+void BLEAdafruitSensor::setPeriod(int period_ms)
 {
   _period.write32(period_ms);
   _update_timer(period_ms);

libraries/BLEAdafruitService/src/services/BLEAdafruitSensor.h

@@ -30,17 +30,17 @@
 class BLEAdafruitSensor : public BLEService
 {
   public:
-    static const int32_t DEFAULT_PERIOD = 1000;
+    static const int DEFAULT_PERIOD = 1000;
 
     typedef void (*notify_callback_t)(uint16_t conn_hdl, bool enabled);
     typedef uint16_t (*measure_callback_t )(uint8_t* buf, uint16_t bufsize);
 
     BLEAdafruitSensor(BLEUuid service_uuid, BLEUuid data_uuid);
 
-    virtual err_t begin(measure_callback_t fp, int32_t ms = DEFAULT_PERIOD);
-    virtual err_t begin(Adafruit_Sensor* sensor, int32_t ms = DEFAULT_PERIOD);
+    virtual err_t begin(measure_callback_t fp, int ms = DEFAULT_PERIOD);
+    virtual err_t begin(Adafruit_Sensor* sensor, int ms = DEFAULT_PERIOD);
 
-    void setPeriod(int32_t period_ms);
+    void setPeriod(int period_ms);
     void setNotifyCallback(notify_callback_t fp);
 
   protected:
@@ -54,7 +54,7 @@ class BLEAdafruitSensor : public BLEService
 
     SoftwareTimer _timer;
 
-    err_t _begin(int32_t ms);
+    err_t _begin(int ms);
 
     virtual void _update_timer(int32_t ms);
     virtual void _measure_handler(void);

libraries/Bluefruit52Lib/src/BLECharacteristic.cpp

@@ -564,11 +564,6 @@ uint16_t BLECharacteristic::write32(int num)
   return write32( (uint32_t) num );
 }
 
-uint16_t BLECharacteristic::write32(int32_t num)
-{
-  return write32( (uint32_t) num );
-}
-
 /*------------------------------------------------------------------*/
 /* READ
  *------------------------------------------------------------------*/

libraries/Bluefruit52Lib/src/BLECharacteristic.h

@@ -129,7 +129,6 @@ class BLECharacteristic
     uint16_t write16 (uint16_t num);
     uint16_t write32 (uint32_t num);
     uint16_t write32 (int      num);
-    uint16_t write32 (int32_t  num);
 
     /*------------- Read -------------*/
     uint16_t read  (void* buffer, uint16_t bufsize, uint16_t offset = 0);

libraries/Bluefruit52Lib/src/BLEClientCharacteristic.cpp

@@ -153,7 +153,7 @@ bool BLEClientCharacteristic::_discoverDescriptor(uint16_t conn_handle, ble_gatt
     if ( disc_rsp.descs[i].uuid.type == BLE_UUID_TYPE_BLE &&
          disc_rsp.descs[i].uuid.uuid == BLE_UUID_DESCRIPTOR_CLIENT_CHAR_CONFIG )
     {
-      LOG_LV2("DISC", "Found CCDD: handle = %d", disc_rsp.descs[i].handle);
+      LOG_LV2("DISC", "Found CCCD: handle = %d", disc_rsp.descs[i].handle);
       _cccd_handle = disc_rsp.descs[i].handle;
 
       break;

libraries/Bluefruit52Lib/src/BLEDiscovery.cpp

@@ -107,9 +107,10 @@ bool BLEDiscovery::_discoverService(uint16_t conn_handle, BLEClientService& svc,
 uint8_t BLEDiscovery::discoverCharacteristic(uint16_t conn_handle, BLEClientCharacteristic* chr[], uint8_t count)
 {
   // We could found more characteristic than we looking for. Buffer must be large enough
-  enum { MAX_DISC_CHARS = 4 };
+  enum { MAX_DISC_CHARS = 8 };
 
-  uint16_t bufsize = sizeof(ble_gattc_evt_char_disc_rsp_t) + (MAX_DISC_CHARS-1)*sizeof(ble_gattc_char_t);
+  // -1 because the first ble_gattc_char_t is built in to ble_gattc_evt_char_disc_rsp_t
+  uint16_t bufsize = sizeof(ble_gattc_evt_char_disc_rsp_t) + (MAX_DISC_CHARS-1)*sizeof(ble_gattc_char_t); 
   ble_gattc_evt_char_disc_rsp_t* disc_chr = (ble_gattc_evt_char_disc_rsp_t*) rtos_malloc( bufsize );
 
   uint8_t found = 0;
@@ -129,6 +130,9 @@ uint8_t BLEDiscovery::discoverCharacteristic(uint16_t conn_handle, BLEClientChar
     // timeout or has no data (due to GATT Error)
     if ( bytecount <= 0 ) break;
 
+    // if we truncated the response, adjust the count to match
+    if ( disc_chr->count > MAX_DISC_CHARS ) disc_chr->count = MAX_DISC_CHARS;
+
     // Look for matched uuid in the discovered list
     for(uint8_t d=0 ; d<disc_chr->count; d++)
     {

tools/build_all_travis.py

@@ -39,11 +39,17 @@ const uint32_t g_ADigitalPinMap[] =
 
 void initVariant()
 {
-  // LED1 & LED2
+  // init all 4 onboard LEDs
   pinMode(PIN_LED1, OUTPUT);
   ledOff(PIN_LED1);
 
   pinMode(PIN_LED2, OUTPUT);
-  ledOff(PIN_LED2);;
+  ledOff(PIN_LED2);
+
+  pinMode(PIN_LED3, OUTPUT);
+  ledOff(PIN_LED3);
+
+  pinMode(PIN_LED4, OUTPUT);
+  ledOff(PIN_LED4);
 }
 

variants/pca10056/variant.cpp

@@ -45,6 +45,8 @@ extern "C"
 // LEDs
 #define PIN_LED1             (13)
 #define PIN_LED2             (14)
+#define PIN_LED3             (15)
+#define PIN_LED4             (16)
 
 #define LED_BUILTIN          PIN_LED1
 #define LED_CONN             PIN_LED2