diff --git a/dependencies/control_system_client b/dependencies/control_system_client index c7dec65..cd6e4f0 160000 --- a/dependencies/control_system_client +++ b/dependencies/control_system_client @@ -1 +1 @@ -Subproject commit c7dec65f5d131a5bcfb831273916ba3e36337248 +Subproject commit cd6e4f08d51f94a433fc41a5f81847325ac8b366 diff --git a/front-generator/template/common/admin.html.j2 b/front-generator/template/common/admin.html.j2 index ee8fbfc..7ec2902 100644 --- a/front-generator/template/common/admin.html.j2 +++ b/front-generator/template/common/admin.html.j2 @@ -12,7 +12,7 @@ ID модема{{ about.modemUid }} Серийный номер{{ about.modemSn }} MAC интерфейса управления{{ about.macManagement }} - MAC интерфейса управления{{ about.macData }} + MAC интерфейса данных{{ about.macData }}
diff --git a/front-generator/template/common/monitoring-methods.js.j2 b/front-generator/template/common/monitoring-methods.js.j2 index bc5d411..aff7510 100644 --- a/front-generator/template/common/monitoring-methods.js.j2 +++ b/front-generator/template/common/monitoring-methods.js.j2 @@ -79,7 +79,7 @@ let hours = uptime % 24 uptime = Math.floor( uptime / 24) let res = `${hours}:${mins.toString().padStart(2, '0')}:${secs.toString().padStart(2, '0')}` - if (uptime > 0) { res = `${uptime} days, ` + res } + if (uptime > 0) { res = `${uptime} дней, ` + res } this.statOs.uptime = res } else { this.statOs.uptime = '?' diff --git a/front-generator/template/common/monitoring.html.j2 b/front-generator/template/common/monitoring.html.j2 index d1c1f82..adc1eb3 100644 --- a/front-generator/template/common/monitoring.html.j2 +++ b/front-generator/template/common/monitoring.html.j2 @@ -74,9 +74,9 @@ Температура ADRV{{ statDevice.adrv }} °C Температура ZYNQ{{ statDevice.zynq }} °C Температура FPGA{{ statDevice.fpga }} °C - Uptime{{ statOs.uptime }} - Load average{{ statOs.load1 }} {{ statOs.load5 }} {{ statOs.load15 }} - RAM total/free{{ statOs.totalram }}Mb/{{ statOs.freeram }}Mb + Время работы устройства{{ statOs.uptime }} + Средняя загрузка ЦП (1/5/15 мин.){{ statOs.load1 }}% {{ statOs.load5 }}% {{ statOs.load15 }}% + ОЗУ всего/свободно{{ statOs.totalram }}MB/{{ statOs.freeram }}MB
diff --git a/src/terminal_api_driver.cpp b/src/terminal_api_driver.cpp index 92af6c5..e6d3c2b 100644 --- a/src/terminal_api_driver.cpp +++ b/src/terminal_api_driver.cpp @@ -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(modSettings.rollof * 100); + result << ",\"txRolloff\":" << static_cast(modSettings.rollof); #ifdef MODEM_IS_SCPC result << ",\"txGoldan\":" << static_cast(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(demodSettings.rollof * 100); + result << ",\"rxRolloff\":" << static_cast(demodSettings.rollof); #ifdef MODEM_IS_SCPC result << ",\"txGoldan\":" << static_cast(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("txIsTestInput"); mod.central_freq_in_kGz = pt.get("txCentralFreq"); mod.baudrate = pt.get("txBaudrate"); - mod.rollof = pt.get("txRolloff") / 100.0; + mod.rollof = pt.get("txRolloff"); #ifdef MODEM_IS_SCPC mod.gold_seq_is_active = pt.get("txGoldan"); #endif @@ -1037,7 +1037,7 @@ void api_driver::ApiDriver::setRxTxSettings(boost::property_tree::ptree &pt) { demod.is_rvt_iq = pt.get("aupcEn"); demod.central_freq_in_kGz = pt.get("rxCentralFreq"); demod.baudrate = pt.get("rxBaudrate"); - demod.rollof = pt.get("rxRolloff") / 100.0; + demod.rollof = pt.get("rxRolloff"); #ifdef MODEM_IS_SCPC demod.gold_seq_is_active = pt.get("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(info.loads[0]), 2); diff --git a/static/main-scpc.html b/static/main-scpc.html index 6a8bb8a..36c13d0 100644 --- a/static/main-scpc.html +++ b/static/main-scpc.html @@ -118,9 +118,9 @@ Температура ADRV{{ statDevice.adrv }} °C Температура ZYNQ{{ statDevice.zynq }} °C Температура FPGA{{ statDevice.fpga }} °C - Uptime{{ statOs.uptime }} - Load average{{ statOs.load1 }} {{ statOs.load5 }} {{ statOs.load15 }} - RAM total/free{{ statOs.totalram }}Mb/{{ statOs.freeram }}Mb + Время работы устройства{{ statOs.uptime }} + Средняя загрузка ЦП (1/5/15 мин.){{ statOs.load1 }}% {{ statOs.load5 }}% {{ statOs.load15 }}% + ОЗУ всего/свободно{{ statOs.totalram }}MB/{{ statOs.freeram }}MB @@ -503,7 +503,7 @@ ID модема{{ about.modemUid }} Серийный номер{{ about.modemSn }} MAC интерфейса управления{{ about.macManagement }} - MAC интерфейса управления{{ about.macData }} + MAC интерфейса данных{{ about.macData }}
@@ -986,7 +986,7 @@ let hours = uptime % 24 uptime = Math.floor( uptime / 24) let res = `${hours}:${mins.toString().padStart(2, '0')}:${secs.toString().padStart(2, '0')}` - if (uptime > 0) { res = `${uptime} days, ` + res } + if (uptime > 0) { res = `${uptime} дней, ` + res } this.statOs.uptime = res } else { this.statOs.uptime = '?' diff --git a/static/main-tdma.html b/static/main-tdma.html index 31911c0..470bc45 100644 --- a/static/main-tdma.html +++ b/static/main-tdma.html @@ -104,9 +104,9 @@ Температура ADRV{{ statDevice.adrv }} °C Температура ZYNQ{{ statDevice.zynq }} °C Температура FPGA{{ statDevice.fpga }} °C - Uptime{{ statOs.uptime }} - Load average{{ statOs.load1 }} {{ statOs.load5 }} {{ statOs.load15 }} - RAM total/free{{ statOs.totalram }}Mb/{{ statOs.freeram }}Mb + Время работы устройства{{ statOs.uptime }} + Средняя загрузка ЦП (1/5/15 мин.){{ statOs.load1 }}% {{ statOs.load5 }}% {{ statOs.load15 }}% + ОЗУ всего/свободно{{ statOs.totalram }}MB/{{ statOs.freeram }}MB
@@ -237,7 +237,7 @@ ID модема{{ about.modemUid }} Серийный номер{{ about.modemSn }} MAC интерфейса управления{{ about.macManagement }} - MAC интерфейса управления{{ about.macData }} + MAC интерфейса данных{{ about.macData }}
@@ -571,7 +571,7 @@ let hours = uptime % 24 uptime = Math.floor( uptime / 24) let res = `${hours}:${mins.toString().padStart(2, '0')}:${secs.toString().padStart(2, '0')}` - if (uptime > 0) { res = `${uptime} days, ` + res } + if (uptime > 0) { res = `${uptime} дней, ` + res } this.statOs.uptime = res } else { this.statOs.uptime = '?'