FIX: Board mode marker never actually launched a multi char situation

OpenBCI_32bit_Library.cpp

@@ -368,6 +368,11 @@ boolean OpenBCI_32bit_Library::processChar(char character) {
         startMultiCharCmdTimer(MULTI_CHAR_CMD_SETTINGS_SAMPLE_RATE);
         break;
 
+      // Sample rate set
+      case OPENBCI_INSERT_MARKER:
+        startMultiCharCmdTimer(MULTI_CHAR_CMD_INSERT_MARKER);
+        break;
+
       case OPENBCI_WIFI_ATTACH:
         if (wifi.attach()) {
           printSuccess();
@@ -865,14 +870,12 @@ void OpenBCI_32bit_Library::processIncomingSampleRate(char c) {
  * @param character {char} - The character that will be inserted into the data stream
  */
 void OpenBCI_32bit_Library::processInsertMarker(char c) {
-    if (c < 128) {
-        markerValue = c;
-        newMarkerReceived = true;
-    } else {
-        markerValue = 0;
-        newMarkerReceived = false;
-    }
-    endMultiCharCmdTimer();
+  markerValue = c;
+  newMarkerReceived = true;
+  endMultiCharCmdTimer();
+  if (wifi.present && wifi.tx) {
+    wifi.sendStringLast("Marker recieved");
+  }
 }
 
 
@@ -2603,7 +2606,6 @@ void OpenBCI_32bit_Library::updateChannelData(void) {
     case BOARD_MODE_MARKER:
       if (newMarkerReceived){
         auxData[0] = (short)markerValue;
-        markerValue = 0;
         newMarkerReceived = false;
       }
       break;

changelog.md

@@ -12,8 +12,8 @@
    * BOARD_MODE_DEBUG is `1`
    * BOARD_MODE_ANALOG is `2`
    * BOARD_MODE_DIGITAL is `3`
-   * BOARD_MODE_MARKER is `4` 
-* A new board mode called MARKER.  In this mode, if a command in the format of ``'`n'``  (where n is ASCII '0':'9') is received by the Cyton over any of the serial streams (including wifi) then a marker of int(n) is inserted in the AUX1 channel.  Note that this mode is mutually exclusive to the DEFAULT (accelerometer mode) as it uses the AUX1/ACCELX channel. 
+   * BOARD_MODE_MARKER is `4`
+* A new board mode called MARKER.  In this mode, if a command in the format of ``'`n'``  (where n is ASCII '0':'9') is received by the Cyton over any of the serial streams (including wifi) then a marker of int(n) is inserted in the AUX1 channel.  Note that this mode is mutually exclusive to the DEFAULT (accelerometer mode) as it uses the AUX1/ACCELX channel.
 * Add loop function for internal timing operations related to power on reset for wifi shield, remove `loop` to free up pins and such and remove wifi capability.
 * Add function to turn time stamps on `useTimeStamp(true)`, time stamps are disabled by default. Note the Wifi shield will use NTP time stamps.
 * Add wifi commands:
@@ -57,6 +57,10 @@
 * Sending data for register query took too long to send, removed delay when command came from wifi.
 * Setting board mode restarted board for no real reason.
 
+### New Features
+
+* Marker mode, where you can store markers to the stream.
+
 ## Release Candidate 6
 
 ### Bug Fixes

library.properties

@@ -1,5 +1,5 @@
 name=OpenBCI_32bit_Library
-version=3.0.0-rc6
+version=3.0.0-rc7
 author=Joel Murphy <joel@openbci.com>, Conor Russomanno <conor@openbci.com>, Leif Percifield <lpercifield@gmail.com>, AJ Keller <pushtheworldllc@gmail.com>
 maintainer=Joel Murphy <joel@openbci.com>, AJ Keller <pushtheworldllc@gmail.com>
 sentence=The library for controlling OpenBCI Cyton (32bit) boards. The Cyton is the main one.