Merge pull request #44 from aj-ptw/dev

Dev

Author: AJ Keller

OpenBCI_Wifi.cpp

@@ -73,6 +73,7 @@ void OpenBCI_Wifi_Class::initVariables(void) {
   head = 0;
   lastSampleNumber = 0;
   lastTimeWasPolled = 0;
+  mqttPort = DEFAULT_MQTT_PORT;
   passthroughPosition = 0;
   tail = 0;
   tcpPort = 80;
@@ -222,7 +223,7 @@ String OpenBCI_Wifi_Class::getInfoBoard(void) {
 }
 
 String OpenBCI_Wifi_Class::getInfoMQTT(boolean clientMQTTConnected) {
-  const size_t bufferSize = JSON_OBJECT_SIZE(6) + 1400;
+  const size_t bufferSize = JSON_OBJECT_SIZE(7) + 2000;
   StaticJsonBuffer<bufferSize> jsonBuffer;
   String json;
   JsonObject& root = jsonBuffer.createObject();
@@ -231,6 +232,7 @@ String OpenBCI_Wifi_Class::getInfoMQTT(boolean clientMQTTConnected) {
   root[JSON_MQTT_USERNAME] = String(mqttUsername);
   root[JSON_TCP_OUTPUT] = getCurOutputModeString();
   root[JSON_LATENCY] = getLatency();
+  root[JSON_MQTT_PORT] = mqttPort;
   root.printTo(json);
   return json;
 }
@@ -336,12 +338,12 @@ unsigned long OpenBCI_Wifi_Class::getLatency(void) {
 uint8_t OpenBCI_Wifi_Class::getJSONMaxPackets(uint8_t numChannels) {
   switch (numChannels) {
     case NUM_CHANNELS_GANGLION:
-      return 7; // Size of
+      return 10; // Size of
     case NUM_CHANNELS_CYTON_DAISY:
-      return 2;
+      return 6;
     case NUM_CHANNELS_CYTON:
     default:
-      return 5;
+      return 10;
   }
 }
 
@@ -616,10 +618,11 @@ void OpenBCI_Wifi_Class::setGains(uint8_t *raw) {
  * @param username      {String} - The username for the MQTT broker to user
  * @param password      {String} - The password for you to connect to
  */
-void OpenBCI_Wifi_Class::setInfoMQTT(String brokerAddress, String username, String password) {
+void OpenBCI_Wifi_Class::setInfoMQTT(String brokerAddress, String username, String password, int port) {
   mqttBrokerAddress = brokerAddress;
   mqttUsername = username;
   mqttPassword = password;
+  mqttPort = port;
   setOutputProtocol(OUTPUT_PROTOCOL_MQTT);
 }
 

OpenBCI_Wifi.h

@@ -41,7 +41,8 @@ class OpenBCI_Wifi_Class {
     OUTPUT_PROTOCOL_TCP,
     OUTPUT_PROTOCOL_MQTT,
     OUTPUT_PROTOCOL_WEB_SOCKETS,
-    OUTPUT_PROTOCOL_SERIAL
+    OUTPUT_PROTOCOL_SERIAL,
+    OUTPUT_PROTOCOL_AZURE_EVENT_HUB
   };
 
   typedef enum CYTON_GAIN {
@@ -139,7 +140,7 @@ class OpenBCI_Wifi_Class {
   void sampleReset(Sample *, uint8_t);
   void setGains(uint8_t *);
   void setGains(uint8_t *, uint8_t *);
-  void setInfoMQTT(String, String, String);
+  void setInfoMQTT(String, String, String, int);
   void setInfoTCP(String, int, boolean);
   void setLatency(unsigned long);
   void setNumChannels(uint8_t);
@@ -169,6 +170,7 @@ class OpenBCI_Wifi_Class {
 
   IPAddress tcpAddress;
 
+  int mqttPort;
   int tcpPort;
 
   OUTPUT_MODE curOutputMode;

OpenBCI_Wifi_Definitions.h

@@ -9,7 +9,7 @@
 #ifndef __OpenBCI_Wifi_Definitions__
 #define __OpenBCI_Wifi_Definitions__
 
-#define SOFTWARE_VERSION "v1.1.3"
+#define SOFTWARE_VERSION "v1.3.0"
 
 #define ADS1299_VREF 4.5
 #define MCP3912_VREF 1.2
@@ -20,12 +20,9 @@
 // #define DEBUG 1
 #define MAX_SRV_CLIENTS 2
 #define BYTES_PER_CHANNEL 3
-// #define NUM_PACKETS_IN_RING_BUFFER 45
-#define NUM_PACKETS_IN_RING_BUFFER 2000
-#define NUM_PACKETS_IN_RING_BUFFER_JSON 20
+#define NUM_PACKETS_IN_RING_BUFFER_JSON 1
 #define NUM_RAW_BUFFERS 2
-// #define MAX_PACKETS_PER_SEND_TCP 20
-#define MAX_PACKETS_PER_SEND_TCP 30
+#define MAX_PACKETS_PER_SEND_TCP 50
 #define BYTES_PER_RAW_BUFFER MAX_PACKETS_PER_SEND_TCP * BYTES_PER_OBCI_PACKET
 #define WIFI_SPI_MSG_LAST 0x01
 #define WIFI_SPI_MSG_MULTI 0x02
@@ -39,6 +36,7 @@
 #define LED_NOTIFY 5
 #define GANGLION_GAIN 51
 #define DEFAULT_LATENCY 10000
+#define DEFAULT_MQTT_PORT 1883
 // #define bit(b) (1UL << (b)) // Taken directly from Arduino.h
 // Arduino JSON needs bytes for duplication
 // to recalculate visit:
@@ -57,7 +55,7 @@
 #define CLIENT_RESPONSE_NO_BODY_IN_POST 402
 #define CLIENT_RESPONSE_MISSING_REQUIRED_CMD 403
 #define NANO_VOLTS_IN_VOLTS 1000000000.0
-#define MAX_JSON_BUFFER_SIZE 3000
+#define MAX_JSON_BUFFER_SIZE 4000
 
 #define ADS_GAIN_1 1
 #define ADS_GAIN_2 2
@@ -101,6 +99,7 @@
 #define JSON_MQTT_BROKER_ADDR "broker_address"
 #define JSON_MQTT_PASSWORD "password"
 #define JSON_MQTT_USERNAME "username"
+#define JSON_MQTT_PORT "port"
 #define JSON_NAME "name"
 #define JSON_NUM_CHANNELS "num_channels"
 #define JSON_SAMPLE_NUMBERS "sample_numbers"

WiFiClientPrint.h

@@ -4,7 +4,7 @@
 #include <WiFiClient.h>
 #include <Print.h>
 
-template<size_t BUFFER_SIZE = MAX_JSON_BUFFER_SIZE>
+template<size_t BUFFER_SIZE = 1000>
 class WiFiClientPrint : public Print
 {
   public:
@@ -42,6 +42,9 @@ class WiFiClientPrint : public Print
     void flush()
     {
       if (_length != 0) {
+        // for (size_t i = 0; i < _length; i++) {
+        //   Serial.print((char)_buffer[i]);
+        // }
         _client.write((const uint8_t*)_buffer, _length);
         _length = 0;
       }

changelog.md

@@ -1,3 +1,26 @@
+# v1.3.0
+
+At this time, can no longer support both RAW and JSON modes with a single binary file. Need optimized builds. We ended up having two modes that didnt work that well instead of highly optimized builds for the different operating modes.
+
+### Breaking Changes
+
+* For RAW only (can't do Raw to JSON or MQTT) - upload the binary for `DefaultWifiShield_v1.3.0.bin`
+  * This is the default firmware to be shipped with WiFi Shields
+  * Sample rates of 1000Hz with Cyton (with or without Daisy) possible
+  * Use the OpenBCI_GUI/OpenBCIHub
+* For JSON over (TCP/MQTT) (can't use OpenBCI GUI) - upload the binary for `WifiShield_RawToJSON_v1.3.0.bin`
+  * Only tested with 200Hz with Ganglion
+  * Only tested with 250Hz with Cyton
+
+# v1.2.0
+
+### Bug Fixes
+
+* Allow for CORS on HTTP server for every call. Closes #41
+* Extend max tcp packets per send
+* Optimize JSON packet streaming for better performance, allows for latency up to 39ms for 8 channel and 4 channel and 25ms for 16 channel when streaming out JSON
+* Changed return of route of /cloud
+
 # v1.1.4
 
 ### Bug Fixes