Merge branch 'master' of https://github.com/brainflow-dev/brainflow

Author: Andrey1994

src/board_controller/board.cpp

@@ -89,25 +89,16 @@ int Board::prepare_for_acquisition (int buffer_size, char *streamer_params)
         db = NULL;
     }
 
-    try
+    std::vector<std::string> required_fields {"num_rows", "timestamp_channel", "name"};
+    for (std::string field : required_fields)
     {
-        board_descr = brainflow_boards_json["boards"][int_to_string (board_id)];
-        std::vector<std::string> required_fields {"num_rows", "timestamp_channel", "name"};
-        for (std::string field : required_fields)
+        if (board_descr.find (field) == board_descr.end ())
         {
-            if (board_descr.find (field) == board_descr.end ())
-            {
-                safe_logger (spdlog::level::err,
-                    "Field {} is not found in brainflow_boards.h for id {}", field, board_id);
-                return (int)BrainFlowExitCodes::GENERAL_ERROR;
-            }
+            safe_logger (spdlog::level::err,
+                "Field {} is not found in brainflow_boards.h for id {}", field, board_id);
+            return (int)BrainFlowExitCodes::GENERAL_ERROR;
         }
     }
-    catch (json::exception &e)
-    {
-        safe_logger (spdlog::level::err, e.what ());
-        return (int)BrainFlowExitCodes::GENERAL_ERROR;
-    }
 
     int res = prepare_streamer (streamer_params);
     if (res != (int)BrainFlowExitCodes::STATUS_OK)

src/board_controller/board_info_getter.cpp

@@ -1,6 +1,5 @@
 #include <fstream>
 #include <set>
-#include <sstream>
 #include <string.h>
 #include <string>
 #include <vector>
@@ -10,20 +9,20 @@
 #include "brainflow_boards.h"
 #include "brainflow_constants.h"
 
-inline std::string int_to_string (int val);
-inline int get_single_value (
+
+static int get_single_value (
     int board_id, const char *param_name, int *value, bool use_logger = true);
-inline int get_string_value (
+static int get_string_value (
     int board_id, const char *param_name, char *string, int *len, bool use_logger = true);
-inline int get_array_value (
+static int get_array_value (
     int board_id, const char *param_name, int *output_array, int *len, bool use_logger = true);
 
 
 int get_board_descr (int board_id, char *board_descr, int *len)
 {
     try
     {
-        std::string res = brainflow_boards_json["boards"][int_to_string (board_id)].dump ();
+        std::string res = brainflow_boards_json["boards"][std::to_string (board_id)].dump ();
         strcpy (board_descr, res.c_str ());
         *len = (int)strlen (res.c_str ());
         return (int)BrainFlowExitCodes::STATUS_OK;
@@ -166,18 +165,11 @@ int get_exg_channels (int board_id, int *exg_channels, int *len)
     return (int)BrainFlowExitCodes::STATUS_OK;
 }
 
-inline std::string int_to_string (int val)
-{
-    std::ostringstream ss;
-    ss << val;
-    return ss.str ();
-}
-
-inline int get_single_value (int board_id, const char *param_name, int *value, bool use_logger)
+static int get_single_value (int board_id, const char *param_name, int *value, bool use_logger)
 {
     try
     {
-        int val = (int)brainflow_boards_json["boards"][int_to_string (board_id)][param_name];
+        int val = (int)brainflow_boards_json["boards"][std::to_string (board_id)][param_name];
         *value = val;
         return (int)BrainFlowExitCodes::STATUS_OK;
     }
@@ -191,13 +183,13 @@ inline int get_single_value (int board_id, const char *param_name, int *value, b
     }
 }
 
-inline int get_array_value (
+static int get_array_value (
     int board_id, const char *param_name, int *output_array, int *len, bool use_logger)
 {
     try
     {
         std::vector<int> values =
-            brainflow_boards_json["boards"][int_to_string (board_id)][param_name];
+            brainflow_boards_json["boards"][std::to_string (board_id)][param_name];
         if (!values.empty ())
         {
             memcpy (output_array, &values[0], sizeof (int) * values.size ());
@@ -215,12 +207,12 @@ inline int get_array_value (
     }
 }
 
-inline int get_string_value (
+static int get_string_value (
     int board_id, const char *param_name, char *string, int *len, bool use_logger)
 {
     try
     {
-        std::string val = brainflow_boards_json["boards"][int_to_string (board_id)][param_name];
+        std::string val = brainflow_boards_json["boards"][std::to_string (board_id)][param_name];
         strcpy (string, val.c_str ());
         *len = (int)strlen (val.c_str ());
         return (int)BrainFlowExitCodes::STATUS_OK;

src/board_controller/brainflow_boards.cpp

@@ -312,24 +312,26 @@ json brainflow_boards_json = {
         {"21",
             {{"name", "MuseSBLED"},
             {"sampling_rate", 256},
-            {"timestamp_channel", 8},
-            {"marker_channel", 9},
+            {"timestamp_channel", 11},
+            {"marker_channel", 12},
             {"package_num_channel", 0},
-            {"num_rows", 10},
+            {"num_rows", 13},
             {"eeg_channels", {1, 2, 3, 4}},
             {"eeg_names", "TP9,Fp1,Fp2,TP10"},
-            {"accel_channels", {5, 6, 7}}
+            {"accel_channels", {5, 6, 7}},
+            {"gyro_channels", {8, 9, 10}}
         }},
         {"22",
             {{"name", "Muse2BLED"},
             {"sampling_rate", 256},
-            {"timestamp_channel", 8},
-            {"marker_channel", 9},
+            {"timestamp_channel", 11},
+            {"marker_channel", 12},
             {"package_num_channel", 0},
-            {"num_rows", 10},
+            {"num_rows", 13},
             {"eeg_channels", {1, 2, 3, 4}},
             {"eeg_names", "TP9,Fp1,Fp2,TP10"},
-            {"accel_channels", {5, 6, 7}}
+            {"accel_channels", {5, 6, 7}},
+            {"gyro_channels", {8, 9, 10}}
         }},
         {"23",
             {{"name", "CrownOSC"},

src/board_controller/inc/board.h

@@ -40,6 +40,14 @@ class Board
         streamer = NULL;
         this->board_id = board_id;
         this->params = params;
+        try
+        {
+            board_descr = brainflow_boards_json["boards"][std::to_string (board_id)];
+        }
+        catch (json::exception &e)
+        {
+            safe_logger (spdlog::level::err, e.what ());
+        }
     }
     virtual int prepare_session () = 0;
     virtual int start_stream (int buffer_size, char *streamer_params) = 0;

src/board_controller/muse/muse_2_bled.cpp

@@ -3,7 +3,6 @@
 
 #include "get_dll_dir.h"
 #include "muse_2_bled.h"
-#include "muse_types.h"
 
 #include "brainflow_constants.h"
 

src/board_controller/muse/muse_bglib/inc/muse_2_bglib_helper.h

@@ -8,17 +8,12 @@
 class Muse2BGLibHelper : public MuseBGLibHelper
 {
 public:
-    Muse2BGLibHelper () : MuseBGLibHelper ()
+    Muse2BGLibHelper (json board_descr) : MuseBGLibHelper (board_descr)
     {
     }
 
     std::string get_preset ()
     {
         return "p21";
     }
-
-    int get_buffer_size ()
-    {
-        return 10;
-    }
 };

src/board_controller/muse/muse_bglib/inc/muse_bglib_helper.h

@@ -14,7 +14,9 @@
 #include "brainflow_constants.h"
 #include "brainflow_input_params.h"
 #include "data_buffer.h"
+#include "json.hpp"
 
+using json = nlohmann::json;
 
 enum class DeviceState : int
 {
@@ -49,13 +51,14 @@ class MuseBGLibHelper
     std::vector<std::vector<double>> current_buf;
     std::vector<bool> new_eeg_data;
     double last_timestamp;
+    json board_descr;
 
     void thread_worker ();
 
 public:
     volatile int exit_code;
 
-    MuseBGLibHelper ()
+    MuseBGLibHelper (json descr)
     {
         exit_code = (int)BrainFlowExitCodes::SYNC_TIMEOUT_ERROR;
         connection = -1;
@@ -67,6 +70,7 @@ class MuseBGLibHelper
         control_char_handle = 0;
         db = NULL;
         last_timestamp = -1.0;
+        board_descr = descr;
     }
 
     virtual ~MuseBGLibHelper ()
@@ -88,7 +92,6 @@ class MuseBGLibHelper
     virtual int config_device (const char *config);
 
     virtual std::string get_preset () = 0;
-    virtual int get_buffer_size () = 0;
 
     // callbacks from bglib which we need
     virtual void ble_evt_connection_status (const struct ble_msg_connection_status_evt_t *msg);

src/board_controller/muse/muse_bglib/inc/muse_s_bglib_helper.h

@@ -9,17 +9,12 @@
 class MuseSBGLibHelper : public MuseBGLibHelper
 {
 public:
-    MuseSBGLibHelper () : MuseBGLibHelper ()
+    MuseSBGLibHelper (json board_descr) : MuseBGLibHelper (board_descr)
     {
     }
 
     std::string get_preset ()
     {
         return "p21";
     }
-
-    int get_buffer_size ()
-    {
-        return 10;
-    }
 };

src/board_controller/muse/muse_bglib/inc/muse_types.h

@@ -38,10 +38,10 @@ int initialize (void *param)
     switch (static_cast<BoardIds> (std::get<0> (*info)))
     {
         case BoardIds::MUSE_S_BLED_BOARD:
-            helper = new MuseSBGLibHelper ();
+            helper = new MuseSBGLibHelper (std::get<2> (*info));
             break;
         case BoardIds::MUSE_2_BLED_BOARD:
-            helper = new Muse2BGLibHelper ();
+            helper = new Muse2BGLibHelper (std::get<2> (*info));
             break;
         default:
             return (int)BrainFlowExitCodes::UNSUPPORTED_BOARD_ERROR;