Merge pull request #399 from adafruit/develop

Cplayground bluefruit service

Author: hathach

.travis.yml

@@ -56,7 +56,7 @@ install:
   - BSP_VERSION=`eval ls $BSP_PATH`
   - rm -r $BSP_PATH/*
   - ln -s $TRAVIS_BUILD_DIR $BSP_PATH/$BSP_VERSION
-  - arduino --install-library "Adafruit NeoPixel","Adafruit NeoMatrix","Adafruit GFX Library","Adafruit SSD1306","MIDI Library","Adafruit ILI9341","Adafruit HX8357 Library"
+  - arduino --install-library "Adafruit NeoPixel","Adafruit NeoMatrix","Adafruit GFX Library","Adafruit SSD1306","MIDI Library","Adafruit ILI9341","Adafruit HX8357 Library","Adafruit Circuit Playground"
 
 before_script:
 

boards.txt

@@ -32,7 +32,7 @@ feather52832.upload.use_1200bps_touch=false
 feather52832.upload.wait_for_upload_port=false
 feather52832.upload.native_usb=false
 feather52832.upload.maximum_size=290816
-feather52832.upload.maximum_data_size=51072
+feather52832.upload.maximum_data_size=52224
 
 # Build
 feather52832.build.mcu=cortex-m4
@@ -81,7 +81,7 @@ feather52840.upload.protocol=nrfutil
 feather52840.upload.use_1200bps_touch=true
 feather52840.upload.wait_for_upload_port=true
 feather52840.upload.maximum_size=815104
-feather52840.upload.maximum_data_size=248832
+feather52840.upload.maximum_data_size=237568
 
 # Build
 feather52840.build.mcu=cortex-m4
@@ -135,7 +135,7 @@ itsybitsy52840.upload.protocol=nrfutil
 itsybitsy52840.upload.use_1200bps_touch=true
 itsybitsy52840.upload.wait_for_upload_port=true
 itsybitsy52840.upload.maximum_size=815104
-itsybitsy52840.upload.maximum_data_size=248832
+itsybitsy52840.upload.maximum_data_size=237568
 
 # Build
 itsybitsy52840.build.mcu=cortex-m4
@@ -188,7 +188,7 @@ cplaynrf52840.upload.protocol=nrfutil
 cplaynrf52840.upload.use_1200bps_touch=true
 cplaynrf52840.upload.wait_for_upload_port=true
 cplaynrf52840.upload.maximum_size=815104
-cplaynrf52840.upload.maximum_data_size=248832
+cplaynrf52840.upload.maximum_data_size=237568
 
 # Build
 cplaynrf52840.build.mcu=cortex-m4
@@ -295,7 +295,7 @@ metro52840.upload.protocol=nrfutil
 metro52840.upload.use_1200bps_touch=true
 metro52840.upload.wait_for_upload_port=true
 metro52840.upload.maximum_size=815104
-metro52840.upload.maximum_data_size=248832
+metro52840.upload.maximum_data_size=237568
 
 # Build
 metro52840.build.mcu=cortex-m4
@@ -338,7 +338,7 @@ pca10056.upload.protocol=nrfutil
 pca10056.upload.use_1200bps_touch=true
 pca10056.upload.wait_for_upload_port=true
 pca10056.upload.maximum_size=815104
-pca10056.upload.maximum_data_size=248832
+pca10056.upload.maximum_data_size=237568
 
 # Build
 pca10056.build.mcu=cortex-m4

cores/nRF5/freertos/config/FreeRTOSConfig.h

@@ -91,7 +91,7 @@
 #define configUSE_TIMERS                                         1
 #define configTIMER_TASK_PRIORITY                                ( 2 ) // Normal
 #define configTIMER_QUEUE_LENGTH                                 32
-#define configTIMER_TASK_STACK_DEPTH                             ( 100 )
+#define configTIMER_TASK_STACK_DEPTH                             ( 256 )
 
 /* Tickless Idle configuration. */
 #define configEXPECTED_IDLE_TIME_BEFORE_SLEEP                    2

cores/nRF5/linker/nrf52840_s140_v6.ld

@@ -8,13 +8,13 @@ MEMORY
   FLASH (rx)     : ORIGIN = 0x26000, LENGTH = 0xED000 - 0x26000
 
   /* SRAM required by S132 depend on
-   * - Attribute Table Size
+   * - Attribute Table Size (Number of Services and Characteristics)
    * - Vendor UUID count
    * - Max ATT MTU
    * - Concurrent connection peripheral + central + secure links
    * - Event Len, HVN queue, Write CMD queue
    */ 
-  RAM (rwx) :  ORIGIN = 0x20003400, LENGTH = 0x20040000 - 0x20003400
+  RAM (rwx) :  ORIGIN = 0x20006000, LENGTH = 0x20040000 - 0x20006000
 }
 
 SECTIONS

cores/nRF5/utility/AdaCallback.c

@@ -73,15 +73,9 @@ void adafruit_callback_task(void* arg)
   }
 }
 
-//! Test if in interrupt mode
-static inline bool is_isr(void)
-{
-  return (SCB->ICSR & SCB_ICSR_VECTACTIVE_Msk) != 0 ;
-}
-
 void ada_callback_queue(ada_callback_t* cb_item)
 {
-  BaseType_t ret = is_isr() ? xQueueSendFromISR(_cb_queue, (void*) &cb_item, NULL) : xQueueSend(_cb_queue, (void*) &cb_item, CFG_CALLBACK_TIMEOUT);
+  BaseType_t ret = isInISR() ? xQueueSendFromISR(_cb_queue, (void*) &cb_item, NULL) : xQueueSend(_cb_queue, (void*) &cb_item, CFG_CALLBACK_TIMEOUT);
 
   if ( ret != pdTRUE )
   {
@@ -91,7 +85,7 @@ void ada_callback_queue(ada_callback_t* cb_item)
       _cb_qdepth = 2*_cb_qdepth;
 
       // try again
-      if ( is_isr() )
+      if ( isInISR() )
       {
         xQueueSendFromISR(_cb_queue, (void*) &cb_item, NULL);
       }else

cores/nRF5/utility/SoftwareTimer.cpp

@@ -0,0 +1,111 @@
+/* 
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Ha Thach (tinyusb.org) for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "SoftwareTimer.h"
+
+SoftwareTimer::SoftwareTimer()
+{
+  _handle = NULL;
+}
+
+SoftwareTimer::~SoftwareTimer ()
+{
+  if ( _handle != NULL ) xTimerDelete(_handle, 0);
+}
+
+void SoftwareTimer::begin(uint32_t ms, TimerCallbackFunction_t callback, void* timerID, bool repeating)
+{
+  _handle = xTimerCreate(NULL, ms2tick(ms), repeating, timerID, callback);
+}
+
+bool SoftwareTimer::start(void)
+{
+  bool ret = true;
+  if ( isInISR() )
+  {
+    BaseType_t ret, xHigherPriorityTaskWoken = pdFALSE;
+    ret = (pdPASS == xTimerStartFromISR(_handle, &xHigherPriorityTaskWoken));
+    portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
+  }else
+  {
+    xTimerStart(_handle, 0);
+  }
+  return ret;
+}
+
+bool SoftwareTimer::stop (void)
+{
+  bool ret = true;
+  if ( isInISR() )
+  {
+    BaseType_t xHigherPriorityTaskWoken = pdFALSE;
+    ret = (pdPASS == xTimerStopFromISR(_handle, &xHigherPriorityTaskWoken));
+    portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
+  }
+  else
+  {
+    xTimerStop (_handle, 0);
+  }
+
+  return ret;
+}
+
+bool SoftwareTimer::reset (void)
+{
+  bool ret = true;
+  if ( isInISR() )
+  {
+    BaseType_t xHigherPriorityTaskWoken = pdFALSE;
+    ret = (pdPASS == xTimerResetFromISR(_handle, &xHigherPriorityTaskWoken));
+    portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
+  }
+  else
+  {
+    xTimerReset(_handle, 0);
+  }
+
+  return ret;
+}
+
+bool SoftwareTimer::setPeriod(uint32_t ms)
+{
+  BaseType_t active = xTimerIsTimerActive(_handle);
+  bool ret = true;
+
+  if ( isInISR() )
+  {
+    BaseType_t xHigherPriorityTaskWoken = pdFALSE;
+    ret = (pdPASS == xTimerChangePeriodFromISR(_handle, ms2tick(ms), &xHigherPriorityTaskWoken));
+    portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
+  }
+  else
+  {
+    xTimerChangePeriod(_handle, ms2tick(ms), 0);
+  }
+
+  // Change period of inactive timer will also start it !!
+  if ( !active ) stop();
+
+  return ret;
+}

cores/nRF5/utility/SoftwareTimer.h

@@ -44,52 +44,16 @@ class SoftwareTimer
     TimerHandle_t _handle;
 
   public:
-    SoftwareTimer()          { _handle = NULL; }
-    virtual ~SoftwareTimer() { if(_handle != NULL) xTimerDelete(_handle, 0); }
+    SoftwareTimer();
+    virtual ~SoftwareTimer();
 
-    void begin(uint32_t ms, TimerCallbackFunction_t callback, bool repeating = true)
-    {
-      _handle = xTimerCreate(NULL, ms2tick(ms), repeating, NULL, callback);
-    }
+    void begin(uint32_t ms, TimerCallbackFunction_t callback, void* timerID = NULL, bool repeating = true);
+    TimerHandle_t getHandle(void) { return _handle; }
 
-    TimerHandle_t getHandle(void)
-    {
-      return _handle;
-    }
-
-    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)
-    {
-      BaseType_t active = xTimerIsTimerActive(_handle);
-      xTimerChangePeriod(_handle, ms2tick(ms), 0);
-
-      // Change period of inactive timer will also start it !!
-      if ( !active ) xTimerStop(_handle, 0);
-    }
+    bool start(void);
+    bool stop (void);
+    bool reset (void);
+    bool setPeriod(uint32_t ms);
 };
 
 #endif /* SOFTWARETIMER_H_ */

cores/nRF5/wiring.h

@@ -36,6 +36,12 @@ void enterUf2Dfu(void);
 void waitForEvent(void);
 void systemOff(uint32_t pin, uint8_t wake_logic);
 
+// Test if in interrupt mode
+static inline bool isInISR(void)
+{
+  return (SCB->ICSR & SCB_ICSR_VECTACTIVE_Msk) != 0 ;
+}
+
 #ifdef __cplusplus
 }
 #endif

libraries/BLEAdafruitService/library.properties

@@ -0,0 +1,10 @@
+name=Adafruit BLE Services
+version=1.0
+author=Adafruit
+maintainer=Adafruit <[email protected]>
+sentence=Arduino library for nRF52-based Adafruit Bluefruit LE modules
+paragraph=Arduino library for nRF52-based Adafruit Bluefruit LE modules
+category=Communication
+url=https://github.com/adafruit/Adafruit_nRF52_Arduino
+architectures=*
+includes=BLEAdafruitService.h

libraries/BLEAdafruitService/src/BLEAdafruitService.h

@@ -0,0 +1,40 @@
+/* 
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Ha Thach (tinyusb.org) for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef BLEADAFRUITSERVICE_H_
+#define BLEADAFRUITSERVICE_H_
+
+#include "bluefruit_common.h"
+#include "BLECharacteristic.h"
+#include "BLEService.h"
+
+#include "services/BLEAdafruitSensor.h"
+#include "services/BLEAdafruitTemperature.h"
+#include "services/BLEAdafruitAccel.h"
+#include "services/BLEAdafruitLightSensor.h"
+#include "services/BLEAdafruitButton.h"
+#include "services/BLEAdafruitTone.h"
+#include "services/BLEAdafruitAddressablePixel.h"
+
+#endif /* BLEADAFRUITSERVICE_H_ */