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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dependencies/control_system_client vendored

@ -1 +1 @@
Subproject commit c7dec65f5d131a5bcfb831273916ba3e36337248 Subproject commit cd6e4f08d51f94a433fc41a5f81847325ac8b366

2
front-generator/template/common/admin.html.j2
View File

@ -12,7 +12,7 @@
<tr><th>ID модема</th><td>{{ about.modemUid }}</td></tr> <tr><th>ID модема</th><td>{{ about.modemUid }}</td></tr>
<tr><th>Серийный номер</th><td>{{ about.modemSn }}</td></tr> <tr><th>Серийный номер</th><td>{{ about.modemSn }}</td></tr>
<tr><th>MAC интерфейса управления</th><td>{{ about.macManagement }}</td></tr> <tr><th>MAC интерфейса управления</th><td>{{ about.macManagement }}</td></tr>
<tr><th>MAC интерфейса управления</th><td>{{ about.macData }}</td></tr> <tr><th>MAC интерфейса данных</th><td>{{ about.macData }}</td></tr>
</tbody> </tbody>
</table> </table>
<div> <div>

2
front-generator/template/common/monitoring-methods.js.j2
View File

@ -79,7 +79,7 @@
let hours = uptime % 24 let hours = uptime % 24
uptime = Math.floor( uptime / 24) uptime = Math.floor( uptime / 24)
let res = `${hours}:${mins.toString().padStart(2, '0')}:${secs.toString().padStart(2, '0')}` 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 this.statOs.uptime = res
} else { } else {
this.statOs.uptime = '?' this.statOs.uptime = '?'

6
front-generator/template/common/monitoring.html.j2
View File

@ -74,9 +74,9 @@
<tr><th>Температура ADRV</th><td>{{ statDevice.adrv }} °C</td></tr> <tr><th>Температура ADRV</th><td>{{ statDevice.adrv }} °C</td></tr>
<tr><th>Температура ZYNQ</th><td>{{ statDevice.zynq }} °C</td></tr> <tr><th>Температура ZYNQ</th><td>{{ statDevice.zynq }} °C</td></tr>
<tr><th>Температура FPGA</th><td>{{ statDevice.fpga }} °C</td></tr> <tr><th>Температура FPGA</th><td>{{ statDevice.fpga }} °C</td></tr>
<tr><th>Uptime</th><td>{{ statOs.uptime }}</td></tr> <tr><th>Время работы устройства</th><td>{{ statOs.uptime }}</td></tr>
<tr><th>Load average</th><td>{{ statOs.load1 }} {{ statOs.load5 }} {{ statOs.load15 }}</td></tr> <tr><th>Средняя загрузка ЦП (1/5/15 мин.)</th><td>{{ statOs.load1 }}% {{ statOs.load5 }}% {{ statOs.load15 }}%</td></tr>
<tr><th>RAM total/free</th><td>{{ statOs.totalram }}Mb/{{ statOs.freeram }}Mb</td></tr> <tr><th>ОЗУ всего/свободно</th><td>{{ statOs.totalram }}MB/{{ statOs.freeram }}MB</td></tr>
</tbody> </tbody>
</table> </table>
</div> </div>

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

10
static/main-scpc.html
View File

@ -118,9 +118,9 @@
<tr><th>Температура ADRV</th><td>{{ statDevice.adrv }} °C</td></tr> <tr><th>Температура ADRV</th><td>{{ statDevice.adrv }} °C</td></tr>
<tr><th>Температура ZYNQ</th><td>{{ statDevice.zynq }} °C</td></tr> <tr><th>Температура ZYNQ</th><td>{{ statDevice.zynq }} °C</td></tr>
<tr><th>Температура FPGA</th><td>{{ statDevice.fpga }} °C</td></tr> <tr><th>Температура FPGA</th><td>{{ statDevice.fpga }} °C</td></tr>
<tr><th>Uptime</th><td>{{ statOs.uptime }}</td></tr> <tr><th>Время работы устройства</th><td>{{ statOs.uptime }}</td></tr>
<tr><th>Load average</th><td>{{ statOs.load1 }} {{ statOs.load5 }} {{ statOs.load15 }}</td></tr> <tr><th>Средняя загрузка ЦП (1/5/15 мин.)</th><td>{{ statOs.load1 }}% {{ statOs.load5 }}% {{ statOs.load15 }}%</td></tr>
<tr><th>RAM total/free</th><td>{{ statOs.totalram }}Mb/{{ statOs.freeram }}Mb</td></tr> <tr><th>ОЗУ всего/свободно</th><td>{{ statOs.totalram }}MB/{{ statOs.freeram }}MB</td></tr>
</tbody> </tbody>
</table> </table>
</div> </div>
@ -503,7 +503,7 @@
<tr><th>ID модема</th><td>{{ about.modemUid }}</td></tr> <tr><th>ID модема</th><td>{{ about.modemUid }}</td></tr>
<tr><th>Серийный номер</th><td>{{ about.modemSn }}</td></tr> <tr><th>Серийный номер</th><td>{{ about.modemSn }}</td></tr>
<tr><th>MAC интерфейса управления</th><td>{{ about.macManagement }}</td></tr> <tr><th>MAC интерфейса управления</th><td>{{ about.macManagement }}</td></tr>
<tr><th>MAC интерфейса управления</th><td>{{ about.macData }}</td></tr> <tr><th>MAC интерфейса данных</th><td>{{ about.macData }}</td></tr>
</tbody> </tbody>
</table> </table>
<div> <div>
@ -986,7 +986,7 @@
let hours = uptime % 24 let hours = uptime % 24
uptime = Math.floor( uptime / 24) uptime = Math.floor( uptime / 24)
let res = `${hours}:${mins.toString().padStart(2, '0')}:${secs.toString().padStart(2, '0')}` 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 this.statOs.uptime = res
} else { } else {
this.statOs.uptime = '?' this.statOs.uptime = '?'

10
static/main-tdma.html
View File

@ -104,9 +104,9 @@
<tr><th>Температура ADRV</th><td>{{ statDevice.adrv }} °C</td></tr> <tr><th>Температура ADRV</th><td>{{ statDevice.adrv }} °C</td></tr>
<tr><th>Температура ZYNQ</th><td>{{ statDevice.zynq }} °C</td></tr> <tr><th>Температура ZYNQ</th><td>{{ statDevice.zynq }} °C</td></tr>
<tr><th>Температура FPGA</th><td>{{ statDevice.fpga }} °C</td></tr> <tr><th>Температура FPGA</th><td>{{ statDevice.fpga }} °C</td></tr>
<tr><th>Uptime</th><td>{{ statOs.uptime }}</td></tr> <tr><th>Время работы устройства</th><td>{{ statOs.uptime }}</td></tr>
<tr><th>Load average</th><td>{{ statOs.load1 }} {{ statOs.load5 }} {{ statOs.load15 }}</td></tr> <tr><th>Средняя загрузка ЦП (1/5/15 мин.)</th><td>{{ statOs.load1 }}% {{ statOs.load5 }}% {{ statOs.load15 }}%</td></tr>
<tr><th>RAM total/free</th><td>{{ statOs.totalram }}Mb/{{ statOs.freeram }}Mb</td></tr> <tr><th>ОЗУ всего/свободно</th><td>{{ statOs.totalram }}MB/{{ statOs.freeram }}MB</td></tr>
</tbody> </tbody>
</table> </table>
</div> </div>
@ -237,7 +237,7 @@
<tr><th>ID модема</th><td>{{ about.modemUid }}</td></tr> <tr><th>ID модема</th><td>{{ about.modemUid }}</td></tr>
<tr><th>Серийный номер</th><td>{{ about.modemSn }}</td></tr> <tr><th>Серийный номер</th><td>{{ about.modemSn }}</td></tr>
<tr><th>MAC интерфейса управления</th><td>{{ about.macManagement }}</td></tr> <tr><th>MAC интерфейса управления</th><td>{{ about.macManagement }}</td></tr>
<tr><th>MAC интерфейса управления</th><td>{{ about.macData }}</td></tr> <tr><th>MAC интерфейса данных</th><td>{{ about.macData }}</td></tr>
</tbody> </tbody>
</table> </table>
<div> <div>
@ -571,7 +571,7 @@
let hours = uptime % 24 let hours = uptime % 24
uptime = Math.floor( uptime / 24) uptime = Math.floor( uptime / 24)
let res = `${hours}:${mins.toString().padStart(2, '0')}:${secs.toString().padStart(2, '0')}` 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 this.statOs.uptime = res
} else { } else {
this.statOs.uptime = '?' this.statOs.uptime = '?'