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

dependencies/control_system/common/protocol_commands.h

@@ -47,6 +47,79 @@ enum class cmd_dma_debugg
     begin_save_config = 17
 };
 
+struct modulator_settings_com{
+    uint32_t baudrate;
+    double central_freq_in_kGz;
+    double rollof;
+    double attenuation;
+    bool is_test_data;
+    bool is_save_current_state;
+    bool is_carrier;
+    bool tx_is_on;
+    bool is_cinc;
+};
+
+struct modulator_state_com{
+    bool is_tx_on;
+    float snr_remote;
+    uint16_t modcod;
+    bool is_short;
+    bool is_pilots;
+    uint32_t speed_in_bytes_tx;
+    uint32_t speed_in_bytes_tx_iface;
+};
+
+struct demodulator_locks_com{
+    bool pkt_sync;
+    bool afc_lock;
+    bool freq_lock;
+    bool sym_sync_lock;
+};
+
+struct demodulator_settings_com
+{
+    uint32_t baudrate;
+    double central_freq_in_kGz;
+    double rollof;
+    bool is_aru_on;
+    bool is_rvt_iq; 
+    double gain;
+};
+
+struct demodulator_state_com{
+    float snr;
+    uint16_t modcod;
+    bool is_short;
+    bool is_pilots;
+    float rssi;
+    double afc_err;
+    double crs_freq_err;
+    double sym_err;
+    double fine_freq_err;
+    double if_overload;
+    uint32_t packet_ok_cnt;
+    uint32_t packet_bad_cnt;;
+    uint32_t dummy_cnt;
+    uint32_t speed_in_bytes_rx;
+    uint32_t speed_in_bytes_rx_iface;
+    demodulator_locks_com locks;
+};
+
+struct CinC_state_com{
+    float ratio_signal_signal;
+    bool carrier_lock;
+    int32_t freq_error_offset;
+    uint32_t delay_dpdi;
+    int32_t freq_fine_estimate;
+    uint32_t cnt_bad_lock;
+};
+
+struct device_state_com{
+    double adrv_temp;
+    double zynq_temp;
+    double pl_temp;    
+};
+
 enum class name_classes_qos
 {
     realtime1 = 0,
@@ -292,7 +365,15 @@ enum class cmd_type
     get_network = 27,
     set_qos_settings = 28,
     get_qos_settings = 29,
-    set_lbq_params = 30
+    set_lbq_params = 30,
+    get_demodulator_state = 31,
+    get_modulator_state = 32,
+    get_cinc_state = 33,
+    get_device_state = 34,
+    set_modulator_settings = 35,
+    set_demodulator_settings = 36,
+    get_modulator_settings = 37,
+    get_demodulator_settings = 38
 };
 
 struct cmd_lbq_params
@@ -306,6 +387,82 @@ struct cmd_lbq_params
     }
 };
 
+struct cmd_get_cinc_state
+{
+    CinC_state_com cinc_state;
+    template<class Archive>
+    void serialize(Archive & archive)
+    {
+        archive(cinc_state.carrier_lock, cinc_state.cnt_bad_lock, 
+                cinc_state.delay_dpdi, cinc_state.freq_error_offset, 
+                cinc_state.freq_fine_estimate,
+                cinc_state.ratio_signal_signal);
+    }
+};
+
+struct cmd_get_device_state
+{
+    device_state_com device_state;
+    template<class Archive>
+    void serialize(Archive & archive)
+    {
+        archive(device_state.adrv_temp, device_state.pl_temp, device_state.zynq_temp);
+    }
+};
+
+struct cmd_demodulator_settings
+{
+    demodulator_settings_com demodulator_settings;
+
+    template<class Archive>
+    void serialize(Archive & archive)
+    {
+        archive(demodulator_settings.baudrate,demodulator_settings.central_freq_in_kGz,
+                demodulator_settings.gain, demodulator_settings.is_aru_on,
+                demodulator_settings.is_rvt_iq, demodulator_settings.rollof);
+    }
+};
+
+struct cmd_get_demodulator_state
+{
+    demodulator_state_com demodulator_state;
+    template<class Archive>
+    void serialize(Archive & archive)
+    {
+        archive(demodulator_state.snr, demodulator_state.modcod, demodulator_state.is_short, demodulator_state.is_pilots, 
+        demodulator_state.rssi, demodulator_state.afc_err, demodulator_state.crs_freq_err,
+        demodulator_state.sym_err, demodulator_state.fine_freq_err, demodulator_state.if_overload, 
+        demodulator_state.packet_ok_cnt, demodulator_state.packet_bad_cnt, demodulator_state.dummy_cnt,
+        demodulator_state.speed_in_bytes_rx, demodulator_state.speed_in_bytes_rx_iface,
+        demodulator_state.locks.afc_lock, demodulator_state.locks.freq_lock, demodulator_state.locks.pkt_sync, demodulator_state.locks.sym_sync_lock );
+    }
+};
+
+struct cmd_modulator_settings
+{
+    modulator_settings_com modulator_settings;
+
+    template<class Archive>
+    void serialize(Archive & archive)
+    {
+        archive(modulator_settings.attenuation,modulator_settings.baudrate, modulator_settings.central_freq_in_kGz,
+                modulator_settings.is_carrier, modulator_settings.is_cinc,
+                modulator_settings.is_save_current_state, modulator_settings.is_test_data,
+                modulator_settings.rollof, modulator_settings.tx_is_on);
+    }
+
+};
+
+struct cmd_get_modulator_state{
+    modulator_state_com modulator_state;
+    template<class Archive>
+    void serialize(Archive & archive)
+    {
+        archive(modulator_state.snr_remote, modulator_state.modcod, modulator_state.is_short, modulator_state.is_pilots, 
+        modulator_state.is_tx_on, modulator_state.speed_in_bytes_tx, modulator_state.speed_in_bytes_tx_iface);
+    }
+};
+
 
 struct cmd_get_network
 {