добавил в мониторинг 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>