Restored use of setter methods for BLE configuration

Author: cstawarz

examples/StandardFirmataBLE/StandardFirmataBLE.ino

@@ -768,6 +768,13 @@ void setup()
   Firmata.attach(START_SYSEX, sysexCallback);
   Firmata.attach(SYSTEM_RESET, systemResetCallback);
 
+  stream.setLocalName(FIRMATA_BLE_LOCAL_NAME);
+
+  // set the BLE connection interval - this is the fastest interval you can read inputs
+  stream.setConnectionInterval(FIRMATA_BLE_MIN_INTERVAL, FIRMATA_BLE_MAX_INTERVAL);
+  // set how often the BLE TX buffer is flushed (if not full)
+  stream.setFlushInterval(FIRMATA_BLE_TXBUFFER_FLUSH_INTERVAL);
+
 #ifdef IS_IGNORE_BLE_PINS
   for (byte i = 0; i < TOTAL_PINS; i++) {
     if (IS_IGNORE_BLE_PINS(i)) {

examples/StandardFirmataBLE/bleConfig.h

@@ -88,7 +88,6 @@
  * Generic settings
  */
 #if !defined(FIRMATA_BLE_MIN_INTERVAL) && !defined(FIRMATA_BLE_MAX_INTERVAL)
-// BLE connection interval - this is the fastest interval you can read inputs.
 // These values apply to all devices using the Arduino BLEPeripheral library
 // with a Nordic nRF8001 or nRF51822.  Both values must be between
 // 0x0006 (7.5ms) and 0x0c80 (4s).
@@ -97,7 +96,6 @@
 #endif
 
 #if !defined(FIRMATA_BLE_TXBUFFER_FLUSH_INTERVAL)
-// How often the BLE TX buffer is flushed (if not full)
 #define FIRMATA_BLE_TXBUFFER_FLUSH_INTERVAL 30 // 30ms
 #endif
 

utility/BLEStream.h

@@ -19,6 +19,9 @@
 #define _MAX_ATTR_DATA_LEN_ BLE_ATTRIBUTE_MAX_VALUE_LENGTH
 #endif
 
+#define BLESTREAM_TXBUFFER_FLUSH_INTERVAL 80
+#define BLESTREAM_MIN_FLUSH_INTERVAL 8 // minimum interval for flushing the TX buffer
+
 // #define BLE_SERIAL_DEBUG
 
 class BLEStream : public BLEPeripheral, public Stream
@@ -29,6 +32,7 @@ class BLEStream : public BLEPeripheral, public Stream
     void begin(...);
     bool poll();
     void end();
+    void setFlushInterval(int);
 
     virtual int available(void);
     virtual int peek(void);
@@ -41,6 +45,7 @@ class BLEStream : public BLEPeripheral, public Stream
   private:
     bool _connected;
     unsigned long _flushed;
+    int _flushInterval;
     static BLEStream* _instance;
 
     size_t _rxHead;
@@ -80,6 +85,7 @@ BLEStream::BLEStream(unsigned char req, unsigned char rdy, unsigned char rst) :
   this->_txCount = 0;
   this->_rxHead = this->_rxTail = 0;
   this->_flushed = 0;
+  this->_flushInterval = BLESTREAM_TXBUFFER_FLUSH_INTERVAL;
   BLEStream::_instance = this;
 
   addAttribute(this->_uartService);
@@ -94,8 +100,6 @@ BLEStream::BLEStream(unsigned char req, unsigned char rdy, unsigned char rst) :
 
 void BLEStream::begin(...)
 {
-  BLEPeripheral::setLocalName(FIRMATA_BLE_LOCAL_NAME);
-  BLEPeripheral::setConnectionInterval(FIRMATA_BLE_MIN_INTERVAL, FIRMATA_BLE_MAX_INTERVAL);
   BLEPeripheral::begin();
 #ifdef BLE_SERIAL_DEBUG
   Serial.println(F("BLEStream::begin()"));
@@ -106,7 +110,7 @@ bool BLEStream::poll()
 {
   // BLEPeripheral::poll is called each time connected() is called
   this->_connected = BLEPeripheral::connected();
-  if (millis() > this->_flushed + FIRMATA_BLE_TXBUFFER_FLUSH_INTERVAL) {
+  if (millis() > this->_flushed + this->_flushInterval) {
     flush();
   }
   return this->_connected;
@@ -210,6 +214,13 @@ BLEStream::operator bool()
   return retval;
 }
 
+void BLEStream::setFlushInterval(int interval)
+{
+  if (interval > BLESTREAM_MIN_FLUSH_INTERVAL) {
+    this->_flushInterval = interval;
+  }
+}
+
 void BLEStream::_received(const unsigned char* data, size_t size)
 {
   for (size_t i = 0; i < size; i++) {

utility/BluefruitLE_SPI_Stream.h

@@ -16,6 +16,10 @@ class BluefruitLE_SPI_Stream : public Stream
   public:
     BluefruitLE_SPI_Stream(int8_t csPin, int8_t irqPin, int8_t rstPin);
 
+    void setLocalName(const char *localName);
+    void setConnectionInterval(unsigned short minConnInterval, unsigned short maxConnInterval);
+    void setFlushInterval(int flushInterval);
+
     void begin();
     bool poll();
     void end();
@@ -33,16 +37,38 @@ class BluefruitLE_SPI_Stream : public Stream
   private:
     Adafruit_BluefruitLE_SPI ble;
 
+    String localName;
+    unsigned short minConnInterval;
+    unsigned short maxConnInterval;
+
     uint8_t txBuffer[SDEP_MAX_PACKETSIZE];
     size_t txCount;
 };
 
 
 BluefruitLE_SPI_Stream::BluefruitLE_SPI_Stream(int8_t csPin, int8_t irqPin, int8_t rstPin) :
   ble(csPin, irqPin, rstPin),
+  minConnInterval(0),
+  maxConnInterval(0),
   txCount(0)
 { }
 
+void BluefruitLE_SPI_Stream::setLocalName(const char *localName)
+{
+  this->localName = localName;
+}
+
+void BluefruitLE_SPI_Stream::setConnectionInterval(unsigned short minConnInterval, unsigned short maxConnInterval)
+{
+  this->minConnInterval = minConnInterval;
+  this->maxConnInterval = maxConnInterval;
+}
+
+void BluefruitLE_SPI_Stream::setFlushInterval(int flushInterval)
+{
+  // Not used
+}
+
 void BluefruitLE_SPI_Stream::begin()
 {
   // Initialize the SPI interface
@@ -58,15 +84,19 @@ void BluefruitLE_SPI_Stream::begin()
   ble.println("AT+HWMODELED=BLEUART");
 
   // Set local name
-  ble.print("AT+GAPDEVNAME=");
-  ble.println(FIRMATA_BLE_LOCAL_NAME);
+  if (localName.length() > 0) {
+    ble.print("AT+GAPDEVNAME=");
+    ble.println(localName);
+  }
 
   // Set connection interval
-  ble.print("AT+GAPINTERVALS=");
-  ble.print(FIRMATA_BLE_MIN_INTERVAL);
-  ble.print(",");
-  ble.print(FIRMATA_BLE_MAX_INTERVAL);
-  ble.println(",,,");
+  if (minConnInterval > 0 && maxConnInterval > 0) {
+    ble.print("AT+GAPINTERVALS=");
+    ble.print(minConnInterval);
+    ble.print(",");
+    ble.print(maxConnInterval);
+    ble.println(",,,");
+  }
 
   // Disable real and simulated mode switch (i.e. "+++") command
   ble.println("AT+MODESWITCHEN=local,0");