diff --git a/src/board_controller/brainflow_boards.cpp b/src/board_controller/brainflow_boards.cpp index 32b9c84c2..c1aef65bb 100644 --- a/src/board_controller/brainflow_boards.cpp +++ b/src/board_controller/brainflow_boards.cpp @@ -895,9 +895,9 @@ BrainFlowBoards::BrainFlowBoards() {"timestamp_channel", 27}, {"marker_channel", 28}, {"num_rows", 29}, - {"eeg_channels", {7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24}}, - {"eeg_names", "Fp1,Fp2,F1,C3,F2,Cz,C4,Pz,P4,O2,P3,O1,X1,X2,X3,X4,X5,X6"}, - {"emg_channels", {1, 2, 3, 4}}, + {"eeg_channels", {9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24}}, + {"eeg_names", "F1,C3,F2,Cz,C4,Pz,P4,O2,P3,O1,X1,X2,X3,X4,X5,X6"}, + {"emg_channels", {1, 2, 3, 4, 7, 8}}, {"eog_channels", {5, 6}}, {"other_channels", {25, 26}}, }; @@ -926,9 +926,9 @@ BrainFlowBoards::BrainFlowBoards() {"timestamp_channel", 27}, {"marker_channel", 28}, {"num_rows", 29}, - {"eeg_channels", {7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24}}, - {"eeg_names", "Fp1,Fp2,F1,C3,F2,Cz,C4,Pz,P4,O2,P3,O1,X1,X2,X3,X4,X5,X6"}, - {"emg_channels", {1, 2, 3, 4}}, + {"eeg_channels", {9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24}}, + {"eeg_names", "F1,C3,F2,Cz,C4,Pz,P4,O2,P3,O1,X1,X2,X3,X4,X5,X6"}, + {"emg_channels", {1, 2, 3, 4, 7, 8}}, {"eog_channels", {5, 6}}, {"other_channels", {25, 26}}, }; diff --git a/src/board_controller/openbci/inc/openbci_gain_tracker.h b/src/board_controller/openbci/inc/openbci_gain_tracker.h index 69e0a9975..b5f2f2a63 100644 --- a/src/board_controller/openbci/inc/openbci_gain_tracker.h +++ b/src/board_controller/openbci/inc/openbci_gain_tracker.h @@ -221,8 +221,8 @@ class GaleaV4GainTracker : public OpenBCIGainTracker { public: GaleaV4GainTracker () - : OpenBCIGainTracker ({4, 4, 4, 4, 4, 4, 12, 12, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2}) // to be confirmed + : OpenBCIGainTracker ({4, 4, 4, 4, 4, 4, 4, 4, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, + 12, 12, 12, 12, 12}) // to be confirmed { channel_letters = std::vector {'1', '2', '3', '4', '5', '6', '7', '8', 'Q', 'W', 'E', 'R', 'T', 'Y', 'U', 'I', 'A', 'S', 'D', 'G', 'H', 'J', 'K', 'L'}; @@ -242,17 +242,13 @@ class GaleaV4GainTracker : public OpenBCIGainTracker std::copy (current_gains.begin (), current_gains.end (), old_gains.begin ()); for (size_t i = 0; i < current_gains.size (); i++) { - if (i < 6) + if (i < 8) { current_gains[i] = 4; } - else if ((i == 6) || (i == 7)) - { - current_gains[i] = 12; - } else { - current_gains[i] = 2; + current_gains[i] = 12; } } }