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

мелкие исправления интерфейса + фикс rolloff

Browse Source
This commit is contained in:
Vladislav Ostapov
2025-01-16 11:46:21 +03:00
parent 90c02eb63a
commit e3a4bb8256
7 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/terminal_api_driver.cpp
View File

@@ -878,7 +878,7 @@ std::string api_driver::ApiDriver::loadSettings() const {
result << ",\"txIsTestInput\":" << boolAsStr(modSettings.is_test_data);
result << ",\"txCentralFreq\":"; writeDouble(result, modSettings.central_freq_in_kGz);
result << ",\"txBaudrate\":" << modSettings.baudrate;
result << ",\"txRolloff\":" << static_cast<int>(modSettings.rollof * 100);
result << ",\"txRolloff\":" << static_cast<int>(modSettings.rollof);
#ifdef MODEM_IS_SCPC
result << ",\"txGoldan\":" << static_cast<int>(modSettings.gold_seq_is_active);
#endif
@@ -917,7 +917,7 @@ std::string api_driver::ApiDriver::loadSettings() const {
result << ",\"rxManualGain\":"; writeDouble(result, demodSettings.gain);
result << ",\"rxCentralFreq\":"; writeDouble(result, demodSettings.central_freq_in_kGz);
result << ",\"rxBaudrate\":" << demodSettings.baudrate;
result << ",\"rxRolloff\":" << static_cast<int>(demodSettings.rollof * 100);
result << ",\"rxRolloff\":" << static_cast<int>(demodSettings.rollof);
#ifdef MODEM_IS_SCPC
result << ",\"txGoldan\":" << static_cast<int>(demodSettings.gold_seq_is_active);
#endif
@@ -1020,7 +1020,7 @@ void api_driver::ApiDriver::setRxTxSettings(boost::property_tree::ptree &pt) {
mod.is_test_data = pt.get<bool>("txIsTestInput");
mod.central_freq_in_kGz = pt.get<double>("txCentralFreq");
mod.baudrate = pt.get<uint32_t>("txBaudrate");
mod.rollof = pt.get<int>("txRolloff") / 100.0;
mod.rollof = pt.get<int>("txRolloff");
#ifdef MODEM_IS_SCPC
mod.gold_seq_is_active = pt.get<bool>("txGoldan");
#endif
@@ -1037,7 +1037,7 @@ void api_driver::ApiDriver::setRxTxSettings(boost::property_tree::ptree &pt) {
demod.is_rvt_iq = pt.get<bool>("aupcEn");
demod.central_freq_in_kGz = pt.get<double>("rxCentralFreq");
demod.baudrate = pt.get<uint32_t>("rxBaudrate");
demod.rollof = pt.get<int>("rxRolloff") / 100.0;
demod.rollof = pt.get<int>("rxRolloff");
#ifdef MODEM_IS_SCPC
demod.gold_seq_is_active = pt.get<bool>("rxGoldan");
#endif
@@ -1179,7 +1179,7 @@ std::string api_driver::ApiDriver::loadSysInfo() {
// unsigned int mem_unit; /* Memory unit size in bytes */
// };
double f_load = 1.0 / (1 << SI_LOAD_SHIFT);
const double f_load = 100.0 / ((1 << SI_LOAD_SHIFT) * get_nprocs());
result << "{\n\"uptime\":" << info.uptime;
result << ",\"load1min\":"; writeDouble(result, f_load * static_cast<double>(info.loads[0]), 2);