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

исправил тестовое состояние, исправил логику работы TDMA-морды, мелкие исправления в именовании параметров

Browse Source
This commit is contained in:
Vladislav Ostapov
2025-01-20 10:39:18 +03:00
parent 6464cda437
commit 8813488df8
7 changed files with 41 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/terminal_api_driver.cpp
View File

@@ -469,6 +469,15 @@ public:
}
#endif
bool isTest() {
std::shared_lock lock(this->settingsMutex);
return !modSettings.is_carrier
#ifdef MODEM_IS_SCPC
|| this->modSettings.is_test_data
#endif
;
}
void getNetworkSettings(TerminalNetworkSettings& dest) {
std::shared_lock lock(this->networkSettingsMutex);
dest = this->networkSettings;
@@ -690,6 +699,7 @@ std::string api_driver::ApiDriver::loadTerminalState() const {
std::stringstream result;
result << "{\n\"initState\":" << buildEscapedString(daemon->getDeviceInitState());
result << ",\n\"testState\":" << boolAsStr(daemon->isTest());
modulator_state modulator{};
demodulator_state demodulator{};
@@ -873,15 +883,15 @@ std::string api_driver::ApiDriver::loadSettings() const {
std::stringstream result;
result << "{\n\"txAutoStart\":" << boolAsStr(modSettings.is_save_current_state);
#ifdef MODEM_IS_SCPC
result << ",\"txEn\":" << boolAsStr(modSettings.tx_is_on);
result << ",\"txModulatorIsTest\":" << boolAsStr(!modSettings.is_carrier);
#endif
#ifdef MODEM_IS_SCPC
result << ",\"txIsTestInput\":" << boolAsStr(modSettings.is_test_data);
#endif
result << ",\"txModulatorIsTest\":" << boolAsStr(!modSettings.is_carrier);
result << ",\"txCentralFreq\":"; writeDouble(result, modSettings.central_freq_in_kGz);
#ifdef MODEM_IS_SCPC
result << ",\"txBaudrate\":" << modSettings.baudrate;
result << ",\"txRolloff\":" << static_cast<int>(modSettings.rollof);
#ifdef MODEM_IS_SCPC
result << ",\"txGoldan\":" << static_cast<int>(modSettings.gold_seq_is_active);
#endif
result << ",\"txAttenuation\":"; writeDouble(result, modSettings.attenuation);
@@ -1017,13 +1027,13 @@ void api_driver::ApiDriver::setRxTxSettings(boost::property_tree::ptree &pt) {
mod.tx_is_on = pt.get<bool>("txEn");
#ifdef MODEM_IS_SCPC
mod.is_save_current_state = pt.get<bool>("txAutoStart");
mod.is_carrier = !pt.get<bool>("txModulatorIsTest");
#endif
mod.is_test_data = pt.get<bool>("txIsTestInput");
#endif
mod.is_carrier = !pt.get<bool>("txModulatorIsTest");
mod.central_freq_in_kGz = pt.get<double>("txCentralFreq");
mod.baudrate = pt.get<uint32_t>("txBaudrate");
mod.rollof = pt.get<int>("txRolloff");
#ifdef MODEM_IS_SCPC
mod.baudrate = pt.get<uint32_t>("txBaudrate");
mod.rollof = pt.get<unsigned int>("txRolloff");
mod.gold_seq_is_active = pt.get<bool>("txGoldan");
#endif
mod.attenuation = pt.get<double>("txAttenuation");
@@ -1036,10 +1046,10 @@ void api_driver::ApiDriver::setRxTxSettings(boost::property_tree::ptree &pt) {
// демодулятор
demod.is_aru_on = pt.get<bool>("rxAgcEn");
demod.gain = pt.get<double>("rxManualGain");
demod.is_rvt_iq = pt.get<bool>("aupcEn");
demod.is_rvt_iq = pt.get<bool>("rxSpectrumInversion");
demod.central_freq_in_kGz = pt.get<double>("rxCentralFreq");
demod.baudrate = pt.get<uint32_t>("rxBaudrate");
demod.rollof = pt.get<int>("rxRolloff");
demod.rollof = pt.get<unsigned int>("rxRolloff");
#ifdef MODEM_IS_SCPC
demod.gold_seq_is_active = pt.get<bool>("rxGoldan");
#endif