complete bufferTXD() for bleuart

- reduce default max connection interval from 40 to 30 ms
- finish firmata port

Author: hathach

cores/nRF5/Arduino.h

@@ -97,7 +97,7 @@ uint32_t setLoopStacksize(void);
 #define lowByte(w) ((uint8_t) ((w) & 0xff))
 #define highByte(w) ((uint8_t) ((w) >> 8))
 
-#define bitRead(value, bit) (((value) >> (bit)) & 0x01)
+#define bitRead(value, bit) (((value) >> (bit)) & 0x01ul)
 #define bitSet(value, bit) ((value) |= (1UL << (bit)))
 #define bitClear(value, bit) ((value) &= ~(1UL << (bit)))
 #define bitWrite(value, bit, bitvalue) (bitvalue ? bitSet(value, bit) : bitClear(value, bit))
@@ -110,7 +110,7 @@ uint32_t setLoopStacksize(void);
 #define portOutputRegister(port)   ( &(NRF_GPIO->OUT) )
 #define portInputRegister(port)    ( &(NRF_GPIO->IN) )
 #define portModeRegister(port)     ( &(NRF_GPIO->DIRSET) )
-#define digitalPinHasPWM(P)        ( true )
+#define digitalPinHasPWM(P)        ( (P) > 1 )
 
 void rtos_idle_callback(void) ATTR_WEAK;
 /*

cores/nRF5/utility/adafruit_fifo.cpp

@@ -67,8 +67,7 @@ void Adafruit_FIFO::begin(void)
 void Adafruit_FIFO::begin(uint16_t depth)
 {
   _depth  = depth;
-  _buffer = (uint8_t*) malloc(_item_size*_depth);
-  _mutex  = xSemaphoreCreateMutex();
+  begin();
 }
 
 void Adafruit_FIFO::overwriteIfFull(bool enable)

libraries/Bluefruit52Lib/examples/Peripheral/StandardFirmata/LICENSE.txt

@@ -302,15 +302,16 @@ void setPinModeCallback(byte pin, int mode)
       }
       break;
     case INPUT:
-      if (IS_PIN_DIGITAL(pin)) {
-        pinMode(PIN_TO_DIGITAL(pin), INPUT);    // disable output driver
-#if ARDUINO <= 100
-        // deprecated since Arduino 1.0.1 - TODO: drop support in Firmata 2.6
-        digitalWrite(PIN_TO_DIGITAL(pin), LOW); // disable internal pull-ups
-#endif
-        Firmata.setPinMode(pin, INPUT);
-      }
-      break;
+// Adafruit: Input without pull up cause pin state changes randomly --> lots of transmission data     
+//      if (IS_PIN_DIGITAL(pin)) {
+//        pinMode(PIN_TO_DIGITAL(pin), INPUT);    // disable output driver
+//#if ARDUINO <= 100
+//        // deprecated since Arduino 1.0.1 - TODO: drop support in Firmata 2.6
+//        digitalWrite(PIN_TO_DIGITAL(pin), LOW); // disable internal pull-ups
+//#endif
+//        Firmata.setPinMode(pin, INPUT);
+//      }
+//      break;
     case PIN_MODE_PULLUP:
       if (IS_PIN_DIGITAL(pin)) {
         pinMode(PIN_TO_DIGITAL(pin), INPUT_PULLUP);
@@ -730,11 +731,8 @@ void systemResetCallback()
       // turns off pullup, configures everything
       setPinModeCallback(i, PIN_MODE_ANALOG);
     } else if (IS_PIN_DIGITAL(i)) {
-      if ( i != LED_BLUE ) // skip connection LED
-      {
-        // sets the output to 0, configures portConfigInputs
-        setPinModeCallback(i, OUTPUT);
-      }
+      // sets the output to 0, configures portConfigInputs
+      setPinModeCallback(i, OUTPUT);
     }
 
     servoPinMap[i] = 255;
@@ -761,12 +759,15 @@ void setup()
 {
   Serial.begin(115200);                              
   Serial.println("Bluefruit52 Standard Firmata via BLEUART Example");
-  Serial.println("---------------------------\n");
+  Serial.println("------------------------------------------------\n");
 
   Bluefruit.begin();
-  Bluefruit.setTxPower(4);          // Maximum TX power = 4 dBm
   Bluefruit.setName("Bluefruit52");
-
+  Bluefruit.setTxPower(4);          // Maximum TX power = 4 dBm
+  // try to go as fast as possible, could be rejected by some central, increase it if needed
+  // iOS won't negotitate and will mostly use 30ms
+  Bluefruit.setConnInterval(9, 16); // min = 9*1.25=11.25 ms, max = 16*1.25=20ms
+  
   // Configure and Start BLE Uart Service
   // Firmata use several small write(1) --> buffering TXD is required to run smoothly
   // Enable buffering TXD

libraries/Bluefruit52Lib/examples/Peripheral/StandardFirmata/StandardFirmata.ino

@@ -500,6 +500,7 @@ bool BLECharacteristic::notify(const void* data, uint16_t len)
           .p_data = (uint8_t*) u8data,
       };
 
+      LOG_LV2(CHR, "Notify %d bytes", packet_len);
       VERIFY_STATUS( sd_ble_gatts_hvx(Bluefruit.connHandle(), &hvx_params), false );
 
       remaining -= packet_len;

libraries/Bluefruit52Lib/src/BLECharacteristic.cpp

@@ -49,7 +49,7 @@
 #define BLE_GAP_CONN_SLAVE_LATENCY              0
 
 #define BLE_GAP_CONN_MIN_INTERVAL_DFLT          MS100TO125(20)
-#define BLE_GAP_CONN_MAX_INTERVAL_DFLT          MS100TO125(40)
+#define BLE_GAP_CONN_MAX_INTERVAL_DFLT          MS100TO125(30)
 
 // Converts an integer of 1.25ms units to msecs
 #define MS100TO125(ms100) (((ms100)*4)/5)

libraries/Bluefruit52Lib/src/bluefruit_common.h

@@ -71,7 +71,7 @@ BLEUart::BLEUart(uint16_t fifo_depth)
 {
   _rx_cb        = NULL;
 
-  _tx_buffered = false;
+  _tx_buffered  = 0;
   _buffered_th  = NULL;
 
   _tx_fifo      = NULL;
@@ -114,7 +114,7 @@ void bleuart_txd_buffered_hdlr(TimerHandle_t timer)
   // skip if null (unlikely)
   if ( !svc->_tx_fifo ) return;
 
-  // flush data (send notiication)
+  // flush tx data
   svc->flush_tx_buffered();
 }
 
@@ -144,7 +144,7 @@ void BLEUart::setRxCallback( rx_callback_t fp)
  * Note: packet is sent right away if it reach MTU bytes
  * @param enable true or false
  */
-void BLEUart::bufferTXD(bool enable)
+void BLEUart::bufferTXD(uint8_t enable)
 {
   _tx_buffered = enable;
 
@@ -206,15 +206,18 @@ void BLEUart::_disconnect_cb(void)
   {
     xTimerDelete(_buffered_th, 0);
     _buffered_th = NULL;
+
+    if (_tx_fifo) _tx_fifo->clear();
   }
 }
 
 void BLEUart::_connect_cb (void)
 {
   if ( _tx_buffered)
   {
-    // create buffered timer with interval = connection interval
-    _buffered_th = xTimerCreate(NULL, (5*ms2tick(Bluefruit.connInterval())) / 4, true, this, bleuart_txd_buffered_hdlr);
+    // create TXD timer TODO take connInterval into account
+    // ((5*ms2tick(Bluefruit.connInterval())) / 4) / 2
+    _buffered_th = xTimerCreate(NULL, ms2tick(10), true, this, bleuart_txd_buffered_hdlr);
   }
 }
 

libraries/Bluefruit52Lib/src/services/BLEUart.cpp

@@ -61,7 +61,7 @@ class BLEUart : public BLEService, public Stream
     bool notifyEnabled(void);
 
     void setRxCallback( rx_callback_t fp);
-    void bufferTXD(bool enable);
+    void bufferTXD(uint8_t enable);
 
     // Stream API
     virtual int       read       ( void );
@@ -83,10 +83,9 @@ class BLEUart : public BLEService, public Stream
     Adafruit_FIFO     _rx_fifo;
     rx_callback_t     _rx_cb;
 
-    bool            _tx_buffered;
-    TimerHandle_t   _buffered_th;
-
-    Adafruit_FIFO*  _tx_fifo;
+    uint8_t           _tx_buffered;
+    TimerHandle_t     _buffered_th;
+    Adafruit_FIFO*    _tx_fifo;
 
     bool flush_tx_buffered(void);