Merge branch 'process-widget-data-background-networking' of https://g…

…ithub.com/OpenBCI/OpenBCI_GUI into process-widget-data-background-networking
OpenBCI · Sep 11, 2023 · af9cd8b · af9cd8b
2 parents 954c263 + 2925566
commit af9cd8b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 - Update repository to Processing 4.2 #1111
 - Add Software Marker Widget #1091
 - Process all data in the background when widgets are closed and sending over Networking stream #1094
+- Add channel labels for Cyton Digital Channels in GUI CSV files and also label unused channels #1108
 
 # v5.2.1
 

diff --git a/OpenBCI_GUI/BoardCyton.pde b/OpenBCI_GUI/BoardCyton.pde
@@ -602,12 +602,22 @@ implements ImpedanceSettingsBoard, AccelerometerCapableBoard, AnalogCapableBoard
 
     @Override
     protected void addChannelNamesInternal(String[] channelNames) {
-        for (int i=0; i<getAccelerometerChannels().length; i++) {
+        for (int i = 0; i < getAccelerometerChannels().length; i++) {
             channelNames[getAccelerometerChannels()[i]] = "Accel Channel " + i;
         }
-        for (int i=0; i<getAnalogChannels().length; i++) {
+        for (int i = 0; i < getAnalogChannels().length; i++) {
             channelNames[getAnalogChannels()[i]] = "Analog Channel " + i;
         }
+
+        channelNames[getDigitalChannels()[0]] = "Digital Channel 0 (D11)";
+        channelNames[getDigitalChannels()[1]] = "Digital Channel 1 (D12)";
+        channelNames[getDigitalChannels()[2]] = "Digital Channel 2 (D13)";
+        channelNames[getDigitalChannels()[3]] = "Digital Channel 3 (D17)";
+        channelNames[getDigitalChannels()[4]] = "Digital Channel 4 (D18)";
+
+        channelNames[getOtherChannels()[0]] = "Not Used";
+        channelNames[getOtherChannels()[5]] = "Not Used";
+
         channelNames[getMarkerChannel()] = "Marker Channel";
     }