Skip to content

Commit cda4358

Browse files
authored
updated ANT neuro wrapper (#781)
* updated ANT neuro wrapper (impedances are not read from bipolar channels) * clang fix
1 parent 78fab43 commit cda4358

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

src/board_controller/ant_neuro/ant_neuro.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ void AntNeuroBoard::read_thread ()
307307
}
308308
catch (...)
309309
{
310-
safe_logger (spdlog::level::trace, "device has no resistance_channels channels");
310+
safe_logger (spdlog::level::trace, "device has no resistance channels");
311311
}
312312
std::vector<channel> ant_channels = stream->getChannelList ();
313313

@@ -319,6 +319,7 @@ void AntNeuroBoard::read_thread ()
319319
int buf_channels_len = buf.getChannelCount ();
320320
for (int i = 0; i < (int)buf.getSampleCount (); i++)
321321
{
322+
std::fill (package, package + num_rows, 0.0);
322323
int eeg_counter = 0;
323324
int emg_counter = 0;
324325
int resistance_counter = 0;

src/board_controller/brainflow_boards.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ BrainFlowBoards::BrainFlowBoards()
574574
{"eeg_channels", {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32}},
575575
{"emg_channels", {33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56}},
576576
{"resistance_channels", {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
577-
32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58}},
577+
32, 57, 58}},
578578
{"other_channels", {59}}
579579
};
580580
brainflow_boards_json["boards"]["31"]["default"] =
@@ -590,7 +590,7 @@ BrainFlowBoards::BrainFlowBoards()
590590
{"emg_channels", {65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88}},
591591
{"resistance_channels", {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
592592
32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 55, 56, 57, 58, 59, 60, 61, 62, 63,
593-
64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90}},
593+
64, 89, 90}},
594594
{"other_channels", {91}}
595595
};
596596
brainflow_boards_json["boards"]["32"]["default"] =
@@ -628,7 +628,7 @@ BrainFlowBoards::BrainFlowBoards()
628628
{"eeg_channels", {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32}},
629629
{"emg_channels", {33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56}},
630630
{"resistance_channels", {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
631-
32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58}},
631+
32, 57, 58}},
632632
{"other_channels", {59}}
633633
};
634634
brainflow_boards_json["boards"]["35"]["default"] =
@@ -658,7 +658,7 @@ BrainFlowBoards::BrainFlowBoards()
658658
{"emg_channels", {65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88}},
659659
{"resistance_channels", {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
660660
32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 55, 56, 57, 58, 59, 60, 61, 62, 63,
661-
64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90}},
661+
64, 89, 90}},
662662
{"other_channels", {91}}
663663
};
664664
brainflow_boards_json["boards"]["37"]["default"] =
@@ -1009,7 +1009,7 @@ BrainFlowBoards::BrainFlowBoards()
10091009
{"num_rows", 34},
10101010
{"eeg_channels", {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24}},
10111011
{"emg_channels", {25, 26, 27, 28}},
1012-
{"resistance_channels", {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30}},
1012+
{"resistance_channels", {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 29, 30}},
10131013
{"other_channels", {31}}
10141014
};
10151015
brainflow_boards_json["boards"]["52"]["default"] =

0 commit comments

Comments
 (0)