Merge pull request #442 from retiutut/Cyton-Impedance-Fix2

Bug Fixes for 4.1.0-beta.0

Author: daniellasry

CHANGELOG.md

@@ -1,6 +1,11 @@
 # v4.1.0
 
-Use OpenBCIHub v2.0.5 please.
+Use OpenBCIHub v2.0.6 please.
+
+## Beta 1
+
+### Bug Fixes
+* Cyton impedance check did not work for Ch16 #427
 
 ## Beta 0
 
@@ -15,21 +20,21 @@ Use OpenBCIHub v2.0.5 please.
 * Align Ganglion accelerometer data to match Cyton #398
 * Fixed the GUI freezing on launch with a grey screen #409 #406 #426
 
-# v4.0.4	
+# v4.0.4
 
-Use OpenBCIHub v2.0.5 please.	
+Use OpenBCIHub v2.0.5 please.
 
-### Bug Fix	
+### Bug Fix
 
-* Cyton impedance check did not work #427	
+* Cyton impedance check did not work #427
 
 # v4.0.3
 
 Use OpenBCIHub v2.0.3 please.
 
-### New Features	
+### New Features
 
-* On Windows, it is no longer necessary to launch the HUB separately.	
+* On Windows, it is no longer necessary to launch the HUB separately.
 * The HUB is packaged within the GUI on Windows, just like on Mac and Linux.
 
 ### Bug Fixes

OpenBCI_GUI/BoardCyton.pde

@@ -687,8 +687,8 @@ class Cyton {
     json.setString(TCP_JSON_KEY_TYPE, TCP_TYPE_IMPEDANCE);
     json.setString(TCP_JSON_KEY_ACTION, TCP_ACTION_SET);
     json.setInt(TCP_JSON_KEY_CHANNEL_NUMBER, _numChannel);
-    json.setBoolean(TCP_JSON_KEY_IMPEDANCE_SET_P_INPUT, impedanceCheckValues[_numChannel][0] == '1');
-    json.setBoolean(TCP_JSON_KEY_IMPEDANCE_SET_N_INPUT, impedanceCheckValues[_numChannel][1] == '1');
+    json.setBoolean(TCP_JSON_KEY_IMPEDANCE_SET_P_INPUT, impedanceCheckValues[_numChannel-1][0] == '1');
+    json.setBoolean(TCP_JSON_KEY_IMPEDANCE_SET_N_INPUT, impedanceCheckValues[_numChannel-1][1] == '1');
     hub.writeJSON(json);
     isWritingImp = false;
   }

OpenBCI_GUI/HardwareSettingsController.pde

@@ -381,12 +381,12 @@ class HardwareSettingsController{
   }
 
   public void initImpWrite(int _numChannel, char pORn, char onORoff) {
-    verbosePrint("Writing impedance check settings (" + pORn + "," + onORoff +  ") for channel " + str(_numChannel+1) + " to OpenBCI!");
+    verbosePrint("Writing impedance check settings (" + pORn + "," + onORoff +  ") for channel " + str(_numChannel) + " to OpenBCI!");
     if (pORn == 'p') {
-      impedanceCheckValues[_numChannel][0] = onORoff;
+      impedanceCheckValues[_numChannel-1][0] = onORoff;
     }
     if (pORn == 'n') {
-      impedanceCheckValues[_numChannel][1] = onORoff;
+      impedanceCheckValues[_numChannel-1][1] = onORoff;
     }
     cyton.writeImpedanceSettings(_numChannel, impedanceCheckValues);
     // impChannelToWrite = _numChannel;
@@ -529,10 +529,10 @@ class HardwareSettingsController{
     }
   }
 
-  void toggleImpedanceCheck(int _channelNumber){
+  void toggleImpedanceCheck(int _channelNumber){ //Channel Numbers start at 1
 
-    if(channelSettingValues[_channelNumber][4] == '1'){     //is N pin being used...
-      if (impedanceCheckValues[_channelNumber][1] < '1') { //if not checking/drawing impedance
+    if(channelSettingValues[_channelNumber-1][4] == '1'){     //is N pin being used...
+      if (impedanceCheckValues[_channelNumber-1][1] < '1') { //if not checking/drawing impedance
         initImpWrite(_channelNumber, 'n', '1');  // turn on the impedance check for the desired channel
         println("Imp[" + _channelNumber + "] is on.");
       } else {
@@ -541,8 +541,8 @@ class HardwareSettingsController{
       }
     }
 
-    if(channelSettingValues[_channelNumber][4] == '0'){     //is P pin being used
-      if (impedanceCheckValues[_channelNumber][0] < '1') {    //is channel on
+    if(channelSettingValues[_channelNumber-1][4] == '0'){     //is P pin being used
+      if (impedanceCheckValues[_channelNumber-1][0] < '1') {    //is channel on
         // impedanceCheckValues[i][0] = '1';	//increment [i][j] channelSettingValue by, until it reaches max values per setting [j],
         // channelSettingButtons[i][0].setColorNotPressed(color(25,25,25));
         // writeImpedanceSettings(i);

OpenBCI_GUI/Info.plist.tmpl

@@ -23,7 +23,7 @@
     <key>CFBundleShortVersionString</key>
     <string>4</string>
     <key>CFBundleVersion</key>
-    <string>4.1.0-beta.0</string>
+    <string>4.1.0-beta.1</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>NSHumanReadableCopyright</key>

OpenBCI_GUI/OpenBCI_GUI.pde

@@ -50,7 +50,7 @@ import gifAnimation.*;
 //                       Global Variables & Instances
 //------------------------------------------------------------------------
 //Used to check GUI version in TopNav.pde and displayed on the splash screen on startup
-String localGUIVersionString = "4.1.0-beta.0";
+String localGUIVersionString = "4.1.0-beta.1";
 String localGUIVersionDate = "February 2019";
 String guiLatestReleaseLocation = "https://github.com/OpenBCI/OpenBCI_GUI/releases/latest";
 Boolean guiVersionCheckHasOccured = false;

OpenBCI_GUI/SoftwareSettings.pde

@@ -235,7 +235,7 @@ void initSoftwareSettings() {
     loadGUISettings(userSettingsFileToLoad);
     errorUserSettingsNotFound = false;
   } catch (Exception e) {
-    e.printStackTrace();
+    //e.printStackTrace();
     println(userSettingsFileToLoad + " not found. Save settings with keyboard 'n' or using dropdown menu.");
     errorUserSettingsNotFound = true;
   }