front-generator/render-params.json

@@ -18,10 +18,14 @@
                   {"widget": "h3", "label": "Настройки передатчика"},
                   {"widget": "checkbox", "label": "Включить передатчик", "name": "txEn"},
                   {
-                    "widget": "select", "label": "Режим работы модулятора", "name": "txModulatorIsTest",
+                    "widget": "select", "label": "Входные данные", "name": "txIsTestInput",
-                    "values": [{"label": "Нормальный", "value": "false"}, {"label": "Тест (CW)", "value": "true"}]
+                    "values": [
+                      {"label": "SCPC", "value": "false"},
+                      {"label": "Тест", "value": "true"}
+                    ]
                   },
-                  {"widget": "number", "label": "Центральная частота, КГц", "name": "txCentralFreq", "min": 900000, "step": 0.01, "v_show": "paramRxtx.txModulatorIsTest"},
+                  {"widget": "number", "label": "Центральная частота, КГц", "name": "txCentralFreq", "min": 900000, "step": 0.01, "v_show": "paramRxrx.txIsTestInput"},
+                  {"widget": "number", "label": "Символьная скорость, Бод", "name": "txBaudrate", "min": 0, "step": 1, "v_show": "paramRxrx.txIsTestInput"},
                   {"widget": "number", "label": "Ослабление, дБ", "name": "txAttenuation", "min": 0, "step": 1}
                 ]
               },
@@ -182,14 +186,11 @@
                   },
                   {"widget": "modulation-modcod", "label": "Модуляция", "name": "dvbCcm", "v_show": "paramRxtx.dvbIsAcm === false"},
                   {"widget": "modulation-speed", "label": "Скорость кода", "name": "dvbCcm", "v_show": "paramRxtx.dvbIsAcm === false"},
-                  {"widget": "watch-expr", "label": "Расчетная скорость, kbit", "expr": "calcInterfaceSpeedKb(paramRxtx.txBaudrate, paramRxtx.dvbCcmModulation, paramRxtx.dvbCcmSpeed)", "v_show": "paramRxtx.dvbIsAcm === false"},
+                  {"widget": "watch", "label": "Текущий модкод", "model": "statTx.modcod", "v_show": "paramRxtx.dvbIsAcm === true"},
-                  {"widget": "watch-expr", "label": "Текущий модкод", "expr": "statTx.modcod", "v_show": "paramRxtx.dvbIsAcm === true"},
                   {"widget": "modulation-modcod", "label": "Модуляция (мин. режим)", "name": "dvbAcmMin", "v_show": "paramRxtx.dvbIsAcm === true"},
                   {"widget": "modulation-speed", "label": "Скорость кода (мин. режим)", "name": "dvbAcmMin", "v_show": "paramRxtx.dvbIsAcm === true"},
-                  {"widget": "watch-expr", "label": "Расчетная скорость (мин. режим), kbit", "expr": "calcInterfaceSpeedKb(paramRxtx.txBaudrate, paramRxtx.dvbAcmMinModulation, paramRxtx.dvbAcmMinSpeed)", "v_show": "paramRxtx.dvbIsAcm === true"},
                   {"widget": "modulation-modcod", "label": "Модуляция (макс. режим)", "name": "dvbAcmMax", "v_show": "paramRxtx.dvbIsAcm === true"},
                   {"widget": "modulation-speed", "label": "Скорость кода (макс. режим)", "name": "dvbAcmMax", "v_show": "paramRxtx.dvbIsAcm === true"},
-                  {"widget": "watch-expr", "label": "Расчетная скорость (макс. режим), kbit", "expr": "calcInterfaceSpeedKb(paramRxtx.txBaudrate, paramRxtx.dvbAcmMaxModulation, paramRxtx.dvbAcmMaxSpeed)", "v_show": "paramRxtx.dvbIsAcm === true"},
                   {"widget": "number", "label": "Запас ОСШ, дБ", "name": "dvbSnrReserve", "min": 0, "step": 0.01, "max": 10}
                 ]
               },
@@ -212,7 +213,7 @@
                     "values": [{"label": "РРУ", "value": "false"}, {"label": "АРУ", "value": "true"}]
                   },
                   {"widget": "number", "label": "Усиление, дБ", "name": "rxManualGain", "min": -40, "step": 0.01, "max": 40, "v_show": "paramRxtx.rxAgcEn === false"},
-                  {"widget": "watch-expr", "label": "Текущее усиление", "expr": "paramRxtx.rxManualGain", "v_show": "paramRxtx.rxAgcEn === true"},
+                  {"widget": "watch", "label": "Текущее усиление", "model": "paramRxtx.rxManualGain", "v_show": "paramRxtx.rxAgcEn === true"},
                   {"widget": "checkbox", "label": "Инверсия спектра", "name": "rxSpectrumInversion"},
                   {"widget": "number", "label": "Центральная частота, КГц", "name": "rxCentralFreq", "min": 900000, "step": 0.01},
                   {"widget": "number", "label": "Символьная скорость, Бод", "name": "rxBaudrate", "min": 0, "step": 1},

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

@@ -99,5 +99,4 @@
                     this.statRx.packetsBad = 0
                     this.statRx.packetsDummy = 0
                 })
-            },
+            },
-

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

@@ -1,8 +0,0 @@
-{% if 'rxtx' in params and modem == 'scpc' %}
-            calcInterfaceSpeedKb(baud, modulation, speed) {
-                const mMod = Math.max(2, ['', '', 'qpsk', '8psk', '16apsk', '32apsk'].indexOf(modulation))
-                const speedVals = {'1/4': 0.25, '1/3': 0.333, '2/5': 0.4, '1/2': 0.5, '3/5': 0.6, '2/3': 0.666, '3/4': 0.75, '4/5': 0.8, '5/6': 0.833, '8/9': 0.888, '9/10': 0.9}
-                const mSpeed = speed in speedVals ? speedVals[speed] : 1
-                return ((baud * mMod * mSpeed) / 1024).toLocaleString()
-            },
-{% endif %}

front-generator/template/common/widgets.j2

@@ -16,11 +16,6 @@
 
 {% macro build_widget_watch(param_group, widget) %}<label{% if widget.v_show %} v-show="{{ widget.v_show }}"{% endif %}><span>{{ widget.label }}</span><input type="text" readonly v-model="{{ widget.model }}"/></label>{% endmacro %}
 
-{% macro build_widget_watch_expr(param_group, widget) %}<label{% if widget.v_show %} v-show="{{ widget.v_show }}"{% endif %}>
-    <span>{{ widget.label }}</span><span>{{ '{{ ' ~ widget.expr ~ ' }}' }}</span>
-</label>{% endmacro %}
-
-
 {% macro build_widget_modulation_modcod(param_group, widget) %}<label{% if widget.v_show %} v-show="{{ widget.v_show }}"{% endif %}>
     <span>{{ widget.label }}</span>
     <select v-model="param{{ param_group | title }}.{{ widget.name }}Modulation" @change="param{{ param_group | title }}.{{ widget.name }}Speed = correctModcodSpeed(param{{ param_group | title }}.{{ widget.name }}Modulation, param{{ param_group | title }}.{{ widget.name }}Speed)">
@@ -59,7 +54,6 @@
 {% elif widget.widget == 'checkbox' %}{{ build_widget_checkbox(param_group, widget) }}
 {% elif widget.widget == 'number' %}{{ build_widget_number(param_group, widget) }}
 {% elif widget.widget == 'watch' %}{{ build_widget_watch(param_group, widget) }}
-{% elif widget.widget == 'watch-expr' %}{{ build_widget_watch_expr(param_group, widget) }}
 {% elif widget.widget == 'select' %}{{ build_widget_select(param_group, widget) }}
 {% elif widget.widget == 'modulation-modcod' %}{{ build_widget_modulation_modcod(param_group, widget) }}
 {% elif widget.widget == 'modulation-speed' %}{{ build_widget_modulation_speed(param_group, widget) }}

front-generator/template/main.html

@@ -59,7 +59,7 @@
     </div>
     {% endraw %}
 </div>
-<script src="/js/vue.js?v=3.5.13"></script>
+<script src="/js/vue.js"></script>
 <script>
     const availableTabs = ['{{ tab_names_array | join("', '") }}']
 

src/auth/jwt.cpp

@@ -30,10 +30,10 @@ http::auth::jwt::Jwt http::auth::jwt::Jwt::fromCookies(const std::string &cookie
         const auto auth = pc.at("auth");
         std::string::size_type firstDot = std::string::npos;
         std::string::size_type secondDot = std::string::npos;
-        for (std::string::size_type i = 0; i < auth.size(); i++) {
+        for (size_t i = 0; i < auth.size(); i++) {
             if (auth[i] == '.') {
-                if (firstDot == std::string::npos) { firstDot = i; }
+                if (firstDot == std::string::npos) { firstDot = static_cast<int>(i); }
-                else if (secondDot == std::string::npos) { secondDot = i; }
+                else if (secondDot == std::string::npos) { secondDot = static_cast<int>(i); }
                 else {
                     // так быть не должно
                     return t;

src/main.cpp

@@ -28,6 +28,25 @@ constexpr const char* REBOOT_COMMAND = "web-action reboot";
 constexpr const char* UPGRADE_COMMAND = "web-action upgrade";
 
 
+static std::vector<char> loadFile(const std::string& path) {
+    std::ifstream is(path, std::ios::in | std::ios::binary);
+    if (!is) {
+        throw std::runtime_error("File not found");
+    }
+
+    std::vector<char> content;
+    for (;;) {
+        char buf[512];
+        auto len = is.read(buf, sizeof(buf)).gcount();
+        if (len <= 0) {
+            break;
+        }
+        content.insert(content.end(), buf, buf + len);
+    }
+    return content;
+}
+
+
 namespace mime_types = http::server::mime_types;
 
 void init_logging() {
@@ -496,9 +515,9 @@ int main(int argc, char *argv[]) {
             s->run();
 
         } else if (strcmp(argv[1], "ssl") == 0) {
-            std::vector<char> cert; http::resource::loadFile("cert.pem", cert);
+            const auto cert = loadFile("cert.pem");
-            std::vector<char> key; http::resource::loadFile("key.pem", key);
+            const auto key = loadFile("key.pem");
-            std::vector<char> dh; http::resource::loadFile("dh.pem", dh);
+            const auto dh = loadFile("dh.pem");
 
             auto ctx = std::make_shared<ssl::context>(ssl::context::tlsv12);
 

src/server/resource.cpp

@@ -3,10 +3,10 @@
 #include <fstream>
 #include <utility>
 
-void http::resource::loadFile(const std::string& path, std::vector<char>& content) {
+static void loadFile(const std::string& path, std::vector<char>& content) {
     std::ifstream is(path, std::ios::in | std::ios::binary);
     if (!is) {
-        throw std::runtime_error("File not found " + path);
+        throw std::runtime_error("File not found");
     }
 
     content.clear();

src/server/resource.h

@@ -62,8 +62,6 @@ namespace http::resource {
 
         ~GenericResource() override;
     };
-
-    void loadFile(const std::string& path, std::vector<char>& content);
 }
 
 #endif //RESOURCE_H

src/terminal_api_driver.cpp

@@ -469,15 +469,6 @@ public:
     }
 #endif
 
-    bool isTest() {
-        std::shared_lock lock(this->settingsMutex);
-        return !modSettings.is_carrier
-#ifdef MODEM_IS_SCPC
-            || this->modSettings.is_test_data
-#endif
-        ;
-    }
-
     void getNetworkSettings(TerminalNetworkSettings& dest) {
         std::shared_lock lock(this->networkSettingsMutex);
         dest = this->networkSettings;
@@ -699,7 +690,6 @@ std::string api_driver::ApiDriver::loadTerminalState() const {
     std::stringstream result;
 
     result << "{\n\"initState\":" << buildEscapedString(daemon->getDeviceInitState());
-    result << ",\n\"testState\":" << boolAsStr(daemon->isTest());
 
     modulator_state modulator{};
     demodulator_state demodulator{};
@@ -847,7 +837,7 @@ const static ModcodDef_t ModcodDefs[] = {
 static const char* extractModcodModulation(uint32_t modcod, bool defaultQpsk1_4 = true) {
     modcod >>= 2;
     const auto* d = defaultQpsk1_4 ? ModcodDefs : ModcodDefs + 1;
-    if (modcod < (sizeof(ModcodDefs) / sizeof(ModcodDef_t))) {
+    if (modcod < 28) {
         d = ModcodDefs + modcod;
     }
     return d->modulation;
@@ -856,7 +846,7 @@ static const char* extractModcodModulation(uint32_t modcod, bool defaultQpsk1_4
 static const char* extractModcodSpeed(uint32_t modcod, bool defaultQpsk1_4 = true) {
     modcod >>= 2;
     const auto* d = defaultQpsk1_4 ? ModcodDefs : ModcodDefs + 1;
-    if (modcod < (sizeof(ModcodDefs) / sizeof(ModcodDef_t))) {
+    if (modcod < 28) {
         d = ModcodDefs + modcod;
     }
     return d->speed;
@@ -883,15 +873,15 @@ std::string api_driver::ApiDriver::loadSettings() const {
 
     std::stringstream result;
     result << "{\n\"txAutoStart\":" << boolAsStr(modSettings.is_save_current_state);
+#ifdef MODEM_IS_SCPC
     result << ",\"txEn\":" << boolAsStr(modSettings.tx_is_on);
-#ifdef MODEM_IS_SCPC
-    result << ",\"txIsTestInput\":" << boolAsStr(modSettings.is_test_data);
-#endif
     result << ",\"txModulatorIsTest\":" << boolAsStr(!modSettings.is_carrier);
+#endif
+    result << ",\"txIsTestInput\":" << boolAsStr(modSettings.is_test_data);
     result << ",\"txCentralFreq\":"; writeDouble(result, modSettings.central_freq_in_kGz);
-#ifdef MODEM_IS_SCPC
     result << ",\"txBaudrate\":" << modSettings.baudrate;
     result << ",\"txRolloff\":" << static_cast<int>(modSettings.rollof);
+#ifdef MODEM_IS_SCPC
     result << ",\"txGoldan\":" << static_cast<int>(modSettings.gold_seq_is_active);
 #endif
     result << ",\"txAttenuation\":"; writeDouble(result, modSettings.attenuation);
@@ -1027,13 +1017,13 @@ void api_driver::ApiDriver::setRxTxSettings(boost::property_tree::ptree &pt) {
     mod.tx_is_on = pt.get<bool>("txEn");
 #ifdef MODEM_IS_SCPC
     mod.is_save_current_state = pt.get<bool>("txAutoStart");
-    mod.is_test_data = pt.get<bool>("txIsTestInput");
-#endif
     mod.is_carrier = !pt.get<bool>("txModulatorIsTest");
+#endif
+    mod.is_test_data = pt.get<bool>("txIsTestInput");
     mod.central_freq_in_kGz = pt.get<double>("txCentralFreq");
-#ifdef MODEM_IS_SCPC
     mod.baudrate = pt.get<uint32_t>("txBaudrate");
-    mod.rollof = pt.get<unsigned int>("txRolloff");
+    mod.rollof = pt.get<int>("txRolloff");
+#ifdef MODEM_IS_SCPC
     mod.gold_seq_is_active = pt.get<bool>("txGoldan");
 #endif
     mod.attenuation = pt.get<double>("txAttenuation");
@@ -1046,10 +1036,10 @@ void api_driver::ApiDriver::setRxTxSettings(boost::property_tree::ptree &pt) {
     // демодулятор
     demod.is_aru_on = pt.get<bool>("rxAgcEn");
     demod.gain = pt.get<double>("rxManualGain");
-    demod.is_rvt_iq = pt.get<bool>("rxSpectrumInversion");
+    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<unsigned int>("rxRolloff");
+    demod.rollof = pt.get<int>("rxRolloff");
 #ifdef MODEM_IS_SCPC
     demod.gold_seq_is_active = pt.get<bool>("rxGoldan");
 #endif

static/main-scpc.html

@@ -216,12 +216,7 @@
                             <option v-for="speed in getAvailableModcods(paramRxtx.dvbCcmModulation)" v-bind:value="speed">{{ speed }}</option>
                         </select>
                     </label>
-                    <label v-show="paramRxtx.dvbIsAcm === false">
+                    <label v-show="paramRxtx.dvbIsAcm === true"><span>Текущий модкод</span><input type="text" readonly v-model="statTx.modcod"/></label>
-                        <span>Расчетная скорость, kbit</span><span>{{ calcInterfaceSpeedKb(paramRxtx.txBaudrate, paramRxtx.dvbCcmModulation, paramRxtx.dvbCcmSpeed) }}</span>
-                    </label>
-                    <label v-show="paramRxtx.dvbIsAcm === true">
-                        <span>Текущий модкод</span><span>{{ statTx.modcod }}</span>
-                    </label>
                     <label v-show="paramRxtx.dvbIsAcm === true">
                         <span>Модуляция (мин. режим)</span>
                         <select v-model="paramRxtx.dvbAcmMinModulation" @change="paramRxtx.dvbAcmMinSpeed = correctModcodSpeed(paramRxtx.dvbAcmMinModulation, paramRxtx.dvbAcmMinSpeed)">
@@ -237,9 +232,6 @@
                             <option v-for="speed in getAvailableModcods(paramRxtx.dvbAcmMinModulation)" v-bind:value="speed">{{ speed }}</option>
                         </select>
                     </label>
-                    <label v-show="paramRxtx.dvbIsAcm === true">
-                        <span>Расчетная скорость (мин. режим), kbit</span><span>{{ calcInterfaceSpeedKb(paramRxtx.txBaudrate, paramRxtx.dvbAcmMinModulation, paramRxtx.dvbAcmMinSpeed) }}</span>
-                    </label>
                     <label v-show="paramRxtx.dvbIsAcm === true">
                         <span>Модуляция (макс. режим)</span>
                         <select v-model="paramRxtx.dvbAcmMaxModulation" @change="paramRxtx.dvbAcmMaxSpeed = correctModcodSpeed(paramRxtx.dvbAcmMaxModulation, paramRxtx.dvbAcmMaxSpeed)">
@@ -255,9 +247,6 @@
                             <option v-for="speed in getAvailableModcods(paramRxtx.dvbAcmMaxModulation)" v-bind:value="speed">{{ speed }}</option>
                         </select>
                     </label>
-                    <label v-show="paramRxtx.dvbIsAcm === true">
-                        <span>Расчетная скорость (макс. режим), kbit</span><span>{{ calcInterfaceSpeedKb(paramRxtx.txBaudrate, paramRxtx.dvbAcmMaxModulation, paramRxtx.dvbAcmMaxSpeed) }}</span>
-                    </label>
                     <label><span>Запас ОСШ, дБ</span><input type="number" v-model="paramRxtx.dvbSnrReserve" max="10" step="0.01"/></label>
                 </div>
                 <div class="settings-set-container">
@@ -280,9 +269,7 @@
                         </select>
                     </label>
                     <label v-show="paramRxtx.rxAgcEn === false"><span>Усиление, дБ</span><input type="number" v-model="paramRxtx.rxManualGain" min="-40" max="40" step="0.01"/></label>
-                    <label v-show="paramRxtx.rxAgcEn === true">
+                    <label v-show="paramRxtx.rxAgcEn === true"><span>Текущее усиление</span><input type="text" readonly v-model="paramRxtx.rxManualGain"/></label>
-                        <span>Текущее усиление</span><span>{{ paramRxtx.rxManualGain }}</span>
-                    </label>
                     <label>
                         <span>Инверсия спектра</span>
                         <span class="toggle-input"><input type="checkbox" v-model="paramRxtx.rxSpectrumInversion" /><span class="slider"></span></span>
@@ -539,7 +526,7 @@
         <p>Последнее обновление статистики: {{ lastUpdateTime }}</p>
     </div>
 </div>
-<script src="/js/vue.js?v=3.5.13"></script>
+<script src="/js/vue.js"></script>
 <script>
     const availableTabs = ['monitoring', 'setup', 'qos', 'admin']
 
@@ -1020,16 +1007,9 @@
                     this.statRx.packetsBad = 0
                     this.statRx.packetsDummy = 0
                 })
-            },
+            },            // ========== include end from 'common/monitoring-methods.js.j2'
-            // ========== include end from 'common/monitoring-methods.js.j2'
 
             // ========== include from 'common/setup-methods.js.j2'
-            calcInterfaceSpeedKb(baud, modulation, speed) {
-                const mMod = Math.max(2, ['', '', 'qpsk', '8psk', '16apsk', '32apsk'].indexOf(modulation))
-                const speedVals = {'1/4': 0.25, '1/3': 0.333, '2/5': 0.4, '1/2': 0.5, '3/5': 0.6, '2/3': 0.666, '3/4': 0.75, '4/5': 0.8, '5/6': 0.833, '8/9': 0.888, '9/10': 0.9}
-                const mSpeed = speed in speedVals ? speedVals[speed] : 1
-                return ((baud * mMod * mSpeed) / 1024).toLocaleString()
-            },
             // ========== include end from 'common/setup-methods.js.j2'
 
             // ========== include from 'common/qos-methods.js.j2'

static/main-tdma.html

@@ -121,13 +121,14 @@
                         <span class="toggle-input"><input type="checkbox" v-model="paramRxtx.txEn" /><span class="slider"></span></span>
                     </label>
                     <label>
-                        <span>Режим работы модулятора</span>
+                        <span>Входные данные</span>
-                        <select v-model="paramRxtx.txModulatorIsTest">
+                        <select v-model="paramRxtx.txIsTestInput">
-                            <option :value="false">Нормальный</option>
+                            <option :value="false">SCPC</option>
-                            <option :value="true">Тест (CW)</option>
+                            <option :value="true">Тест</option>
                         </select>
                     </label>
-                    <label v-show="paramRxtx.txModulatorIsTest"><span>Центральная частота, КГц</span><input type="number" v-model="paramRxtx.txCentralFreq" min="900000" step="0.01"/></label>
+                    <label v-show="paramRxrx.txIsTestInput"><span>Центральная частота, КГц</span><input type="number" v-model="paramRxtx.txCentralFreq" min="900000" step="0.01"/></label>
+                    <label v-show="paramRxrx.txIsTestInput"><span>Символьная скорость, Бод</span><input type="number" v-model="paramRxtx.txBaudrate" step="1"/></label>
                     <label><span>Ослабление, дБ</span><input type="number" v-model="paramRxtx.txAttenuation" step="1"/></label>
                 </div>
                 <div class="settings-set-container">
@@ -258,7 +259,7 @@
         <p>Последнее обновление статистики: {{ lastUpdateTime }}</p>
     </div>
 </div>
-<script src="/js/vue.js?v=3.5.13"></script>
+<script src="/js/vue.js"></script>
 <script>
     const availableTabs = ['monitoring', 'setup', 'admin']
 
@@ -291,8 +292,9 @@
                 // ========== include from 'common/all-params-data.js.j2'
                 paramRxtx: {
                     txEn: false,
-                    txModulatorIsTest: false,
+                    txIsTestInput: false,
                     txCentralFreq: 900000,
+                    txBaudrate: 0,
                     txAttenuation: 0,
                     rxAgcEn: true,
                     rxManualGain: -40,
@@ -420,8 +422,9 @@
 
                 let query = {
                     "txEn": this.paramRxtx.txEn,
-                    "txModulatorIsTest": this.paramRxtx.txModulatorIsTest,
+                    "txIsTestInput": this.paramRxtx.txIsTestInput,
                     "txCentralFreq": this.paramRxtx.txCentralFreq,
+                    "txBaudrate": this.paramRxtx.txBaudrate,
                     "txAttenuation": this.paramRxtx.txAttenuation,
                     "rxAgcEn": this.paramRxtx.rxAgcEn,
                     "rxManualGain": this.paramRxtx.rxManualGain,
@@ -477,8 +480,9 @@
             updateRxtxSettings(vals) {
                 this.submitStatus.rxtx = false
                 this.paramRxtx.txEn = vals["settings"]["txEn"]
-                this.paramRxtx.txModulatorIsTest = vals["settings"]["txModulatorIsTest"]
+                this.paramRxtx.txIsTestInput = vals["settings"]["txIsTestInput"]
                 this.paramRxtx.txCentralFreq = vals["settings"]["txCentralFreq"]
+                this.paramRxtx.txBaudrate = vals["settings"]["txBaudrate"]
                 this.paramRxtx.txAttenuation = vals["settings"]["txAttenuation"]
                 this.paramRxtx.rxAgcEn = vals["settings"]["rxAgcEn"]
                 this.paramRxtx.rxManualGain = vals["settings"]["rxManualGain"]
@@ -587,8 +591,7 @@
                     this.statRx.packetsBad = 0
                     this.statRx.packetsDummy = 0
                 })
-            },
+            },            // ========== include end from 'common/monitoring-methods.js.j2'
-            // ========== include end from 'common/monitoring-methods.js.j2'
 
             // ========== include from 'common/setup-methods.js.j2'
             // ========== include end from 'common/setup-methods.js.j2'