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

front-generator/render-params.json

@@ -39,7 +39,7 @@
                   {"widget": "number", "label": "Ручное усиление, дБ", "name": "rxManualGain", "v_show": "!paramRxtx.rxAgcEn", "min":  -40},
                   {"widget": "checkbox", "label": "Инверсия спектра", "name": "rxSpectrumInversion"},
                   {"widget": "number-int", "label": "Центральная частота, КГц", "name": "rxCentralFreq", "min": 900000, "step": 0.01},
-                  {"widget": "number-int", "label": "Символьная скорость, Бод", "name": "rxBaudrate", "min": 0, "step": 1},
+                  {"widget": "number-int", "label": "Символьная скорость, Бод", "name": "rxBaudrate", "min": 200000, "max": 54000000, "step": 1},
                   {
                     "widget": "select", "label": "Roll-off", "name": "rxRolloff",
                     "values": [{"label": "0.02", "value": "2"}, {"label": "0.05", "value": "5"}, {"label": "0.10", "value": "10"}, {"label": "0.15", "value": "15"}, {"label": "0.20", "value": "20"}, {"label": "0.25", "value": "25"}]

front-generator/template/common/monitoring-data.js.j2

@@ -26,9 +26,9 @@
 
                     // прочие поля
                     {% if modem == 'scpc' %}
-                    snr: '?', modcod: '?', frameSizeNormal: '?', isPilots: '?', speedOnTxKbit: '?', speedOnIifKbit: '?',
+                    snr: '?', modcod: '?', frameSizeNormal: '?', isPilots: '?', speedOnTxKbit: '?', speedOnIifKbit: '?'
                     {% else %}
-                    modcod: '?', speedOnTxKbit: '?', speedOnIifKbit: '?', centerFreq: '?', symSpeed: '?',
+                    modcod: '?', speedOnTxKbit: '?', speedOnIifKbit: '?', centerFreq: '?', symSpeed: '?'
                     {% endif %}
                 },
                 {% if modem == 'scpc' %}
@@ -42,6 +42,9 @@
                 {% endif %}
                 statDevice: { // температурные датчики
                     adrv: 0, zynq: 0, fpga: 0
+                    {% if modem == 'tdma' %},
+                    upgradeStatus: "", upgradePercent: 0, upgradeImage: ""
+                    {% endif %}
                 },
                 statOs: {uptime: '?', load1: '?', load5: '?', load15: '?', totalram: '?', freeram: '?'},
 

front-generator/template/common/monitoring-methods.js.j2

@@ -71,6 +71,11 @@
                 this.statDevice.adrv = vals["mainState"]["device.adrv"]
                 this.statDevice.zynq = vals["mainState"]["device.zynq"]
                 this.statDevice.fpga = vals["mainState"]["device.fpga"]
+                {% if modem == 'tdma' %},
+                this.statDevice.upgradeStatus = vals["mainState"]["device.upgradeStatus"]
+                this.statDevice.upgradePercent = vals["mainState"]["device.upgradePercent"]
+                this.statDevice.upgradeImage = vals["mainState"]["device.upgradeImage"]
+                {% endif %}
 
                 this.testState = vals["mainState"]["testState"]
 

front-generator/template/common/monitoring.html.j2

@@ -72,7 +72,11 @@
                     <tr><th>Температура FPGA</th><td>{{ statDevice.fpga }} °C</td></tr>
                     <tr><th>Время работы устройства</th><td>{{ statOs.uptime }}</td></tr>
                     <tr><th>Средняя загрузка ЦП (1/5/15 мин.)</th><td>{{ statOs.load1 }}% {{ statOs.load5 }}% {{ statOs.load15 }}%</td></tr>
-                    <tr><th>ОЗУ всего/свободно</th><td>{{ statOs.totalram }}МБ/{{ statOs.freeram }}МБ</td></tr>
+                    <tr><th>ОЗУ всего/свободно</th><td>{{ statOs.totalram }}МБ/{{ statOs.freeram }}МБ</td></tr>{% endraw %}{% if modem == 'tdma' %}{% raw %}
+                    <tr><td colspan="2" style="padding-top: 1em; text-align: center">Статус обновления</td></tr>
+                    <tr><th>Статус</th><td>{{ statDevice.upgradeStatus }}</td></tr>
+                    <tr><th>Прогресс</th><td>{{ statDevice.upgradePercent }}%</td></tr>
+                    <tr><th>Имя образа</th><td><code>{{ statDevice.upgradeImage }}</code></td></tr>{% endraw %}{% endif %}{% raw %}
                     </tbody>
                 </table>
             </div>

src/terminal_api_driver.cpp

@@ -255,7 +255,6 @@ private:
     void updateState() {
         modulator_state modulator{};
         demodulator_state demodulator{};
-        device_state device{};
 #ifdef MODEM_IS_SCPC
         CinC_state cinc{};
 #endif
@@ -263,7 +262,6 @@ private:
         std::lock_guard lock(this->cpApiMutex);
         logCpApiError("api_driver::TerminalApiDaemon::updateState()->CP_GetModulatorState()", CP_GetModulatorState(sid, modulator));
         logCpApiError("api_driver::TerminalApiDaemon::updateState()->CP_GetDemodulatorState()", CP_GetDemodulatorState(sid, demodulator));
-        logCpApiError("api_driver::TerminalApiDaemon::updateState()->CP_GetDeviceState()", CP_GetDeviceState(sid, device));
 #ifdef MODEM_IS_TDMA
         std::string tmpDevState;
         logCpApiError("api_driver::TerminalApiDaemon::updateState()->CP_GetDmaDebug(status_init)", CP_GetDmaDebug(sid, "status_init", &tmpDevState));
@@ -281,7 +279,6 @@ private:
             std::lock_guard lock2(this->stateMutex);
             this->modState = modulator;
             this->demodState = demodulator;
-            this->devState = device;
 #ifdef MODEM_IS_TDMA
             this->deviceInitState = tmpDevState;
 #endif
@@ -323,6 +320,16 @@ private:
         }
     }
 
+    void updateDeviceState() {
+        device_state device{};
+        std::lock_guard lock(this->cpApiMutex);
+        logCpApiError("api_driver::TerminalApiDaemon::updateState()->CP_GetDeviceState()", CP_GetDeviceState(sid, device));
+        {
+            std::lock_guard lock2(this->stateMutex);
+            this->devState = device;
+        }
+    }
+
     void unsafeLoadNetworkSettings(TerminalNetworkSettings& s) {
         s.loadDefaults();
         logCpApiError("api_driver::TerminalApiDaemon::unsafeLoadNetworkSettings()->CP_GetNetwork(addr)", CP_GetNetwork(sid, "addr", &s.managementIp));
@@ -475,6 +482,15 @@ private:
                     BOOST_LOG_TRIVIAL(error) << "api_driver::TerminalApiDaemon::updateState() failed to log: " << e.what();
                 }
             }},
+            // обновление состояния устройства (обновления, температура)
+            {.lastUpdate = 0, .periodMs = CACHE_DEV_STATE_UPDATE_MS, .callback = [this]() {
+                try {
+                    this->updateDeviceState();
+                    BOOST_LOG_TRIVIAL(debug) << "api_driver::TerminalApiDaemon::updateDeviceState(): success update!";
+                } catch (std::exception& e) {
+                    BOOST_LOG_TRIVIAL(error) << "api_driver::TerminalApiDaemon::updateDeviceState(): " << e.what();
+                }
+            }},
             // обновление кеша настроек
             {.lastUpdate = 0, .periodMs = CACHE_SETTINGS_UPDATE_MS, .callback = [this]() {
                 try {
@@ -515,7 +531,12 @@ private:
             auto now = TIME_NOW();
             for (auto& u: updaters) {
                 if (u.checkNeedUpdate(now)) {
-                    u.lastUpdate = now;
+                    // выравнивание таймингов (-20ms...+50ms)
+                    if (u.lastUpdate + u.periodMs + 50 < now) {
+                        u.lastUpdate += u.periodMs;
+                    } else {
+                        u.lastUpdate = now;
+                    }
                     u.callback();
                     now = TIME_NOW();
                 }
@@ -942,6 +963,25 @@ std::string api_driver::ApiDriver::loadTerminalState() const {
     result << ",\n\"device.adrv\":"; writeDouble(result, device.adrv_temp, 1);
     result << ",\"device.fpga\":"; writeDouble(result, device.pl_temp, 1);
     result << ",\"device.zynq\":"; writeDouble(result, device.zynq_temp, 1);
+#ifdef MODEM_IS_TDMA
+    if (device.cur_image.empty()) {
+        result << R"(,
+"device.upgradeStatus":"Нет обновлений","device.upgradePercent":0,"device.upgradeImage":"")";
+    } else {
+        switch (device.status) {
+            case NORM_RX_OBJECT_NEW_API: result << ",\n" R"("device.upgradeStatus": "Начало загрузки")"; break;
+            case NORM_RX_OBJECT_INFO_API: result << ",\n" R"("device.upgradeStatus": "Получено имя образа")"; break;
+            case NORM_RX_OBJECT_UPDATED_API: result << ",\n" R"("device.upgradeStatus": "Загружается")"; break;
+            case NORM_RX_OBJECT_COMPLETED_API: result << ",\n" R"("device.upgradeStatus": "Загрузка завершена")"; break;
+            case NORM_RX_OBJECT_ABORTED_API: result << ",\n" R"("device.upgradeStatus": "Загрузка прервана")"; break;
+            default: result << ",\n" R"("device.upgradeStatus": "?")";
+
+        }
+        result << ",\"device.upgradePercent\":" << device.dwl_percent;
+        result << ",\"device.upgradeImage\":" << buildEscapedString(device.cur_image);
+    }
+
+#endif
 
     result << "}";
 

src/terminal_api_driver.h

@@ -9,7 +9,8 @@
 
 
 namespace api_driver {
-    constexpr int CACHE_STATISTICS_UPDATE_MS = 500;
+    constexpr int CACHE_STATISTICS_UPDATE_MS = 500; ///< время обновления кеша статистики модулятора/демодулятора
+    constexpr int CACHE_DEV_STATE_UPDATE_MS = 3000; ///< время обновления статуса устройства (обновления по воздуху, температуры)
     constexpr int CACHE_SETTINGS_UPDATE_MS = 5000;
     constexpr int CACHE_QOS_UPDATE_MS = 5000;
 

static/main-scpc.html

@@ -687,7 +687,7 @@
                     state: '?',
 
                     // прочие поля
-                    snr: '?', modcod: '?', frameSizeNormal: '?', isPilots: '?', speedOnTxKbit: '?', speedOnIifKbit: '?',
+                    snr: '?', modcod: '?', frameSizeNormal: '?', isPilots: '?', speedOnTxKbit: '?', speedOnIifKbit: '?'
                 },
                 statCinc: {
                     occ: '?',

static/main-tdma.html

@@ -103,6 +103,10 @@
                     <tr><th>Время работы устройства</th><td>{{ statOs.uptime }}</td></tr>
                     <tr><th>Средняя загрузка ЦП (1/5/15 мин.)</th><td>{{ statOs.load1 }}% {{ statOs.load5 }}% {{ statOs.load15 }}%</td></tr>
                     <tr><th>ОЗУ всего/свободно</th><td>{{ statOs.totalram }}МБ/{{ statOs.freeram }}МБ</td></tr>
+                    <tr><td colspan="2" style="padding-top: 1em; text-align: center">Статус обновления</td></tr>
+                    <tr><th>Статус</th><td>{{ statDevice.upgradeStatus }}</td></tr>
+                    <tr><th>Прогресс</th><td>{{ statDevice.upgradePercent }}%</td></tr>
+                    <tr><th>Имя образа</th><td><code>{{ statDevice.upgradeImage }}</code></td></tr>
                     </tbody>
                 </table>
             </div>
@@ -149,7 +153,7 @@
                     </label>
                     <label>
                         <span>Символьная скорость, Бод</span>
-                        <input type="text" v-model.lazy="paramRxtx.rxBaudrate" @change="e => paramRxtx.rxBaudrate = inputFormatNumber(inputFormatNumber(e.target.value, {step:1}), {step:1})"/>
+                        <input type="text" v-model.lazy="paramRxtx.rxBaudrate" @change="e => paramRxtx.rxBaudrate = inputFormatNumber(inputFormatNumber(e.target.value, {min:200000,max:54000000,step:1}), {min:200000,max:54000000,step:1})"/>
                     </label>
                     <label>
                         <span>Roll-off</span>
@@ -391,10 +395,12 @@
                     state: '?',
 
                     // прочие поля
-                    modcod: '?', speedOnTxKbit: '?', speedOnIifKbit: '?', centerFreq: '?', symSpeed: '?',
+                    modcod: '?', speedOnTxKbit: '?', speedOnIifKbit: '?', centerFreq: '?', symSpeed: '?'
                 },
                 statDevice: { // температурные датчики
                     adrv: 0, zynq: 0, fpga: 0
+,
+                    upgradeStatus: "", upgradePercent: 0, upgradeImage: ""
                 },
                 statOs: {uptime: '?', load1: '?', load5: '?', load15: '?', totalram: '?', freeram: '?'},
                 // ========== include end from 'common/monitoring-data.js.j2'
@@ -558,7 +564,7 @@
                 this.paramRxtx.rxManualGain = vals["settings"]["rxManualGain"]
                 this.paramRxtx.rxSpectrumInversion = vals["settings"]["rxSpectrumInversion"]
                 this.paramRxtx.rxCentralFreq = this.inputFormatNumber(vals["settings"]["rxCentralFreq"], {min:900000,step:0.01})
-                this.paramRxtx.rxBaudrate = this.inputFormatNumber(vals["settings"]["rxBaudrate"], {step:1})
+                this.paramRxtx.rxBaudrate = this.inputFormatNumber(vals["settings"]["rxBaudrate"], {min:200000,max:54000000,step:1})
                 this.paramRxtx.rxRolloff = vals["settings"]["rxRolloff"]
             },
             updateBuclnbSettings(vals) {
@@ -642,6 +648,10 @@
                 this.statDevice.adrv = vals["mainState"]["device.adrv"]
                 this.statDevice.zynq = vals["mainState"]["device.zynq"]
                 this.statDevice.fpga = vals["mainState"]["device.fpga"]
+,
+                this.statDevice.upgradeStatus = vals["mainState"]["device.upgradeStatus"]
+                this.statDevice.upgradePercent = vals["mainState"]["device.upgradePercent"]
+                this.statDevice.upgradeImage = vals["mainState"]["device.upgradeImage"]
 
                 this.testState = vals["mainState"]["testState"]