VladislavOstapov/terminal-web-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

добавил последовательность голда

Browse Source
This commit is contained in:
Vladislav Ostapov
2025-01-14 15:15:35 +03:00
parent 872b5e7b3d
commit 670780e328
7 changed files with 63 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
dependencies/control_system/common/protocol_commands.h vendored
View File

@@ -58,6 +58,7 @@ struct modulator_settings_com{
bool tx_is_on;
bool is_cinc;
uint32_t modcod_tx;
bool qold_seq_is_active;
};
struct modulator_state_com{
@@ -83,8 +84,9 @@ struct demodulator_settings_com
double central_freq_in_kGz;
double rollof;
bool is_aru_on;
bool is_rvt_iq;
bool is_rvt_iq;
double gain;
bool qold_seq_is_active;
};
struct demodulator_state_com{
@@ -110,7 +112,7 @@ struct CinC_state_com{
float ratio_signal_signal;
bool carrier_lock;
int32_t freq_error_offset;
uint32_t delay_dpdi;
float delay_dpdi;
int32_t freq_fine_estimate;
uint32_t cnt_bad_lock;
};
@@ -118,14 +120,14 @@ struct CinC_state_com{
struct device_state_com{
double adrv_temp;
double zynq_temp;
double pl_temp;
double pl_temp;
};
enum class voltage_lnb_com{
DISABLE = 0, _13V, _18V, _24V
};
enum class voltage_buc_com{
DISABLE = 0, _24V, _48V
DISABLE = 0, _24V, _48V
};
struct buc_lnb_settings_com
{
@@ -269,7 +271,8 @@ enum class demodulator_value
mode_demod = 10,
gold_seq = 11,
attitude_signals = 12,
is_reset_CinC = 13
is_reset_CinC = 13,
is_pilots_insert = 14
};
enum class getdemodulator_value
{
@@ -294,7 +297,8 @@ enum class getdemodulator_value
freq_fine_estimate = 18,
is_reset_CinC = 19,
type_pack = 20,
is_pilots = 21
is_pilots = 21,
is_pilots_insert = 22
};
enum class gain_value
@@ -422,8 +426,8 @@ struct cmd_get_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,
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);
}
@@ -448,7 +452,7 @@ struct cmd_demodulator_settings
{
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);
demodulator_settings.is_rvt_iq, demodulator_settings.rollof, demodulator_settings.qold_seq_is_active);
}
};
@@ -458,9 +462,9 @@ struct cmd_get_demodulator_state
template<class Archive>
void serialize(Archive & archive)
{
archive(demodulator_state.snr, demodulator_state.modcod, demodulator_state.is_short, demodulator_state.is_pilots,
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.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 );
@@ -477,7 +481,7 @@ struct cmd_modulator_settings
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, modulator_settings.modcod_tx);
modulator_settings.rollof, modulator_settings.tx_is_on, modulator_settings.modcod_tx, modulator_settings.qold_seq_is_active);
}
};
@@ -487,7 +491,7 @@ struct cmd_get_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,
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);
}
};
@@ -568,6 +572,7 @@ struct cmd_get_acm_param
archive(enable, max_attenuation, max_modcod, min_attenuation, min_modcod, snr_treashold, enable_auto_atten, snr_treashold_acm, period_pack);
}
};
struct cmd_qos_settings{
std::string json_string;
bool is_enable;
@@ -577,6 +582,7 @@ struct cmd_qos_settings{
archive(json_string, is_enable);
}
};
struct cmd_set_qos_settings
{
std::string node;
@@ -862,4 +868,4 @@ struct response_header
{
archive(id, cmd, rsp);
}
};
};