Send gains after connecting to wifi shield

Author: AJ Keller

OpenBCI_32bit_Library.cpp

@@ -1044,11 +1044,11 @@ void OpenBCI_32bit_Library::sendChannelData(PACKET_TYPE packetType) {
   if (wifi.present && wifi.tx) {
     sendChannelDataWifi(packetType, false);
     if (daisyPresent) sendChannelDataWifi(packetType, true);
+  } else {
+    // Send over bluetooth
+    if (iSerial0.tx || iSerial1.tx) sendChannelDataSerial(packetType);
   }
 
-  // Send over bluetooth
-  if (iSerial0.tx || iSerial1.tx) sendChannelDataSerial(packetType);
-
   if (packetType == PACKET_TYPE_ACCEL) LIS3DH_zeroAxisData();
   if (packetType == PACKET_TYPE_RAW_AUX || packetType == PACKET_TYPE_RAW_AUX_TIME_SYNC) zeroAuxData();
 
@@ -1558,19 +1558,27 @@ void OpenBCI_32bit_Library::streamSafeSetAllChannelsToDefault(void) {
   }
 }
 
+/**
+ * Return an array of gains in coded ADS form i.e. 0-6 where 6 is x24 and so on.
+ * @return  [description]
+ */
+uint8_t *OpenBCI_32bit_Library::getGains(void) {
+  uint8_t gains[numChannels];
+  for (uint8_t i = 0; i < numChannels; i++) {
+    gains[i] = channelSettings[i][GAIN_SET];
+  }
+  return gains;
+}
+
 /**
 * @description Call this to start the streaming data from the ADS1299
 * @returns boolean if able to start streaming
 */
 void OpenBCI_32bit_Library::streamStart(){  // needs daisy functionality
 
   if (wifi.present && wifi.tx) {
-    uint8_t gains[numChannels];
-    for (uint8_t i = 0; i < numChannels; i++) {
-      gains[i] = channelSettings[i][GAIN_SET];
-    }
     // TODO: Remove this debug line
-    wifi.sendGains(numChannels, gains);
+    wifi.sendGains(numChannels, getGains());
   }
   streaming = true;
   startADS();

OpenBCI_32bit_Library.h

@@ -103,6 +103,7 @@ class OpenBCI_32bit_Library {
   byte    getDefaultChannelSettingForSetting(byte);
   char    getDefaultChannelSettingForSettingAscii(byte);
   char    getGainForAsciiChar(char);
+  uint8_t * getGains(void);
   char    getNumberForAsciiChar(char);
   const char* getSampleRate(void);
   char    getTargetSSForConstrainedChannelNumber(byte);

changelog.md

@@ -47,9 +47,15 @@
 * Removed public `timeSynced` and private `sendTimeSyncUpPacket`
 * Setting internal test signal now, when not streaming, returns a success message, with EOT `$$$`
 
-## rc1
+## Beta5
 
-The first release candidate for Cyton
+### New Features
+
+* Send gains after connecting to Wifi shield
+
+### Breaking Changes
+
+* Don't send streaming data over bluetooth when wifi is present and attached
 
 ## Beta4
 

examples/BoardWithWifi/BoardWithWifi.ino

@@ -47,4 +47,10 @@ void loop() {
     // Send to the board library
     board.processChar(newChar);
   }
+
+  if (!wifi.sentGains) {
+    if(wifi.present && wifi.tx) {
+      wifi.sendGains(board.numChannels, board.getGains());
+    }
+  }
 }

examples/DefaultBoard/DefaultBoard.ino

@@ -48,9 +48,6 @@ void loop() {
     }
   }
 
-  // Call to wifi loop
-  wifi.loop();
-
   // Check serial 0 for new data
   if (board.hasDataSerial0()) {
     // Read one char from the serial 0 port
@@ -74,6 +71,9 @@ void loop() {
     board.processChar(newChar);
   }
 
+  // Call to wifi loop
+  wifi.loop();
+
   if (wifi.hasData()) {
     // Read one char from the wifi shield
     char newChar = wifi.getChar();
@@ -84,4 +84,10 @@ void loop() {
     // Send to the board library
     board.processChar(newChar);
   }
+
+  if (!wifi.sentGains) {
+    if(wifi.present && wifi.tx) {
+      wifi.sendGains(board.numChannels, board.getGains());
+    }
+  }
 }