Merge remote-tracking branch 'openbci/master'

brainflow-dev · Mar 12, 2020 · fa668ff · fa668ff
2 parents 03e720b + 80ea96f
commit fa668ff
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/board_controller/board.cpp b/src/board_controller/board.cpp
@@ -6,6 +6,8 @@
 #include "multicast_streamer.h"
 #include "stub_streamer.h"
 
+#include "spdlog/sinks/null_sink.h"
+
 
 #define LOGGER_NAME "brainflow_logger"
 
@@ -30,10 +32,13 @@ int Board::set_log_level (int level)
 int Board::set_log_file (char *log_file)
 {
     spdlog::level::level_enum level = Board::board_logger->level ();
+    Board::board_logger = spdlog::create<spdlog::sinks::null_sink_st> (
+        "null_logger"); // to dont set logger to nullptr and avoid raice condition
     spdlog::drop (LOGGER_NAME);
     Board::board_logger = spdlog::basic_logger_mt (LOGGER_NAME, log_file);
     Board::board_logger->set_level (level);
     Board::board_logger->flush_on (level);
+    spdlog::drop ("null_logger");
     return STATUS_OK;
 }
 

diff --git a/tests/python/hardware_test.py b/tests/python/hardware_test.py
@@ -145,7 +145,7 @@ def main ():
 
             columns = list ()
             for i in range (len (total_channels) - 1):
-                columns.append ('channel_%d' % i)
+                columns.append ('channel_%d' % (int(total_channels[i]) - 1))
             columns.append ('timestamp')
 
             df = pd.DataFrame (np.transpose (data))