make single json with amplifier info

Author: bdieudonne

python_package/examples/tests/eego_impedances_and_eeg.py

@@ -1,4 +1,5 @@
 import time
+import json
 
 from brainflow.board_shim import BoardShim, BrainFlowInputParams, BoardIds
 
@@ -8,13 +9,9 @@
     board.prepare_session()
 
     # Get amplifier info
-    print(f"get_type: {board.config_board('get_type')}")
-    print(f"get_firmware_version: {board.config_board('get_firmware_version')}")
-    print(f"get_serial_number: {board.config_board('get_serial_number')}")
-    print(f"get_sampling_rates_available: {board.config_board('get_sampling_rates_available')}")
-    print(f"get_reference_ranges_available: {board.config_board('get_reference_ranges_available')}")
-    print(f"get_bipolar_ranges_available: {board.config_board('get_bipolar_ranges_available')}")
-    print(f"get_power_state: {board.config_board('get_power_state')}")
+    info = json.loads(board.config_board('get_info'))
+    for key, value in info.items():
+        print(f" - {key}: {value}")
 
     # Get impedance data
     board.config_board('impedance_mode:1')

src/board_controller/ant_neuro/ant_neuro.cpp

@@ -349,14 +349,7 @@ int AntNeuroBoard::config_board (std::string config, std::string &response)
     std::string rv_prefix = "reference_range:";
     std::string bv_prefix = "bipolar_range:";
     std::string mode_prefix = "impedance_mode:";
-
-    std::string get_type = "get_type";
-    std::string get_firmware_version = "get_firmware_version";
-    std::string get_serial_number = "get_serial_number";
-    std::string get_sampling_rates_available = "get_sampling_rates_available";
-    std::string get_reference_ranges_available = "get_reference_ranges_available";
-    std::string get_bipolar_ranges_available = "get_bipolar_ranges_available";
-    std::string get_power_state = "get_power_state";
+    std::string get_info = "get_info";
 
     if (config.find (prefix) != std::string::npos)
     {
@@ -482,75 +475,73 @@ int AntNeuroBoard::config_board (std::string config, std::string &response)
             return (int)BrainFlowExitCodes::INVALID_ARGUMENTS_ERROR;
         }
     }
-    // get info from ANT SDK
-    else if (config == get_type)
-    {
-        response = amp->getType ();
-        return (int)BrainFlowExitCodes::STATUS_OK;
-    }
-    else if (config == get_firmware_version)
-    {
-        int version = amp->getFirmwareVersion ();
-        response = std::to_string (version);
-        return (int)BrainFlowExitCodes::STATUS_OK;
-    }
-    else if (config == get_serial_number)
-    {
-        response = amp->getSerialNumber ();
-        return (int)BrainFlowExitCodes::STATUS_OK;
-    }
-    else if (config == get_sampling_rates_available)
+    else if (config == get_info) // return stringified JSON with info from ANT board
     {
+        std::ostringstream oss;
+        oss << "{";
+
+        // getType
+        oss << "\"type\":\"" << amp->getType () << "\",";
+
+        // getFirmwareVersion
+        oss << "\"firmware_version\":" << amp->getFirmwareVersion () << ",";
+
+        // getSerialNumber
+        oss << "\"serial_number\":\"" << amp->getSerialNumber () << "\",";
+
+        // getSamplingRatesAvailable
         std::vector<int> sampling_rates = amp->getSamplingRatesAvailable ();
-        std::ostringstream result;
-        if (!sampling_rates.empty ())
+        oss << "\"sampling_rates\":[";
+        for (int i = 0; i < sampling_rates.size (); ++i)
         {
-            std::copy (sampling_rates.begin (), sampling_rates.end () - 1,
-                std::ostream_iterator<int> (result, ","));
-            result << sampling_rates.back (); // no trailing comma
+            oss << sampling_rates[i];
+            if (i != sampling_rates.size () - 1)
+            {
+                oss << ",";
+            }
         }
-        response = result.str ();
-        return (int)BrainFlowExitCodes::STATUS_OK;
-    }
-    else if (config == get_reference_ranges_available)
-    {
+        oss << "],";
+
+        // getReferenceRangesAvailable
         std::vector<double> reference_ranges = amp->getReferenceRangesAvailable ();
-        std::ostringstream result;
-        if (!reference_ranges.empty ())
+        oss << "\"reference_ranges\":[";
+        for (int i = 0; i < reference_ranges.size (); ++i)
         {
-            std::copy (reference_ranges.begin (), reference_ranges.end () - 1,
-                std::ostream_iterator<double> (result, ","));
-            result << reference_ranges.back (); // no trailing comma
+            oss << reference_ranges[i];
+            if (i != reference_ranges.size() - 1)
+            {
+                oss << ",";
+            }
         }
-        response = result.str ();
-        return (int)BrainFlowExitCodes::STATUS_OK;
-    }
-    else if (config == get_bipolar_ranges_available)
-    {
+        oss << "],";
+
+        // getBipolarRangesAvailable
         std::vector<double> bipolar_ranges = amp->getBipolarRangesAvailable ();
-        std::ostringstream result;
-        if (!bipolar_ranges.empty ())
+        oss << "\"bipolar_ranges\":[";
+        for (int i = 0; i < bipolar_ranges.size (); ++i)
         {
-            std::copy (bipolar_ranges.begin (), bipolar_ranges.end () - 1,
-                std::ostream_iterator<double> (result, ","));
-            result << bipolar_ranges.back (); // no trailing comma
+            oss << bipolar_ranges[i];
+            if (i != bipolar_ranges.size () - 1)
+            {
+                oss << ",";
+            }
         }
-        response = result.str ();
-        return (int)BrainFlowExitCodes::STATUS_OK;
-    }
-    else if (config == get_power_state)
-    {
+        oss << "],";
+
+        // getPowerState
         amplifier::power_state power_state = amp->getPowerState ();
-        std::ostringstream oss;
-        oss << "is_powered: " << power_state.is_powered
-            << ", is_charging: " << power_state.is_charging
-            << ", charging_level: " << power_state.charging_level;
-        response = oss.str ();
+        oss << "\"power_state\":{";
+        oss << "\"is_powered\":" << power_state.is_powered << ",";
+        oss << "\"is_charging\":" << power_state.is_charging << ",";
+        oss << "\"charging_level\":" << power_state.charging_level;
+        oss << "}";
+
+        oss << "}";
 
+        response = oss.str ();
         return (int)BrainFlowExitCodes::STATUS_OK;
     }
-
-    safe_logger (spdlog::level::err, "format is '{}value'", prefix.c_str ());
+    safe_logger (spdlog::level::err, "format is '{}value' or 'get_info'", prefix.c_str ());
     return (int)BrainFlowExitCodes::INVALID_ARGUMENTS_ERROR;
 }