fix previousMillis val. minor BLEStream improvements

Author: soundanalogous

examples/StandardFirmataBLE/StandardFirmataBLE.ino

@@ -11,7 +11,7 @@
   Copyright (C) 2006-2008 Hans-Christoph Steiner.  All rights reserved.
   Copyright (C) 2010-2011 Paul Stoffregen.  All rights reserved.
   Copyright (C) 2009 Shigeru Kobayashi.  All rights reserved.
-  Copyright (C) 2009-2015 Jeff Hoefs.  All rights reserved.
+  Copyright (C) 2009-2016 Jeff Hoefs.  All rights reserved.
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -20,7 +20,7 @@
 
   See file LICENSE.txt for further informations on licensing terms.
 
-  Last updated by Jeff Hoefs: December 26th, 2015
+  Last updated by Jeff Hoefs: January 3rd, 2015
 */
 
 #include <Servo.h>
@@ -30,6 +30,9 @@
 #include <CurieBle.h>
 #include "utility/BLEStream.h"
 
+//#define SERIAL_DEBUG
+#include "utility/firmataDebug.h"
+
 #define I2C_WRITE                   B00000000
 #define I2C_READ                    B00001000
 #define I2C_READ_CONTINUOUSLY       B00010000
@@ -718,6 +721,8 @@ void systemResetCallback()
 
 void setup()
 {
+  DEBUG_BEGIN(9600);
+
   Firmata.setFirmwareVersion(FIRMATA_FIRMWARE_MAJOR_VERSION, FIRMATA_FIRMWARE_MINOR_VERSION);
 
   Firmata.attach(ANALOG_MESSAGE, analogWriteCallback);
@@ -745,12 +750,12 @@ void loop()
   byte pin, analogPin;
 
   // do not process data if no BLE connection is established
+  // poll will send the TX buffer every 30ms while it contains data
   if (!stream.poll()) return;
 
   /* DIGITALREAD - as fast as possible, check for changes and output them to the
    * Stream buffer using Stream.write()  */
   checkDigitalInputs();
-  //stream.flush(); // send digital input values immediately
 
   /* STREAMREAD - processing incoming messagse as soon as possible, while still
    * checking digital inputs.  */
@@ -759,7 +764,7 @@ void loop()
 
   currentMillis = millis();
   if (currentMillis - previousMillis > samplingInterval) {
-    previousMillis += samplingInterval;
+    previousMillis = currentMillis;
     /* ANALOGREAD - do all analogReads() at the configured sampling interval */
     for (pin = 0; pin < TOTAL_PINS; pin++) {
       if (IS_PIN_ANALOG(pin) && pinConfig[pin] == PIN_MODE_ANALOG) {
@@ -775,6 +780,5 @@ void loop()
         readAndReportData(query[i].addr, query[i].reg, query[i].bytes, query[i].stopTX);
       }
     }
-    //stream.flush();
   }
 }

utility/BLEStream.cpp

@@ -7,7 +7,7 @@
 
 #include "BLEStream.h"
 
-// #define BLE_SERIAL_DEBUG
+//#define BLE_SERIAL_DEBUG
 
 BLEStream* BLEStream::_instance = NULL;
 
@@ -38,7 +38,7 @@ void BLEStream::begin(...) {
 
 bool BLEStream::poll() {
   this->_connected = BLEPeripheral::connected();
-  if (millis() > this->_flushed + 100) flush();
+  if (millis() > this->_flushed + BLESTREAM_TXBUFFER_FLUSH_INTERVAL) flush();
   return this->_connected;
 }
 
@@ -52,8 +52,10 @@ void BLEStream::end() {
 int BLEStream::available(void) {
   int retval = (this->_rxHead - this->_rxTail + sizeof(this->_rxBuffer)) % sizeof(this->_rxBuffer);
   #ifdef BLE_SERIAL_DEBUG
-    Serial.print(F("BLEStream::available() = "));
-    Serial.println(retval);
+    if (retval > 0) {
+      Serial.print(F("BLEStream::available() = "));
+      Serial.println(retval);
+    }
   #endif
   return retval;
 }
@@ -62,9 +64,7 @@ int BLEStream::peek(void) {
   if (this->_rxTail == this->_rxHead) return -1;
   unsigned char byte = this->_rxBuffer[this->_rxTail];
   #ifdef BLE_SERIAL_DEBUG
-    Serial.print(F("BLEStream::peek() = "));
-    Serial.print((char) byte);
-    Serial.print(F(" 0x"));
+    Serial.print(F("BLEStream::peek() = 0x"));
     Serial.println(byte, HEX);
   #endif
   return byte;
@@ -75,9 +75,7 @@ int BLEStream::read(void) {
   this->_rxTail = (this->_rxTail + 1) % sizeof(this->_rxBuffer);
   unsigned char byte = this->_rxBuffer[this->_rxTail];
   #ifdef BLE_SERIAL_DEBUG
-    Serial.print(F("BLEStream::read() = "));
-    Serial.print((char) byte);
-    Serial.print(F(" 0x"));
+    Serial.print(F("BLEStream::read() = 0x"));
     Serial.println(byte, HEX);
   #endif
   return byte;
@@ -97,9 +95,7 @@ size_t BLEStream::write(uint8_t byte) {
   this->_txBuffer[this->_txCount++] = byte;
   if (this->_txCount == sizeof(this->_txBuffer)) flush();
   #ifdef BLE_SERIAL_DEBUG
-    Serial.print(F("BLEStream::write("));
-    Serial.print((char) byte);
-    Serial.print(F(" 0x"));
+    Serial.print(F("BLEStream::write( 0x"));
     Serial.print(byte, HEX);
     Serial.println(F(") = 1"));
   #endif
@@ -122,7 +118,7 @@ void BLEStream::_received(const unsigned char* data, size_t size) {
   }
   #ifdef BLE_SERIAL_DEBUG
     Serial.print(F("BLEStream::received("));
-    for (int i = 0; i < size; i++) Serial.print((char)data[i]);
+    for (int i = 0; i < size; i++) Serial.print(data[i], HEX);
     Serial.println(F(")"));
   #endif
 }

utility/BLEStream.h

@@ -11,6 +11,8 @@
 #include <Arduino.h>
 #include <CurieBle.h>
 
+#define BLESTREAM_TXBUFFER_FLUSH_INTERVAL 30
+
 class BLEStream : public BLEPeripheral, public Stream
 {
   public: