fix: восстановил чтение статуса обновление с предупреждением, что в этом месте API зависает

CI: установка переменной GIT_SUBMODULE_STRATEGY=recursive
Merge remote-tracking branch 'origin/tdma-lo-feature'
2025-07-18 16:32:05 +03:00 · 2025-07-14 13:31:46 +03:00 · 2025-07-14 11:38:43 +03:00 · 2025-07-14 11:37:40 +03:00 · 2025-07-10 11:26:42 +03:00 · 2025-07-05 15:10:09 +03:00
22 changed files with 1000 additions and 337 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,9 +8,9 @@ test for build:
    - cpp-test-universal
  only:
    - master
+  variables:
+    GIT_SUBMODULE_STRATEGY: recursive
  script:
-    - git submodule init
-    - git submodule update
    - cmake -DCMAKE_BUILD_TYPE=Debug -DMODEM_TYPE=TDMA -B cmake-build-debug-tdma
    - cmake -DCMAKE_BUILD_TYPE=Debug -DMODEM_TYPE=SCPC -B cmake-build-debug-scpc
    - cmake -DCMAKE_BUILD_TYPE=Debug -DMODEM_TYPE=SHPS -B cmake-build-debug-shps
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,9 @@
 [submodule "dependencies/control_system_client"]
 	path = dependencies/control_system_client
 	url = http://gitlab.devrss.vg/mf-tdma/protocol_processing/control_system_client.git
+[submodule "dependencies/control_system_client_tdma"]
+	path = dependencies/control_system_client_tdma
+	url = http://gitlab.devrss.vg/mf-tdma/protocol_processing/control_system_client.git
+[submodule "dependencies/control_system_client_shps"]
+	path = dependencies/control_system_client_shps
+	url = http://gitlab.devrss.vg/mf-tdma/protocol_processing/control_system_client.git
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,12 +18,15 @@ endif()
 if("${MODEM_TYPE}" STREQUAL "SCPC")
    add_definitions(-DMODEM_IS_SCPC)
    message(STATUS "Selected SCPC modem")
+    add_subdirectory(dependencies/control_system_client) # подключение правильного control system client SCPC, ветка main
 elseif ("${MODEM_TYPE}" STREQUAL "TDMA")
    add_definitions(-DMODEM_IS_TDMA)
    message(STATUS "Selected TDMA modem")
+    add_subdirectory(dependencies/control_system_client_tdma) # подключение правильного control system client TDMA, ветка terminal-tdma
 elseif ("${MODEM_TYPE}" STREQUAL "SHPS")
    add_definitions(-DMODEM_IS_SHPS)
    message(STATUS "Selected SHPS modem")
+    add_subdirectory(dependencies/control_system_client_shps) # подключение правильного control system client SHPS, ветка shps
 else()
    message(FATAL_ERROR "You must set `MODEM_TYPE` \"SCPC\" or \"TDMA\" or \"SHPS\"!")
 endif()
@@ -52,7 +55,6 @@ add_compile_options(-Wall -Wextra -Wsign-conversion -DPROJECT_GIT_REVISION="${PR
 # максимальный размер тела запроса 200mb
 add_definitions(-DHTTP_MAX_PAYLOAD=200000000)

-add_subdirectory(dependencies/control_system_client)

 include_directories(src/)

--- a/dependencies/control_system_client
+++ b/dependencies/control_system_client
--- a/dependencies/control_system_client_shps
+++ b/dependencies/control_system_client_shps
--- a/dependencies/control_system_client_tdma
+++ b/dependencies/control_system_client_tdma
--- a/devtool.py
+++ b/devtool.py
@@ -44,6 +44,25 @@ def cp_get_dma_debug(base_url, param_name):
    return res.content.decode('utf-8')


+def cp_set_network(base_url, param_name, value):
+    session = do_login(base_url)
+    res = session.post(f"{base_url}/dev/cpapicall", params={
+        "f": "SetDmaDebug",
+        "param": param_name,
+        "value": value
+    })
+    return res.content.decode('utf-8')
+
+
+def cp_get_network(base_url, param_name):
+    session = do_login(base_url)
+    res = session.post(f"{base_url}/dev/cpapicall", params={
+        "f": "GetDmaDebug",
+        "param": param_name
+    })
+    return res.content.decode('utf-8')
+
+
 def set_logging(base_url, value):
    print(cp_set_dma_debug(base_url, "log_bool", value))

@@ -53,6 +72,8 @@ if __name__ == '__main__':
        print(f"Usage: {sys.argv[0]} http(s)://terminal-url logging on|off")
        print(f"                                            set_dma_debug <param_name> <value>")
        print(f"                                            get_dma_debug <param_name>")
+        print(f"                                            set_network <param_name> <value>")
+        print(f"                                            get_network <param_name>")
        exit(1)

    if sys.argv[2] == "logging":
@@ -67,7 +88,17 @@ if __name__ == '__main__':
            print(cp_set_dma_debug(sys.argv[1], sys.argv[3], sys.argv[4]))
    elif sys.argv[2] == "get_dma_debug":
        if len(sys.argv) != 4:
-            print("Wrong set dma debug usage!")
+            print("Wrong get dma debug usage!")
+        else:
+            print(cp_get_dma_debug(sys.argv[1], sys.argv[3]))
+    elif sys.argv[2] == "set_network":
+        if len(sys.argv) != 5:
+            print("Wrong set network usage!")
+        else:
+            print(cp_set_dma_debug(sys.argv[1], sys.argv[3], sys.argv[4]))
+    elif sys.argv[2] == "get_network":
+        if len(sys.argv) != 4:
+            print("Wrong get dma debug usage!")
        else:
            print(cp_get_dma_debug(sys.argv[1], sys.argv[3]))
    else:
--- a/front-generator/render-params.json
+++ b/front-generator/render-params.json
@@ -42,7 +42,7 @@
                  {"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"}]
+                    "values": [{"label": "0.02", "value": "20"}, {"label": "0.05", "value": "50"}, {"label": "0.10", "value": "100"}, {"label": "0.15", "value": "150"}, {"label": "0.20", "value": "200"}, {"label": "0.25", "value": "250"}]
                  }
                ]
              }
@@ -65,7 +65,8 @@
                      {"label": "Выкл", "value": "0"},
                      {"label": "24В", "value": "24"}
                    ]
-                  }
+                  },
+                  {"widget": "number-int", "label": "Частота LO, кГц", "name": "bucLoKhz",  "min": 0, "max": 40000000, "step": 1}
                ]
              },
              {
@@ -81,7 +82,8 @@
                      {"label": "18В", "value": "18"},
                      {"label": "24В", "value": "24"}
                    ]
-                  }
+                  },
+                  {"widget": "number-int", "label": "Частота LO, кГц", "name": "lnbLoKhz",  "min": 0, "max": 40000000, "step": 1}
                ]
              },
              {
@@ -101,17 +103,17 @@
            "widget": "settings-container",
            "childs": [
              {
-                "widget": "select", "label": "Метод расчета задержки", "name": "dpdiIsPositional",
+                "widget": "select", "label": "Метод расчета задержки", "name": "isPositional",
                "values": [
                  {"label": "Позиционированием", "value": "true"},
                  {"label": "Окном задержки", "value": "false"}
                ]
              },
-              {"widget": "h2", "label": "Настройки позиционирования", "v_show": "paramDpdi.dpdiIsPositional === true"},
-              {"widget": "number", "label": "Широта станции", "name": "dpdiPositionStationLatitude", "v_show": "paramDpdi.dpdiIsPositional === true", "min": -180, "step": 0.000001, "max":  180},
-              {"widget": "number", "label": "Долгота станции", "name": "dpdiPositionStationLongitude", "v_show": "paramDpdi.dpdiIsPositional === true", "min": -180, "step": 0.000001, "max":  180},
-              {"widget": "number", "label": "Подспутниковая точка", "name": "dpdiPositionSatelliteLongitude", "v_show": "paramDpdi.dpdiIsPositional === true", "min": -180, "step": 0.000001, "max":  180},
-              {"widget": "number", "label": "Задержка до спутника, мс", "name": "dpdiDelay", "v_show": "paramDpdi.dpdiIsPositional === false", "min": 0, "step": 0.1, "max":  400}]
+              {"widget": "h2", "label": "Настройки позиционирования", "v_show": "paramDpdi.isPositional === true"},
+              {"widget": "number", "label": "Широта станции", "name": "positionStationLatitude", "v_show": "paramDpdi.isPositional === true", "min": -180, "step": 0.000001, "max":  180},
+              {"widget": "number", "label": "Долгота станции", "name": "positionStationLongitude", "v_show": "paramDpdi.isPositional === true", "min": -180, "step": 0.000001, "max":  180},
+              {"widget": "number", "label": "Подспутниковая точка", "name": "positionSatelliteLongitude", "v_show": "paramDpdi.isPositional === true", "min": -180, "step": 0.000001, "max":  180},
+              {"widget": "number", "label": "Задержка до спутника, мс", "name": "delay", "v_show": "paramDpdi.isPositional === false", "min": 0, "step": 0.1, "max":  400}]
          },
          {"widget": "submit"}
        ],
@@ -120,10 +122,10 @@
          {
            "widget": "settings-container",
            "childs": [
-              {"widget": "text", "label": "Пароль для входа в сеть ЦЗС", "name": "netCesPassword"},
+              {"widget": "text", "label": "Пароль для входа в сеть ЦЗС", "name": "cesPassword"},
              {"widget": "h3", "label": "Настройки интерфейса управления"},
-              {"widget": "ip-address", "label": "IP Интерфейса управления (/24)", "name": "netManagementIp"},
-              {"widget": "text", "label": "Имя веб-сервера", "name": "netServerName"}
+              {"widget": "ip-address-mask", "label": "Интерфейс управления (a.d.d.r/mask)", "name": "managementIp"},
+              {"widget": "text", "label": "Имя веб-сервера", "name": "serverName"}
            ]
          }
        ]
@@ -170,11 +172,11 @@
                    "values": [{"label": "Ethernet", "value": "false"}, {"label": "Тест", "value": "true"}]
                  },
                  {"widget": "h3", "label": "Параметры передачи"},
-                  {"widget": "number-int", "label": "Центральная частота, КГц", "name": "txCentralFreq", "min": 950000, "max": 6000000, "step": 0.01},
+                  {"widget": "number-int", "label": "Центральная частота, КГц", "name": "txCentralFreq", "min": 100000, "max": 6000000, "step": 0.01},
                  {"widget": "number-int", "label": "Символьная скорость, Бод", "name": "txBaudrate", "min": 200000, "max": 54000000},
                  {
                    "widget": "select", "label": "Roll-off", "name": "txRolloff",
-                    "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"}]
+                    "values": [{"label": "0.02", "value": "20"}, {"label": "0.05", "value": "50"}, {"label": "0.10", "value": "100"}, {"label": "0.15", "value": "150"}, {"label": "0.20", "value": "200"}, {"label": "0.25", "value": "250"}]
                  },
                  {
                    "widget": "select", "label": "Номер последовательности Голда", "name": "txGoldan",
@@ -217,7 +219,7 @@
                  {"widget": "checkbox", "label": "Авто-регулировка мощности", "name": "aupcEn"},
                  {"widget": "number", "label": "Минимальное ослабление, дБ", "name": "aupcMinAttenuation", "min": 0, "step": 0.1, "max": 10},
                  {"widget": "number", "label": "Максимальное ослабление, дБ", "name": "aupcMaxAttenuation", "min": 0, "step": 0.1, "max": 10},
-                  {"widget": "number", "label": "Требуемое ОСШ", "name": "aupcRequiredSnr", "min": 0, "step": 0.01, "max": 10}
+                  {"widget": "number", "label": "Требуемое ОСШ", "name": "aupcRequiredSnr", "min": 0, "step": 0.01, "max": 30}
                ]
              },
              {
@@ -231,11 +233,11 @@
                  {"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": "checkbox", "label": "Инверсия спектра", "name": "rxSpectrumInversion"},
-                  {"widget": "number-int", "label": "Центральная частота, КГц", "name": "rxCentralFreq", "min": 950000, "max": 6000000, "step": 0.01},
+                  {"widget": "number-int", "label": "Центральная частота, КГц", "name": "rxCentralFreq", "min": 100000, "max": 6000000, "step": 0.01},
                  {"widget": "number-int", "label": "Символьная скорость, Бод", "name": "rxBaudrate", "min": 200000, "max": 54000000},
                  {
                    "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"}]
+                    "values": [{"label": "0.02", "value": "20"}, {"label": "0.05", "value": "50"}, {"label": "0.10", "value": "100"}, {"label": "0.15", "value": "150"}, {"label": "0.20", "value": "200"}, {"label": "0.25", "value": "250"}]
                  },
                  {
                    "widget": "select", "label": "Номер последовательности Голда", "name": "rxGoldan",
@@ -252,20 +254,20 @@
            "widget": "settings-container", "v_show": "paramRxtx.isCinC",
            "childs": [
              {
-                "widget": "select", "label": "Метод расчета задержки", "name": "dpdiIsPositional",
+                "widget": "select", "label": "Метод расчета задержки", "name": "isPositional",
                "values": [
                  {"label": "Позиционированием", "value": "true"},
                  {"label": "Окном задержки", "value": "false"}
                ]
              },
-              {"widget": "number", "label": "Полоса поиска, КГц ±", "name": "dpdiSearchBandwidth", "min": 0, "step": 1, "max":  100},
-              {"widget": "h2", "label": "Настройки позиционирования", "v_show": "paramDpdi.dpdiIsPositional === true"},
-              {"widget": "number", "label": "Широта станции", "name": "dpdiPositionStationLatitude", "v_show": "paramDpdi.dpdiIsPositional === true", "min": -180, "step": 0.000001, "max":  180},
-              {"widget": "number", "label": "Долгота станции", "name": "dpdiPositionStationLongitude", "v_show": "paramDpdi.dpdiIsPositional === true", "min": -180, "step": 0.000001, "max":  180},
-              {"widget": "number", "label": "Подспутниковая точка", "name": "dpdiPositionSatelliteLongitude", "v_show": "paramDpdi.dpdiIsPositional === true", "min": -180, "step": 0.000001, "max":  180},
-              {"widget": "h2", "label": "Задержка до спутника", "v_show": "paramDpdi.dpdiIsPositional === false"},
-              {"widget": "number", "label": "от, мс", "name": "dpdiDelayMin", "v_show": "paramDpdi.dpdiIsPositional === false", "min": 0, "step": 0.1, "max":  400},
-              {"widget": "number", "label": "до, мс", "name": "dpdiDelayMax", "v_show": "paramDpdi.dpdiIsPositional === false", "min": 0, "step": 0.1, "max":  400}]
+              {"widget": "number", "label": "Полоса поиска, КГц ±", "name": "searchBandwidth", "min": 0, "step": 1, "max":  100},
+              {"widget": "h2", "label": "Настройки позиционирования", "v_show": "paramDpdi.isPositional === true"},
+              {"widget": "number", "label": "Широта станции", "name": "positionStationLatitude", "v_show": "paramDpdi.isPositional === true", "min": -180, "step": 0.000001, "max":  180},
+              {"widget": "number", "label": "Долгота станции", "name": "positionStationLongitude", "v_show": "paramDpdi.isPositional === true", "min": -180, "step": 0.000001, "max":  180},
+              {"widget": "number", "label": "Подспутниковая точка", "name": "positionSatelliteLongitude", "v_show": "paramDpdi.isPositional === true", "min": -180, "step": 0.000001, "max":  180},
+              {"widget": "h2", "label": "Задержка до спутника", "v_show": "paramDpdi.isPositional === false"},
+              {"widget": "number", "label": "от, мс", "name": "delayMin", "v_show": "paramDpdi.isPositional === false", "min": 0, "step": 0.1, "max":  400},
+              {"widget": "number", "label": "до, мс", "name": "delayMax", "v_show": "paramDpdi.isPositional === false", "min": 0, "step": 0.1, "max":  400}]
          },
          {"widget": "submit", "v_show": "paramRxtx.isCinC"}
        ],
@@ -322,14 +324,14 @@
            "widget": "settings-container",
            "childs": [
              {"widget": "h3", "label": "Настройки интерфейса управления"},
-              {"widget": "ip-address", "label": "Интерфейс управления (/24)", "name": "netManagementIp"},
+              {"widget": "ip-address-mask", "label": "Интерфейс управления (a.d.d.r/mask)", "name": "managementIp"},
              {
-                "widget": "select", "label": "Режим сети", "name": "netIsL2",
+                "widget": "select", "label": "Режим сети", "name": "isL2",
                "values": [{"label": "Маршрутизатор", "value": "false"}, {"label": "Коммутатор", "value": "true"}]
              },
-              {"widget": "ip-address", "label": "Интерфейс данных (/24)", "name": "netDataIp", "v_show": "paramNetwork.netIsL2 === false"},
-              {"widget": "number", "label": "MTU интерфейса данных", "name": "netDataMtu", "min": 1500, "step": 1, "max": 2000},
-              {"widget": "text", "label": "Имя веб-сервера", "name": "netServerName"}
+              {"widget": "ip-address", "label": "Интерфейс данных (/24)", "name": "dataIp", "v_show": "paramNetwork.isL2 === false"},
+              {"widget": "number", "label": "MTU интерфейса данных", "name": "dataMtu", "min": 1500, "step": 1, "max": 2000},
+              {"widget": "text", "label": "Имя веб-сервера", "name": "serverName"}
            ]
          }
        ]
@@ -368,20 +370,26 @@
                    "values": [{"label": "Ethernet", "value": "false"}, {"label": "Тест", "value": "true"}]
                  },
                  {"widget": "h3", "label": "Параметры передачи"},
-                  {"widget": "number", "label": "Центральная частота, КГц", "name": "txCentralFreq", "min": 950000, "max": 6000000, "step": 0.01},
+                  {"widget": "number", "label": "Центральная частота, КГц", "name": "txCentralFreq", "min": 100000, "max": 6000000, "step": 0.01},
                  {"widget": "number", "label": "Символьная скорость, Бод", "name": "txBaudrate", "min": 200000, "max": 54000000},
                  {
                    "widget": "select", "label": "Roll-off", "name": "txRolloff",
-                    "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"}]
+                    "values": [{"label": "0.02", "value": "20"}, {"label": "0.05", "value": "50"}, {"label": "0.10", "value": "100"}, {"label": "0.15", "value": "150"}, {"label": "0.20", "value": "200"}, {"label": "0.25", "value": "250"}]
                  },
                  {"widget": "number", "label": "Коэф. расширения", "name": "txSpreadCoef", "max": 1000, "min": -1000, "step": 0.01},
-                  {
-                    "widget": "select", "label": "Номер последовательности Голда", "name": "txGoldan",
-                    "values": [{"label": "0", "value": "0"}, {"label": "1", "value": "1"}]
-                  },
                  {"widget": "number", "label": "Ослабление, дБ", "name": "txAttenuation", "max": 0, "min": -40, "step": 0.25}
                ]
              },
+              {
+                "widget": "settings-container",
+                "childs": [
+                  {"widget": "h3", "label": "Авто-регулировка мощности"},
+                  {"widget": "checkbox", "label": "Авто-регулировка мощности", "name": "aupcEn"},
+                  {"widget": "number", "label": "Минимальное ослабление, дБ", "name": "aupcMinAttenuation", "min": 0, "step": 0.1, "max": 10},
+                  {"widget": "number", "label": "Максимальное ослабление, дБ", "name": "aupcMaxAttenuation", "min": 0, "step": 0.1, "max": 10},
+                  {"widget": "number", "label": "Требуемое ОСШ", "name": "aupcRequiredSnr", "min": 0, "step": 0.01, "max": 30}
+                ]
+              },
              {
                "widget": "settings-container",
                "childs": [
@@ -393,17 +401,13 @@
                  {"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": "checkbox", "label": "Инверсия спектра", "name": "rxSpectrumInversion"},
-                  {"widget": "number", "label": "Центральная частота, КГц", "name": "rxCentralFreq", "min": 950000, "max": 6000000, "step": 0.01},
+                  {"widget": "number", "label": "Центральная частота, КГц", "name": "rxCentralFreq", "min": 100000, "max": 6000000, "step": 0.01},
                  {"widget": "number", "label": "Символьная скорость, Бод", "name": "rxBaudrate", "min": 200000, "max": 54000000},
                  {
                    "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"}]
+                    "values": [{"label": "0.02", "value": "20"}, {"label": "0.05", "value": "50"}, {"label": "0.10", "value": "100"}, {"label": "0.15", "value": "150"}, {"label": "0.20", "value": "200"}, {"label": "0.25", "value": "250"}]
                  },
-                  {"widget": "number", "label": "Коэф. расширения", "name": "rxSpreadCoef", "max": 1000, "min": -1000, "step": 0.01},
-                  {
-                    "widget": "select", "label": "Номер последовательности Голда", "name": "rxGoldan",
-                    "values": [{"label": "0", "value": "0"}, {"label": "1", "value": "1"}]
-                  }
+                  {"widget": "number", "label": "Коэф. расширения", "name": "rxSpreadCoef", "max": 1000, "min": -1000, "step": 0.01}
                ]
              }
            ]
@@ -455,6 +459,23 @@
              }
            ]
          }
+        ],
+        "network": [
+          {"widget": "h2", "label": "Настройки сети"},
+          {
+            "widget": "settings-container",
+            "childs": [
+              {"widget": "h3", "label": "Настройки интерфейса управления"},
+              {"widget": "ip-address-mask", "label": "Интерфейс управления (a.d.d.r/mask)", "name": "managementIp"},
+              {
+                "widget": "select", "label": "Режим сети", "name": "isL2",
+                "values": [{"label": "Маршрутизатор", "value": "false"}, {"label": "Коммутатор", "value": "true"}]
+              },
+              {"widget": "ip-address", "label": "Интерфейс данных (/24)", "name": "dataIp", "v_show": "paramNetwork.isL2 === false"},
+              {"widget": "number", "label": "MTU интерфейса данных", "name": "dataMtu", "min": 1500, "step": 1, "max": 2000},
+              {"widget": "text", "label": "Имя веб-сервера", "name": "serverName"}
+            ]
+          }
        ]
      },
      "tabs": [
--- a/front-generator/template/common/admin-methods.js.j2
+++ b/front-generator/template/common/admin-methods.js.j2
@@ -72,3 +72,130 @@
                this.submitStatus.modemReboot = 30
                fetch('/api/reboot', { method: 'POST' }).then((r) => {})
            },
+            async restoreAllSettings() {
+                // Порядок применения настроек
+                const settingsApplyOrder = ['qos', 'tcpaccel', 'dpdi', 'rxtx', 'buclnb', 'network'];
+
+                // 1. Чтение JSON-файла, выбранного пользователем
+                const fileInput = document.createElement('input');
+                fileInput.type = 'file';
+                fileInput.accept = '.json';
+
+                const filePromise = new Promise((resolve, reject) => {
+                    fileInput.onchange = e => {
+                        const file = e.target.files[0];
+                        if (!file) {
+                            reject(new Error('Файл не выбран'));
+                            return;
+                        }
+
+                        const reader = new FileReader();
+                        reader.onload = event => {
+                            try {
+                                const jsonData = JSON.parse(event.target.result);
+                                resolve(jsonData);
+                            } catch (error) {
+                                reject(new Error('Ошибка парсинга JSON'));
+                            }
+                        };
+                        reader.onerror = () => reject(new Error('Ошибка чтения файла'));
+                        reader.readAsText(file);
+                    };
+                    fileInput.click();
+                });
+
+                try {
+                    const settingsToApply = await filePromise;
+                    const errors = [];
+
+                    // 2. Перебор групп параметров в заданном порядке
+                    for (const groupName of settingsApplyOrder) {
+                        if (!settingsToApply.hasOwnProperty(groupName)) {
+                            continue; // Пропускаем группы, которых нет в файле
+                        }
+
+                        const groupSettings = settingsToApply[groupName];
+                        if (typeof groupSettings !== 'object' || groupSettings === null) {
+                            continue;
+                        }
+
+                        try {
+                            // 2.1. POST-запрос для применения группы параметров
+                            const postResponse = await fetch(`/api/set/${groupName}`, {
+                                method: 'POST',
+                                headers: {
+                                    'Content-Type': 'application/json',
+                                },
+                                body: JSON.stringify(groupSettings)
+                            });
+
+                            if (!postResponse.ok) {
+                                throw new Error(`HTTP error ${postResponse.status}`);
+                            }
+
+                            const postResult = await postResponse.json();
+                            if (postResult.status !== 'ok') {
+                                throw new Error(`API error: ${postResult.message || 'unknown error'}`);
+                            }
+
+                            // 2.2. Проверка примененных параметров
+                            const getResponse = await fetch('/api/get/settings', { method: 'GET' });
+                            if (!getResponse.ok) {
+                                throw new Error(`HTTP error ${getResponse.status}`);
+                            }
+
+                            const fetchSettingsResult = await getResponse.json();
+                            if (fetchSettingsResult.status !== 'ok') {
+                                throw new Error('Не удалось получить текущие настройки');
+                            }
+
+                            // Проверка соответствия параметров
+                            const appliedGroup = fetchSettingsResult.settings[groupName] || {};
+                            const failedSettings = [];
+
+                            for (const [key, value] of Object.entries(groupSettings)) {
+                                if (appliedGroup[key] !== value) {
+                                    failedSettings.push(`${key} (ожидалось: ${value}, получено: ${appliedGroup[key]})`);
+                                }
+                            }
+
+                            if (failedSettings.length > 0) {
+                                throw new Error(`Не совпадают параметры: ${failedSettings.join(', ')}`);
+                            }
+
+                        } catch (groupError) {
+                            errors.push(`Группа ${groupName}: ${groupError.message}`);
+                        }
+                    }
+
+                    // 3. Показ ошибок, если они есть
+                    if (errors.length > 0) {
+                        const errorMessage = errors.join('\n\n') +
+                            '\n\nНекоторые настройки могли примениться некорректно.\nСтраница будет перезагружена.';
+                        alert(errorMessage);
+                    }
+
+                } catch (error) {
+                    alert(`Ошибка при восстановлении настроек: ${error.message}`);
+                    return;
+                }
+
+                // 4. Перезагрузка страницы
+                location.reload();
+            },
+            async dumpAllSettings() {
+                function downloadAsFile(data, filename) {
+                    let a = document.createElement("a");
+                    let file = new Blob([data], {type: 'application/json'});
+                    a.href = URL.createObjectURL(file);
+                    a.download = filename;
+                    a.click();
+                }
+                const response = await fetch('/api/get/settings', { method: 'GET' })
+                if (response.ok) {
+                    const jres = await response.json()
+                    if (jres["status"] === "ok") {
+                        downloadAsFile(JSON.stringify(jres["settings"], null, 4), "backup-" + this.about.firmwareVersion + "-" + this.about.modemSn + ".json")
+                    }
+                }
+            },
--- a/front-generator/template/common/admin.html.j2
+++ b/front-generator/template/common/admin.html.j2
@@ -21,6 +21,8 @@
                <div>
                    <button class="dangerous-button" onclick="fetch('/api/resetSettings', { method: 'POST' }).then((r) => { window.location.reload(); })">Сбросить модем до заводских настроек</button>
                </div>
+                <button class="action-button" @click="dumpAllSettings()">Сохранить бекап конфигурации</button>
+                <button class="dangerous-button" @click="restoreAllSettings()">Восстановить бекап конфигурации</button>
            </div>

            <h2>Обновление ПО</h2>
--- a/front-generator/template/common/monitoring-methods.js.j2
+++ b/front-generator/template/common/monitoring-methods.js.j2
@@ -29,42 +29,42 @@
                this.statRx.freq_search_lock = vals["state"]["rx"]["freq_search_lock"]
                this.statRx.afc_lock = vals["state"]["rx"]["afc_lock"]
                this.statRx.pkt_sync = vals["state"]["rx"]["pkt_sync"]
-                this.statRx.snr = vals["state"]["rx"]["snr"]
-                this.statRx.rssi = vals["state"]["rx"]["rssi"]
+                this.statRx.snr = Math.round(vals["state"]["rx"]["snr"] * 10) / 10
+                this.statRx.rssi = Math.round(vals["state"]["rx"]["rssi"] * 10) / 10
                this.statRx.modcod = modcodToStr(vals["state"]["rx"]["modcod"])
                this.statRx.frameSizeNormal = vals["state"]["rx"]["frameSizeNormal"]
                this.statRx.isPilots = vals["state"]["rx"]["isPilots"]
                this.statRx.symError = vals["state"]["rx"]["symError"]
-                this.statRx.freqErr = vals["state"]["rx"]["freqErr"]
-                this.statRx.freqErrAcc = vals["state"]["rx"]["freqErrAcc"]
+                this.statRx.freqErr = Math.round(vals["state"]["rx"]["freqErr"] * 100) / 100
+                this.statRx.freqErrAcc = Math.round(vals["state"]["rx"]["freqErrAcc"] * 100) / 100
                this.statRx.inputSignalLevel = vals["state"]["rx"]["inputSignalLevel"]
-                this.statRx.pllError = vals["state"]["rx"]["pllError"]
-                this.statRx.speedOnRxKbit = vals["state"]["rx"]["speedOnRxKbit"]
-                this.statRx.speedOnIifKbit = vals["state"]["rx"]["speedOnIifKbit"]
+                this.statRx.pllError = Math.round(vals["state"]["rx"]["pllError"] * 100) / 100
+                this.statRx.speedOnRxKbit = Math.round(vals["state"]["rx"]["speedOnRxKbit"] * 100) / 100
+                this.statRx.speedOnIifKbit = Math.round(vals["state"]["rx"]["speedOnIifKbit"] * 100) / 100
                this.statRx.packetsOk = vals["state"]["rx"]["packetsOk"]
                this.statRx.packetsBad = vals["state"]["rx"]["packetsBad"]
                this.statRx.packetsDummy = vals["state"]["rx"]["packetsDummy"]

                {% if modem == 'scpc' %}
                this.statTx.state = vals["state"]["tx"]["state"]
-                this.statTx.snr = vals["state"]["tx"]["snr"]
+                this.statTx.snr = Math.round(vals["state"]["tx"]["snr"] * 100) / 100
                this.statTx.modcod = modcodToStr(vals["state"]["tx"]["modcod"])
                this.statTx.frameSizeNormal = vals["state"]["tx"]["frameSizeNormal"]
                this.statTx.isPilots = vals["state"]["tx"]["isPilots"]
-                this.statTx.speedOnTxKbit = vals["state"]["tx"]["speedOnTxKbit"]
-                this.statTx.speedOnIifKbit = vals["state"]["tx"]["speedOnIifKbit"]
+                this.statTx.speedOnTxKbit = Math.round(vals["state"]["tx"]["speedOnTxKbit"] * 100) / 100
+                this.statTx.speedOnIifKbit = Math.round(vals["state"]["tx"]["speedOnIifKbit"] * 100) / 100

                this.statCinc.occ = vals["state"]["cinc"]["occ"]
                this.statCinc.correlator = vals["state"]["cinc"]["correlator"]
                this.statCinc.correlatorFails = vals["state"]["cinc"]["correlatorFails"]
-                this.statCinc.freqErr = vals["state"]["cinc"]["freqErr"]
-                this.statCinc.freqErrAcc = vals["state"]["cinc"]["freqErrAcc"]
+                this.statCinc.freqErr = Math.round(vals["state"]["cinc"]["freqErr"] * 100) / 100
+                this.statCinc.freqErrAcc = Math.round(vals["state"]["cinc"]["freqErrAcc"] * 100) / 100
                this.statCinc.channelDelay = vals["state"]["cinc"]["channelDelay"]
                {% else %}
                this.statTx.state = vals["state"]["tx"]["state"]
                this.statTx.modcod = modcodToStr(vals["state"]["tx"]["modcod"])
-                this.statTx.speedOnTxKbit = vals["state"]["tx"]["speedOnTxKbit"]
-                this.statTx.speedOnIifKbit = vals["state"]["tx"]["speedOnIifKbit"]
+                this.statTx.speedOnTxKbit = Math.round(vals["state"]["tx"]["speedOnTxKbit"] * 100) / 100
+                this.statTx.speedOnIifKbit = Math.round(vals["state"]["tx"]["speedOnIifKbit"] * 100) / 100
                this.statTx.centerFreq = vals["state"]["tx"]["centerFreq"]
                this.statTx.symSpeed = vals["state"]["tx"]["symSpeed"]
                {% endif %}
@@ -91,9 +91,9 @@
                } else {
                    this.statOs.uptime = '?'
                }
-                this.statOs.load1 = vals["state"]["device"]["load1min"]
-                this.statOs.load5 = vals["state"]["device"]["load5min"]
-                this.statOs.load15 = vals["state"]["device"]["load15min"]
+                this.statOs.load1 = Math.round(vals["state"]["device"]["load1min"] * 100) / 100
+                this.statOs.load5 = Math.round(vals["state"]["device"]["load5min"] * 100) / 100
+                this.statOs.load15 = Math.round(vals["state"]["device"]["load15min"] * 100) / 100
                this.statOs.totalram = vals["state"]["device"]["totalram"]
                this.statOs.freeram = vals["state"]["device"]["freeram"]
            },
--- a/front-generator/template/common/widgets.j2
+++ b/front-generator/template/common/widgets.j2
@@ -58,6 +58,10 @@
    <span>{{ widget.label }}</span>
    <input v-model="param{{ param_group | title }}.{{ widget.name }}" required type="text" pattern="^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$">
 </label>{% endmacro %}
+{% macro build_widget_ip_address_mask(param_group, widget) %}<label{% if widget.v_show %} v-show="{{ widget.v_show }}"{% endif %}>
+    <span>{{ widget.label }}</span>
+    <input v-model="param{{ param_group | title }}.{{ widget.name }}" required type="text" pattern="^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\/([0-9]|[1-2][0-9]|3[0-2])$">
+</label>{% endmacro %}

 {% macro build_widget_text(param_group, widget) %}<label{% if widget.v_show %} v-show="{{ widget.v_show }}"{% endif %}>
    <span>{{ widget.label }}</span>
@@ -78,22 +82,23 @@
 {% elif widget.widget == 'modulation-modcod' %}{{ build_widget_modulation_modcod(param_group, widget) }}
 {% elif widget.widget == 'modulation-speed' %}{{ build_widget_modulation_speed(param_group, widget) }}
 {% elif widget.widget == 'ip-address' %}{{ build_widget_ip_address(param_group, widget) }}
+{% elif widget.widget == 'ip-address-mask' %}{{ build_widget_ip_address_mask(param_group, widget) }}
 {% elif widget.widget == 'text' %}{{ build_widget_text(param_group, widget) }}
 {% else %}<p>Widget '{{ widget.widget }}' not defined!</p><p>{{ widget }}</p>
 {% endif %}
 {% endmacro %}

 {% macro build_getter_js(param_group, widget) %}{% if widget.widget in ['flex-container', 'settings-container', 'h2', 'h3', 'submit', 'watch', 'watch-expr'] %}null{%
-elif widget.widget in ['checkbox', 'number', 'select', 'ip-address', 'modulation-modcod', 'modulation-speed', 'text'] %}this.param{{ param_group | title }}.{{ widget.name }}{%
+elif widget.widget in ['checkbox', 'number', 'select', 'ip-address', 'ip-address-mask', 'modulation-modcod', 'modulation-speed', 'text'] %}this.param{{ param_group | title }}.{{ widget.name }}{%
 elif widget.widget == 'number-int' %}parseFloat(this.param{{ param_group | title }}.{{ widget.name }}.replace(/[^0-9,.]/g, '').replace(',', '.')){%
 else %}<p>Widget '{{ widget.widget }}' not defined!</p><p>{{ widget }}</p>{% endif %}{% endmacro %}

 {% macro build_setter_js(param_group, widget, expr) %}{% if widget.widget in ['flex-container', 'settings-container', 'h2', 'h3', 'submit', 'watch', 'watch-expr'] %}null{%
-elif widget.widget in ['checkbox', 'number', 'select', 'ip-address', 'modulation-modcod', 'modulation-speed', 'text'] %}this.param{{ param_group | title }}.{{ widget.name }} = {{ expr }}{%
+elif widget.widget in ['checkbox', 'number', 'select', 'ip-address', 'ip-address-mask', 'modulation-modcod', 'modulation-speed', 'text'] %}this.param{{ param_group | title }}.{{ widget.name }} = {{ expr }}{%
 elif widget.widget == 'number-int' %}this.param{{ param_group | title }}.{{ widget.name }} = this.inputFormatNumber({{ expr }}, {{ js_build_number_number_validator(widget) }}){%
 else %}<p>Widget '{{ widget.widget }}' not defined!</p><p>{{ widget }}</p>{% endif %}{% endmacro %}

 {% macro build_setter(param_group, widget, expr) %}{% if widget.widget in ['flex-container', 'settings-container', 'h2', 'h3', 'submit', 'watch', 'watch-expr'] %}null{%
-elif widget.widget in ['checkbox', 'number', 'select', 'ip-address', 'modulation-modcod', 'modulation-speed', 'text'] %}param{{ param_group | title }}.{{ widget.name }} = {{ expr }}{%
+elif widget.widget in ['checkbox', 'number', 'select', 'ip-address', 'ip-address-mask', 'modulation-modcod', 'modulation-speed', 'text'] %}param{{ param_group | title }}.{{ widget.name }} = {{ expr }}{%
 elif widget.widget == 'number-int' %}param{{ param_group | title }}.{{ widget.name }} = inputFormatNumber({{ expr }}, {{ js_build_number_number_validator(widget) }}){%
 else %}<p>Widget '{{ widget.widget }}' not defined!</p><p>{{ widget }}</p>{% endif %}{% endmacro %}
--- a/src/api-driver/proxy.cpp
+++ b/src/api-driver/proxy.cpp
@@ -73,7 +73,7 @@ void api_driver::proxy::CpProxy::getAcmSettings(ACM_parameters_serv_ &dest) {
 }

 void api_driver::proxy::CpProxy::setAcmSettings(ACM_parameters_serv_ &dest) {
-    CPAPI_PROXY_CALL_HELPER("CpProxy::setAcmSettings", CP_GetAcmParams, (sid, &dest), "struct {...}");
+    CPAPI_PROXY_CALL_HELPER("CpProxy::setAcmSettings", CP_SetAcmParams, (sid, dest), "struct {...}");
 }
 #endif

--- a/src/api-driver/stricts-enable.h
+++ b/src/api-driver/stricts-enable.h
@@ -6,11 +6,11 @@
 #define API_OBJECT_DEBUG_METRICS_ENABLE
 #endif

-#if defined(MODEM_IS_SCPC)
+#if defined(MODEM_IS_SCPC) || defined(MODEM_IS_SHPS)
 #define API_STRUCT_ACM_ENABLE
 #endif

-#if defined(MODEM_IS_SCPC) || defined(MODEM_IS_TDMA)
+#if defined(MODEM_IS_SCPC) || defined(MODEM_IS_TDMA) || defined(MODEM_IS_SHPS)
 #define API_OBJECT_NETWORK_SETTINGS_ENABLE
 #endif

--- a/src/api-driver/structs.cpp
+++ b/src/api-driver/structs.cpp
@@ -9,50 +9,6 @@

 #define TIME_NOW() std::chrono::time_point_cast<std::chrono::milliseconds>(std::chrono::system_clock::now()).time_since_epoch().count()

-typedef boost::property_tree::ptree::path_type json_path;
-
-// static int calculateSubnetMask(const std::string& subnet_mask) {
-//     int mask = 0;
-//     std::istringstream iss(subnet_mask);
-//     std::string octet;
-//     while (std::getline(iss, octet, '.')) {
-//         int octet_value = std::stoi(octet);
-//         for (int i = 7; i >= 0; i--) {
-//             if (octet_value & (1 << i)) {
-//                 mask++;
-//             }
-//         }
-//     }
-//     return mask;
-// }
-
-/**
- * Преобразует строку вида `1.2.3.4/24` в пару строк вида `1.2.3.4` `255.255.255.0`
- */
-// std::pair<std::string, std::string> splitIpAndMask(const std::string& input) {
-//     auto pos = input.find('/');
-//     if (pos == std::string::npos) {
-//         // Обработка ошибки: нет символа '/'
-//         throw std::runtime_error("address not contains mask");
-//     }
-//     std::string ip = input.substr(0, pos);
-//     const unsigned int mask_int = std::stoul(input.substr(pos + 1));
-//
-//     if (mask_int > 32) {
-//         throw std::runtime_error("invalid mask");
-//     }
-//
-//     std::string mask_binary = std::string(mask_int, '1') + std::string(32 - mask_int, '0');
-//     std::string mask_str;
-//
-//     for (unsigned int i = 0; i < 4; ++i) {
-//         std::string octet = mask_binary.substr(i * 8u, 8);
-//         int octet_value = std::stoi(octet, nullptr, 2);
-//         mask_str += std::to_string(octet_value) + (i < 3 ? "." : "");
-//     }
-//
-//     return std::make_pair(ip, mask_str);
-// }
 static inline void rtrim(std::string &s) {
    s.erase(std::find_if(s.rbegin(), s.rend(), [](unsigned char ch) {
        return !std::isspace(ch);
@@ -94,14 +50,13 @@ std::string makeTimepointFromMillis(int64_t unix_time_ms) {
 #ifdef API_OBJECT_DEBUG_METRICS_ENABLE
 api_driver::obj::StatisticsLogger::StatisticsLogger(): timeStart(TIME_NOW()) {}

-std::string api_driver::obj::StatisticsLogger::getSettings() {
+nlohmann::json api_driver::obj::StatisticsLogger::getSettings() {
    std::lock_guard _lock(mutex);
-    std::stringstream res;
-    res << "{\"en\":" << boolAsStr(this->logEn);
-    res << ",\"logPeriodMs\":" << logPeriodMs;
-    res << ",\"maxAgeMs\":" << maxAgeMs;
-    res << '}';
-    return res.str();
+    nlohmann::json res;
+    res["en"] = this->logEn;
+    res["logPeriodMs"] = logPeriodMs.load();
+    res["maxAgeMs"] = maxAgeMs.load();
+    return res;
 }

 void api_driver::obj::StatisticsLogger::setSettings(const nlohmann::json& data) {
@@ -178,6 +133,49 @@ api_driver::obj::StatisticsLogger::~StatisticsLogger() = default;
 #endif

 #ifdef API_OBJECT_NETWORK_SETTINGS_ENABLE
+static int calculateSubnetMask(const std::string& subnet_mask) {
+    int mask = 0;
+    std::istringstream iss(subnet_mask);
+    std::string octet;
+    while (std::getline(iss, octet, '.')) {
+        int octet_value = std::stoi(octet);
+        for (int i = 7; i >= 0; i--) {
+            if (octet_value & (1 << i)) {
+                mask++;
+            }
+        }
+    }
+    return mask;
+}
+
+/**
+ * Преобразует строку вида `1.2.3.4/24` в пару строк вида `1.2.3.4` `255.255.255.0`
+ */
+std::pair<std::string, std::string> splitIpAndMask(const std::string& input) {
+    auto pos = input.find('/');
+    if (pos == std::string::npos) {
+        // Обработка ошибки: нет символа '/'
+        throw std::runtime_error("address not contains mask");
+    }
+    std::string ip = input.substr(0, pos);
+    const unsigned int mask_int = std::stoul(input.substr(pos + 1));
+
+    if (mask_int > 32) {
+        throw std::runtime_error("invalid mask");
+    }
+
+    std::string mask_binary = std::string(mask_int, '1') + std::string(32 - mask_int, '0');
+    std::string mask_str;
+
+    for (unsigned int i = 0; i < 4; ++i) {
+        std::string octet = mask_binary.substr(i * 8u, 8);
+        int octet_value = std::stoi(octet, nullptr, 2);
+        mask_str += std::to_string(octet_value) + (i < 3 ? "." : "");
+    }
+
+    return std::make_pair(ip, mask_str);
+}
+
 api_driver::obj::TerminalNetworkSettings::TerminalNetworkSettings() { loadDefaults(); }

 api_driver::obj::TerminalNetworkSettings::TerminalNetworkSettings(const TerminalNetworkSettings &src) = default;
@@ -185,7 +183,7 @@ api_driver::obj::TerminalNetworkSettings::TerminalNetworkSettings(const Terminal
 api_driver::obj::TerminalNetworkSettings & api_driver::obj::TerminalNetworkSettings::operator=(const TerminalNetworkSettings &src) = default;

 void api_driver::obj::TerminalNetworkSettings::loadDefaults() {
-    managementIp = "0.0.0.0";
+    managementIp = "0.0.0.0/24";
    managementGateway = "";
    isL2 = true;
    dataIp = "0.0.0.0";
@@ -197,8 +195,8 @@ void api_driver::obj::TerminalNetworkSettings::updateCallback(proxy::CpProxy &cp
    loadDefaults();
    try {
        managementIp = cp.getNetwork("addr");
-        // s.managementIp += "/";
-        // s.managementIp += std::to_string(calculateSubnetMask(cp.getNetwork("mask")));
+        managementIp += "/";
+        managementIp += std::to_string(calculateSubnetMask(cp.getNetwork("mask")));

        managementGateway = cp.getNetwork("gateway");
        if (cp.getNetwork("mode") == "tun") {
@@ -228,12 +226,13 @@ void api_driver::obj::TerminalNetworkSettings::updateFromJson(const nlohmann::js
 void api_driver::obj::TerminalNetworkSettings::store(proxy::CpProxy& cp) {
    try {
        cp.setNetwork("mode", isL2 ? "tap" : "tun");
-        cp.setNetwork("addr", managementIp);
+        auto [mAddr, mMask] = splitIpAndMask(managementIp);
+        cp.setNetwork("addr", mAddr);
+        cp.setNetwork("mask", mMask);

        if (!isL2) {
            cp.setNetwork("addr_data", dataIp);
        }
-        cp.setNetwork("mask", "255.255.255.0");
        cp.setNetwork("gateway", managementGateway);

        // cp.setNetwork("data_mtu", std::to_string(dataMtu));
@@ -391,10 +390,8 @@ void api_driver::obj::TerminalState::updateCallback(proxy::CpProxy& cp) {
    fCincFreqErrAcc = cinc.freq_fine_estimate;
    fCincChannelDelay = cinc.delay_dpdi;
 #endif
-#ifdef MODEM_IS_TDMA
    fTxCenterFreq = modSet.central_freq_in_kGz;
    fTxSymSpeed = static_cast<double>(modSet.baudrate) / 1000.0;
-#endif
 }

 nlohmann::json api_driver::obj::TerminalState::asJson() {
@@ -454,10 +451,8 @@ nlohmann::json api_driver::obj::TerminalState::asJson() {
        res["cinc"]["correlator"] = nullptr;
    }
 #endif
-#ifdef MODEM_IS_TDMA
    res["tx"]["centerFreq"] = fTxCenterFreq;
    res["tx"]["symSpeed"] = fTxSymSpeed;
-#endif

    return res;
 }
@@ -680,12 +675,12 @@ void api_driver::obj::TerminalRxTxSettings::updateMainSettings(const nlohmann::j

 #ifdef API_STRUCT_ACM_ENABLE
    // ACM
-#ifndef MODEM_IS_SHPS
-    // в ШПС этих настроек нет
+#ifdef MODEM_IS_SCPC
+    // эти настройки только в SCPC
    acm.period_pack_acm = data.value("dvbServicePacketPeriod", acm.period_pack_acm);
    acm.enable_acm = data.value("dvbIsAcm", acm.enable_acm);
    acm.min_modcod_acm = buildModcodFromJson(data, acm.min_modcod_acm, "dvbAcmMin", acmIsFrameSizeNormal, acmIsPilots);
-    acm.min_modcod_acm = buildModcodFromJson(data, acm.max_modcod_acm, "dvbAcmMax", acmIsFrameSizeNormal, acmIsPilots);
+    acm.max_modcod_acm = buildModcodFromJson(data, acm.max_modcod_acm, "dvbAcmMax", acmIsFrameSizeNormal, acmIsPilots);
    acm.snr_threashold_acm = data.value("dvbSnrReserve", acm.snr_threashold_acm); // запас ОСШ
 #endif

@@ -740,7 +735,7 @@ void api_driver::obj::TerminalRxTxSettings::updateDpdiSettings(const nlohmann::j
    dpdi.max_delay = data.value("delayMax", dpdi.max_delay);
 #else
    dpdi.min_delay = 0;
-    dpdi.max_delay = data.value("dpdiDelay", dpdi.max_delay);
+    dpdi.max_delay = data.value("delay", dpdi.max_delay);
 #endif
 }
 void api_driver::obj::TerminalRxTxSettings::storeDpdiSettings(proxy::CpProxy &cp) {
@@ -770,6 +765,9 @@ void api_driver::obj::TerminalRxTxSettings::updateBuclnbSettings(const nlohmann:
        }
    }
    buclnb.is_ref_10MHz_buc = data.value("bucRefClk10M", buclnb.is_ref_10MHz_buc);
+#ifdef MODEM_IS_TDMA
+    buclnb.lo_buc_inkHz = data.value("bucLoKhz", buclnb.lo_buc_inkHz);
+#endif

    {
        // напряжение lnb
@@ -789,8 +787,10 @@ void api_driver::obj::TerminalRxTxSettings::updateBuclnbSettings(const nlohmann:
            default: buclnb.lnb = voltage_lnb::DISABLE;
        }
    }
-
    buclnb.is_ref_10MHz_lnb = data.value("lnbRefClk10M", buclnb.is_ref_10MHz_lnb);
+#ifdef MODEM_IS_TDMA
+    buclnb.lo_lnb_inkHz = data.value("lnbLoKhz", buclnb.lo_lnb_inkHz);
+#endif

    buclnb.is_ref_10MHz_output = data.value("srvRefClk10M", buclnb.is_ref_10MHz_output);
    buclnb.is_save_current_state = data.value("bucLnbAutoStart", buclnb.is_save_current_state);
@@ -867,8 +867,8 @@ nlohmann::json api_driver::obj::TerminalRxTxSettings::asJson() const {

 #ifdef API_STRUCT_ACM_ENABLE
        // ACM
-#ifndef MODEM_IS_SHPS
-        // в ШПС этих настроек нет
+#ifdef MODEM_IS_SCPC
+        // эти настройки только в SCPC
        rxtx["dvbServicePacketPeriod"] = acm.period_pack_acm;
        rxtx["dvbIsAcm"] = acm.enable_acm;

@@ -921,6 +921,9 @@ nlohmann::json api_driver::obj::TerminalRxTxSettings::asJson() const {
 #endif
            default: bl["bucPowering"] = 0;
        }
+#ifdef MODEM_IS_TDMA
+        bl["bucLoKhz"] = buclnb.lo_buc_inkHz;
+#endif

        bl["bucRefClk10M"] = buclnb.is_ref_10MHz_buc;
        switch (buclnb.lnb) {
@@ -930,6 +933,9 @@ nlohmann::json api_driver::obj::TerminalRxTxSettings::asJson() const {
            default: bl["lnbPowering"] = 0;
        }
        bl["lnbRefClk10M"] = buclnb.is_ref_10MHz_lnb;
+#ifdef MODEM_IS_TDMA
+        bl["lnbLoKhz"] = buclnb.lo_lnb_inkHz;
+#endif

        bl["srvRefClk10M"] = buclnb.is_ref_10MHz_output;
        bl["bucLnbAutoStart"] = buclnb.is_save_current_state;
--- a/src/api-driver/structs.h
+++ b/src/api-driver/structs.h
@@ -7,8 +7,6 @@
 #include <fstream>
 #include <shared_mutex>
 #include <string>
-//#include <boost/property_tree/ptree_fwd.hpp>
-
 #include "common/nlohmann/json.hpp"


@@ -30,7 +28,7 @@ namespace api_driver::obj {
         *
         * @return {"en": bool, "logPeriodMs": int, "maxAgeMs": int}
         */
-        std::string getSettings();
+        nlohmann::json getSettings();
        void setSettings(const nlohmann::json& data);

        void updateCallback(proxy::CpProxy& cp);
@@ -172,10 +170,8 @@ namespace api_driver::obj {
        int32_t fCincFreqErrAcc{};
        float fCincChannelDelay{};
 #endif
-#ifdef MODEM_IS_TDMA
        double fTxCenterFreq;
        double fTxSymSpeed;
-#endif

        TerminalState();

--- a/src/main.cpp
+++ b/src/main.cpp
@@ -595,6 +595,8 @@ public:
        }));
 #ifdef API_OBJECT_DEBUG_METRICS_ENABLE
        s.resources.emplace_back(std::make_unique<http::auth::AuthRequiredResource>("/dev/settings", this->auth, http::auth::User::DEVELOPER, [this](const auto& req, auto& rep) {
+            rep.status = http::server::ok;
+            rep.headers.push_back({.name = "Content-Type", .value = toString(mime_types::text_plain)});
            nlohmann::json resultJson;

            try {
@@ -603,7 +605,7 @@ public:
                    resultJson["logstat"] = api->getLoggingStatisticsSettings();
                } else if (req.method == "POST") {
                    auto reqJson = nlohmann::json::parse(std::string(req.payload.begin(), req.payload.end()));
-                    api->setQosSettings(reqJson);
+                    api->setLoggingStatisticsSettings(reqJson);

                    resultJson["status"] = "ok";
                    resultJson["logstat"] = api->getLoggingStatisticsSettings();
--- a/src/terminal_api_driver.cpp
+++ b/src/terminal_api_driver.cpp
@@ -107,7 +107,7 @@ void api_driver::ApiDriver::setDpdiSettings(const nlohmann::json& data) {

    std::lock_guard _lapi(this->daemon->cpApiMutex);
    this->daemon->cp.setDmaDebug("begin_save_config", "");
-    rxtx.storeMainSettings(this->daemon->cp);
+    rxtx.storeDpdiSettings(this->daemon->cp);
    this->daemon->cp.setDmaDebug("save_config", "");
    rxtx.updateCallback(this->daemon->cp);
    {
@@ -186,7 +186,7 @@ std::string api_driver::ApiDriver::getOtaFileLocation() const {
 #endif

 #ifdef MODEM_IS_SCPC
-std::string api_driver::ApiDriver::getLoggingStatisticsSettings() {
+nlohmann::json api_driver::ApiDriver::getLoggingStatisticsSettings() {
    return this->daemon->statsLogs.getSettings();
 }

--- a/src/terminal_api_driver.h
+++ b/src/terminal_api_driver.h
@@ -78,7 +78,7 @@ namespace api_driver {
        void executeInApi(const std::function<void(proxy::CpProxy&)> &callback);

 #ifdef API_OBJECT_DEBUG_METRICS_ENABLE
-        std::string getLoggingStatisticsSettings();
+        nlohmann::json getLoggingStatisticsSettings();
        void setLoggingStatisticsSettings(const nlohmann::json& data);

        /**
--- a/static/main-scpc.html
+++ b/static/main-scpc.html
@@ -160,7 +160,7 @@
                    <h3>Параметры передачи</h3>
                    <label>
                        <span>Центральная частота, КГц</span>
-                        <input type="text" v-model.lazy="paramRxtx.txCentralFreq" @change="e => paramRxtx.txCentralFreq = inputFormatNumber(inputFormatNumber(e.target.value, {min:950000,max:6000000,step:0.01}), {min:950000,max:6000000,step:0.01})"/>
+                        <input type="text" v-model.lazy="paramRxtx.txCentralFreq" @change="e => paramRxtx.txCentralFreq = inputFormatNumber(inputFormatNumber(e.target.value, {min:100000,max:6000000,step:0.01}), {min:100000,max:6000000,step:0.01})"/>
                    </label>
                    <label>
                        <span>Символьная скорость, Бод</span>
@@ -169,12 +169,12 @@
                    <label>
                        <span>Roll-off</span>
                        <select v-model="paramRxtx.txRolloff">
-                            <option :value="2">0.02</option>
-                            <option :value="5">0.05</option>
-                            <option :value="10">0.10</option>
-                            <option :value="15">0.15</option>
-                            <option :value="20">0.20</option>
-                            <option :value="25">0.25</option>
+                            <option :value="20">0.02</option>
+                            <option :value="50">0.05</option>
+                            <option :value="100">0.10</option>
+                            <option :value="150">0.15</option>
+                            <option :value="200">0.20</option>
+                            <option :value="250">0.25</option>
                        </select>
                    </label>
                    <label>
@@ -274,7 +274,7 @@
                    </label>
                    <label><span>Минимальное ослабление, дБ</span><input type="number" v-model="paramRxtx.aupcMinAttenuation" max="10" step="0.1"/></label>
                    <label><span>Максимальное ослабление, дБ</span><input type="number" v-model="paramRxtx.aupcMaxAttenuation" max="10" step="0.1"/></label>
-                    <label><span>Требуемое ОСШ</span><input type="number" v-model="paramRxtx.aupcRequiredSnr" max="10" step="0.01"/></label>
+                    <label><span>Требуемое ОСШ</span><input type="number" v-model="paramRxtx.aupcRequiredSnr" max="30" step="0.01"/></label>
                </div>
                <div class="settings-set-container">
                    <h3>Настройки приемника</h3>
@@ -295,7 +295,7 @@
                    </label>
                    <label>
                        <span>Центральная частота, КГц</span>
-                        <input type="text" v-model.lazy="paramRxtx.rxCentralFreq" @change="e => paramRxtx.rxCentralFreq = inputFormatNumber(inputFormatNumber(e.target.value, {min:950000,max:6000000,step:0.01}), {min:950000,max:6000000,step:0.01})"/>
+                        <input type="text" v-model.lazy="paramRxtx.rxCentralFreq" @change="e => paramRxtx.rxCentralFreq = inputFormatNumber(inputFormatNumber(e.target.value, {min:100000,max:6000000,step:0.01}), {min:100000,max:6000000,step:0.01})"/>
                    </label>
                    <label>
                        <span>Символьная скорость, Бод</span>
@@ -304,12 +304,12 @@
                    <label>
                        <span>Roll-off</span>
                        <select v-model="paramRxtx.rxRolloff">
-                            <option :value="2">0.02</option>
-                            <option :value="5">0.05</option>
-                            <option :value="10">0.10</option>
-                            <option :value="15">0.15</option>
-                            <option :value="20">0.20</option>
-                            <option :value="25">0.25</option>
+                            <option :value="20">0.02</option>
+                            <option :value="50">0.05</option>
+                            <option :value="100">0.10</option>
+                            <option :value="150">0.15</option>
+                            <option :value="200">0.20</option>
+                            <option :value="250">0.25</option>
                        </select>
                    </label>
                    <label>
@@ -326,19 +326,19 @@
            <div class="settings-set-container" v-show="paramRxtx.isCinC">
                <label>
                    <span>Метод расчета задержки</span>
-                    <select v-model="paramDpdi.dpdiIsPositional">
+                    <select v-model="paramDpdi.isPositional">
                        <option :value="true">Позиционированием</option>
                        <option :value="false">Окном задержки</option>
                    </select>
                </label>
-                <label><span>Полоса поиска, КГц ±</span><input type="number" v-model="paramDpdi.dpdiSearchBandwidth" max="100" step="1"/></label>
-                <h2 v-show="paramDpdi.dpdiIsPositional === true">Настройки позиционирования</h2>
-                <label v-show="paramDpdi.dpdiIsPositional === true"><span>Широта станции</span><input type="number" v-model="paramDpdi.dpdiPositionStationLatitude" min="-180" max="180" step="1e-06"/></label>
-                <label v-show="paramDpdi.dpdiIsPositional === true"><span>Долгота станции</span><input type="number" v-model="paramDpdi.dpdiPositionStationLongitude" min="-180" max="180" step="1e-06"/></label>
-                <label v-show="paramDpdi.dpdiIsPositional === true"><span>Подспутниковая точка</span><input type="number" v-model="paramDpdi.dpdiPositionSatelliteLongitude" min="-180" max="180" step="1e-06"/></label>
-                <h2 v-show="paramDpdi.dpdiIsPositional === false">Задержка до спутника</h2>
-                <label v-show="paramDpdi.dpdiIsPositional === false"><span>от, мс</span><input type="number" v-model="paramDpdi.dpdiDelayMin" max="400" step="0.1"/></label>
-                <label v-show="paramDpdi.dpdiIsPositional === false"><span>до, мс</span><input type="number" v-model="paramDpdi.dpdiDelayMax" max="400" step="0.1"/></label>
+                <label><span>Полоса поиска, КГц ±</span><input type="number" v-model="paramDpdi.searchBandwidth" max="100" step="1"/></label>
+                <h2 v-show="paramDpdi.isPositional === true">Настройки позиционирования</h2>
+                <label v-show="paramDpdi.isPositional === true"><span>Широта станции</span><input type="number" v-model="paramDpdi.positionStationLatitude" min="-180" max="180" step="1e-06"/></label>
+                <label v-show="paramDpdi.isPositional === true"><span>Долгота станции</span><input type="number" v-model="paramDpdi.positionStationLongitude" min="-180" max="180" step="1e-06"/></label>
+                <label v-show="paramDpdi.isPositional === true"><span>Подспутниковая точка</span><input type="number" v-model="paramDpdi.positionSatelliteLongitude" min="-180" max="180" step="1e-06"/></label>
+                <h2 v-show="paramDpdi.isPositional === false">Задержка до спутника</h2>
+                <label v-show="paramDpdi.isPositional === false"><span>от, мс</span><input type="number" v-model="paramDpdi.delayMin" max="400" step="0.1"/></label>
+                <label v-show="paramDpdi.isPositional === false"><span>до, мс</span><input type="number" v-model="paramDpdi.delayMax" max="400" step="0.1"/></label>
            </div>
            <button class="action-button" @click="settingsSubmitDpdi()" v-show="paramRxtx.isCinC">Сохранить <span class="submit-spinner" v-show="submitStatus.dpdi"></span></button>
            <h2>Настройки питания и опорного генератора</h2>
@@ -494,24 +494,24 @@
            <div class="settings-set-container">
                <h3>Настройки интерфейса управления</h3>
                <label>
-                    <span>Интерфейс управления (/24)</span>
-                    <input v-model="paramNetwork.netManagementIp" required type="text" pattern="^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$">
+                    <span>Интерфейс управления (a.d.d.r/mask)</span>
+                    <input v-model="paramNetwork.managementIp" required type="text" pattern="^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\/([0-9]|[1-2][0-9]|3[0-2])$">
                </label>
                <label>
                    <span>Режим сети</span>
-                    <select v-model="paramNetwork.netIsL2">
+                    <select v-model="paramNetwork.isL2">
                        <option :value="false">Маршрутизатор</option>
                        <option :value="true">Коммутатор</option>
                    </select>
                </label>
-                <label v-show="paramNetwork.netIsL2 === false">
+                <label v-show="paramNetwork.isL2 === false">
                    <span>Интерфейс данных (/24)</span>
-                    <input v-model="paramNetwork.netDataIp" required type="text" pattern="^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$">
+                    <input v-model="paramNetwork.dataIp" required type="text" pattern="^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$">
                </label>
-                <label><span>MTU интерфейса данных</span><input type="number" v-model="paramNetwork.netDataMtu" min="1500" max="2000" step="1"/></label>
+                <label><span>MTU интерфейса данных</span><input type="number" v-model="paramNetwork.dataMtu" min="1500" max="2000" step="1"/></label>
                <label>
                    <span>Имя веб-сервера</span>
-                    <input v-model="paramNetwork.netServerName" type="text">
+                    <input v-model="paramNetwork.serverName" type="text">
                </label>
            </div>
            <button class="action-button" @click="settingsSubmitNetwork()">Сохранить <span class="submit-spinner" v-show="submitStatus.network"></span></button>
@@ -533,6 +533,8 @@
                <div>
                    <button class="dangerous-button" onclick="fetch('/api/resetSettings', { method: 'POST' }).then((r) => { window.location.reload(); })">Сбросить модем до заводских настроек</button>
                </div>
+                <button class="action-button" @click="dumpAllSettings()">Сохранить бекап конфигурации</button>
+                <button class="dangerous-button" @click="restoreAllSettings()">Восстановить бекап конфигурации</button>
            </div>

            <h2>Обновление ПО</h2>
@@ -602,7 +604,7 @@
                    txIsTestInput: false,
                    txCentralFreq: 0,
                    txBaudrate: 0,
-                    txRolloff: 2,
+                    txRolloff: 20,
                    txGoldan: 0,
                    txAttenuation: -40,
                    dvbServicePacketPeriod: 0,
@@ -625,17 +627,17 @@
                    rxSpectrumInversion: false,
                    rxCentralFreq: 0,
                    rxBaudrate: 0,
-                    rxRolloff: 2,
+                    rxRolloff: 20,
                    rxGoldan: 0,
                },
                paramDpdi: {
-                    dpdiIsPositional: true,
-                    dpdiSearchBandwidth: 0,
-                    dpdiPositionStationLatitude: -180,
-                    dpdiPositionStationLongitude: -180,
-                    dpdiPositionSatelliteLongitude: -180,
-                    dpdiDelayMin: 0,
-                    dpdiDelayMax: 0,
+                    isPositional: true,
+                    searchBandwidth: 0,
+                    positionStationLatitude: -180,
+                    positionStationLongitude: -180,
+                    positionSatelliteLongitude: -180,
+                    delayMin: 0,
+                    delayMax: 0,
                },
                paramBuclnb: {
                    bucRefClk10M: false,
@@ -646,11 +648,11 @@
                    bucLnbAutoStart: false,
                },
                paramNetwork: {
-                    netManagementIp: null,
-                    netIsL2: false,
-                    netDataIp: null,
-                    netDataMtu: 1500,
-                    netServerName: null,
+                    managementIp: null,
+                    isL2: false,
+                    dataIp: null,
+                    dataMtu: 1500,
+                    serverName: null,
                },
                // ========== include end from 'common/all-params-data.js.j2'

@@ -827,13 +829,13 @@
                if (this.submitStatus.dpdi) { return }

                let query = {
-                    "dpdiIsPositional": this.paramDpdi.dpdiIsPositional,
-                    "dpdiSearchBandwidth": this.paramDpdi.dpdiSearchBandwidth,
-                    "dpdiPositionStationLatitude": this.paramDpdi.dpdiPositionStationLatitude,
-                    "dpdiPositionStationLongitude": this.paramDpdi.dpdiPositionStationLongitude,
-                    "dpdiPositionSatelliteLongitude": this.paramDpdi.dpdiPositionSatelliteLongitude,
-                    "dpdiDelayMin": this.paramDpdi.dpdiDelayMin,
-                    "dpdiDelayMax": this.paramDpdi.dpdiDelayMax,
+                    "isPositional": this.paramDpdi.isPositional,
+                    "searchBandwidth": this.paramDpdi.searchBandwidth,
+                    "positionStationLatitude": this.paramDpdi.positionStationLatitude,
+                    "positionStationLongitude": this.paramDpdi.positionStationLongitude,
+                    "positionSatelliteLongitude": this.paramDpdi.positionSatelliteLongitude,
+                    "delayMin": this.paramDpdi.delayMin,
+                    "delayMax": this.paramDpdi.delayMax,
                }

                this.submitStatus.dpdi = true
@@ -866,11 +868,11 @@
                { if (!confirm("Применение этих настроек может сделать модем недоступным! Продолжить?")) return }

                let query = {
-                    "netManagementIp": this.paramNetwork.netManagementIp,
-                    "netIsL2": this.paramNetwork.netIsL2,
-                    "netDataIp": this.paramNetwork.netDataIp,
-                    "netDataMtu": this.paramNetwork.netDataMtu,
-                    "netServerName": this.paramNetwork.netServerName,
+                    "managementIp": this.paramNetwork.managementIp,
+                    "isL2": this.paramNetwork.isL2,
+                    "dataIp": this.paramNetwork.dataIp,
+                    "dataMtu": this.paramNetwork.dataMtu,
+                    "serverName": this.paramNetwork.serverName,
                }

                this.submitStatus.network = true
@@ -887,7 +889,7 @@
                this.paramRxtx.txAutoStart = vals["settings"]["rxtx"]["txAutoStart"]
                this.paramRxtx.txModulatorIsTest = vals["settings"]["rxtx"]["txModulatorIsTest"]
                this.paramRxtx.txIsTestInput = vals["settings"]["rxtx"]["txIsTestInput"]
-                this.paramRxtx.txCentralFreq = this.inputFormatNumber(vals["settings"]["rxtx"]["txCentralFreq"], {min:950000,max:6000000,step:0.01})
+                this.paramRxtx.txCentralFreq = this.inputFormatNumber(vals["settings"]["rxtx"]["txCentralFreq"], {min:100000,max:6000000,step:0.01})
                this.paramRxtx.txBaudrate = this.inputFormatNumber(vals["settings"]["rxtx"]["txBaudrate"], {min:200000,max:54000000,})
                this.paramRxtx.txRolloff = vals["settings"]["rxtx"]["txRolloff"]
                this.paramRxtx.txGoldan = vals["settings"]["rxtx"]["txGoldan"]
@@ -910,20 +912,20 @@
                this.paramRxtx.rxAgcEn = vals["settings"]["rxtx"]["rxAgcEn"]
                this.paramRxtx.rxManualGain = vals["settings"]["rxtx"]["rxManualGain"]
                this.paramRxtx.rxSpectrumInversion = vals["settings"]["rxtx"]["rxSpectrumInversion"]
-                this.paramRxtx.rxCentralFreq = this.inputFormatNumber(vals["settings"]["rxtx"]["rxCentralFreq"], {min:950000,max:6000000,step:0.01})
+                this.paramRxtx.rxCentralFreq = this.inputFormatNumber(vals["settings"]["rxtx"]["rxCentralFreq"], {min:100000,max:6000000,step:0.01})
                this.paramRxtx.rxBaudrate = this.inputFormatNumber(vals["settings"]["rxtx"]["rxBaudrate"], {min:200000,max:54000000,})
                this.paramRxtx.rxRolloff = vals["settings"]["rxtx"]["rxRolloff"]
                this.paramRxtx.rxGoldan = vals["settings"]["rxtx"]["rxGoldan"]
            },
            updateDpdiSettings(vals) {
                this.submitStatus.dpdi = false
-                this.paramDpdi.dpdiIsPositional = vals["settings"]["dpdi"]["dpdiIsPositional"]
-                this.paramDpdi.dpdiSearchBandwidth = vals["settings"]["dpdi"]["dpdiSearchBandwidth"]
-                this.paramDpdi.dpdiPositionStationLatitude = vals["settings"]["dpdi"]["dpdiPositionStationLatitude"]
-                this.paramDpdi.dpdiPositionStationLongitude = vals["settings"]["dpdi"]["dpdiPositionStationLongitude"]
-                this.paramDpdi.dpdiPositionSatelliteLongitude = vals["settings"]["dpdi"]["dpdiPositionSatelliteLongitude"]
-                this.paramDpdi.dpdiDelayMin = vals["settings"]["dpdi"]["dpdiDelayMin"]
-                this.paramDpdi.dpdiDelayMax = vals["settings"]["dpdi"]["dpdiDelayMax"]
+                this.paramDpdi.isPositional = vals["settings"]["dpdi"]["isPositional"]
+                this.paramDpdi.searchBandwidth = vals["settings"]["dpdi"]["searchBandwidth"]
+                this.paramDpdi.positionStationLatitude = vals["settings"]["dpdi"]["positionStationLatitude"]
+                this.paramDpdi.positionStationLongitude = vals["settings"]["dpdi"]["positionStationLongitude"]
+                this.paramDpdi.positionSatelliteLongitude = vals["settings"]["dpdi"]["positionSatelliteLongitude"]
+                this.paramDpdi.delayMin = vals["settings"]["dpdi"]["delayMin"]
+                this.paramDpdi.delayMax = vals["settings"]["dpdi"]["delayMax"]
            },
            updateBuclnbSettings(vals) {
                this.submitStatus.buclnb = false
@@ -936,11 +938,11 @@
            },
            updateNetworkSettings(vals) {
                this.submitStatus.network = false
-                this.paramNetwork.netManagementIp = vals["settings"]["network"]["netManagementIp"]
-                this.paramNetwork.netIsL2 = vals["settings"]["network"]["netIsL2"]
-                this.paramNetwork.netDataIp = vals["settings"]["network"]["netDataIp"]
-                this.paramNetwork.netDataMtu = vals["settings"]["network"]["netDataMtu"]
-                this.paramNetwork.netServerName = vals["settings"]["network"]["netServerName"]
+                this.paramNetwork.managementIp = vals["settings"]["network"]["managementIp"]
+                this.paramNetwork.isL2 = vals["settings"]["network"]["isL2"]
+                this.paramNetwork.dataIp = vals["settings"]["network"]["dataIp"]
+                this.paramNetwork.dataMtu = vals["settings"]["network"]["dataMtu"]
+                this.paramNetwork.serverName = vals["settings"]["network"]["serverName"]
            },
            // ========== include end from 'common/all-params-methods.js.j2'

@@ -974,35 +976,35 @@
                this.statRx.freq_search_lock = vals["state"]["rx"]["freq_search_lock"]
                this.statRx.afc_lock = vals["state"]["rx"]["afc_lock"]
                this.statRx.pkt_sync = vals["state"]["rx"]["pkt_sync"]
-                this.statRx.snr = vals["state"]["rx"]["snr"]
-                this.statRx.rssi = vals["state"]["rx"]["rssi"]
+                this.statRx.snr = Math.round(vals["state"]["rx"]["snr"] * 10) / 10
+                this.statRx.rssi = Math.round(vals["state"]["rx"]["rssi"] * 10) / 10
                this.statRx.modcod = modcodToStr(vals["state"]["rx"]["modcod"])
                this.statRx.frameSizeNormal = vals["state"]["rx"]["frameSizeNormal"]
                this.statRx.isPilots = vals["state"]["rx"]["isPilots"]
                this.statRx.symError = vals["state"]["rx"]["symError"]
-                this.statRx.freqErr = vals["state"]["rx"]["freqErr"]
-                this.statRx.freqErrAcc = vals["state"]["rx"]["freqErrAcc"]
+                this.statRx.freqErr = Math.round(vals["state"]["rx"]["freqErr"] * 100) / 100
+                this.statRx.freqErrAcc = Math.round(vals["state"]["rx"]["freqErrAcc"] * 100) / 100
                this.statRx.inputSignalLevel = vals["state"]["rx"]["inputSignalLevel"]
-                this.statRx.pllError = vals["state"]["rx"]["pllError"]
-                this.statRx.speedOnRxKbit = vals["state"]["rx"]["speedOnRxKbit"]
-                this.statRx.speedOnIifKbit = vals["state"]["rx"]["speedOnIifKbit"]
+                this.statRx.pllError = Math.round(vals["state"]["rx"]["pllError"] * 100) / 100
+                this.statRx.speedOnRxKbit = Math.round(vals["state"]["rx"]["speedOnRxKbit"] * 100) / 100
+                this.statRx.speedOnIifKbit = Math.round(vals["state"]["rx"]["speedOnIifKbit"] * 100) / 100
                this.statRx.packetsOk = vals["state"]["rx"]["packetsOk"]
                this.statRx.packetsBad = vals["state"]["rx"]["packetsBad"]
                this.statRx.packetsDummy = vals["state"]["rx"]["packetsDummy"]

                this.statTx.state = vals["state"]["tx"]["state"]
-                this.statTx.snr = vals["state"]["tx"]["snr"]
+                this.statTx.snr = Math.round(vals["state"]["tx"]["snr"] * 100) / 100
                this.statTx.modcod = modcodToStr(vals["state"]["tx"]["modcod"])
                this.statTx.frameSizeNormal = vals["state"]["tx"]["frameSizeNormal"]
                this.statTx.isPilots = vals["state"]["tx"]["isPilots"]
-                this.statTx.speedOnTxKbit = vals["state"]["tx"]["speedOnTxKbit"]
-                this.statTx.speedOnIifKbit = vals["state"]["tx"]["speedOnIifKbit"]
+                this.statTx.speedOnTxKbit = Math.round(vals["state"]["tx"]["speedOnTxKbit"] * 100) / 100
+                this.statTx.speedOnIifKbit = Math.round(vals["state"]["tx"]["speedOnIifKbit"] * 100) / 100

                this.statCinc.occ = vals["state"]["cinc"]["occ"]
                this.statCinc.correlator = vals["state"]["cinc"]["correlator"]
                this.statCinc.correlatorFails = vals["state"]["cinc"]["correlatorFails"]
-                this.statCinc.freqErr = vals["state"]["cinc"]["freqErr"]
-                this.statCinc.freqErrAcc = vals["state"]["cinc"]["freqErrAcc"]
+                this.statCinc.freqErr = Math.round(vals["state"]["cinc"]["freqErr"] * 100) / 100
+                this.statCinc.freqErrAcc = Math.round(vals["state"]["cinc"]["freqErrAcc"] * 100) / 100
                this.statCinc.channelDelay = vals["state"]["cinc"]["channelDelay"]

                this.statDevice.adrv = vals["state"]["device"]["adrv"]
@@ -1022,9 +1024,9 @@
                } else {
                    this.statOs.uptime = '?'
                }
-                this.statOs.load1 = vals["state"]["device"]["load1min"]
-                this.statOs.load5 = vals["state"]["device"]["load5min"]
-                this.statOs.load15 = vals["state"]["device"]["load15min"]
+                this.statOs.load1 = Math.round(vals["state"]["device"]["load1min"] * 100) / 100
+                this.statOs.load5 = Math.round(vals["state"]["device"]["load5min"] * 100) / 100
+                this.statOs.load15 = Math.round(vals["state"]["device"]["load15min"] * 100) / 100
                this.statOs.totalram = vals["state"]["device"]["totalram"]
                this.statOs.freeram = vals["state"]["device"]["freeram"]
            },
@@ -1363,6 +1365,133 @@
                }
                this.submitStatus.modemReboot = 30
                fetch('/api/reboot', { method: 'POST' }).then((r) => {})
+            },
+            async restoreAllSettings() {
+                // Порядок применения настроек
+                const settingsApplyOrder = ['qos', 'tcpaccel', 'dpdi', 'rxtx', 'buclnb', 'network'];
+
+                // 1. Чтение JSON-файла, выбранного пользователем
+                const fileInput = document.createElement('input');
+                fileInput.type = 'file';
+                fileInput.accept = '.json';
+
+                const filePromise = new Promise((resolve, reject) => {
+                    fileInput.onchange = e => {
+                        const file = e.target.files[0];
+                        if (!file) {
+                            reject(new Error('Файл не выбран'));
+                            return;
+                        }
+
+                        const reader = new FileReader();
+                        reader.onload = event => {
+                            try {
+                                const jsonData = JSON.parse(event.target.result);
+                                resolve(jsonData);
+                            } catch (error) {
+                                reject(new Error('Ошибка парсинга JSON'));
+                            }
+                        };
+                        reader.onerror = () => reject(new Error('Ошибка чтения файла'));
+                        reader.readAsText(file);
+                    };
+                    fileInput.click();
+                });
+
+                try {
+                    const settingsToApply = await filePromise;
+                    const errors = [];
+
+                    // 2. Перебор групп параметров в заданном порядке
+                    for (const groupName of settingsApplyOrder) {
+                        if (!settingsToApply.hasOwnProperty(groupName)) {
+                            continue; // Пропускаем группы, которых нет в файле
+                        }
+
+                        const groupSettings = settingsToApply[groupName];
+                        if (typeof groupSettings !== 'object' || groupSettings === null) {
+                            continue;
+                        }
+
+                        try {
+                            // 2.1. POST-запрос для применения группы параметров
+                            const postResponse = await fetch(`/api/set/${groupName}`, {
+                                method: 'POST',
+                                headers: {
+                                    'Content-Type': 'application/json',
+                                },
+                                body: JSON.stringify(groupSettings)
+                            });
+
+                            if (!postResponse.ok) {
+                                throw new Error(`HTTP error ${postResponse.status}`);
+                            }
+
+                            const postResult = await postResponse.json();
+                            if (postResult.status !== 'ok') {
+                                throw new Error(`API error: ${postResult.message || 'unknown error'}`);
+                            }
+
+                            // 2.2. Проверка примененных параметров
+                            const getResponse = await fetch('/api/get/settings', { method: 'GET' });
+                            if (!getResponse.ok) {
+                                throw new Error(`HTTP error ${getResponse.status}`);
+                            }
+
+                            const fetchSettingsResult = await getResponse.json();
+                            if (fetchSettingsResult.status !== 'ok') {
+                                throw new Error('Не удалось получить текущие настройки');
+                            }
+
+                            // Проверка соответствия параметров
+                            const appliedGroup = fetchSettingsResult.settings[groupName] || {};
+                            const failedSettings = [];
+
+                            for (const [key, value] of Object.entries(groupSettings)) {
+                                if (appliedGroup[key] !== value) {
+                                    failedSettings.push(`${key} (ожидалось: ${value}, получено: ${appliedGroup[key]})`);
+                                }
+                            }
+
+                            if (failedSettings.length > 0) {
+                                throw new Error(`Не совпадают параметры: ${failedSettings.join(', ')}`);
+                            }
+
+                        } catch (groupError) {
+                            errors.push(`Группа ${groupName}: ${groupError.message}`);
+                        }
+                    }
+
+                    // 3. Показ ошибок, если они есть
+                    if (errors.length > 0) {
+                        const errorMessage = errors.join('\n\n') +
+                            '\n\nНекоторые настройки могли примениться некорректно.\nСтраница будет перезагружена.';
+                        alert(errorMessage);
+                    }
+
+                } catch (error) {
+                    alert(`Ошибка при восстановлении настроек: ${error.message}`);
+                    return;
+                }
+
+                // 4. Перезагрузка страницы
+                location.reload();
+            },
+            async dumpAllSettings() {
+                function downloadAsFile(data, filename) {
+                    let a = document.createElement("a");
+                    let file = new Blob([data], {type: 'application/json'});
+                    a.href = URL.createObjectURL(file);
+                    a.download = filename;
+                    a.click();
+                }
+                const response = await fetch('/api/get/settings', { method: 'GET' })
+                if (response.ok) {
+                    const jres = await response.json()
+                    if (jres["status"] === "ok") {
+                        downloadAsFile(JSON.stringify(jres["settings"], null, 4), "backup-" + this.about.firmwareVersion + "-" + this.about.modemSn + ".json")
+                    }
+                }
            },            // ========== include end from 'common/admin-methods.js.j2'


--- a/static/main-shps.html
+++ b/static/main-shps.html
@@ -135,29 +135,32 @@
                        </select>
                    </label>
                    <h3>Параметры передачи</h3>
-                    <label><span>Центральная частота, КГц</span><input type="number" v-model="paramRxtx.txCentralFreq" min="950000" max="6000000" step="0.01"/></label>
+                    <label><span>Центральная частота, КГц</span><input type="number" v-model="paramRxtx.txCentralFreq" min="100000" max="6000000" step="0.01"/></label>
                    <label><span>Символьная скорость, Бод</span><input type="number" v-model="paramRxtx.txBaudrate" min="200000" max="54000000"/></label>
                    <label>
                        <span>Roll-off</span>
                        <select v-model="paramRxtx.txRolloff">
-                            <option :value="2">0.02</option>
-                            <option :value="5">0.05</option>
-                            <option :value="10">0.10</option>
-                            <option :value="15">0.15</option>
-                            <option :value="20">0.20</option>
-                            <option :value="25">0.25</option>
+                            <option :value="20">0.02</option>
+                            <option :value="50">0.05</option>
+                            <option :value="100">0.10</option>
+                            <option :value="150">0.15</option>
+                            <option :value="200">0.20</option>
+                            <option :value="250">0.25</option>
                        </select>
                    </label>
                    <label><span>Коэф. расширения</span><input type="number" v-model="paramRxtx.txSpreadCoef" min="-1000" max="1000" step="0.01"/></label>
-                    <label>
-                        <span>Номер последовательности Голда</span>
-                        <select v-model="paramRxtx.txGoldan">
-                            <option :value="0">0</option>
-                            <option :value="1">1</option>
-                        </select>
-                    </label>
                    <label><span>Ослабление, дБ</span><input type="number" v-model="paramRxtx.txAttenuation" min="-40" step="0.25"/></label>
                </div>
+                <div class="settings-set-container">
+                    <h3>Авто-регулировка мощности</h3>
+                    <label>
+                        <span>Авто-регулировка мощности</span>
+                        <span class="toggle-input"><input type="checkbox" v-model="paramRxtx.aupcEn" /><span class="slider"></span></span>
+                    </label>
+                    <label><span>Минимальное ослабление, дБ</span><input type="number" v-model="paramRxtx.aupcMinAttenuation" max="10" step="0.1"/></label>
+                    <label><span>Максимальное ослабление, дБ</span><input type="number" v-model="paramRxtx.aupcMaxAttenuation" max="10" step="0.1"/></label>
+                    <label><span>Требуемое ОСШ</span><input type="number" v-model="paramRxtx.aupcRequiredSnr" max="30" step="0.01"/></label>
+                </div>
                <div class="settings-set-container">
                    <h3>Настройки приемника</h3>
                    <label>
@@ -175,27 +178,20 @@
                        <span>Инверсия спектра</span>
                        <span class="toggle-input"><input type="checkbox" v-model="paramRxtx.rxSpectrumInversion" /><span class="slider"></span></span>
                    </label>
-                    <label><span>Центральная частота, КГц</span><input type="number" v-model="paramRxtx.rxCentralFreq" min="950000" max="6000000" step="0.01"/></label>
+                    <label><span>Центральная частота, КГц</span><input type="number" v-model="paramRxtx.rxCentralFreq" min="100000" max="6000000" step="0.01"/></label>
                    <label><span>Символьная скорость, Бод</span><input type="number" v-model="paramRxtx.rxBaudrate" min="200000" max="54000000"/></label>
                    <label>
                        <span>Roll-off</span>
                        <select v-model="paramRxtx.rxRolloff">
-                            <option :value="2">0.02</option>
-                            <option :value="5">0.05</option>
-                            <option :value="10">0.10</option>
-                            <option :value="15">0.15</option>
-                            <option :value="20">0.20</option>
-                            <option :value="25">0.25</option>
+                            <option :value="20">0.02</option>
+                            <option :value="50">0.05</option>
+                            <option :value="100">0.10</option>
+                            <option :value="150">0.15</option>
+                            <option :value="200">0.20</option>
+                            <option :value="250">0.25</option>
                        </select>
                    </label>
                    <label><span>Коэф. расширения</span><input type="number" v-model="paramRxtx.rxSpreadCoef" min="-1000" max="1000" step="0.01"/></label>
-                    <label>
-                        <span>Номер последовательности Голда</span>
-                        <select v-model="paramRxtx.rxGoldan">
-                            <option :value="0">0</option>
-                            <option :value="1">1</option>
-                        </select>
-                    </label>
                </div>
            </div>
            <button class="action-button" @click="settingsSubmitRxtx()">Сохранить <span class="submit-spinner" v-show="submitStatus.rxtx"></span></button>
@@ -246,6 +242,31 @@
            </div>
            <button class="action-button" @click="settingsSubmitBuclnb()">Сохранить <span class="submit-spinner" v-show="submitStatus.buclnb"></span></button>
        </div>        <div class="tabs-body-item" v-if="activeTab === 'admin' && settingFetchComplete">
+            <h2>Настройки сети</h2>
+            <div class="settings-set-container">
+                <h3>Настройки интерфейса управления</h3>
+                <label>
+                    <span>Интерфейс управления (a.d.d.r/mask)</span>
+                    <input v-model="paramNetwork.managementIp" required type="text" pattern="^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\/([0-9]|[1-2][0-9]|3[0-2])$">
+                </label>
+                <label>
+                    <span>Режим сети</span>
+                    <select v-model="paramNetwork.isL2">
+                        <option :value="false">Маршрутизатор</option>
+                        <option :value="true">Коммутатор</option>
+                    </select>
+                </label>
+                <label v-show="paramNetwork.isL2 === false">
+                    <span>Интерфейс данных (/24)</span>
+                    <input v-model="paramNetwork.dataIp" required type="text" pattern="^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$">
+                </label>
+                <label><span>MTU интерфейса данных</span><input type="number" v-model="paramNetwork.dataMtu" min="1500" max="2000" step="1"/></label>
+                <label>
+                    <span>Имя веб-сервера</span>
+                    <input v-model="paramNetwork.serverName" type="text">
+                </label>
+            </div>
+            <button class="action-button" @click="settingsSubmitNetwork()">Сохранить <span class="submit-spinner" v-show="submitStatus.network"></span></button>

            <h2>Система</h2>
            <div class="settings-set-container statistics-container">
@@ -264,6 +285,8 @@
                <div>
                    <button class="dangerous-button" onclick="fetch('/api/resetSettings', { method: 'POST' }).then((r) => { window.location.reload(); })">Сбросить модем до заводских настроек</button>
                </div>
+                <button class="action-button" @click="dumpAllSettings()">Сохранить бекап конфигурации</button>
+                <button class="dangerous-button" @click="restoreAllSettings()">Восстановить бекап конфигурации</button>
            </div>

            <h2>Обновление ПО</h2>
@@ -316,6 +339,7 @@
                submitStatus: {
                    rxtx: false,
                    buclnb: false,
+                    network: false,
                    firmwareUpload: false,
                    firmwareUpgrade: false,
                    // когда модем перезагружается, тут должен быть счетчик. Направление счета - к нулю
@@ -328,20 +352,22 @@
                    txAutoStart: false,
                    txModulatorIsTest: false,
                    txIsTestInput: false,
-                    txCentralFreq: 950000,
+                    txCentralFreq: 100000,
                    txBaudrate: 200000,
-                    txRolloff: 2,
+                    txRolloff: 20,
                    txSpreadCoef: -1000,
-                    txGoldan: 0,
                    txAttenuation: -40,
+                    aupcEn: false,
+                    aupcMinAttenuation: 0,
+                    aupcMaxAttenuation: 0,
+                    aupcRequiredSnr: 0,
                    rxAgcEn: false,
                    rxManualGain: -40,
                    rxSpectrumInversion: false,
-                    rxCentralFreq: 950000,
+                    rxCentralFreq: 100000,
                    rxBaudrate: 200000,
-                    rxRolloff: 2,
+                    rxRolloff: 20,
                    rxSpreadCoef: -1000,
-                    rxGoldan: 0,
                },
                paramBuclnb: {
                    bucRefClk10M: false,
@@ -351,6 +377,13 @@
                    srvRefClk10M: false,
                    bucLnbAutoStart: false,
                },
+                paramNetwork: {
+                    managementIp: null,
+                    isL2: false,
+                    dataIp: null,
+                    dataMtu: 1500,
+                    serverName: null,
+                },
                // ========== include end from 'common/all-params-data.js.j2'

                // ========== include from 'common/monitoring-data.js.j2'
@@ -473,8 +506,11 @@
                    "txBaudrate": this.paramRxtx.txBaudrate,
                    "txRolloff": this.paramRxtx.txRolloff,
                    "txSpreadCoef": this.paramRxtx.txSpreadCoef,
-                    "txGoldan": this.paramRxtx.txGoldan,
                    "txAttenuation": this.paramRxtx.txAttenuation,
+                    "aupcEn": this.paramRxtx.aupcEn,
+                    "aupcMinAttenuation": this.paramRxtx.aupcMinAttenuation,
+                    "aupcMaxAttenuation": this.paramRxtx.aupcMaxAttenuation,
+                    "aupcRequiredSnr": this.paramRxtx.aupcRequiredSnr,
                    "rxAgcEn": this.paramRxtx.rxAgcEn,
                    "rxManualGain": this.paramRxtx.rxManualGain,
                    "rxSpectrumInversion": this.paramRxtx.rxSpectrumInversion,
@@ -482,7 +518,6 @@
                    "rxBaudrate": this.paramRxtx.rxBaudrate,
                    "rxRolloff": this.paramRxtx.rxRolloff,
                    "rxSpreadCoef": this.paramRxtx.rxSpreadCoef,
-                    "rxGoldan": this.paramRxtx.rxGoldan,
                }

                this.submitStatus.rxtx = true
@@ -510,6 +545,24 @@
                    .catch((reason) => { alert(`Ошибка при применении настроек: ${reason}`) })
                    .finally(() => { this.submitStatus.buclnb = false })
            },
+            settingsSubmitNetwork() {
+                if (this.submitStatus.network) { return }
+                { if (!confirm("Применение этих настроек может сделать модем недоступным! Продолжить?")) return }
+
+                let query = {
+                    "managementIp": this.paramNetwork.managementIp,
+                    "isL2": this.paramNetwork.isL2,
+                    "dataIp": this.paramNetwork.dataIp,
+                    "dataMtu": this.paramNetwork.dataMtu,
+                    "serverName": this.paramNetwork.serverName,
+                }
+
+                this.submitStatus.network = true
+                fetch('/api/set/network', {method: 'POST', headers: {'Content-Type': 'application/json'}, body: JSON.stringify(query), credentials: 'same-origin' })
+                    .then(async (resp) => { let vals = await resp.json(); if (vals['status'] !== 'ok') { throw new Error(vals['error'] ? vals['error'] : "Server returns undefined error") } this.updateNetworkSettings(vals) })
+                    .catch((reason) => { alert(`Ошибка при применении настроек: ${reason}`) })
+                    .finally(() => { this.submitStatus.network = false })
+            },

            updateRxtxSettings(vals) {
                this.submitStatus.rxtx = false
@@ -521,8 +574,11 @@
                this.paramRxtx.txBaudrate = vals["settings"]["rxtx"]["txBaudrate"]
                this.paramRxtx.txRolloff = vals["settings"]["rxtx"]["txRolloff"]
                this.paramRxtx.txSpreadCoef = vals["settings"]["rxtx"]["txSpreadCoef"]
-                this.paramRxtx.txGoldan = vals["settings"]["rxtx"]["txGoldan"]
                this.paramRxtx.txAttenuation = vals["settings"]["rxtx"]["txAttenuation"]
+                this.paramRxtx.aupcEn = vals["settings"]["rxtx"]["aupcEn"]
+                this.paramRxtx.aupcMinAttenuation = vals["settings"]["rxtx"]["aupcMinAttenuation"]
+                this.paramRxtx.aupcMaxAttenuation = vals["settings"]["rxtx"]["aupcMaxAttenuation"]
+                this.paramRxtx.aupcRequiredSnr = vals["settings"]["rxtx"]["aupcRequiredSnr"]
                this.paramRxtx.rxAgcEn = vals["settings"]["rxtx"]["rxAgcEn"]
                this.paramRxtx.rxManualGain = vals["settings"]["rxtx"]["rxManualGain"]
                this.paramRxtx.rxSpectrumInversion = vals["settings"]["rxtx"]["rxSpectrumInversion"]
@@ -530,7 +586,6 @@
                this.paramRxtx.rxBaudrate = vals["settings"]["rxtx"]["rxBaudrate"]
                this.paramRxtx.rxRolloff = vals["settings"]["rxtx"]["rxRolloff"]
                this.paramRxtx.rxSpreadCoef = vals["settings"]["rxtx"]["rxSpreadCoef"]
-                this.paramRxtx.rxGoldan = vals["settings"]["rxtx"]["rxGoldan"]
            },
            updateBuclnbSettings(vals) {
                this.submitStatus.buclnb = false
@@ -541,6 +596,14 @@
                this.paramBuclnb.srvRefClk10M = vals["settings"]["buclnb"]["srvRefClk10M"]
                this.paramBuclnb.bucLnbAutoStart = vals["settings"]["buclnb"]["bucLnbAutoStart"]
            },
+            updateNetworkSettings(vals) {
+                this.submitStatus.network = false
+                this.paramNetwork.managementIp = vals["settings"]["network"]["managementIp"]
+                this.paramNetwork.isL2 = vals["settings"]["network"]["isL2"]
+                this.paramNetwork.dataIp = vals["settings"]["network"]["dataIp"]
+                this.paramNetwork.dataMtu = vals["settings"]["network"]["dataMtu"]
+                this.paramNetwork.serverName = vals["settings"]["network"]["serverName"]
+            },
            // ========== include end from 'common/all-params-methods.js.j2'

            // ========== include from 'common/monitoring-methods.js.j2'
@@ -572,26 +635,26 @@
                this.statRx.freq_search_lock = vals["state"]["rx"]["freq_search_lock"]
                this.statRx.afc_lock = vals["state"]["rx"]["afc_lock"]
                this.statRx.pkt_sync = vals["state"]["rx"]["pkt_sync"]
-                this.statRx.snr = vals["state"]["rx"]["snr"]
-                this.statRx.rssi = vals["state"]["rx"]["rssi"]
+                this.statRx.snr = Math.round(vals["state"]["rx"]["snr"] * 10) / 10
+                this.statRx.rssi = Math.round(vals["state"]["rx"]["rssi"] * 10) / 10
                this.statRx.modcod = modcodToStr(vals["state"]["rx"]["modcod"])
                this.statRx.frameSizeNormal = vals["state"]["rx"]["frameSizeNormal"]
                this.statRx.isPilots = vals["state"]["rx"]["isPilots"]
                this.statRx.symError = vals["state"]["rx"]["symError"]
-                this.statRx.freqErr = vals["state"]["rx"]["freqErr"]
-                this.statRx.freqErrAcc = vals["state"]["rx"]["freqErrAcc"]
+                this.statRx.freqErr = Math.round(vals["state"]["rx"]["freqErr"] * 100) / 100
+                this.statRx.freqErrAcc = Math.round(vals["state"]["rx"]["freqErrAcc"] * 100) / 100
                this.statRx.inputSignalLevel = vals["state"]["rx"]["inputSignalLevel"]
-                this.statRx.pllError = vals["state"]["rx"]["pllError"]
-                this.statRx.speedOnRxKbit = vals["state"]["rx"]["speedOnRxKbit"]
-                this.statRx.speedOnIifKbit = vals["state"]["rx"]["speedOnIifKbit"]
+                this.statRx.pllError = Math.round(vals["state"]["rx"]["pllError"] * 100) / 100
+                this.statRx.speedOnRxKbit = Math.round(vals["state"]["rx"]["speedOnRxKbit"] * 100) / 100
+                this.statRx.speedOnIifKbit = Math.round(vals["state"]["rx"]["speedOnIifKbit"] * 100) / 100
                this.statRx.packetsOk = vals["state"]["rx"]["packetsOk"]
                this.statRx.packetsBad = vals["state"]["rx"]["packetsBad"]
                this.statRx.packetsDummy = vals["state"]["rx"]["packetsDummy"]

                this.statTx.state = vals["state"]["tx"]["state"]
                this.statTx.modcod = modcodToStr(vals["state"]["tx"]["modcod"])
-                this.statTx.speedOnTxKbit = vals["state"]["tx"]["speedOnTxKbit"]
-                this.statTx.speedOnIifKbit = vals["state"]["tx"]["speedOnIifKbit"]
+                this.statTx.speedOnTxKbit = Math.round(vals["state"]["tx"]["speedOnTxKbit"] * 100) / 100
+                this.statTx.speedOnIifKbit = Math.round(vals["state"]["tx"]["speedOnIifKbit"] * 100) / 100
                this.statTx.centerFreq = vals["state"]["tx"]["centerFreq"]
                this.statTx.symSpeed = vals["state"]["tx"]["symSpeed"]

@@ -612,9 +675,9 @@
                } else {
                    this.statOs.uptime = '?'
                }
-                this.statOs.load1 = vals["state"]["device"]["load1min"]
-                this.statOs.load5 = vals["state"]["device"]["load5min"]
-                this.statOs.load15 = vals["state"]["device"]["load15min"]
+                this.statOs.load1 = Math.round(vals["state"]["device"]["load1min"] * 100) / 100
+                this.statOs.load5 = Math.round(vals["state"]["device"]["load5min"] * 100) / 100
+                this.statOs.load15 = Math.round(vals["state"]["device"]["load15min"] * 100) / 100
                this.statOs.totalram = vals["state"]["device"]["totalram"]
                this.statOs.freeram = vals["state"]["device"]["freeram"]
            },
@@ -695,6 +758,133 @@
                }
                this.submitStatus.modemReboot = 30
                fetch('/api/reboot', { method: 'POST' }).then((r) => {})
+            },
+            async restoreAllSettings() {
+                // Порядок применения настроек
+                const settingsApplyOrder = ['qos', 'tcpaccel', 'dpdi', 'rxtx', 'buclnb', 'network'];
+
+                // 1. Чтение JSON-файла, выбранного пользователем
+                const fileInput = document.createElement('input');
+                fileInput.type = 'file';
+                fileInput.accept = '.json';
+
+                const filePromise = new Promise((resolve, reject) => {
+                    fileInput.onchange = e => {
+                        const file = e.target.files[0];
+                        if (!file) {
+                            reject(new Error('Файл не выбран'));
+                            return;
+                        }
+
+                        const reader = new FileReader();
+                        reader.onload = event => {
+                            try {
+                                const jsonData = JSON.parse(event.target.result);
+                                resolve(jsonData);
+                            } catch (error) {
+                                reject(new Error('Ошибка парсинга JSON'));
+                            }
+                        };
+                        reader.onerror = () => reject(new Error('Ошибка чтения файла'));
+                        reader.readAsText(file);
+                    };
+                    fileInput.click();
+                });
+
+                try {
+                    const settingsToApply = await filePromise;
+                    const errors = [];
+
+                    // 2. Перебор групп параметров в заданном порядке
+                    for (const groupName of settingsApplyOrder) {
+                        if (!settingsToApply.hasOwnProperty(groupName)) {
+                            continue; // Пропускаем группы, которых нет в файле
+                        }
+
+                        const groupSettings = settingsToApply[groupName];
+                        if (typeof groupSettings !== 'object' || groupSettings === null) {
+                            continue;
+                        }
+
+                        try {
+                            // 2.1. POST-запрос для применения группы параметров
+                            const postResponse = await fetch(`/api/set/${groupName}`, {
+                                method: 'POST',
+                                headers: {
+                                    'Content-Type': 'application/json',
+                                },
+                                body: JSON.stringify(groupSettings)
+                            });
+
+                            if (!postResponse.ok) {
+                                throw new Error(`HTTP error ${postResponse.status}`);
+                            }
+
+                            const postResult = await postResponse.json();
+                            if (postResult.status !== 'ok') {
+                                throw new Error(`API error: ${postResult.message || 'unknown error'}`);
+                            }
+
+                            // 2.2. Проверка примененных параметров
+                            const getResponse = await fetch('/api/get/settings', { method: 'GET' });
+                            if (!getResponse.ok) {
+                                throw new Error(`HTTP error ${getResponse.status}`);
+                            }
+
+                            const fetchSettingsResult = await getResponse.json();
+                            if (fetchSettingsResult.status !== 'ok') {
+                                throw new Error('Не удалось получить текущие настройки');
+                            }
+
+                            // Проверка соответствия параметров
+                            const appliedGroup = fetchSettingsResult.settings[groupName] || {};
+                            const failedSettings = [];
+
+                            for (const [key, value] of Object.entries(groupSettings)) {
+                                if (appliedGroup[key] !== value) {
+                                    failedSettings.push(`${key} (ожидалось: ${value}, получено: ${appliedGroup[key]})`);
+                                }
+                            }
+
+                            if (failedSettings.length > 0) {
+                                throw new Error(`Не совпадают параметры: ${failedSettings.join(', ')}`);
+                            }
+
+                        } catch (groupError) {
+                            errors.push(`Группа ${groupName}: ${groupError.message}`);
+                        }
+                    }
+
+                    // 3. Показ ошибок, если они есть
+                    if (errors.length > 0) {
+                        const errorMessage = errors.join('\n\n') +
+                            '\n\nНекоторые настройки могли примениться некорректно.\nСтраница будет перезагружена.';
+                        alert(errorMessage);
+                    }
+
+                } catch (error) {
+                    alert(`Ошибка при восстановлении настроек: ${error.message}`);
+                    return;
+                }
+
+                // 4. Перезагрузка страницы
+                location.reload();
+            },
+            async dumpAllSettings() {
+                function downloadAsFile(data, filename) {
+                    let a = document.createElement("a");
+                    let file = new Blob([data], {type: 'application/json'});
+                    a.href = URL.createObjectURL(file);
+                    a.download = filename;
+                    a.click();
+                }
+                const response = await fetch('/api/get/settings', { method: 'GET' })
+                if (response.ok) {
+                    const jres = await response.json()
+                    if (jres["status"] === "ok") {
+                        downloadAsFile(JSON.stringify(jres["settings"], null, 4), "backup-" + this.about.firmwareVersion + "-" + this.about.modemSn + ".json")
+                    }
+                }
            },            // ========== include end from 'common/admin-methods.js.j2'


@@ -705,6 +895,7 @@
                    this.settingFetchComplete = true
                    this.updateRxtxSettings(vals)
                    this.updateBuclnbSettings(vals)
+                    this.updateNetworkSettings(vals)

                    if ('netServerName' in vals['settings']) {
                        document.getElementsByTagName('title')[0].innerText = vals['settings']['netServerName']
--- a/static/main-tdma.html
+++ b/static/main-tdma.html
@@ -158,12 +158,12 @@
                    <label>
                        <span>Roll-off</span>
                        <select v-model="paramRxtx.rxRolloff">
-                            <option :value="2">0.02</option>
-                            <option :value="5">0.05</option>
-                            <option :value="10">0.10</option>
-                            <option :value="15">0.15</option>
-                            <option :value="20">0.20</option>
-                            <option :value="25">0.25</option>
+                            <option :value="20">0.02</option>
+                            <option :value="50">0.05</option>
+                            <option :value="100">0.10</option>
+                            <option :value="150">0.15</option>
+                            <option :value="200">0.20</option>
+                            <option :value="250">0.25</option>
                        </select>
                    </label>
                </div>
@@ -173,16 +173,16 @@
            <div class="settings-set-container">
                <label>
                    <span>Метод расчета задержки</span>
-                    <select v-model="paramDpdi.dpdiIsPositional">
+                    <select v-model="paramDpdi.isPositional">
                        <option :value="true">Позиционированием</option>
                        <option :value="false">Окном задержки</option>
                    </select>
                </label>
-                <h2 v-show="paramDpdi.dpdiIsPositional === true">Настройки позиционирования</h2>
-                <label v-show="paramDpdi.dpdiIsPositional === true"><span>Широта станции</span><input type="number" v-model="paramDpdi.dpdiPositionStationLatitude" min="-180" max="180" step="1e-06"/></label>
-                <label v-show="paramDpdi.dpdiIsPositional === true"><span>Долгота станции</span><input type="number" v-model="paramDpdi.dpdiPositionStationLongitude" min="-180" max="180" step="1e-06"/></label>
-                <label v-show="paramDpdi.dpdiIsPositional === true"><span>Подспутниковая точка</span><input type="number" v-model="paramDpdi.dpdiPositionSatelliteLongitude" min="-180" max="180" step="1e-06"/></label>
-                <label v-show="paramDpdi.dpdiIsPositional === false"><span>Задержка до спутника, мс</span><input type="number" v-model="paramDpdi.dpdiDelay" max="400" step="0.1"/></label>
+                <h2 v-show="paramDpdi.isPositional === true">Настройки позиционирования</h2>
+                <label v-show="paramDpdi.isPositional === true"><span>Широта станции</span><input type="number" v-model="paramDpdi.positionStationLatitude" min="-180" max="180" step="1e-06"/></label>
+                <label v-show="paramDpdi.isPositional === true"><span>Долгота станции</span><input type="number" v-model="paramDpdi.positionStationLongitude" min="-180" max="180" step="1e-06"/></label>
+                <label v-show="paramDpdi.isPositional === true"><span>Подспутниковая точка</span><input type="number" v-model="paramDpdi.positionSatelliteLongitude" min="-180" max="180" step="1e-06"/></label>
+                <label v-show="paramDpdi.isPositional === false"><span>Задержка до спутника, мс</span><input type="number" v-model="paramDpdi.delay" max="400" step="0.1"/></label>
            </div>
            <button class="action-button" @click="settingsSubmitDpdi()">Сохранить <span class="submit-spinner" v-show="submitStatus.dpdi"></span></button>
            <h2>Настройки питания и опорного генератора</h2>
@@ -200,6 +200,10 @@
                            <option :value="24">24В</option>
                        </select>
                    </label>
+                    <label>
+                        <span>Частота LO, кГц</span>
+                        <input type="text" v-model.lazy="paramBuclnb.bucLoKhz" @change="e => paramBuclnb.bucLoKhz = inputFormatNumber(inputFormatNumber(e.target.value, {max:40000000,step:1}), {max:40000000,step:1})"/>
+                    </label>
                </div>
                <div class="settings-set-container">
                    <h3>Настройки LNB</h3>
@@ -216,6 +220,10 @@
                            <option :value="24">24В</option>
                        </select>
                    </label>
+                    <label>
+                        <span>Частота LO, кГц</span>
+                        <input type="text" v-model.lazy="paramBuclnb.lnbLoKhz" @change="e => paramBuclnb.lnbLoKhz = inputFormatNumber(inputFormatNumber(e.target.value, {max:40000000,step:1}), {max:40000000,step:1})"/>
+                    </label>
                </div>
                <div class="settings-set-container">
                    <h3>Сервисные настройки</h3>
@@ -235,16 +243,16 @@
            <div class="settings-set-container">
                <label>
                    <span>Пароль для входа в сеть ЦЗС</span>
-                    <input v-model="paramNetwork.netCesPassword" type="text">
+                    <input v-model="paramNetwork.cesPassword" type="text">
                </label>
                <h3>Настройки интерфейса управления</h3>
                <label>
-                    <span>IP Интерфейса управления (/24)</span>
-                    <input v-model="paramNetwork.netManagementIp" required type="text" pattern="^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$">
+                    <span>Интерфейс управления (a.d.d.r/mask)</span>
+                    <input v-model="paramNetwork.managementIp" required type="text" pattern="^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\/([0-9]|[1-2][0-9]|3[0-2])$">
                </label>
                <label>
                    <span>Имя веб-сервера</span>
-                    <input v-model="paramNetwork.netServerName" type="text">
+                    <input v-model="paramNetwork.serverName" type="text">
                </label>
            </div>
            <button class="action-button" @click="settingsSubmitNetwork()">Сохранить <span class="submit-spinner" v-show="submitStatus.network"></span></button>
@@ -266,6 +274,8 @@
                <div>
                    <button class="dangerous-button" onclick="fetch('/api/resetSettings', { method: 'POST' }).then((r) => { window.location.reload(); })">Сбросить модем до заводских настроек</button>
                </div>
+                <button class="action-button" @click="dumpAllSettings()">Сохранить бекап конфигурации</button>
+                <button class="dangerous-button" @click="restoreAllSettings()">Восстановить бекап конфигурации</button>
            </div>

            <h2>Обновление ПО</h2>
@@ -340,27 +350,29 @@
                    rxSpectrumInversion: false,
                    rxCentralFreq: 0,
                    rxBaudrate: 0,
-                    rxRolloff: 2,
+                    rxRolloff: 20,
                },
                paramBuclnb: {
                    bucRefClk10M: false,
                    bucPowering: 0,
+                    bucLoKhz: 0,
                    lnbRefClk10M: false,
                    lnbPowering: 0,
+                    lnbLoKhz: 0,
                    srvRefClk10M: false,
                    bucLnbAutoStart: false,
                },
                paramDpdi: {
-                    dpdiIsPositional: true,
-                    dpdiPositionStationLatitude: -180,
-                    dpdiPositionStationLongitude: -180,
-                    dpdiPositionSatelliteLongitude: -180,
-                    dpdiDelay: 0,
+                    isPositional: true,
+                    positionStationLatitude: -180,
+                    positionStationLongitude: -180,
+                    positionSatelliteLongitude: -180,
+                    delay: 0,
                },
                paramNetwork: {
-                    netCesPassword: null,
-                    netManagementIp: null,
-                    netServerName: null,
+                    cesPassword: null,
+                    managementIp: null,
+                    serverName: null,
                },
                // ========== include end from 'common/all-params-data.js.j2'

@@ -503,8 +515,10 @@
                let query = {
                    "bucRefClk10M": this.paramBuclnb.bucRefClk10M,
                    "bucPowering": this.paramBuclnb.bucPowering,
+                    "bucLoKhz": parseFloat(this.paramBuclnb.bucLoKhz.replace(/[^0-9,.]/g, '').replace(',', '.')),
                    "lnbRefClk10M": this.paramBuclnb.lnbRefClk10M,
                    "lnbPowering": this.paramBuclnb.lnbPowering,
+                    "lnbLoKhz": parseFloat(this.paramBuclnb.lnbLoKhz.replace(/[^0-9,.]/g, '').replace(',', '.')),
                    "srvRefClk10M": this.paramBuclnb.srvRefClk10M,
                    "bucLnbAutoStart": this.paramBuclnb.bucLnbAutoStart,
                }
@@ -519,11 +533,11 @@
                if (this.submitStatus.dpdi) { return }

                let query = {
-                    "dpdiIsPositional": this.paramDpdi.dpdiIsPositional,
-                    "dpdiPositionStationLatitude": this.paramDpdi.dpdiPositionStationLatitude,
-                    "dpdiPositionStationLongitude": this.paramDpdi.dpdiPositionStationLongitude,
-                    "dpdiPositionSatelliteLongitude": this.paramDpdi.dpdiPositionSatelliteLongitude,
-                    "dpdiDelay": this.paramDpdi.dpdiDelay,
+                    "isPositional": this.paramDpdi.isPositional,
+                    "positionStationLatitude": this.paramDpdi.positionStationLatitude,
+                    "positionStationLongitude": this.paramDpdi.positionStationLongitude,
+                    "positionSatelliteLongitude": this.paramDpdi.positionSatelliteLongitude,
+                    "delay": this.paramDpdi.delay,
                }

                this.submitStatus.dpdi = true
@@ -537,9 +551,9 @@
                { if (!confirm("Применение этих настроек может сделать модем недоступным! Продолжить?")) return }

                let query = {
-                    "netCesPassword": this.paramNetwork.netCesPassword,
-                    "netManagementIp": this.paramNetwork.netManagementIp,
-                    "netServerName": this.paramNetwork.netServerName,
+                    "cesPassword": this.paramNetwork.cesPassword,
+                    "managementIp": this.paramNetwork.managementIp,
+                    "serverName": this.paramNetwork.serverName,
                }

                this.submitStatus.network = true
@@ -566,24 +580,26 @@
                this.submitStatus.buclnb = false
                this.paramBuclnb.bucRefClk10M = vals["settings"]["buclnb"]["bucRefClk10M"]
                this.paramBuclnb.bucPowering = vals["settings"]["buclnb"]["bucPowering"]
+                this.paramBuclnb.bucLoKhz = this.inputFormatNumber(vals["settings"]["buclnb"]["bucLoKhz"], {max:40000000,step:1})
                this.paramBuclnb.lnbRefClk10M = vals["settings"]["buclnb"]["lnbRefClk10M"]
                this.paramBuclnb.lnbPowering = vals["settings"]["buclnb"]["lnbPowering"]
+                this.paramBuclnb.lnbLoKhz = this.inputFormatNumber(vals["settings"]["buclnb"]["lnbLoKhz"], {max:40000000,step:1})
                this.paramBuclnb.srvRefClk10M = vals["settings"]["buclnb"]["srvRefClk10M"]
                this.paramBuclnb.bucLnbAutoStart = vals["settings"]["buclnb"]["bucLnbAutoStart"]
            },
            updateDpdiSettings(vals) {
                this.submitStatus.dpdi = false
-                this.paramDpdi.dpdiIsPositional = vals["settings"]["dpdi"]["dpdiIsPositional"]
-                this.paramDpdi.dpdiPositionStationLatitude = vals["settings"]["dpdi"]["dpdiPositionStationLatitude"]
-                this.paramDpdi.dpdiPositionStationLongitude = vals["settings"]["dpdi"]["dpdiPositionStationLongitude"]
-                this.paramDpdi.dpdiPositionSatelliteLongitude = vals["settings"]["dpdi"]["dpdiPositionSatelliteLongitude"]
-                this.paramDpdi.dpdiDelay = vals["settings"]["dpdi"]["dpdiDelay"]
+                this.paramDpdi.isPositional = vals["settings"]["dpdi"]["isPositional"]
+                this.paramDpdi.positionStationLatitude = vals["settings"]["dpdi"]["positionStationLatitude"]
+                this.paramDpdi.positionStationLongitude = vals["settings"]["dpdi"]["positionStationLongitude"]
+                this.paramDpdi.positionSatelliteLongitude = vals["settings"]["dpdi"]["positionSatelliteLongitude"]
+                this.paramDpdi.delay = vals["settings"]["dpdi"]["delay"]
            },
            updateNetworkSettings(vals) {
                this.submitStatus.network = false
-                this.paramNetwork.netCesPassword = vals["settings"]["network"]["netCesPassword"]
-                this.paramNetwork.netManagementIp = vals["settings"]["network"]["netManagementIp"]
-                this.paramNetwork.netServerName = vals["settings"]["network"]["netServerName"]
+                this.paramNetwork.cesPassword = vals["settings"]["network"]["cesPassword"]
+                this.paramNetwork.managementIp = vals["settings"]["network"]["managementIp"]
+                this.paramNetwork.serverName = vals["settings"]["network"]["serverName"]
            },
            // ========== include end from 'common/all-params-methods.js.j2'

@@ -616,26 +632,26 @@
                this.statRx.freq_search_lock = vals["state"]["rx"]["freq_search_lock"]
                this.statRx.afc_lock = vals["state"]["rx"]["afc_lock"]
                this.statRx.pkt_sync = vals["state"]["rx"]["pkt_sync"]
-                this.statRx.snr = vals["state"]["rx"]["snr"]
-                this.statRx.rssi = vals["state"]["rx"]["rssi"]
+                this.statRx.snr = Math.round(vals["state"]["rx"]["snr"] * 10) / 10
+                this.statRx.rssi = Math.round(vals["state"]["rx"]["rssi"] * 10) / 10
                this.statRx.modcod = modcodToStr(vals["state"]["rx"]["modcod"])
                this.statRx.frameSizeNormal = vals["state"]["rx"]["frameSizeNormal"]
                this.statRx.isPilots = vals["state"]["rx"]["isPilots"]
                this.statRx.symError = vals["state"]["rx"]["symError"]
-                this.statRx.freqErr = vals["state"]["rx"]["freqErr"]
-                this.statRx.freqErrAcc = vals["state"]["rx"]["freqErrAcc"]
+                this.statRx.freqErr = Math.round(vals["state"]["rx"]["freqErr"] * 100) / 100
+                this.statRx.freqErrAcc = Math.round(vals["state"]["rx"]["freqErrAcc"] * 100) / 100
                this.statRx.inputSignalLevel = vals["state"]["rx"]["inputSignalLevel"]
-                this.statRx.pllError = vals["state"]["rx"]["pllError"]
-                this.statRx.speedOnRxKbit = vals["state"]["rx"]["speedOnRxKbit"]
-                this.statRx.speedOnIifKbit = vals["state"]["rx"]["speedOnIifKbit"]
+                this.statRx.pllError = Math.round(vals["state"]["rx"]["pllError"] * 100) / 100
+                this.statRx.speedOnRxKbit = Math.round(vals["state"]["rx"]["speedOnRxKbit"] * 100) / 100
+                this.statRx.speedOnIifKbit = Math.round(vals["state"]["rx"]["speedOnIifKbit"] * 100) / 100
                this.statRx.packetsOk = vals["state"]["rx"]["packetsOk"]
                this.statRx.packetsBad = vals["state"]["rx"]["packetsBad"]
                this.statRx.packetsDummy = vals["state"]["rx"]["packetsDummy"]

                this.statTx.state = vals["state"]["tx"]["state"]
                this.statTx.modcod = modcodToStr(vals["state"]["tx"]["modcod"])
-                this.statTx.speedOnTxKbit = vals["state"]["tx"]["speedOnTxKbit"]
-                this.statTx.speedOnIifKbit = vals["state"]["tx"]["speedOnIifKbit"]
+                this.statTx.speedOnTxKbit = Math.round(vals["state"]["tx"]["speedOnTxKbit"] * 100) / 100
+                this.statTx.speedOnIifKbit = Math.round(vals["state"]["tx"]["speedOnIifKbit"] * 100) / 100
                this.statTx.centerFreq = vals["state"]["tx"]["centerFreq"]
                this.statTx.symSpeed = vals["state"]["tx"]["symSpeed"]

@@ -659,9 +675,9 @@
                } else {
                    this.statOs.uptime = '?'
                }
-                this.statOs.load1 = vals["state"]["device"]["load1min"]
-                this.statOs.load5 = vals["state"]["device"]["load5min"]
-                this.statOs.load15 = vals["state"]["device"]["load15min"]
+                this.statOs.load1 = Math.round(vals["state"]["device"]["load1min"] * 100) / 100
+                this.statOs.load5 = Math.round(vals["state"]["device"]["load5min"] * 100) / 100
+                this.statOs.load15 = Math.round(vals["state"]["device"]["load15min"] * 100) / 100
                this.statOs.totalram = vals["state"]["device"]["totalram"]
                this.statOs.freeram = vals["state"]["device"]["freeram"]
            },
@@ -752,6 +768,133 @@
                }
                this.submitStatus.modemReboot = 30
                fetch('/api/reboot', { method: 'POST' }).then((r) => {})
+            },
+            async restoreAllSettings() {
+                // Порядок применения настроек
+                const settingsApplyOrder = ['qos', 'tcpaccel', 'dpdi', 'rxtx', 'buclnb', 'network'];
+
+                // 1. Чтение JSON-файла, выбранного пользователем
+                const fileInput = document.createElement('input');
+                fileInput.type = 'file';
+                fileInput.accept = '.json';
+
+                const filePromise = new Promise((resolve, reject) => {
+                    fileInput.onchange = e => {
+                        const file = e.target.files[0];
+                        if (!file) {
+                            reject(new Error('Файл не выбран'));
+                            return;
+                        }
+
+                        const reader = new FileReader();
+                        reader.onload = event => {
+                            try {
+                                const jsonData = JSON.parse(event.target.result);
+                                resolve(jsonData);
+                            } catch (error) {
+                                reject(new Error('Ошибка парсинга JSON'));
+                            }
+                        };
+                        reader.onerror = () => reject(new Error('Ошибка чтения файла'));
+                        reader.readAsText(file);
+                    };
+                    fileInput.click();
+                });
+
+                try {
+                    const settingsToApply = await filePromise;
+                    const errors = [];
+
+                    // 2. Перебор групп параметров в заданном порядке
+                    for (const groupName of settingsApplyOrder) {
+                        if (!settingsToApply.hasOwnProperty(groupName)) {
+                            continue; // Пропускаем группы, которых нет в файле
+                        }
+
+                        const groupSettings = settingsToApply[groupName];
+                        if (typeof groupSettings !== 'object' || groupSettings === null) {
+                            continue;
+                        }
+
+                        try {
+                            // 2.1. POST-запрос для применения группы параметров
+                            const postResponse = await fetch(`/api/set/${groupName}`, {
+                                method: 'POST',
+                                headers: {
+                                    'Content-Type': 'application/json',
+                                },
+                                body: JSON.stringify(groupSettings)
+                            });
+
+                            if (!postResponse.ok) {
+                                throw new Error(`HTTP error ${postResponse.status}`);
+                            }
+
+                            const postResult = await postResponse.json();
+                            if (postResult.status !== 'ok') {
+                                throw new Error(`API error: ${postResult.message || 'unknown error'}`);
+                            }
+
+                            // 2.2. Проверка примененных параметров
+                            const getResponse = await fetch('/api/get/settings', { method: 'GET' });
+                            if (!getResponse.ok) {
+                                throw new Error(`HTTP error ${getResponse.status}`);
+                            }
+
+                            const fetchSettingsResult = await getResponse.json();
+                            if (fetchSettingsResult.status !== 'ok') {
+                                throw new Error('Не удалось получить текущие настройки');
+                            }
+
+                            // Проверка соответствия параметров
+                            const appliedGroup = fetchSettingsResult.settings[groupName] || {};
+                            const failedSettings = [];
+
+                            for (const [key, value] of Object.entries(groupSettings)) {
+                                if (appliedGroup[key] !== value) {
+                                    failedSettings.push(`${key} (ожидалось: ${value}, получено: ${appliedGroup[key]})`);
+                                }
+                            }
+
+                            if (failedSettings.length > 0) {
+                                throw new Error(`Не совпадают параметры: ${failedSettings.join(', ')}`);
+                            }
+
+                        } catch (groupError) {
+                            errors.push(`Группа ${groupName}: ${groupError.message}`);
+                        }
+                    }
+
+                    // 3. Показ ошибок, если они есть
+                    if (errors.length > 0) {
+                        const errorMessage = errors.join('\n\n') +
+                            '\n\nНекоторые настройки могли примениться некорректно.\nСтраница будет перезагружена.';
+                        alert(errorMessage);
+                    }
+
+                } catch (error) {
+                    alert(`Ошибка при восстановлении настроек: ${error.message}`);
+                    return;
+                }
+
+                // 4. Перезагрузка страницы
+                location.reload();
+            },
+            async dumpAllSettings() {
+                function downloadAsFile(data, filename) {
+                    let a = document.createElement("a");
+                    let file = new Blob([data], {type: 'application/json'});
+                    a.href = URL.createObjectURL(file);
+                    a.download = filename;
+                    a.click();
+                }
+                const response = await fetch('/api/get/settings', { method: 'GET' })
+                if (response.ok) {
+                    const jres = await response.json()
+                    if (jres["status"] === "ok") {
+                        downloadAsFile(JSON.stringify(jres["settings"], null, 4), "backup-" + this.about.firmwareVersion + "-" + this.about.modemSn + ".json")
+                    }
+                }
            },            // ========== include end from 'common/admin-methods.js.j2'
Author	SHA1	Message	Date
Vladislav Ostapov	beca00ff70	fix: восстановил чтение статуса обновление с предупреждением, что в этом месте API зависает	2025-07-18 16:32:05 +03:00
Vladislav Ostapov	ed6694b99d	CI: установка переменной GIT_SUBMODULE_STRATEGY=recursive	2025-07-14 13:31:46 +03:00
Vladislav Ostapov	305a8c54fa	Merge remote-tracking branch 'origin/tdma-lo-feature'	2025-07-14 11:38:43 +03:00
Vladislav Ostapov	297e681b75	привет, зоопарк веток control_system_client! зато теперь вебка должна собираться для всех модемов из одной ветки	2025-07-14 11:37:40 +03:00
Vladislav Ostapov	32720ca365	fix: scpc некорректный максимальный модкод для ACM	2025-07-10 11:26:42 +03:00
Vladislav Ostapov	33bbdafc3d	fix: tdma временное отключение мониторинга статуса обновления и фикс установки настроек DPDI	2025-07-05 15:10:09 +03:00
Vladislav Ostapov	bfcdc88da9	fix: tdma+scpc не читались и не применялись настройки DPDI	2025-07-05 14:38:04 +03:00
Vladislav Ostapov	760a6858ee	feature: LO freq для BUC и LNB	2025-07-05 13:54:21 +03:00
Vladislav Ostapov	e9ff1d099a	fix: set ACM settings	2025-07-02 15:33:06 +03:00
Vladislav Ostapov	11e4561551	fix: aupcRequiredSnr - изменена граница допустимых значений	2025-07-02 14:52:17 +03:00
Vladislav Ostapov	081ef1b84f	fix: большие числа в мониторинге параметров (2)	2025-07-02 13:20:30 +03:00
Vladislav Ostapov	bb90a3fec2	unlock: установил нижний предел частот 100MHz вместо 950MHz	2025-06-17 13:08:00 +03:00
Vladislav Ostapov	9fbe88b64d	фича: маска для сети управления + исправление багов на странице для разработчиков	2025-06-05 17:07:27 +03:00
Vladislav Ostapov	996e711436	фича: бекап параметров и восстановление через вебку	2025-06-05 15:21:18 +03:00
Vladislav Ostapov	57ba61da41	фикс огромных чисел на странице мониторинга	2025-06-05 11:22:34 +03:00
Vladislav Ostapov	b9a25e8734	фикс roll-off, фикс нечитающихся настроек сети, фикс значений на странице мониторинга, добавил авто-регулировку мощности в ШПС	2025-06-05 11:15:13 +03:00
Vladislav Ostapov	1e185a987d	мелкие косметические изменения, добавил в вебку ШПС настройки сети	2025-06-05 10:29:58 +03:00