Keep ANT EDX impedance compatible with legacy presets

Author: caleycaleycaley

src/board_controller/ant_neuro_edx/ant_neuro_edx.cpp

@@ -672,18 +672,19 @@ int AntNeuroEdxBoard::process_frames ()
         return (int)BrainFlowExitCodes::BOARD_NOT_READY_ERROR;
     }
 
-    int num_rows = board_descr["default"]["num_rows"];
-    int package_num_channel = board_descr["default"]["package_num_channel"];
-    int timestamp_channel = board_descr["default"]["timestamp_channel"];
-    int marker_channel = board_descr["default"]["marker_channel"];
-    std::vector<int> eeg_channels = try_get_vec (board_descr["default"], "eeg_channels");
-    std::vector<int> emg_channels = try_get_vec (board_descr["default"], "emg_channels");
-    std::vector<int> resistance_channels = try_get_vec (board_descr["default"], "resistance_channels");
+    json &frame_descr = board_descr["default"];
+    int num_rows = frame_descr["num_rows"];
+    int package_num_channel = frame_descr["package_num_channel"];
+    int timestamp_channel = frame_descr["timestamp_channel"];
+    int marker_channel = frame_descr["marker_channel"];
+    std::vector<int> eeg_channels = try_get_vec (frame_descr, "eeg_channels");
+    std::vector<int> emg_channels = try_get_vec (frame_descr, "emg_channels");
+    std::vector<int> resistance_channels = try_get_vec (frame_descr, "resistance_channels");
     std::vector<int> ref_resistance_channels =
-        try_get_vec (board_descr["default"], "ref_resistance_channels");
+        try_get_vec (frame_descr, "ref_resistance_channels");
     std::vector<int> gnd_resistance_channels =
-        try_get_vec (board_descr["default"], "gnd_resistance_channels");
-    std::vector<int> other_channels = try_get_vec (board_descr["default"], "other_channels");
+        try_get_vec (frame_descr, "gnd_resistance_channels");
+    std::vector<int> other_channels = try_get_vec (frame_descr, "other_channels");
     std::vector<double> package ((size_t)num_rows, 0.0);
     const double sample_dt = (sampling_rate > 0) ? (1.0 / (double)sampling_rate) : 0.0;
     const double large_gap_threshold = 1.0;
@@ -745,6 +746,7 @@ int AntNeuroEdxBoard::process_frames ()
             }
             last_emitted_timestamp = package[(size_t)timestamp_channel];
             impedance_sample_count++;
+            push_package (package.data ());
             push_package (package.data (), (int)BrainFlowPresets::ANCILLARY_PRESET);
             continue;
         }

src/board_controller/brainflow_boards.cpp

@@ -1179,27 +1179,16 @@ BrainFlowBoards::BrainFlowBoards()
     {
         json src =
             brainflow_boards_json["boards"][std::to_string (master_board_id)]["default"];
-        // default preset: EEG streaming mode — no resistance channels
-        json eeg_preset = src;
-        eeg_preset["name"] = name;
-        eeg_preset.erase ("resistance_channels");
-        eeg_preset.erase ("ref_resistance_channels");
-        eeg_preset.erase ("gnd_resistance_channels");
-        brainflow_boards_json["boards"][std::to_string (edx_board_id)]["default"] = eeg_preset;
-        // ancillary preset: impedance measurement mode
-        json res_preset;
-        res_preset["name"] = name;
-        res_preset["num_rows"] = src["num_rows"];
-        res_preset["timestamp_channel"] = src["timestamp_channel"];
-        res_preset["marker_channel"] = src["marker_channel"];
-        res_preset["package_num_channel"] = src["package_num_channel"];
-        if (src.contains ("resistance_channels"))
-            res_preset["resistance_channels"] = src["resistance_channels"];
-        if (src.contains ("ref_resistance_channels"))
-            res_preset["ref_resistance_channels"] = src["ref_resistance_channels"];
-        if (src.contains ("gnd_resistance_channels"))
-            res_preset["gnd_resistance_channels"] = src["gnd_resistance_channels"];
-        brainflow_boards_json["boards"][std::to_string (edx_board_id)]["ancillary"] = res_preset;
+        // Keep the legacy ANT layout on default for compatibility, and mirror
+        // it on ancillary as an optional EDX-specific access path.
+        json default_preset = src;
+        default_preset["name"] = name;
+        brainflow_boards_json["boards"][std::to_string (edx_board_id)]["default"] =
+            default_preset;
+        json ancillary_preset = src;
+        ancillary_preset["name"] = name;
+        brainflow_boards_json["boards"][std::to_string (edx_board_id)]["ancillary"] =
+            ancillary_preset;
     };
     clone_ant_edx_board (67, 24, "AntNeuroEE410EDX");
     clone_ant_edx_board (68, 25, "AntNeuroEE411EDX");