переход на получение статистики устройства новым API библиотеки control_system_client

dependencies/control_system/client/system_client.cpp

@@ -315,6 +315,72 @@ void system_client::data_received(const std::vector<uint8_t> & data)
             break;
         }
 
+        case cmd_type::get_demodulator_state:
+        {
+            if(cmd.rsp == response_type::ok)
+            {
+                cmd_get_demodulator_state value;
+                iarchive(value);
+                data_from_serv = value;
+            }
+            break;
+        }
+
+        case cmd_type::get_modulator_state:
+        {
+            if(cmd.rsp == response_type::ok)
+            {
+                cmd_get_modulator_state value;
+                iarchive(value);
+                data_from_serv = value;
+            }
+            break;
+        }
+
+        case cmd_type::get_demodulator_settings:
+        {
+            if(cmd.rsp == response_type::ok)
+            {
+                cmd_demodulator_settings value;
+                iarchive(value);
+                data_from_serv = value;
+            }
+            break;
+        }
+
+        case cmd_type::get_modulator_settings:
+        {
+            if(cmd.rsp == response_type::ok)
+            {
+                cmd_modulator_settings value;
+                iarchive(value);
+                data_from_serv = value;
+            }
+            break;
+        }
+
+        case cmd_type::get_device_state:
+        {
+            if(cmd.rsp == response_type::ok)
+            {
+                cmd_get_device_state value;
+                iarchive(value);
+                data_from_serv = value;
+            }
+            break;
+        }
+
+        case cmd_type::get_cinc_state:
+        {
+            if(cmd.rsp == response_type::ok)
+            {
+                cmd_get_cinc_state value;
+                iarchive(value);
+                data_from_serv = value;
+            }
+            break;
+        }
+
         case cmd_type::get_dma_debugg:
         {
             if (cmd.rsp == response_type::ok)
@@ -677,6 +743,136 @@ response_type system_client::send_set_lbq_params(const uint32_t & tick_ms, const
     return result;
 }
 
+response_type system_client::send_set_modulator_settings(modulator_settings_com &settings)
+{
+    std::scoped_lock lock(cmd_in_progress_mtx);
+    uint32_t curr_id { ++cmd_id };
+    cmd_header cmd_acm_header{curr_id, cmd_type::set_modulator_settings};
+
+    cmd_modulator_settings settings_;
+    settings_.modulator_settings = settings;
+    send_to_socket(cmd_acm_header, settings_);
+
+    std::any data_to_serv;
+
+    auto result = wait_for_response(curr_id, cmd_type::set_modulator_settings, data_to_serv);
+
+    return result;
+}
+
+response_type system_client::send_set_demodulator_settings(demodulator_settings_com &settings)
+{
+    std::scoped_lock lock(cmd_in_progress_mtx);
+    uint32_t curr_id { ++cmd_id };
+    cmd_header cmd_acm_header{curr_id, cmd_type::set_demodulator_settings};
+
+    cmd_demodulator_settings settings_;
+    settings_.demodulator_settings = settings;
+    send_to_socket(cmd_acm_header, settings_);
+
+    std::any data_to_serv;
+
+    auto result = wait_for_response(curr_id, cmd_type::set_demodulator_settings, data_to_serv);
+
+    return result;
+
+}
+
+response_type system_client::send_get_modulator_settings(modulator_settings_com &settings)
+{
+    std::scoped_lock lock(cmd_in_progress_mtx);
+    uint32_t curr_id { ++cmd_id };
+    cmd_header cmd_dpdi_header{curr_id, cmd_type::get_modulator_settings};
+    cmd_modulator_settings modulator;
+    send_to_socket(cmd_dpdi_header, modulator);
+
+    std::any data_from_serv;
+
+    auto result = wait_for_response(curr_id, cmd_type::get_modulator_settings, data_from_serv);
+    if (data_from_serv.has_value())
+        settings = std::any_cast<cmd_modulator_settings>(data_from_serv).modulator_settings;
+    return result;
+}
+
+response_type system_client::send_get_demodulator_settings(demodulator_settings_com &settings)
+{
+    std::scoped_lock lock(cmd_in_progress_mtx);
+    uint32_t curr_id { ++cmd_id };
+    cmd_header cmd_dpdi_header{curr_id, cmd_type::get_demodulator_settings};
+    cmd_demodulator_settings demodulator;
+    send_to_socket(cmd_dpdi_header, demodulator);
+    std::cout << "END GET_DEMODULATOR SETTINGS SEND TO SOCKET" << std::endl;
+    std::any data_from_serv;
+
+    auto result = wait_for_response(curr_id, cmd_type::get_demodulator_settings, data_from_serv);
+    if (data_from_serv.has_value())
+        settings = std::any_cast<cmd_demodulator_settings>(data_from_serv).demodulator_settings;
+    return result;
+}
+
+response_type system_client::send_get_demodulator_state(demodulator_state_com &demodulator_state){
+    std::scoped_lock lock(cmd_in_progress_mtx);
+    uint32_t curr_id { ++cmd_id };
+    cmd_header cmd_dpdi_header{curr_id, cmd_type::get_demodulator_state};
+    cmd_get_demodulator_state demodulator;
+    send_to_socket(cmd_dpdi_header, demodulator);
+
+    std::any data_from_serv;
+
+    auto result = wait_for_response(curr_id, cmd_type::get_demodulator_state, data_from_serv);
+    if (data_from_serv.has_value())
+        demodulator_state = std::any_cast<cmd_get_demodulator_state>(data_from_serv).demodulator_state;
+    return result;
+}
+
+response_type system_client::send_get_modulator_state(modulator_state_com &modulator_state){
+    std::scoped_lock lock(cmd_in_progress_mtx);
+    uint32_t curr_id { ++cmd_id };
+    cmd_header cmd_dpdi_header{curr_id, cmd_type::get_modulator_state};
+    cmd_get_modulator_state modulator;
+    send_to_socket(cmd_dpdi_header, modulator);
+
+    std::any data_from_serv;
+
+    auto result = wait_for_response(curr_id, cmd_type::get_modulator_state, data_from_serv);
+    if (data_from_serv.has_value())
+        modulator_state = std::any_cast<cmd_get_modulator_state>(data_from_serv).modulator_state;
+
+    return result;
+}
+
+response_type system_client::send_get_device_state(device_state_com &device_state ){
+    std::scoped_lock lock(cmd_in_progress_mtx);
+    uint32_t curr_id { ++cmd_id };
+    cmd_header cmd_dpdi_header{curr_id, cmd_type::get_device_state};
+    cmd_get_device_state device;
+    send_to_socket(cmd_dpdi_header, device);
+
+    std::any data_from_serv;
+
+    auto result = wait_for_response(curr_id, cmd_type::get_device_state, data_from_serv);
+    if (data_from_serv.has_value())
+        device_state = std::any_cast<cmd_get_device_state>(data_from_serv).device_state;
+
+    return result;
+}
+
+response_type system_client::send_get_cinc_state(CinC_state_com &cinc_state){
+    std::scoped_lock lock(cmd_in_progress_mtx);
+    uint32_t curr_id { ++cmd_id };
+    cmd_header cmd_dpdi_header{curr_id, cmd_type::get_cinc_state};
+
+    cmd_get_cinc_state cinc;
+    send_to_socket(cmd_dpdi_header, cinc);
+    std::any data_from_serv;
+
+    auto result = wait_for_response(curr_id, cmd_type::get_cinc_state, data_from_serv);
+    if (data_from_serv.has_value())
+        cinc_state = std::any_cast<cmd_get_cinc_state>(data_from_serv).cinc_state;
+    return result;
+
+}
+
 response_type system_client::send_set_acm_params(const ACM_parameters_serv &acm_params)
 {
     std::scoped_lock lock(cmd_in_progress_mtx);
@@ -752,4 +948,4 @@ response_type system_client::send_get_network_settings(const network_value & cmd
     if (data_from_serv.has_value())
         value = std::any_cast<std::string>(data_from_serv);
     return result;
-}
+}