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
27 changed files with 2311 additions and 960 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_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"}
        ],
@@ -316,30 +318,20 @@
            ]
          }
        ],
-        "tcpaccel": [
-          {"widget": "h2", "label": "Настройки TCP-акселерации"},
-          {
-            "widget": "settings-container",
-            "childs": [
-              {"widget": "checkbox", "label": "Активировать акселерацию", "name": "accelEn"},
-              {"widget": "number", "label": "Максимальное количество соединений", "name": "accelMaxConnections", "min": 0, "step": 1, "max": 4000}
-            ]
-          }
-        ],
        "network": [
          {"widget": "h2", "label": "Настройки сети"},
          {
            "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"}
            ]
          }
        ]
@@ -378,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": [
@@ -403,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}
                ]
              }
            ]
@@ -465,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/all-params-methods.js.j2
+++ b/front-generator/template/common/all-params-methods.js.j2
@@ -24,7 +24,7 @@
            update{{ g['group'] | title }}Settings(vals) {
                this.submitStatus.{{ g['group'] }} = false
                {% for p in g['params'] %}
-                {{ build_setter_js(g['group'], p, "vals[\"settings\"][\"" ~ p['name'] ~ "\"]") }}
+                {{ build_setter_js(g['group'], p, "vals[\"settings\"][\"" ~ g['group'] ~ "\"][\"" ~ p['name'] ~ "\"]") }}
                {% endfor %}
            },
            {% endfor %}
--- a/front-generator/template/common/monitoring-methods.js.j2
+++ b/front-generator/template/common/monitoring-methods.js.j2
@@ -18,69 +18,68 @@
                }

                this.lastUpdateTime = new Date();
-                this.initState = vals["mainState"]["initState"]
+                this.initState = vals["state"]["initState"]
+                this.testState = vals["state"]["testState"]
                {% if modem == 'scpc' %}
-                this.isCinC = vals["mainState"]["isCinC"]
+                this.isCinC = vals["state"]["isCinC"]
                {% endif %}

-                this.statRx.state = vals["mainState"]["rx.state"]
-                this.statRx.sym_sync_lock = vals["mainState"]["rx.sym_sync_lock"]
-                this.statRx.freq_search_lock = vals["mainState"]["rx.freq_search_lock"]
-                this.statRx.afc_lock = vals["mainState"]["rx.afc_lock"]
-                this.statRx.pkt_sync = vals["mainState"]["rx.pkt_sync"]
-                this.statRx.snr = vals["mainState"]["rx.snr"]
-                this.statRx.rssi = vals["mainState"]["rx.rssi"]
-                this.statRx.modcod = modcodToStr(vals["mainState"]["rx.modcod"])
-                this.statRx.frameSizeNormal = vals["mainState"]["rx.frameSizeNormal"]
-                this.statRx.isPilots = vals["mainState"]["rx.isPilots"]
-                this.statRx.symError = vals["mainState"]["rx.symError"]
-                this.statRx.freqErr = vals["mainState"]["rx.freqErr"]
-                this.statRx.freqErrAcc = vals["mainState"]["rx.freqErrAcc"]
-                this.statRx.inputSignalLevel = vals["mainState"]["rx.inputSignalLevel"]
-                this.statRx.pllError = vals["mainState"]["rx.pllError"]
-                this.statRx.speedOnRxKbit = vals["mainState"]["rx.speedOnRxKbit"]
-                this.statRx.speedOnIifKbit = vals["mainState"]["rx.speedOnIifKbit"]
-                this.statRx.packetsOk = vals["mainState"]["rx.packetsOk"]
-                this.statRx.packetsBad = vals["mainState"]["rx.packetsBad"]
-                this.statRx.packetsDummy = vals["mainState"]["rx.packetsDummy"]
+                this.statRx.state = vals["state"]["rx"]["state"]
+                this.statRx.sym_sync_lock = vals["state"]["rx"]["sym_sync_lock"]
+                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 = 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 = 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 = 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["mainState"]["tx.state"]
-                this.statTx.snr = vals["mainState"]["tx.snr"]
-                this.statTx.modcod = modcodToStr(vals["mainState"]["tx.modcod"])
-                this.statTx.frameSizeNormal = vals["mainState"]["tx.frameSizeNormal"]
-                this.statTx.isPilots = vals["mainState"]["tx.isPilots"]
-                this.statTx.speedOnTxKbit = vals["mainState"]["tx.speedOnTxKbit"]
-                this.statTx.speedOnIifKbit = vals["mainState"]["tx.speedOnIifKbit"]
+                this.statTx.state = vals["state"]["tx"]["state"]
+                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 = Math.round(vals["state"]["tx"]["speedOnTxKbit"] * 100) / 100
+                this.statTx.speedOnIifKbit = Math.round(vals["state"]["tx"]["speedOnIifKbit"] * 100) / 100

-                this.statCinc.occ = vals["mainState"]["cinc.occ"]
-                this.statCinc.correlator = vals["mainState"]["cinc.correlator"]
-                this.statCinc.correlatorFails = vals["mainState"]["cinc.correlatorFails"]
-                this.statCinc.freqErr = vals["mainState"]["cinc.freqErr"]
-                this.statCinc.freqErrAcc = vals["mainState"]["cinc.freqErrAcc"]
-                this.statCinc.channelDelay = vals["mainState"]["cinc.channelDelay"]
+                this.statCinc.occ = vals["state"]["cinc"]["occ"]
+                this.statCinc.correlator = vals["state"]["cinc"]["correlator"]
+                this.statCinc.correlatorFails = vals["state"]["cinc"]["correlatorFails"]
+                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["mainState"]["tx.state"]
-                this.statTx.modcod = modcodToStr(vals["mainState"]["tx.modcod"])
-                this.statTx.speedOnTxKbit = vals["mainState"]["tx.speedOnTxKbit"]
-                this.statTx.speedOnIifKbit = vals["mainState"]["tx.speedOnIifKbit"]
-                this.statTx.centerFreq = vals["mainState"]["tx.centerFreq"]
-                this.statTx.symSpeed = vals["mainState"]["tx.symSpeed"]
+                this.statTx.state = vals["state"]["tx"]["state"]
+                this.statTx.modcod = modcodToStr(vals["state"]["tx"]["modcod"])
+                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 %}

-                this.statDevice.adrv = vals["mainState"]["device.adrv"]
-                this.statDevice.zynq = vals["mainState"]["device.zynq"]
-                this.statDevice.fpga = vals["mainState"]["device.fpga"]
+                this.statDevice.adrv = vals["state"]["device"]["adrv"]
+                this.statDevice.zynq = vals["state"]["device"]["zynq"]
+                this.statDevice.fpga = vals["state"]["device"]["fpga"]
                {% if modem == 'tdma' %}
-                this.statDevice.upgradeStatus = vals["mainState"]["device.upgradeStatus"]
-                this.statDevice.upgradePercent = vals["mainState"]["device.upgradePercent"]
-                this.statDevice.upgradeImage = vals["mainState"]["device.upgradeImage"]
+                this.statDevice.upgradeStatus = vals["state"]["device"]["upgradeStatus"]
+                this.statDevice.upgradePercent = vals["state"]["device"]["upgradePercent"]
+                this.statDevice.upgradeImage = vals["state"]["device"]["upgradeImage"]
                {% endif %}

-                this.testState = vals["mainState"]["testState"]
-
                // аптайм приходит в секундах, надо преобразовать его в человеко-читаемый вид
-                let uptime = vals["sysinfo"]["uptime"]
+                let uptime = vals["state"]["device"]["uptime"]
                if (uptime) {
                    let secs = uptime % 60; uptime = Math.floor(uptime / 60)
                    let mins = uptime % 60; uptime = Math.floor(uptime / 60)
@@ -92,11 +91,11 @@
                } else {
                    this.statOs.uptime = '?'
                }
-                this.statOs.load1 = vals["sysinfo"]["load1min"]
-                this.statOs.load5 = vals["sysinfo"]["load5min"]
-                this.statOs.load15 = vals["sysinfo"]["load15min"]
-                this.statOs.totalram = vals["sysinfo"]["totalram"]
-                this.statOs.freeram = vals["sysinfo"]["freeram"]
+                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"]
            },

            resetPacketsStatistics() {
--- a/front-generator/template/common/qos-methods.js.j2
+++ b/front-generator/template/common/qos-methods.js.j2
@@ -44,15 +44,17 @@
                }
                let query = {
                    "en": this.paramQos.en,
-                    "rt1": [],
-                    "rt2": [],
-                    "rt3": [],
-                    "cd": []
+                    "profile": {
+                        "rt1": [],
+                        "rt2": [],
+                        "rt3": [],
+                        "cd": []
+                    }
                }
-                for (let i = 0; i < this.paramQos.rt1.length; i++) { query.rt1.push(_translateQosClass('rt', this.paramQos.rt1[i])) }
-                for (let i = 0; i < this.paramQos.rt2.length; i++) { query.rt2.push(_translateQosClass('rt', this.paramQos.rt2[i])) }
-                for (let i = 0; i < this.paramQos.rt3.length; i++) { query.rt3.push(_translateQosClass('rt', this.paramQos.rt3[i])) }
-                for (let i = 0; i < this.paramQos.cd.length; i++) { query.cd.push(_translateQosClass('rt', this.paramQos.cd[i])) }
+                for (let i = 0; i < this.paramQos.rt1.length; i++) { query.profile.rt1.push(_translateQosClass('rt', this.paramQos.rt1[i])) }
+                for (let i = 0; i < this.paramQos.rt2.length; i++) { query.profile.rt2.push(_translateQosClass('rt', this.paramQos.rt2[i])) }
+                for (let i = 0; i < this.paramQos.rt3.length; i++) { query.profile.rt3.push(_translateQosClass('rt', this.paramQos.rt3[i])) }
+                for (let i = 0; i < this.paramQos.cd.length; i++) { query.profile.cd.push(_translateQosClass('rt', this.paramQos.cd[i])) }

                //console.log(query)
                fetch('/api/set/qos', {
@@ -73,9 +75,9 @@

            updateQosSettings(vals) {
                this.submitStatusQos = false
-                this.paramQos.en = vals["settings"]["qosEnabled"]
+                this.paramQos.en = vals["settings"]["qos"]["en"]

-                const qosProfile = vals["settings"]["qosProfile"]
+                const qosProfile = vals["settings"]["qos"]["profile"]
                if (qosProfile !== null && qosProfile !== undefined) {
                    this.paramQos.rt1 = [] // .splice(0, this.paramQos.rt1.length)
                    this.paramQos.rt2 = [] // .splice(0, this.paramQos.rt2.length)
--- 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/front-generator/template/main.html
+++ b/front-generator/template/main.html
@@ -235,11 +235,11 @@
                try {
                    const fr = await fetch("/api/get/aboutFirmware")
                    const d = await fr.json()
-                    this.about.firmwareVersion = d["fw.version"]
-                    this.about.modemUid = d["fw.modemId"]
-                    this.about.modemSn = d["fw.modemSn"]
-                    this.about.macManagement = d["fw.macMang"]
-                    this.about.macData = d["fw.macData"]
+                    this.about.firmwareVersion = d["firmware"]["version"]
+                    this.about.modemUid = d["firmware"]["modemId"]
+                    this.about.modemSn = d["firmware"]["modemSn"]
+                    this.about.macManagement = d["firmware"]["macMang"]
+                    this.about.macData = d["firmware"]["macData"]
                } catch (e) {
                    console.log('Ошибка загрузки версии ПО', e)
                }
--- a/src/api-driver/daemon.cpp
+++ b/src/api-driver/daemon.cpp
@@ -6,6 +6,11 @@
 // минимальный порог для сна в цикле событий демона
 static constexpr int64_t SLEEP_THRESHOLD = 10;

+int64_t api_driver::TimeNow() {
+    return std::chrono::time_point_cast<std::chrono::milliseconds>(std::chrono::system_clock::now()).time_since_epoch().count();
+}
+
+
 namespace api_driver {
    /**
     * Обертка для объектов, доступных для обновления
@@ -100,9 +105,12 @@ void api_driver::TerminalApiDaemon::run() {
 #endif
        // обновление статистики
        {.uo = CpUpdatebleObject([this]() {
-            std::shared_lock _slock1(this->settingsMutex);
-            obj::TerminalState tmp(state);
-            _slock1.release();
+
+            obj::TerminalState tmp;
+            {
+                std::shared_lock _slock1(this->settingsMutex);
+                tmp = state;
+            }

            tmp.updateCallback(cp);
            std::lock_guard _slock2(this->settingsMutex);
@@ -123,9 +131,11 @@ void api_driver::TerminalApiDaemon::run() {
        }, CACHE_SETTINGS_UPDATE_MS), .updaterName = "updateRxTxSettings"},
 #ifdef API_OBJECT_NETWORK_SETTINGS_ENABLE
        {.uo = CpUpdatebleObject([this]() {
-            std::shared_lock _slock1(this->settingsMutex);
-            obj::TerminalNetworkSettings net(settingsNetwork);
-            _slock1.release();
+            obj::TerminalNetworkSettings net;
+            {
+                std::shared_lock _slock1(this->settingsMutex);
+                net = settingsNetwork;
+            }

            net.updateCallback(cp);
            std::lock_guard _slock2(this->settingsMutex);
@@ -196,37 +206,71 @@ void api_driver::TerminalApiDaemon::getDeviceState(obj::TerminalDeviceState &des
    dest = stateDev;
 }

-void api_driver::TerminalApiDaemon::getSettingsRxTx(obj::TerminalRxTxSettings &dest) {
+api_driver::obj::TerminalRxTxSettings api_driver::TerminalApiDaemon::getSettingsRxTx() {
+    obj::TerminalRxTxSettings s;
+    {
+        std::shared_lock _olock(this->settingsMutex);
+        s = settingsRxTx;
+    }
+    return s;
 }

-void api_driver::TerminalApiDaemon::getNetworkSettings(obj::TerminalNetworkSettings &dest) {
+void api_driver::TerminalApiDaemon::setSettingsRxTx(obj::TerminalRxTxSettings &s) {
+    std::lock_guard _olock(settingsMutex);
+    settingsRxTx = s;
 }

-void api_driver::TerminalApiDaemon::getQosSettings(bool &isEnabled, std::string &json) {
+#ifdef API_OBJECT_NETWORK_SETTINGS_ENABLE
+api_driver::obj::TerminalNetworkSettings api_driver::TerminalApiDaemon::getNetworkSettings() {
+    obj::TerminalNetworkSettings s;
+    {
+        std::shared_lock _olock(this->settingsMutex);
+        s = settingsNetwork;
+    }
+    return s;
 }

-void api_driver::TerminalApiDaemon::setSettingsRxTx(obj::TerminalRxTxSettings &s, bool readback) {
+void api_driver::TerminalApiDaemon::setNetworkSettings(obj::TerminalNetworkSettings &s) {
+    std::lock_guard _olock(settingsMutex);
+    settingsNetwork = s;
+}
+#endif
+
+#ifdef API_OBJECT_QOS_SETTINGS_ENABLE
+api_driver::obj::TerminalQosSettings api_driver::TerminalApiDaemon::getQosSettings() {
+    obj::TerminalQosSettings s;
+    {
+        std::shared_lock _olock(this->settingsMutex);
+        s = settingsQos;
+    }
+    return s;
 }

-void api_driver::TerminalApiDaemon::setSettingsDpdi(DPDI_parmeters &s, bool readback) {
-}
-
-void api_driver::TerminalApiDaemon::setSettingsBucLnb(buc_lnb_settings &bucLnb, bool readback) {
-}
-
-void api_driver::TerminalApiDaemon::setQosSettings(bool enabled, const std::string &str, bool readback) {
-}
-
-void api_driver::TerminalApiDaemon::setNetworkSettings(obj::TerminalNetworkSettings &s, bool readback) {
+void api_driver::TerminalApiDaemon::setQosSettings(obj::TerminalQosSettings &s) {
+    std::lock_guard _olock(settingsMutex);
+    settingsQos = s;
 }
+#endif

 api_driver::obj::TerminalFirmwareVersion api_driver::TerminalApiDaemon::getFirmware() {
+    obj::TerminalFirmwareVersion res;
+    {
+        std::shared_lock _olock(firmwareMutex);
+        res = firmware;
+    }
+    return res;
 }

 void api_driver::TerminalApiDaemon::resetPacketStatistics() {
+    std::lock_guard lock(this->cpApiMutex);
+    cp.getDmaDebug("reset_cnt_rx");
 }

 void api_driver::TerminalApiDaemon::resetDefaultSettings() {
+    std::lock_guard lock(this->cpApiMutex);
+    cp.setDmaDebug("begin_save_config", "");
+    cp.setDmaDebug("default_params", "");
+    cp.setDmaDebug("save_config", "");
 }

 api_driver::TerminalApiDaemon::~TerminalApiDaemon() {
--- a/src/api-driver/daemon.h
+++ b/src/api-driver/daemon.h
@@ -50,22 +50,20 @@ namespace api_driver {

        // /**
        //  * Получение настроек, копирует текущие значения в структуры, переданные по указателю. Если передан пустой указатель, копирования не произойдет.
+        //  * Установка настроек просто копирует настройки и устанавливает их текущими
        //  */
-        void getSettingsRxTx(obj::TerminalRxTxSettings &dest);
+        obj::TerminalRxTxSettings getSettingsRxTx();
+        void setSettingsRxTx(obj::TerminalRxTxSettings &s);

-        void getNetworkSettings(obj::TerminalNetworkSettings &dest);
+        #ifdef API_OBJECT_NETWORK_SETTINGS_ENABLE
+        obj::TerminalNetworkSettings getNetworkSettings();
+        void setNetworkSettings(obj::TerminalNetworkSettings &s);
+        #endif

-        void getQosSettings(bool &isEnabled, std::string &json);
-
-        void setSettingsRxTx(obj::TerminalRxTxSettings &s, bool readback = true);
-
-        void setSettingsDpdi(DPDI_parmeters &s, bool readback = true);
-
-        void setSettingsBucLnb(buc_lnb_settings &bucLnb, bool readback = true);
-
-        void setQosSettings(bool enabled, const std::string &str, bool readback = true);
-
-        void setNetworkSettings(obj::TerminalNetworkSettings &s, bool readback = true);
+        #ifdef API_OBJECT_QOS_SETTINGS_ENABLE
+        obj::TerminalQosSettings getQosSettings();
+        void setQosSettings(obj::TerminalQosSettings &s);
+        #endif

        obj::TerminalFirmwareVersion getFirmware();

--- a/src/api-driver/proxy.cpp
+++ b/src/api-driver/proxy.cpp
@@ -1,10 +1,137 @@
 #include "proxy.h"
+#include "sstream"

-//#define CPAPI_PROXY_CALL(proxy, func, ...) do { auto _res = func(proxy.sid, __VA_ARGS__); if (_res != OK) { BOOST_LOG_TRIVIAL(error) << "CP API error in " #func "(" #__VA_ARGS__ "): " << _res; } } while (0)
-// void foo() {
-//     api_driver::proxy::CpProxy proxy;
-//     std::string tmp;
-//     CPAPI_PROXY_CALL(proxy, CP_GetDmaDebug, "fuck", &tmp);
-// }
+#define CPAPI_PROXY_CALL_HELPER(callfrom, func, funcArgs, throwArgs) do { lastCpError = func funcArgs; if (lastCpError != OK) { \
+    std::stringstream err; err << callfrom ": CP Api error " #func "("; err << throwArgs; err << "): " << lastCpError;\
+    throw std::runtime_error(err.str());\
+    } } while (0)


+api_driver::proxy::CpProxy::CpProxy() = default;
+
+api_driver::proxy::CpProxy::CpProxy(TSID s): sid(s) {}
+
+void api_driver::proxy::CpProxy::connect() {
+    unsigned int access{};
+    CPAPI_PROXY_CALL_HELPER("CpProxy::connect", CP_Login, ("admin", "pass", &sid, &access), R"("admin", "pass", &sid, &access)");
+}
+
+void api_driver::proxy::CpProxy::disconnect() {
+    if (sid != 0) {
+        lastCpError = CP_Logout(sid);
+        sid = 0;
+    }
+}
+
+std::string api_driver::proxy::CpProxy::getDmaDebug(const std::string &arg) {
+    std::string result;
+    CPAPI_PROXY_CALL_HELPER("CpProxy::getDmaDebug", CP_GetDmaDebug, (sid, arg.c_str(), &result), arg);
+    return result;
+}
+
+void api_driver::proxy::CpProxy::setDmaDebug(const std::string &arg, const std::string &value) {
+    CPAPI_PROXY_CALL_HELPER("CpProxy::setDmaDebug", CP_SetDmaDebug, (sid, arg.c_str(), value), arg << ", \"" << value << "\"");
+}
+
+std::string api_driver::proxy::CpProxy::getNetwork(const std::string &param) {
+    std::string result;
+    CPAPI_PROXY_CALL_HELPER("CpProxy::getNetwork", CP_GetNetwork, (sid, param.c_str(), &result), param);
+    return result;
+}
+
+void api_driver::proxy::CpProxy::setNetwork(const std::string &param, const std::string &value) {
+    CPAPI_PROXY_CALL_HELPER("CpProxy::setNetwork", CP_SetNetwork, (sid, param.c_str(), value.c_str()), param << ", \"" << value << "\"");
+}
+
+void api_driver::proxy::CpProxy::getModState(modulator_state &dest) {
+    CPAPI_PROXY_CALL_HELPER("CpProxy::getModState", CP_GetModulatorState, (sid, dest), "");
+}
+
+void api_driver::proxy::CpProxy::getModSettings(modulator_settings &dest) {
+    CPAPI_PROXY_CALL_HELPER("CpProxy::getModSettings", CP_GetModulatorSettings, (sid, dest), "");
+}
+
+void api_driver::proxy::CpProxy::setModSettings(modulator_settings &dest) {
+    CPAPI_PROXY_CALL_HELPER("CpProxy::setModSettings", CP_SetModulatorSettings, (sid, dest), "struct {...}");
+}
+
+void api_driver::proxy::CpProxy::getDemodState(demodulator_state &dest) {
+    CPAPI_PROXY_CALL_HELPER("CpProxy::getDemodState", CP_GetDemodulatorState, (sid, dest), "");
+}
+
+void api_driver::proxy::CpProxy::getDemodSettings(demodulator_settings &dest) {
+    CPAPI_PROXY_CALL_HELPER("CpProxy::getDemodSettings", CP_GetDemodulatorSettings, (sid, dest), "");
+}
+
+void api_driver::proxy::CpProxy::setDemodSettings(demodulator_settings &dest) {
+    CPAPI_PROXY_CALL_HELPER("CpProxy::setDemodSettings", CP_SetDemodulatorSettings, (sid, dest), "struct {...}");
+}
+
+#ifdef API_STRUCT_ACM_ENABLE
+void api_driver::proxy::CpProxy::getAcmSettings(ACM_parameters_serv_ &dest) {
+    CPAPI_PROXY_CALL_HELPER("CpProxy::getAcmSettings", CP_GetAcmParams, (sid, &dest), "");
+}
+
+void api_driver::proxy::CpProxy::setAcmSettings(ACM_parameters_serv_ &dest) {
+    CPAPI_PROXY_CALL_HELPER("CpProxy::setAcmSettings", CP_SetAcmParams, (sid, dest), "struct {...}");
+}
+#endif
+
+void api_driver::proxy::CpProxy::getDeviceState(device_state &dest) {
+    CPAPI_PROXY_CALL_HELPER("CpProxy::getDeviceState", CP_GetDeviceState, (sid, dest), "");
+}
+
+#ifdef API_OBJECT_QOS_SETTINGS_ENABLE
+std::tuple<std::string, bool> api_driver::proxy::CpProxy::getQosSettings() {
+    std::string rules;
+    bool en;
+    CPAPI_PROXY_CALL_HELPER("CpProxy::getQosSettings", CP_GetQoSSettings, (sid, rules, en), "");
+    return {rules, en};
+}
+
+void api_driver::proxy::CpProxy::setQosSettings(const std::string &rules, bool enable) {
+    CPAPI_PROXY_CALL_HELPER("CpProxy::setQosSettings", CP_SetQoSSettings, (sid, rules, enable), "`" << rules << "`, " << (enable ? "true" : "false"));
+}
+#endif
+
+#ifdef API_OBJECT_DPDI_SETTINGS_ENABLE
+void api_driver::proxy::CpProxy::getDpdiSettings(DPDI_parmeters &dest) {
+    CPAPI_PROXY_CALL_HELPER("CpProxy::getDpdiSettings", CP_GetDpdiParams, (sid, &dest), "");
+}
+
+void api_driver::proxy::CpProxy::setDpdiSettings(DPDI_parmeters &dest) {
+    CPAPI_PROXY_CALL_HELPER("CpProxy::setDpdiSettings", CP_SetDpdiParams, (sid, dest), "struct {...}");
+}
+#endif
+
+#ifdef API_OBJECT_BUCLNB_SETTINGS_ENABLE
+void api_driver::proxy::CpProxy::getBuclnbSettings(buc_lnb_settings &dest) {
+    CPAPI_PROXY_CALL_HELPER("CpProxy::getBuclnbSettings", CP_GetBUC_LNB_settings, (sid, dest), "");
+}
+
+void api_driver::proxy::CpProxy::setBuclnbSettings(buc_lnb_settings &dest) {
+    CPAPI_PROXY_CALL_HELPER("CpProxy::setBuclnbSettings", CP_SetBUC_LNB_settings, (sid, dest), "struct {...}");
+}
+#endif
+
+#ifdef MODEM_IS_SCPC
+void api_driver::proxy::CpProxy::getCincState(CinC_state &dest) {
+    CPAPI_PROXY_CALL_HELPER("CpProxy::getCincState", CP_GetCinCState, (sid, dest), "");
+}
+#endif
+
+#ifdef API_OBJECT_DEBUG_METRICS_ENABLE
+void api_driver::proxy::CpProxy::getDebugMetrics(debug_metrics &dest) {
+    CPAPI_PROXY_CALL_HELPER("CpProxy::getDebugMetrics", CP_GetDebugMetrics, (sid, dest), "");
+}
+#endif
+
+#ifdef MODEM_IS_TDMA
+void api_driver::proxy::CpProxy::getUpdateStatus(progress_msg &dest) {
+    CPAPI_PROXY_CALL_HELPER("CpProxy::getUpdateStatus", CP_GetUpdateStatus, (sid, dest), "");
+}
+#endif
+
+api_driver::proxy::CpProxy::~CpProxy() {
+    disconnect();
+}
--- a/src/api-driver/proxy.h
+++ b/src/api-driver/proxy.h
@@ -8,7 +8,6 @@

 std::ostream& operator<<(std::ostream& out, CP_Result result);

-
 namespace api_driver::proxy {
    class CpProxy {
    public:
@@ -41,19 +40,39 @@ namespace api_driver::proxy {
        void getDemodSettings(demodulator_settings& dest);
        void setDemodSettings(demodulator_settings& dest);

+        #ifdef API_STRUCT_ACM_ENABLE
+        void getAcmSettings(ACM_parameters_serv_& dest);
+        void setAcmSettings(ACM_parameters_serv_& dest);
+        #endif
+
        void getDeviceState(device_state& dest);

-#ifdef MODEM_IS_SCPC
+        #ifdef API_OBJECT_QOS_SETTINGS_ENABLE
+        std::tuple<std::string, bool> getQosSettings();
+        void setQosSettings(const std::string& rules, bool enable);
+        #endif
+
+        #ifdef API_OBJECT_DPDI_SETTINGS_ENABLE
+        void getDpdiSettings(DPDI_parmeters& dest);
+        void setDpdiSettings(DPDI_parmeters& dest);
+        #endif
+
+        #ifdef API_OBJECT_BUCLNB_SETTINGS_ENABLE
+        void getBuclnbSettings(buc_lnb_settings& dest);
+        void setBuclnbSettings(buc_lnb_settings& dest);
+        #endif
+
+        #ifdef MODEM_IS_SCPC
        void getCincState(CinC_state& dest);
-#endif
+        #endif

-#ifdef API_OBJECT_DEBUG_METRICS_ENABLE
+        #ifdef API_OBJECT_DEBUG_METRICS_ENABLE
        void getDebugMetrics(debug_metrics& dest);
-#endif
+        #endif

-#ifdef MODEM_IS_TDMA
+        #ifdef MODEM_IS_TDMA
        void getUpdateStatus(progress_msg& dest);
-#endif
+        #endif

        ~CpProxy();
    };
--- a/src/api-driver/stricts-enable.h
+++ b/src/api-driver/stricts-enable.h
@@ -6,7 +6,11 @@
 #define API_OBJECT_DEBUG_METRICS_ENABLE
 #endif

-#if defined(MODEM_IS_SCPC) || defined(MODEM_IS_TDMA)
+#if defined(MODEM_IS_SCPC) || defined(MODEM_IS_SHPS)
+#define API_STRUCT_ACM_ENABLE
+#endif
+
+#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,54 +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;
-
-double translateCoordinates(uint8_t deg, uint8_t min) {
-    return static_cast<double>(deg) + static_cast<double>(min) / 60;
-}
-
-// 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);
@@ -98,20 +50,19 @@ 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(boost::property_tree::ptree &pt) {
-    const bool newEn = pt.get<bool>("en");
-    const int newInterval = pt.get<int>("logPeriodMs");
-    const int newMaxAgeMs = pt.get<int>("maxAgeMs");
+void api_driver::obj::StatisticsLogger::setSettings(const nlohmann::json& data) {
+    const bool newEn = data.value("en", logEn);
+    const int newInterval = data.value("logPeriodMs", logPeriodMs.load());
+    const int newMaxAgeMs = data.value("maxAgeMs", maxAgeMs.load());

    std::lock_guard _lock(this->mutex);
    this->logPeriodMs = newInterval;
@@ -136,7 +87,11 @@ void api_driver::obj::StatisticsLogger::setSettings(boost::property_tree::ptree
 }

 void api_driver::obj::StatisticsLogger::updateCallback(proxy::CpProxy &cp) {
+    if (!logEn) return;

+    debug_metrics dm{};
+    cp.getDebugMetrics(dm);
+    putItem(dm);
 }

 void api_driver::obj::StatisticsLogger::putItem(const debug_metrics &item) {
@@ -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") {
@@ -217,18 +215,24 @@ void api_driver::obj::TerminalNetworkSettings::updateCallback(proxy::CpProxy &cp
    }
 }

-void api_driver::obj::TerminalNetworkSettings::updateFromPt(boost::property_tree::ptree &pt) {
+void api_driver::obj::TerminalNetworkSettings::updateFromJson(const nlohmann::json &data) {
+    managementIp = data.value("managementIp", managementIp);
+    isL2 = data.value("isL2", isL2);
+    dataIp = data.value("dataIp", dataIp);
+    dataMtu = data.value("dataMtu", dataMtu);
+    serverName = data.value("serverName", serverName);
 }

 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));
@@ -239,17 +243,22 @@ void api_driver::obj::TerminalNetworkSettings::store(proxy::CpProxy& cp) {
    }
 }

-std::string api_driver::obj::TerminalNetworkSettings::asJson() {
-    std::stringstream out;
-
-    return out.str();
+nlohmann::json api_driver::obj::TerminalNetworkSettings::asJson() {
+    nlohmann::json res;
+    res["isL2"] = isL2;
+    res["managementIp"] = managementIp;
+    res["managementGateway"] = managementGateway;
+    res["dataIp"] = dataIp;
+    res["dataMtu"] = dataMtu;
+    res["serverName"] = serverName;
+    return res;
 }

 api_driver::obj::TerminalNetworkSettings::~TerminalNetworkSettings() = default;
 #endif

 #ifdef API_OBJECT_QOS_SETTINGS_ENABLE
-api_driver::obj::TerminalQosSettings::TerminalQosSettings() = default;
+api_driver::obj::TerminalQosSettings::TerminalQosSettings(): qosSettingsJson(DEFAULT_QOS_CLASSES) {};
 api_driver::obj::TerminalQosSettings::TerminalQosSettings(const TerminalQosSettings &src) = default;
 api_driver::obj::TerminalQosSettings & api_driver::obj::TerminalQosSettings::operator=(const TerminalQosSettings &src) = default;

@@ -259,20 +268,60 @@ void api_driver::obj::TerminalQosSettings::loadDefaults() {
 }

 void api_driver::obj::TerminalQosSettings::updateCallback(proxy::CpProxy &cp) {
+    auto [profile, en] = cp.getQosSettings();
+    qosEnabled = en;
+    try {
+        qosSettingsJson = nlohmann::json::parse(profile);
+    } catch (std::exception& e) {
+        BOOST_LOG_TRIVIAL(warning) << "api_driver::obj::TerminalQosSettings::updateCallback(): Failed to parse QoS settings json: " << e.what();
+        qosSettingsJson = DEFAULT_QOS_CLASSES;
+    }
 }

-void api_driver::obj::TerminalQosSettings::updateFromPt(boost::property_tree::ptree &pt) {
+void api_driver::obj::TerminalQosSettings::updateFromJson(const nlohmann::json &data) {
+    qosEnabled = data.value("en", qosEnabled);
+    qosSettingsJson = data.value("profile", qosSettingsJson);
 }

 void api_driver::obj::TerminalQosSettings::store(proxy::CpProxy &cp) {
+    cp.setQosSettings(qosSettingsJson.dump(), qosEnabled);
 }

-std::string api_driver::obj::TerminalQosSettings::asJson() {
+nlohmann::json api_driver::obj::TerminalQosSettings::asJson() {
+    nlohmann::json res;
+    res["en"] = qosEnabled;
+    res["profile"] = qosSettingsJson;
+    return res;
 }

 api_driver::obj::TerminalQosSettings::~TerminalQosSettings() = default;
 #endif

+api_driver::obj::TerminalFirmwareVersion::TerminalFirmwareVersion() = default;
+api_driver::obj::TerminalFirmwareVersion::TerminalFirmwareVersion(const TerminalFirmwareVersion &src) = default;
+api_driver::obj::TerminalFirmwareVersion & api_driver::obj::TerminalFirmwareVersion::operator=(const TerminalFirmwareVersion &src) = default;
+
+void api_driver::obj::TerminalFirmwareVersion::load(proxy::CpProxy &cp) {
+    version = cp.getNetwork("version");
+    modemId = cp.getNetwork("chip_id");
+    rtrim(modemId);
+    modemSn = cp.getNetwork("serial");
+    macMang = cp.getNetwork("mac_eth0");
+    macData = cp.getNetwork("mac_eth1");
+}
+
+nlohmann::json api_driver::obj::TerminalFirmwareVersion::asJson() {
+    nlohmann::json res;
+    res["version"] = version;
+    res["modemId"] = modemId;
+    res["modemSn"] = modemSn;
+    res["macMang"] = macMang;
+    res["macData"] = macData;
+    return res;
+}
+
+api_driver::obj::TerminalFirmwareVersion::~TerminalFirmwareVersion() = default;
+

 api_driver::obj::TerminalState::TerminalState() = default;

@@ -341,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() {
@@ -352,7 +399,6 @@ nlohmann::json api_driver::obj::TerminalState::asJson() {

    res["initState"] = fInitState;
    res["testState"] = fIsTest;
-    res["fTxState"] = fIsTest;
 #ifdef MODEM_IS_SCPC
    res["isCinC"] = fIsCinC;
 #endif
@@ -381,6 +427,7 @@ nlohmann::json api_driver::obj::TerminalState::asJson() {
    res["rx"]["packetsDummy"] = fRxPacketsDummy;

    res["tx"]["modcod"] = fTxModcod;
+    res["tx"]["state"] = fTxState;
    res["tx"]["speedOnTxKbit"] = fTxSpeedOnTxKbit;
    res["tx"]["speedOnIifKbit"] = fTxSpeedOnIifKbit;
 #ifdef MODEM_IS_SCPC
@@ -404,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;
 }
@@ -487,6 +532,421 @@ nlohmann::json api_driver::obj::TerminalDeviceState::asJson() const {
 api_driver::obj::TerminalDeviceState::~TerminalDeviceState() = default;


+api_driver::obj::TerminalRxTxSettings::TerminalRxTxSettings() = default;
+api_driver::obj::TerminalRxTxSettings::TerminalRxTxSettings(const TerminalRxTxSettings &src) = default;
+api_driver::obj::TerminalRxTxSettings & api_driver::obj::TerminalRxTxSettings::operator=(const TerminalRxTxSettings &src) = default;
+
+void api_driver::obj::TerminalRxTxSettings::updateCallback(proxy::CpProxy &cp) {
+    cp.getModSettings(mod);
+    cp.getDemodSettings(dem);
+#ifdef API_STRUCT_ACM_ENABLE
+    cp.getAcmSettings(acm);
+#endif
+#ifdef API_OBJECT_DPDI_SETTINGS_ENABLE
+    cp.getDpdiSettings(dpdi);
+#endif
+#ifdef API_OBJECT_BUCLNB_SETTINGS_ENABLE
+    cp.getBuclnbSettings(buclnb);
+#endif
+}
+
+void api_driver::obj::TerminalRxTxSettings::storeMainSettings(proxy::CpProxy &cp) {
+    cp.setModSettings(mod);
+    cp.setDemodSettings(dem);
+#ifdef API_STRUCT_ACM_ENABLE
+    cp.setAcmSettings(acm);
+#endif
+}
+
+
+struct ModcodDef_t {const char* modulation; const char* speed;};
+const static ModcodDef_t ModcodDefs[] = {
+    {.modulation = "dummy", .speed = "0"},
+    {.modulation = "qpsk", .speed = "1/4"},
+    {.modulation = "qpsk", .speed = "1/3"},
+    {.modulation = "qpsk", .speed = "2/5"},
+    {.modulation = "qpsk", .speed = "1/2"},
+    {.modulation = "qpsk", .speed = "3/5"},
+    {.modulation = "qpsk", .speed = "2/3"},
+    {.modulation = "qpsk", .speed = "3/4"},
+    {.modulation = "qpsk", .speed = "4/5"},
+    {.modulation = "qpsk", .speed = "5/6"},
+    {.modulation = "qpsk", .speed = "8/9"},
+    {.modulation = "qpsk", .speed = "9/10"},
+    {.modulation = "8psk", .speed = "3/5"},
+    {.modulation = "8psk", .speed = "2/3"},
+    {.modulation = "8psk", .speed = "3/4"},
+    {.modulation = "8psk", .speed = "5/6"},
+    {.modulation = "8psk", .speed = "8/9"},
+    {.modulation = "8psk", .speed = "9/10"},
+    {.modulation = "16apsk", .speed = "2/3"},
+    {.modulation = "16apsk", .speed = "3/4"},
+    {.modulation = "16apsk", .speed = "4/5"},
+    {.modulation = "16apsk", .speed = "5/6"},
+    {.modulation = "16apsk", .speed = "8/9"},
+    {.modulation = "16apsk", .speed = "9/10"},
+    {.modulation = "32apsk", .speed = "3/4"},
+    {.modulation = "32apsk", .speed = "4/5"},
+    {.modulation = "32apsk", .speed = "5/6"},
+    {.modulation = "32apsk", .speed = "8/9"},
+    {.modulation = "32apsk", .speed = "9/10"},
+};
+
+static const char* extractModcodModulation(uint32_t modcod, bool defaultQpsk1_4 = true) {
+    modcod >>= 2;
+    const auto* d = defaultQpsk1_4 ? ModcodDefs : ModcodDefs + 1;
+    if (modcod < (sizeof(ModcodDefs) / sizeof(ModcodDef_t))) {
+        d = ModcodDefs + modcod;
+    }
+    return d->modulation;
+}
+static const char* extractModcodSpeed(uint32_t modcod, bool defaultQpsk1_4 = true) {
+    modcod >>= 2;
+    const auto* d = defaultQpsk1_4 ? ModcodDefs : ModcodDefs + 1;
+    if (modcod < (sizeof(ModcodDefs) / sizeof(ModcodDef_t))) {
+        d = ModcodDefs + modcod;
+    }
+    return d->speed;
+}
+static bool extractModcodFrameSizeNormal(uint32_t modcod) { return (modcod & 2) == 0; }
+static bool extractModcodIsPilots(uint32_t modcod) { return (modcod & 1) != 0; }
+static uint32_t buildModcodFromJson(const nlohmann::json& data, uint32_t modcod, const std::string& name, bool isNormalFrame, bool isPilots = false) {
+    const std::string mod = data.value(name + "Modulation", extractModcodModulation(modcod));
+    const std::string speed = data.value(name + "Speed", extractModcodSpeed(modcod));
+    uint32_t _index = 0;
+    for (const auto& m: ModcodDefs) {
+        if (mod == m.modulation) {
+            if (modcod == 0) modcod = _index;
+            if (speed == m.speed) {
+                modcod = _index;
+                break;
+            }
+        }
+        _index++;
+    }
+    return (modcod << 2)| (isNormalFrame ? 0 : 2) | (isPilots ? 1 : 0);
+}
+
+
+void api_driver::obj::TerminalRxTxSettings::updateMainSettings(const nlohmann::json &data) {
+    // для модулятора
+#ifdef MODEM_IS_SCPC
+    mod.is_cinc = data.value("isCinC", mod.is_cinc);
+#endif
+    mod.tx_is_on = data.value("txEn", mod.tx_is_on);
+#if defined(MODEM_IS_SCPC) || defined (MODEM_IS_SHPS)
+    mod.is_save_current_state = data.value("txAutoStart", mod.is_save_current_state);
+    mod.is_test_data = data.value("txIsTestInput", mod.is_test_data);
+#endif
+    mod.is_carrier = !data.value("txModulatorIsTest", !mod.is_carrier);
+    mod.central_freq_in_kGz = data.value("txCentralFreq", mod.central_freq_in_kGz);
+#if defined(MODEM_IS_SCPC) || defined (MODEM_IS_SHPS)
+    mod.baudrate = data.value("txBaudrate", mod.baudrate);
+    mod.rollof = data.value("txRolloff", mod.rollof);
+    mod.gold_seq_is_active = data.value("txGoldan", mod.gold_seq_is_active ? 1 : 0);
+#endif
+    mod.attenuation = data.value("txAttenuation", mod.attenuation);
+
+#if defined(MODEM_IS_SCPC) || defined(MODEM_IS_SHPS)
+    bool acmIsFrameSizeNormal = extractModcodFrameSizeNormal(mod.modcod_tx);
+    bool acmIsPilots = extractModcodIsPilots(mod.modcod_tx);
+
+    acmIsFrameSizeNormal = data.value("txFrameSizeNormal", acmIsFrameSizeNormal);
+    acmIsPilots = data.value("txIsPilots", acmIsPilots);
+    mod.modcod_tx = buildModcodFromJson(data, mod.modcod_tx, "dvbCcm", acmIsFrameSizeNormal, acmIsPilots);
+#endif
+#ifdef MODEM_IS_SHPS
+    mod.koef_spread = data.value("txSpreadCoef", mod.koef_spread);
+#endif
+
+    // демодулятор
+    dem.is_aru_on = data.value("rxAgcEn", dem.is_aru_on);
+    dem.gain = data.value("rxManualGain", dem.gain);
+    dem.is_rvt_iq = data.value("rxSpectrumInversion", dem.is_rvt_iq);
+    dem.central_freq_in_kGz = data.value("rxCentralFreq", dem.central_freq_in_kGz);
+    dem.baudrate = data.value("rxBaudrate", dem.baudrate);
+    dem.rollof = data.value("rxRolloff", dem.rollof);
+#if defined(MODEM_IS_SCPC) || defined (MODEM_IS_SHPS)
+    dem.gold_seq_is_active = data.value("rxGoldan", dem.gold_seq_is_active ? 1 : 0);
+#endif
+#ifdef MODEM_IS_SHPS
+    dem.koef_spread = data.value("rxSpreadCoef", dem.koef_spread);
+#endif
+
+#ifdef API_STRUCT_ACM_ENABLE
+    // ACM
+#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.max_modcod_acm = buildModcodFromJson(data, acm.max_modcod_acm, "dvbAcmMax", acmIsFrameSizeNormal, acmIsPilots);
+    acm.snr_threashold_acm = data.value("dvbSnrReserve", acm.snr_threashold_acm); // запас ОСШ
+#endif
+
+    acm.enable_aupc = data.value("aupcEn", acm.enable_aupc);
+    acm.min_attenuation_aupc = data.value("aupcMinAttenuation", acm.min_attenuation_aupc);
+    acm.max_attenuation_aupc = data.value("aupcMaxAttenuation", acm.max_attenuation_aupc);
+    acm.snr_threashold_aupc = data.value("aupcRequiredSnr", acm.snr_threashold_aupc);
+#endif
+}
+
+#ifdef API_OBJECT_DPDI_SETTINGS_ENABLE
+static double translateCoordinates(uint8_t deg, uint8_t min) {
+    return static_cast<double>(deg) + static_cast<double>(min) / 60;
+}
+
+static std::tuple<uint8_t, uint8_t> translateCoordinates(double abs) {
+    auto deg = static_cast<uint8_t>(abs);
+    double min_double = (abs - deg) * 60;
+    auto min = static_cast<uint8_t>(min_double);
+    return std::make_tuple(deg, min);
+}
+
+void api_driver::obj::TerminalRxTxSettings::updateDpdiSettings(const nlohmann::json &data) {
+    dpdi.is_delay_window = !data.value("isPositional", !dpdi.is_delay_window);
+#ifdef MODEM_IS_SCPC
+    dpdi.freq_offset = data.value("searchBandwidth", dpdi.freq_offset);
+#endif
+
+    if (data.contains("positionStationLatitude")) {
+        const double pos = data["positionStationLatitude"];
+        const auto [g, m] = translateCoordinates(pos);
+        dpdi.latitude_station_grad = g;
+        dpdi.latitude_station_minute = m;
+    }
+
+    if (data.contains("positionStationLongitude")) {
+        const double pos = data["positionStationLongitude"];
+        const auto [g, m] = translateCoordinates(pos);
+        dpdi.longitude_station_grad = g;
+        dpdi.longitude_station_minute = m;
+    }
+
+    if (data.contains("positionSatelliteLongitude")) {
+        const double pos = data["positionSatelliteLongitude"];
+        const auto [g, m] = translateCoordinates(pos);
+        dpdi.longitude_sattelite_grad = g;
+        dpdi.longitude_sattelite_minute = m;
+    }
+
+#ifdef MODEM_IS_SCPC
+    dpdi.min_delay = data.value("delayMin", dpdi.min_delay);
+    dpdi.max_delay = data.value("delayMax", dpdi.max_delay);
+#else
+    dpdi.min_delay = 0;
+    dpdi.max_delay = data.value("delay", dpdi.max_delay);
+#endif
+}
+void api_driver::obj::TerminalRxTxSettings::storeDpdiSettings(proxy::CpProxy &cp) {
+    cp.setDpdiSettings(dpdi);
+}
+#endif
+
+#ifdef API_OBJECT_BUCLNB_SETTINGS_ENABLE
+void api_driver::obj::TerminalRxTxSettings::updateBuclnbSettings(const nlohmann::json &data) {
+    {
+        // напряжение buc
+        int oldVoltage = 0;
+        if (buclnb.buc == voltage_buc::_24V) { oldVoltage = 24; }
+#ifdef MODEM_IS_SCPC
+        if (buclnb.buc == voltage_buc::_24V) { oldVoltage = 24; }
+#endif
+
+        auto result = data.value("bucPowering", oldVoltage);
+        switch (result) {
+            case 24: buclnb.buc = voltage_buc::_24V; break;
+#ifdef MODEM_IS_SCPC
+            case 48: buclnb.buc = voltage_buc::_48V; break;
+#endif
+            case 0:
+            default:
+                buclnb.buc = voltage_buc::DISABLE;
+        }
+    }
+    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
+        int oldVoltage;
+        switch (buclnb.lnb) {
+            case voltage_lnb::_13V: oldVoltage = 13; break;
+            case voltage_lnb::_18V: oldVoltage = 18; break;
+            case voltage_lnb::_24V: oldVoltage = 24; break;
+            default: oldVoltage = 0;
+        }
+
+        auto result = data.value("lnbPowering", oldVoltage);
+        switch (result) {
+            case 13: buclnb.lnb = voltage_lnb::_13V; break;
+            case 18: buclnb.lnb = voltage_lnb::_18V; break;
+            case 24: buclnb.lnb = voltage_lnb::_24V; break;
+            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);
+}
+void api_driver::obj::TerminalRxTxSettings::storeBuclnbSettings(proxy::CpProxy &cp) {
+    cp.setBuclnbSettings(buclnb);
+}
+#endif
+
+
+void api_driver::obj::TerminalRxTxSettings::storeAll(proxy::CpProxy &cp) {
+    storeMainSettings(cp);
+#ifdef API_OBJECT_DPDI_SETTINGS_ENABLE
+    storeDpdiSettings(cp);
+#endif
+#ifdef API_OBJECT_BUCLNB_SETTINGS_ENABLE
+    storeBuclnbSettings(cp);
+#endif
+}
+
+
+nlohmann::json api_driver::obj::TerminalRxTxSettings::asJson() const {
+    nlohmann::json res;
+
+    // RX TX
+    {
+        auto& rxtx = res["rxtx"];
+        // для модулятора
+#ifdef MODEM_IS_SCPC
+        rxtx["isCinC"] = mod.is_cinc;
+#endif
+        rxtx["txEn"] = mod.tx_is_on;
+#if defined(MODEM_IS_SCPC) || defined (MODEM_IS_SHPS)
+        rxtx["txAutoStart"] = mod.is_save_current_state;
+        rxtx["txIsTestInput"] = mod.is_test_data;
+#endif
+        rxtx["txModulatorIsTest"] = !mod.is_carrier;
+        rxtx["txCentralFreq"] = mod.central_freq_in_kGz;
+#if defined(MODEM_IS_SCPC) || defined (MODEM_IS_SHPS)
+        rxtx["txBaudrate"] = mod.baudrate;
+        rxtx["txRolloff"] = mod.rollof;
+        rxtx["txGoldan"] = mod.gold_seq_is_active ? 1 : 0;
+#endif
+        rxtx["txAttenuation"] = mod.attenuation;
+#ifdef MODEM_IS_SHPS
+        rxtx["txSpreadCoef"] = mod.koef_spread;
+#endif
+
+#if defined(MODEM_IS_SCPC) || defined(MODEM_IS_SHPS)
+        const bool acmIsFrameSizeNormal = extractModcodFrameSizeNormal(mod.modcod_tx);
+        const bool acmIsPilots = extractModcodIsPilots(mod.modcod_tx);
+
+        rxtx["txFrameSizeNormal"] = acmIsFrameSizeNormal;
+        rxtx["txIsPilots"] = acmIsPilots;
+
+        rxtx["dvbCcmModulation"] = extractModcodModulation(mod.modcod_tx);
+        rxtx["dvbCcmSpeed"] = extractModcodSpeed(mod.modcod_tx);
+#endif
+
+        // демодулятор
+        rxtx["rxAgcEn"] = dem.is_aru_on;
+        rxtx["rxManualGain"] = dem.gain;
+        rxtx["rxSpectrumInversion"] = dem.is_rvt_iq;
+        rxtx["rxCentralFreq"] = dem.central_freq_in_kGz;
+        rxtx["rxBaudrate"] = dem.baudrate;
+        rxtx["rxRolloff"] = dem.rollof;
+#if defined(MODEM_IS_SCPC) || defined (MODEM_IS_SHPS)
+        rxtx["rxGoldan"] = dem.gold_seq_is_active ? 1 : 0;
+#endif
+#ifdef MODEM_IS_SHPS
+        rxtx["txSpreadCoef"] = mod.koef_spread;
+        rxtx["rxSpreadCoef"] = dem.koef_spread;
+#endif
+
+#ifdef API_STRUCT_ACM_ENABLE
+        // ACM
+#ifdef MODEM_IS_SCPC
+        // эти настройки только в SCPC
+        rxtx["dvbServicePacketPeriod"] = acm.period_pack_acm;
+        rxtx["dvbIsAcm"] = acm.enable_acm;
+
+        rxtx["dvbAcmMinModulation"] = extractModcodModulation(acm.min_modcod_acm);
+        rxtx["dvbAcmMinSpeed"] = extractModcodSpeed(acm.min_modcod_acm);
+
+        rxtx["dvbAcmMaxModulation"] = extractModcodModulation(acm.max_modcod_acm);
+        rxtx["dvbAcmMaxSpeed"] = extractModcodSpeed(acm.max_modcod_acm);
+
+        rxtx["dvbSnrReserve"] = acm.snr_threashold_acm; // запас ОСШ
+#endif
+
+        rxtx["aupcEn"] = acm.enable_aupc;
+        rxtx["aupcMinAttenuation"] = acm.min_attenuation_aupc;
+        rxtx["aupcMaxAttenuation"] = acm.max_attenuation_aupc;
+        rxtx["aupcRequiredSnr"] = acm.snr_threashold_aupc;
+#endif
+    }
+
+#ifdef API_OBJECT_DPDI_SETTINGS_ENABLE
+    {
+        auto& dp = res["dpdi"];
+
+        dp["isPositional"] = !dpdi.is_delay_window;
+#ifdef MODEM_IS_SCPC
+        dp["searchBandwidth"] = dpdi.freq_offset;
+#endif
+
+        dp["positionStationLatitude"] = translateCoordinates(dpdi.latitude_station_grad, dpdi.latitude_station_minute);
+        dp["positionStationLongitude"] = translateCoordinates(dpdi.longitude_station_grad, dpdi.longitude_station_minute);
+        dp["positionSatelliteLongitude"] = translateCoordinates(dpdi.longitude_sattelite_grad, dpdi.longitude_sattelite_minute);
+
+#ifdef MODEM_IS_SCPC
+        dp["delayMin"] = dpdi.min_delay;
+        dp["delayMax"] = dpdi.max_delay;
+#else
+        dp["delay"] = dpdi.max_delay;
+#endif
+    }
+#endif
+
+    // BucLnb
+#ifdef API_OBJECT_BUCLNB_SETTINGS_ENABLE
+    {
+        auto& bl = res["buclnb"];
+        switch (buclnb.buc) {
+            case voltage_buc::_24V: bl["bucPowering"] = 24; break;
+#ifdef MODEM_IS_SCPC
+            case voltage_buc::_48V: bl["bucPowering"] = 48; break;
+#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) {
+            case voltage_lnb::_13V: bl["lnbPowering"] = 13; break;
+            case voltage_lnb::_18V: bl["lnbPowering"] = 18; break;
+            case voltage_lnb::_24V: bl["lnbPowering"] = 24; break;
+            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;
+    }
+#endif
+    return res;
+}
+
+api_driver::obj::TerminalRxTxSettings::~TerminalRxTxSettings() = default;
+
+



--- a/src/api-driver/structs.h
+++ b/src/api-driver/structs.h
@@ -7,9 +7,6 @@
 #include <fstream>
 #include <shared_mutex>
 #include <string>
-#include <boost/log/trivial.hpp>
-#include <boost/property_tree/ptree_fwd.hpp>
-
 #include "common/nlohmann/json.hpp"


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

        void updateCallback(proxy::CpProxy& cp);
        /**
@@ -60,7 +57,7 @@ namespace api_driver::obj {
    static constexpr const char* DEFAULT_SERVER_NAME = "RSCM-101";
 #elif defined(MODEM_IS_TDMA)
    static constexpr const char* DEFAULT_SERVER_NAME = "TDMA Abonent";
-#elif defined(MODEM_IS_SHPC)
+#elif defined(MODEM_IS_SHPS)
    static constexpr const char* DEFAULT_SERVER_NAME = "SHPS Terminal";
 #else
 #error "Selected modem type not supported!"
@@ -80,9 +77,9 @@ namespace api_driver::obj {
        void loadDefaults();

        void updateCallback(proxy::CpProxy& cp);
-        void updateFromPt(boost::property_tree::ptree &pt);
+        void updateFromJson(const nlohmann::json& data);
        void store(proxy::CpProxy& cp);
-        std::string asJson();
+        nlohmann::json asJson();

        ~TerminalNetworkSettings();
    };
@@ -92,7 +89,7 @@ namespace api_driver::obj {
    class TerminalQosSettings {
    public:
        static constexpr const char* DEFAULT_QOS_CLASSES = R"({"rt1":[],"rt2":[],"rt3":[],"cd":[]})";
-        std::string qosSettingsJson;
+        nlohmann::json qosSettingsJson;
        bool qosEnabled = false;

        TerminalQosSettings();
@@ -102,9 +99,9 @@ namespace api_driver::obj {
        void loadDefaults();

        void updateCallback(proxy::CpProxy& cp);
-        void updateFromPt(boost::property_tree::ptree &pt);
+        void updateFromJson(const nlohmann::json& data);
        void store(proxy::CpProxy& cp);
-        std::string asJson();
+        nlohmann::json asJson();

        ~TerminalQosSettings();
    };
@@ -116,18 +113,12 @@ namespace api_driver::obj {

        TerminalFirmwareVersion();
        TerminalFirmwareVersion(const TerminalFirmwareVersion& src);
-        ~TerminalFirmwareVersion();
-
-        // logCpApiError("api_driver::TerminalApiDaemon::connectToApi()->CP_GetNetwork(version)", CP_GetNetwork(sid, "version", &f.version));
-        // logCpApiError("api_driver::TerminalApiDaemon::connectToApi()->CP_GetNetwork(chip_id)", CP_GetNetwork(sid, "chip_id", &f.modemId));
-        // rtrim(f.modemId);
-        // logCpApiError("api_driver::TerminalApiDaemon::connectToApi()->CP_GetNetwork(serial)", CP_GetNetwork(sid, "serial", &f.modemSn));
-        // logCpApiError("api_driver::TerminalApiDaemon::connectToApi()->CP_GetNetwork(mac_eth0)", CP_GetNetwork(sid, "mac_eth0", &f.macMang));
-        // logCpApiError("api_driver::TerminalApiDaemon::connectToApi()->CP_GetNetwork(mac_eth1)", CP_GetNetwork(sid, "mac_eth1", &f.macData));
-        void load(proxy::CpProxy& cp);
-        std::string asJson();
-
        TerminalFirmwareVersion& operator= (const TerminalFirmwareVersion& src);
+
+        void load(proxy::CpProxy& cp);
+        nlohmann::json asJson();
+
+        ~TerminalFirmwareVersion();
    };

    /**
@@ -142,47 +133,45 @@ namespace api_driver::obj {
        bool fIsCinC = false;
 #endif

-        bool fRxState;
-        bool fRxSymSyncLock;
-        bool fRxFreqSearchLock;
-        bool fRxAfcLock;
-        bool fRxPktSync;
+        bool fRxState{};
+        bool fRxSymSyncLock{};
+        bool fRxFreqSearchLock{};
+        bool fRxAfcLock{};
+        bool fRxPktSync{};

-        float fRxSnr;
-        float fRxRssi;
-        uint16_t fRxModcod;
-        bool fRxFrameSizeNormal;
-        bool fRxIsPilots;
+        float fRxSnr{};
+        float fRxRssi{};
+        uint16_t fRxModcod{};
+        bool fRxFrameSizeNormal{};
+        bool fRxIsPilots{};

-        double fRxSymError;
-        double fRxFreqErr;
-        double fRxFreqErrAcc;
-        double fRxInputSignalLevel;
-        double fRxPllError;
-        double fRxSpeedOnRxKbit;
-        double fRxSpeedOnIifKbit;
-        uint32_t fRxPacketsOk;
-        uint32_t fRxPacketsBad;
-        uint32_t fRxPacketsDummy;
+        double fRxSymError{};
+        double fRxFreqErr{};
+        double fRxFreqErrAcc{};
+        double fRxInputSignalLevel{};
+        double fRxPllError{};
+        double fRxSpeedOnRxKbit{};
+        double fRxSpeedOnIifKbit{};
+        uint32_t fRxPacketsOk{};
+        uint32_t fRxPacketsBad{};
+        uint32_t fRxPacketsDummy{};

-        uint16_t fTxModcod;
-        double fTxSpeedOnTxKbit;
-        double fTxSpeedOnIifKbit;
+        uint16_t fTxModcod{};
+        double fTxSpeedOnTxKbit{};
+        double fTxSpeedOnIifKbit{};
 #ifdef MODEM_IS_SCPC
-        float fTxSnr;
-        bool fTxFrameSizeNormal;
-        bool fTxIsPilots;
-        double fCincOcc;
-        bool fCincCorrelator;
-        uint32_t fCincCorrelatorFails;
-        int32_t fCincFreqErr;
-        int32_t fCincFreqErrAcc;
-        float fCincChannelDelay;
+        float fTxSnr{};
+        bool fTxFrameSizeNormal{};
+        bool fTxIsPilots{};
+        double fCincOcc{};
+        bool fCincCorrelator{};
+        uint32_t fCincCorrelatorFails{};
+        int32_t fCincFreqErr{};
+        int32_t fCincFreqErrAcc{};
+        float fCincChannelDelay{};
 #endif
-#ifdef MODEM_IS_TDMA
        double fTxCenterFreq;
        double fTxSymSpeed;
-#endif

        TerminalState();

@@ -225,14 +214,40 @@ namespace api_driver::obj {
    };

    class TerminalRxTxSettings {
+        modulator_settings mod{};
+        demodulator_settings dem{};
+        #ifdef API_STRUCT_ACM_ENABLE
+        ACM_parameters_serv_ acm{};
+        #endif
+        #ifdef API_OBJECT_DPDI_SETTINGS_ENABLE
+        DPDI_parmeters dpdi{};
+        #endif
+        #ifdef API_OBJECT_BUCLNB_SETTINGS_ENABLE
+        buc_lnb_settings buclnb{};
+        #endif
    public:

-        // TODO описать все параметры для всех терминалов
+        TerminalRxTxSettings();
+        TerminalRxTxSettings(const TerminalRxTxSettings& src);
+        TerminalRxTxSettings& operator= (const TerminalRxTxSettings& src);

        void updateCallback(proxy::CpProxy& cp);
-        void updateFromPt(boost::property_tree::ptree &pt);
-        void store(proxy::CpProxy& cp);
-        std::string asJson();
+
+        void updateMainSettings(const nlohmann::json& data);
+        void storeMainSettings(proxy::CpProxy& cp);
+
+#ifdef API_OBJECT_DPDI_SETTINGS_ENABLE
+        void updateDpdiSettings(const nlohmann::json& data);
+        void storeDpdiSettings(proxy::CpProxy& cp);
+#endif
+
+#ifdef API_OBJECT_BUCLNB_SETTINGS_ENABLE
+        void updateBuclnbSettings(const nlohmann::json& data);
+        void storeBuclnbSettings(proxy::CpProxy& cp);
+#endif
+
+        void storeAll(proxy::CpProxy& cp);
+        nlohmann::json asJson() const;

        ~TerminalRxTxSettings();
    };
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -11,7 +11,6 @@
 #include <boost/log/utility/setup/formatter_parser.hpp>
 #include <boost/asio/buffer.hpp>
 #include <boost/asio/ssl/context.hpp>
-#include <boost/property_tree/json_parser.hpp>
 #include <cstddef>
 #include <memory>
 #include <fstream>
@@ -105,6 +104,8 @@ public:
    static constexpr const char* INDEX_HTML = "/main-tdma.html";
 #elif defined(MODEM_IS_SCPC)
    static constexpr const char* INDEX_HTML = "/main-scpc.html";
+#elif defined(MODEM_IS_SHPS)
+    static constexpr const char* INDEX_HTML = "/main-shps.html";
 #else
 #error "Modem type not defined!"
 #endif
@@ -178,11 +179,9 @@ public:
                rep.headers.clear();
                rep.headers.push_back({.name = "Content-Type", .value = toString(mime_types::json)});
                try {
-                    std::istringstream is(std::string(req.payload.data(), req.payload.size()));
-                    boost::property_tree::ptree pt;
-                    read_json(is, pt);
+                    auto reqJson = nlohmann::json::parse(std::string(req.payload.begin(), req.payload.end()));

-                    auto u = auth.doAuth(pt.get<std::string>("username"), pt.get<std::string>("password"), req, rep);
+                    auto u = auth.doAuth(reqJson["username"], reqJson["password"], req, rep);
                    if (u == nullptr) {
                        throw std::runtime_error("invalid session");
                    }
@@ -220,10 +219,21 @@ public:
                http::server::stockReply(http::server::bad_request, rep);
                return;
            }
-
            rep.status = http::server::ok;
            rep.headers.push_back({.name = "Content-Type", .value = toString(mime_types::json)});
-            const auto result = api->loadTerminalState();
+            nlohmann::json resultJson;
+
+            try {
+                resultJson["status"] = "ok";
+                resultJson["state"] = api->loadTerminalState();
+            } catch (std::exception& e) {
+                BOOST_LOG_TRIVIAL(error) << "WebHandle(/api/set/qos): Can't set QoS settings: " << e.what();
+                resultJson.clear();
+                resultJson["status"] = "error";
+                resultJson["error"] = e.what();
+            }
+
+            auto result = resultJson.dump();
            rep.content.insert(rep.content.end(), result.c_str(), result.c_str() + result.size());
        }));

@@ -232,12 +242,22 @@ public:
                http::server::stockReply(http::server::bad_request, rep);
                return;
            }
-
            rep.status = http::server::ok;
            rep.headers.push_back({.name = "Content-Type", .value = toString(mime_types::json)});
-            std::string result = R"({"settings":)";
-            result += api->loadSettings();
-            result += "}";
+            nlohmann::json resultJson;
+
+            try {
+                resultJson["status"] = "ok";
+                resultJson["settings"] = api->loadSettings();
+            } catch (std::exception& e) {
+                BOOST_LOG_TRIVIAL(error) << "WebHandle(/api/get/settings): Can't get object: " << e.what();
+                resultJson.clear();
+                rep.status = http::server::internal_server_error;
+                resultJson["status"] = "error";
+                resultJson["error"] = e.what();
+            }
+
+            auto result = resultJson.dump();
            rep.content.insert(rep.content.end(), result.c_str(), result.c_str() + result.size());
        }));

@@ -249,7 +269,20 @@ public:

            rep.status = http::server::ok;
            rep.headers.push_back({.name = "Content-Type", .value = toString(mime_types::json)});
-            const auto result = api->loadFirmwareVersion();
+            nlohmann::json resultJson;
+
+            try {
+                resultJson["status"] = "ok";
+                resultJson["firmware"] = api->loadFirmwareVersion();
+            } catch (std::exception& e) {
+                BOOST_LOG_TRIVIAL(error) << "WebHandle(/api/get/aboutFirmware): Can't get object: " << e.what();
+                resultJson.clear();
+                rep.status = http::server::internal_server_error;
+                resultJson["status"] = "error";
+                resultJson["error"] = e.what();
+            }
+
+            auto result = resultJson.dump();
            rep.content.insert(rep.content.end(), result.c_str(), result.c_str() + result.size());
        }));

@@ -266,6 +299,7 @@ public:
            rep.content.insert(rep.content.end(), result.c_str(), result.c_str() + result.size());
        }));

+#ifdef API_OBJECT_QOS_SETTINGS_ENABLE
        s.resources.emplace_back(std::make_unique<http::auth::AuthRequiredResource>("/api/set/qos", this->auth, http::auth::User::SETUP_QOS, [this](const auto& req, auto& rep) {
            if (req.method != "POST") {
                http::server::stockReply(http::server::bad_request, rep);
@@ -274,26 +308,26 @@ public:

            rep.status = http::server::ok;
            rep.headers.push_back({.name = "Content-Type", .value = toString(mime_types::json)});
+            nlohmann::json resultJson;

            try {
-                std::stringstream ss;
-                ss.str(std::string(req.payload.begin(), req.payload.end()));
-                boost::property_tree::ptree pt;
-                read_json(ss, pt);
-
-                api->setQosSettings(pt);
-
-                std::string result = R"({"status":"ok","settings":)";
-                result += api->loadSettings();
-                result += "}";
-                rep.content.insert(rep.content.end(), result.c_str(), result.c_str() + result.size());
+                auto reqJson = nlohmann::json::parse(std::string(req.payload.begin(), req.payload.end()));
+                api->setQosSettings(reqJson);
+                resultJson["status"] = "ok";
+                resultJson["settings"] = api->loadSettings();
            } catch (std::exception& e) {
                BOOST_LOG_TRIVIAL(error) << "WebHandle(/api/set/qos): Can't set QoS settings: " << e.what();
-                const std::string result = R"({"status": "error", "error": )" + api_driver::buildEscapedString(e.what()) + "}";
-                rep.content.insert(rep.content.end(), result.c_str(), result.c_str() + result.size());
+                resultJson.clear();
+                resultJson["status"] = "error";
+                resultJson["error"] = e.what();
            }
-        }));

+            auto result = resultJson.dump();
+            rep.content.insert(rep.content.end(), result.c_str(), result.c_str() + result.size());
+        }));
+#endif
+
+#ifdef API_OBJECT_BUCLNB_SETTINGS_ENABLE
        s.resources.emplace_back(std::make_unique<http::auth::AuthRequiredResource>("/api/set/buclnb", this->auth, http::auth::User::EDIT_SETTINGS, [this](const auto& req, auto& rep) {
            if (req.method != "POST") {
                http::server::stockReply(http::server::bad_request, rep);
@@ -303,25 +337,26 @@ public:
            rep.status = http::server::ok;
            rep.headers.push_back({.name = "Content-Type", .value = toString(mime_types::json)});

+            nlohmann::json resultJson;
+
            try {
-                std::stringstream ss;
-                ss.str(std::string(req.payload.begin(), req.payload.end()));
-                boost::property_tree::ptree pt;
-                read_json(ss, pt);
-
-                api->setBucLnbSettings(pt);
-
-                std::string result = R"({"status":"ok","settings":)";
-                result += api->loadSettings();
-                result += "}";
-                rep.content.insert(rep.content.end(), result.c_str(), result.c_str() + result.size());
+                auto reqJson = nlohmann::json::parse(std::string(req.payload.begin(), req.payload.end()));
+                api->setBucLnbSettings(reqJson);
+                resultJson["status"] = "ok";
+                resultJson["settings"] = api->loadSettings();
            } catch (std::exception& e) {
                BOOST_LOG_TRIVIAL(error) << "WebHandle(/api/set/buclnb): Can't set BUC LNB settings: " << e.what();
-                const std::string result = R"({"status": "error", "error": )" + api_driver::buildEscapedString(e.what()) + "}";
-                rep.content.insert(rep.content.end(), result.c_str(), result.c_str() + result.size());
+                resultJson.clear();
+                resultJson["status"] = "error";
+                resultJson["error"] = e.what();
            }
-        }));

+            auto result = resultJson.dump();
+            rep.content.insert(rep.content.end(), result.c_str(), result.c_str() + result.size());
+        }));
+#endif
+
+#ifdef API_OBJECT_DPDI_SETTINGS_ENABLE
        s.resources.emplace_back(std::make_unique<http::auth::AuthRequiredResource>("/api/set/dpdi", this->auth, http::auth::User::EDIT_SETTINGS, [this](const auto& req, auto& rep) {
            if (req.method != "POST") {
                http::server::stockReply(http::server::bad_request, rep);
@@ -330,25 +365,24 @@ public:

            rep.status = http::server::ok;
            rep.headers.push_back({.name = "Content-Type", .value = toString(mime_types::json)});
+            nlohmann::json resultJson;

            try {
-                std::stringstream ss;
-                ss.str(std::string(req.payload.begin(), req.payload.end()));
-                boost::property_tree::ptree pt;
-                read_json(ss, pt);
-
-                api->setDpdiSettings(pt);
-
-                std::string result = R"({"status":"ok","settings":)";
-                result += api->loadSettings();
-                result += "}";
-                rep.content.insert(rep.content.end(), result.c_str(), result.c_str() + result.size());
+                auto reqJson = nlohmann::json::parse(std::string(req.payload.begin(), req.payload.end()));
+                api->setDpdiSettings(reqJson);
+                resultJson["status"] = "ok";
+                resultJson["settings"] = api->loadSettings();
            } catch (std::exception& e) {
                BOOST_LOG_TRIVIAL(error) << "WebHandle(/api/set/dpdi): Can't set DPDI settings: " << e.what();
-                const std::string result = R"({"status": "error", "error": )" + api_driver::buildEscapedString(e.what()) + "}";
-                rep.content.insert(rep.content.end(), result.c_str(), result.c_str() + result.size());
+                resultJson.clear();
+                resultJson["status"] = "error";
+                resultJson["error"] = e.what();
            }
+
+            auto result = resultJson.dump();
+            rep.content.insert(rep.content.end(), result.c_str(), result.c_str() + result.size());
        }));
+#endif

        s.resources.emplace_back(std::make_unique<http::auth::AuthRequiredResource>("/api/set/rxtx", this->auth, http::auth::User::EDIT_SETTINGS, [this](const auto& req, auto& rep) {
            if (req.method != "POST") {
@@ -358,26 +392,25 @@ public:

            rep.status = http::server::ok;
            rep.headers.push_back({.name = "Content-Type", .value = toString(mime_types::json)});
+            nlohmann::json resultJson;

            try {
-                std::stringstream ss;
-                ss.str(std::string(req.payload.begin(), req.payload.end()));
-                boost::property_tree::ptree pt;
-                read_json(ss, pt);
-
-                api->setRxTxSettings(pt);
-
-                std::string result = R"({"status":"ok","settings":)";
-                result += api->loadSettings();
-                result += "}";
-                rep.content.insert(rep.content.end(), result.c_str(), result.c_str() + result.size());
+                auto reqJson = nlohmann::json::parse(std::string(req.payload.begin(), req.payload.end()));
+                api->setRxTxSettings(reqJson);
+                resultJson["status"] = "ok";
+                resultJson["settings"] = api->loadSettings();
            } catch (std::exception& e) {
                BOOST_LOG_TRIVIAL(error) << "WebHandle(/api/set/rxtx): Can't set RX/TX settings: " << e.what();
-                const std::string result = R"({"status": "error", "error": )" + api_driver::buildEscapedString(e.what()) + "}";
-                rep.content.insert(rep.content.end(), result.c_str(), result.c_str() + result.size());
+                resultJson.clear();
+                resultJson["status"] = "error";
+                resultJson["error"] = e.what();
            }
+
+            auto result = resultJson.dump();
+            rep.content.insert(rep.content.end(), result.c_str(), result.c_str() + result.size());
        }));

+#ifdef API_OBJECT_NETWORK_SETTINGS_ENABLE
        s.resources.emplace_back(std::make_unique<http::auth::AuthRequiredResource>("/api/set/network", this->auth, http::auth::User::EDIT_SETTINGS, [this](const auto& req, auto& rep) {
            if (req.method != "POST") {
                http::server::stockReply(http::server::bad_request, rep);
@@ -386,25 +419,24 @@ public:

            rep.status = http::server::ok;
            rep.headers.push_back({.name = "Content-Type", .value = toString(mime_types::json)});
+            nlohmann::json resultJson;

            try {
-                std::stringstream ss;
-                ss.str(std::string(req.payload.begin(), req.payload.end()));
-                boost::property_tree::ptree pt;
-                read_json(ss, pt);
-
-                api->setNetworkSettings(pt);
-
-                std::string result = R"({"status":"ok","settings":)";
-                result += api->loadSettings();
-                result += "}";
-                rep.content.insert(rep.content.end(), result.c_str(), result.c_str() + result.size());
+                auto reqJson = nlohmann::json::parse(std::string(req.payload.begin(), req.payload.end()));
+                api->setNetworkSettings(reqJson);
+                resultJson["status"] = "ok";
+                resultJson["settings"] = api->loadSettings();
            } catch (std::exception& e) {
                BOOST_LOG_TRIVIAL(error) << "WebHandle(/api/set/network): Can't set network settings: " << e.what();
-                const std::string result = R"({"status": "error", "error": )" + api_driver::buildEscapedString(e.what()) + "}";
-                rep.content.insert(rep.content.end(), result.c_str(), result.c_str() + result.size());
+                resultJson.clear();
+                resultJson["status"] = "error";
+                resultJson["error"] = e.what();
            }
+
+            auto result = resultJson.dump();
+            rep.content.insert(rep.content.end(), result.c_str(), result.c_str() + result.size());
        }));
+#endif

        s.resources.emplace_back(std::make_unique<http::auth::AuthRequiredResource>("/api/reboot", this->auth, 0, [this](const auto& req, auto& rep) {
            if (req.method != "POST") {
@@ -455,7 +487,13 @@ public:
                http::server::stockReply(http::server::bad_request, rep);
                return;
            }
-            this->upgradeOrRebootRunning = true;
+
+            rep.status = http::server::ok;
+            rep.headers.push_back({.name = "Content-Type", .value = toString(mime_types::json)});
+            nlohmann::json resultJson;
+
+            try {
+                this->upgradeOrRebootRunning = true;
 #ifdef MODEM_IS_TDMA
            if (req.url->params.find("ota") != req.url->params.end()) {
                doTerminalUpgradeOta();
@@ -465,10 +503,15 @@ public:
 #else
            doTerminalUpgrade();
 #endif
-            rep.status = http::server::ok;
-            rep.headers.clear();
-            rep.headers.push_back({.name = "Content-Type", .value = toString(mime_types::json)});
-            const auto result = api->loadFirmwareVersion();
+                resultJson["status"] = "ok";
+            } catch (std::exception& e) {
+                BOOST_LOG_TRIVIAL(error) << "WebHandle(/api/doFirmwareUpgrade): Error: " << e.what();
+                resultJson.clear();
+                resultJson["status"] = "error";
+                resultJson["error"] = e.what();
+            }
+
+            auto result = resultJson.dump();
            rep.content.insert(rep.content.end(), result.c_str(), result.c_str() + result.size());
        }));

@@ -487,58 +530,103 @@ public:
                return;
            }
            const auto func = req.url->params["f"];
-            std::string result = R"({"status":"ok"})";
-            if (func == "SetDmaDebug") {
-                if (req.url->params.find("param") == req.url->params.end()) { http::server::stockReply(http::server::bad_request, rep); return; }
-                if (req.url->params.find("value") == req.url->params.end()) { http::server::stockReply(http::server::bad_request, rep); return; }
-                this->api->executeInApi([&](auto& cp) {
-                    cp.setDmaDebug(req.url->params["param"], req.url->params["value"]);
-                });
-            } else if (func == "GetDmaDebug") {
-                if (req.url->params.find("param") == req.url->params.end()) { http::server::stockReply(http::server::bad_request, rep); return; }
-                this->api->executeInApi([&](auto& cp) {
-                    nlohmann::json tmp;
-                    tmp["status"] = "ok";
-                    tmp["result"] = cp.getDmaDebug(req.url->params["param"]);
-                    result = tmp.dump();
-                });
-            } else {
-                http::server::stockReply(http::server::not_implemented, rep);
-                return;
-            }
-
            rep.status = http::server::ok;
            rep.headers.push_back({.name = "Content-Type", .value = toString(mime_types::json)});
+            nlohmann::json resultJson;
+
+            try {
+                resultJson["status"] = "error";
+                if (func == "SetDmaDebug") {
+                    if (req.url->params.find("param") == req.url->params.end()) {
+                        rep.status = http::server::bad_request;
+                        resultJson["error"] = "missing required adgument: `param`";
+                    } else if (req.url->params.find("value") == req.url->params.end()) {
+                        rep.status = http::server::bad_request;
+                        resultJson["error"] = "missing required adgument: `value`";
+                    } else {
+                        this->api->executeInApi([&](auto& cp) {
+                            cp.setDmaDebug(req.url->params["param"], req.url->params["value"]);
+                        });
+                    }
+                } else if (func == "GetDmaDebug") {
+                    if (req.url->params.find("param") == req.url->params.end()) {
+                        rep.status = http::server::bad_request;
+                        resultJson["error"] = "missing required adgument: `param`";
+                    } else {
+                        this->api->executeInApi([&](auto& cp) {
+                            resultJson["status"] = "ok";
+                            resultJson["result"] = cp.getDmaDebug(req.url->params["param"]);
+                        });
+                    }
+                } else if (func == "SetNetwork") {
+                    if (req.url->params.find("param") == req.url->params.end()) {
+                        rep.status = http::server::bad_request;
+                        resultJson["error"] = "missing required adgument: `param`";
+                    } else if (req.url->params.find("value") == req.url->params.end()) {
+                        rep.status = http::server::bad_request;
+                        resultJson["error"] = "missing required adgument: `value`";
+                    } else {
+                        this->api->executeInApi([&](auto& cp) {
+                            cp.setNetwork(req.url->params["param"], req.url->params["value"]);
+                        });
+                    }
+                } else if (func == "GetNetwork") {
+                    if (req.url->params.find("param") == req.url->params.end()) {
+                        rep.status = http::server::bad_request;
+                        resultJson["error"] = "missing required adgument: `param`";
+                    } else {
+                        this->api->executeInApi([&](auto& cp) {
+                            resultJson["status"] = "ok";
+                            resultJson["result"] = cp.getNetwork(req.url->params["param"]);
+                        });
+                    }
+                } else {
+                    resultJson["error"] = "function not supported";
+                }
+            } catch (std::exception& e) {
+                BOOST_LOG_TRIVIAL(error) << "WebHandle(/api/set/qos): Can't set QoS settings: " << e.what();
+                resultJson.clear();
+                resultJson["status"] = "error";
+                resultJson["error"] = e.what();
+            }
+
+            auto result = resultJson.dump();
            rep.content.insert(rep.content.end(), result.c_str(), result.c_str() + result.size());
        }));
-#ifdef MODEM_IS_SCPC
+#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) {
-            std::string result;
-            if (req.method == "GET") {
-                result = R"({"status":"ok","logstat":)";
-                result += this->api->getLoggingStatisticsSettings();
-                result += "}";
-            } else if (req.method == "POST") {
-                std::stringstream ss;
-                ss.str(std::string(req.payload.begin(), req.payload.end()));
-                boost::property_tree::ptree pt;
-                read_json(ss, pt);
+            rep.status = http::server::ok;
+            rep.headers.push_back({.name = "Content-Type", .value = toString(mime_types::text_plain)});
+            nlohmann::json resultJson;

-                api->setLoggingStatisticsSettings(pt);
+            try {
+                if (req.method == "GET") {
+                    resultJson["status"] = "ok";
+                    resultJson["logstat"] = api->getLoggingStatisticsSettings();
+                } else if (req.method == "POST") {
+                    auto reqJson = nlohmann::json::parse(std::string(req.payload.begin(), req.payload.end()));
+                    api->setLoggingStatisticsSettings(reqJson);

-                result = R"({"status":"ok","logstat":)";
-                result += this->api->getLoggingStatisticsSettings();
-                result += "}";
-            } else {
-                http::server::stockReply(http::server::bad_request, rep);
-                return;
+                    resultJson["status"] = "ok";
+                    resultJson["logstat"] = api->getLoggingStatisticsSettings();
+                } else {
+                    rep.status = http::server::bad_request;
+                    resultJson["status"] = "error";
+                    resultJson["error"] = "unsupported request type";
+                }
+            } catch (std::exception& e) {
+                BOOST_LOG_TRIVIAL(error) << "WebHandle(/api/set/qos): Can't set QoS settings: " << e.what();
+                resultJson.clear();
+                resultJson["status"] = "error";
+                resultJson["error"] = e.what();
            }

-            rep.status = http::server::ok;
-            rep.headers.push_back({.name = "Content-Type", .value = toString(mime_types::json)});
+            auto result = resultJson.dump();
            rep.content.insert(rep.content.end(), result.c_str(), result.c_str() + result.size());
        }));
+#endif

+#ifdef API_OBJECT_DEBUG_METRICS_ENABLE
        s.resources.emplace_back(std::make_unique<http::auth::AuthRequiredResource>("/dev/logs.csv", this->auth, http::auth::User::DEVELOPER, [this](const auto& req, auto& rep) {
            if (req.method != "GET") {
                http::server::stockReply(http::server::bad_request, rep);
--- a/src/terminal_api_driver.cpp
+++ b/src/terminal_api_driver.cpp
@@ -44,7 +44,7 @@ std::tuple<uint8_t, uint8_t> translateCoordinates(double abs) {
 }


-std::string api_driver::ApiDriver::loadTerminalState() const {
+nlohmann::json api_driver::ApiDriver::loadTerminalState() const {
    if (daemon == nullptr) {
        return R"({"error": "api daemon not started!"})";
    }
@@ -56,7 +56,7 @@ std::string api_driver::ApiDriver::loadTerminalState() const {

    auto res = state.asJson();
    res["device"] = devState.asJson();
-    return res.dump();
+    return res;
 }


@@ -64,123 +64,105 @@ void api_driver::ApiDriver::resetPacketStatistics() const {
    this->daemon->resetPacketStatistics();
 }

-#ifdef MODEM_IS_SCPC
-struct ModcodDef_t {const char* modulation; const char* speed;};
-const static ModcodDef_t ModcodDefs[] = {
-    {.modulation = "dummy", .speed = "0"},
-    {.modulation = "qpsk", .speed = "1/4"},
-    {.modulation = "qpsk", .speed = "1/3"},
-    {.modulation = "qpsk", .speed = "2/5"},
-    {.modulation = "qpsk", .speed = "1/2"},
-    {.modulation = "qpsk", .speed = "3/5"},
-    {.modulation = "qpsk", .speed = "2/3"},
-    {.modulation = "qpsk", .speed = "3/4"},
-    {.modulation = "qpsk", .speed = "4/5"},
-    {.modulation = "qpsk", .speed = "5/6"},
-    {.modulation = "qpsk", .speed = "8/9"},
-    {.modulation = "qpsk", .speed = "9/10"},
-    {.modulation = "8psk", .speed = "3/5"},
-    {.modulation = "8psk", .speed = "2/3"},
-    {.modulation = "8psk", .speed = "3/4"},
-    {.modulation = "8psk", .speed = "5/6"},
-    {.modulation = "8psk", .speed = "8/9"},
-    {.modulation = "8psk", .speed = "9/10"},
-    {.modulation = "16apsk", .speed = "2/3"},
-    {.modulation = "16apsk", .speed = "3/4"},
-    {.modulation = "16apsk", .speed = "4/5"},
-    {.modulation = "16apsk", .speed = "5/6"},
-    {.modulation = "16apsk", .speed = "8/9"},
-    {.modulation = "16apsk", .speed = "9/10"},
-    {.modulation = "32apsk", .speed = "3/4"},
-    {.modulation = "32apsk", .speed = "4/5"},
-    {.modulation = "32apsk", .speed = "5/6"},
-    {.modulation = "32apsk", .speed = "8/9"},
-    {.modulation = "32apsk", .speed = "9/10"},
-};
-
-static const char* extractModcodModulation(uint32_t modcod, bool defaultQpsk1_4 = true) {
-    modcod >>= 2;
-    const auto* d = defaultQpsk1_4 ? ModcodDefs : ModcodDefs + 1;
-    if (modcod < (sizeof(ModcodDefs) / sizeof(ModcodDef_t))) {
-        d = ModcodDefs + modcod;
-    }
-    return d->modulation;
-}
-
-static const char* extractModcodSpeed(uint32_t modcod, bool defaultQpsk1_4 = true) {
-    modcod >>= 2;
-    const auto* d = defaultQpsk1_4 ? ModcodDefs : ModcodDefs + 1;
-    if (modcod < (sizeof(ModcodDefs) / sizeof(ModcodDef_t))) {
-        d = ModcodDefs + modcod;
-    }
-    return d->speed;
-}
-#endif
-
-std::string api_driver::ApiDriver::loadSettings() const {
+nlohmann::json api_driver::ApiDriver::loadSettings() const {
    if (daemon == nullptr) {
        return R"({"error": "api daemon not started!"})";
    }

-    // TODO сделать получение настроек
-    return "{}";
+    nlohmann::json res = daemon->getSettingsRxTx().asJson();
+#ifdef API_OBJECT_QOS_SETTINGS_ENABLE
+    res["qos"] = (daemon->getQosSettings().asJson());
+#endif
+#ifdef API_OBJECT_NETWORK_SETTINGS_ENABLE
+    res["network"] = (daemon->getNetworkSettings().asJson());
+#endif
+    return res;
 }

-std::string api_driver::ApiDriver::loadFirmwareVersion() const {
+nlohmann::json api_driver::ApiDriver::loadFirmwareVersion() const {
    if (daemon == nullptr) {
        return R"({"error": "api daemon not started!"})";
    }
-
-    std::stringstream result;
-    auto firmware = daemon->getFirmware();
-    result << "{\n\"fw.version\":" << buildEscapedString(firmware.version);
-    result << ",\"fw.modemId\":" << buildEscapedString(firmware.modemId);
-    result << ",\"fw.modemSn\":" << buildEscapedString(firmware.modemSn);
-    result << ",\"fw.macMang\":" << buildEscapedString(firmware.macMang);
-    result << ",\"fw.macData\":" << buildEscapedString(firmware.macData);
-    result << "\n}";
-    return result.str();
+    return daemon->getFirmware().asJson();
 }

-#ifdef MODEM_IS_SCPC
-static uint32_t buildModcodFromPt(const boost::property_tree::ptree& pt, const std::string& name, bool isShortFrame, bool isPilots = false) {
-    uint32_t modcod = 0;
-    const auto mod = pt.get<std::string>(name + "Modulation");
-    const auto speed = pt.get<std::string>(name + "Speed");
-    uint32_t _index = 0;
-    for (const auto& m: ModcodDefs) {
-        if (mod == m.modulation) {
-            if (modcod == 0) modcod = _index;
-            if (speed == m.speed) {
-                modcod = _index;
-                break;
-            }
-        }
-        _index++;
+void api_driver::ApiDriver::setRxTxSettings(const nlohmann::json& data) {
+    auto rxtx = daemon->getSettingsRxTx();
+    rxtx.updateMainSettings(data);
+
+    std::lock_guard _lapi(this->daemon->cpApiMutex);
+    this->daemon->cp.setDmaDebug("begin_save_config", "");
+    rxtx.storeMainSettings(this->daemon->cp);
+    this->daemon->cp.setDmaDebug("save_config", "");
+    rxtx.updateCallback(this->daemon->cp);
+    {
+        daemon->setSettingsRxTx(rxtx);
+    }
+}
+
+#ifdef API_OBJECT_DPDI_SETTINGS_ENABLE
+void api_driver::ApiDriver::setDpdiSettings(const nlohmann::json& data) {
+    auto rxtx = daemon->getSettingsRxTx();
+    rxtx.updateDpdiSettings(data);
+
+    std::lock_guard _lapi(this->daemon->cpApiMutex);
+    this->daemon->cp.setDmaDebug("begin_save_config", "");
+    rxtx.storeDpdiSettings(this->daemon->cp);
+    this->daemon->cp.setDmaDebug("save_config", "");
+    rxtx.updateCallback(this->daemon->cp);
+    {
+        daemon->setSettingsRxTx(rxtx);
    }
-    return (modcod << 2)| (isShortFrame ? 2 : 0) | (isPilots ? 1 : 0);
 }
 #endif

-void api_driver::ApiDriver::setRxTxSettings(boost::property_tree::ptree &pt) {
-    // TODO
-}
+#ifdef API_OBJECT_BUCLNB_SETTINGS_ENABLE
+void api_driver::ApiDriver::setBucLnbSettings(const nlohmann::json& data) {
+    auto rxtx = daemon->getSettingsRxTx();
+    rxtx.updateBuclnbSettings(data);

-void api_driver::ApiDriver::setDpdiSettings(boost::property_tree::ptree &pt) {
-    // TODO
+    std::lock_guard _lapi(this->daemon->cpApiMutex);
+    this->daemon->cp.setDmaDebug("begin_save_config", "");
+    rxtx.storeBuclnbSettings(this->daemon->cp);
+    this->daemon->cp.setDmaDebug("save_config", "");
+    rxtx.updateCallback(this->daemon->cp);
+    {
+        daemon->setSettingsRxTx(rxtx);
+    }
 }
+#endif

-void api_driver::ApiDriver::setBucLnbSettings(boost::property_tree::ptree &pt) {
-    // TODO
-}
+#ifdef API_OBJECT_QOS_SETTINGS_ENABLE
+void api_driver::ApiDriver::setQosSettings(const nlohmann::json& data) {
+    auto qos = daemon->getQosSettings();
+    qos.updateFromJson(data);

-void api_driver::ApiDriver::setQosSettings(boost::property_tree::ptree &pt) {
-    // TODO
+    std::lock_guard _lapi(this->daemon->cpApiMutex);
+    this->daemon->cp.setDmaDebug("begin_save_config", "");
+    qos.store(this->daemon->cp);
+    this->daemon->cp.setDmaDebug("save_config", "");
+    qos.updateCallback(this->daemon->cp);
+    {
+        daemon->setQosSettings(qos);
+    }
 }
+#endif

-void api_driver::ApiDriver::setNetworkSettings(boost::property_tree::ptree &pt) {
-    // TODO
+#ifdef API_OBJECT_NETWORK_SETTINGS_ENABLE
+void api_driver::ApiDriver::setNetworkSettings(const nlohmann::json& data) {
+    auto net = daemon->getNetworkSettings();
+    net.updateFromJson(data);
+
+    std::lock_guard _lapi(this->daemon->cpApiMutex);
+    this->daemon->cp.setDmaDebug("begin_save_config", "");
+    net.store(this->daemon->cp);
+    this->daemon->cp.setDmaDebug("save_config", "");
+    net.updateCallback(this->daemon->cp);
+    {
+        daemon->setNetworkSettings(net);
+    }
 }
+#endif

 void api_driver::ApiDriver::resetDefaultSettings() {
    daemon->resetDefaultSettings();
@@ -204,12 +186,12 @@ 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();
 }

-void api_driver::ApiDriver::setLoggingStatisticsSettings(boost::property_tree::ptree &pt) {
-    this->daemon->statsLogs.setSettings(pt);
+void api_driver::ApiDriver::setLoggingStatisticsSettings(const nlohmann::json& data) {
+    this->daemon->statsLogs.setSettings(data);
 }
 #endif

--- a/src/terminal_api_driver.h
+++ b/src/terminal_api_driver.h
@@ -5,8 +5,8 @@
 #include "api-driver/proxy.h"
 #include <memory>
 #include <string>
-#include <boost/property_tree/ptree.hpp>

+#include "common/nlohmann/json.hpp"

 namespace api_driver {
    constexpr int CACHE_STATISTICS_UPDATE_MS = 500; ///< время обновления кеша статистики модулятора/демодулятора
@@ -30,48 +30,47 @@ namespace api_driver {

        /**
        * Запросить общее состояние терминала
-        * @return {"txState":false,"rxState":false,"rx.sym_sync_lock":false,"rx.freq_search_lock":false,"rx.afc_lock":false,"rx.pkt_sync":false}
        */
-        std::string loadTerminalState() const;
+        nlohmann::json loadTerminalState() const;

        /**
        * Сбросить статистику пакетов
        */
        void resetPacketStatistics() const;

-        std::string loadSettings() const;
+        nlohmann::json loadSettings() const;

-        std::string loadFirmwareVersion() const;
+        nlohmann::json loadFirmwareVersion() const;

        /**
        * Установить настройки RX/TX, readback можно получить используя loadTerminalState
        */
-        void setRxTxSettings(boost::property_tree::ptree &pt);
+        void setRxTxSettings(const nlohmann::json& data);

 #ifdef API_OBJECT_DPDI_SETTINGS_ENABLE
        /**
        * Установить настройки DPDI, readback можно получить используя loadTerminalState.
        * @note Для TDMA и SCPC модемов эти настройки доступны
        */
-        void setDpdiSettings(boost::property_tree::ptree &pt);
+        void setDpdiSettings(const nlohmann::json& data);
 #endif

 #ifdef API_OBJECT_BUCLNB_SETTINGS_ENABLE
        /**
        * Установить настройки BUC и LNB, readback можно получить используя loadTerminalState.
        */
-        void setBucLnbSettings(boost::property_tree::ptree &pt);
+        void setBucLnbSettings(const nlohmann::json& data);
 #endif

 #ifdef API_OBJECT_QOS_SETTINGS_ENABLE
        /**
        * Установить настройки QoS, readback можно получить используя loadTerminalState.
        */
-        void setQosSettings(boost::property_tree::ptree &pt);
+        void setQosSettings(const nlohmann::json& data);
 #endif

 #ifdef API_OBJECT_NETWORK_SETTINGS_ENABLE
-        void setNetworkSettings(boost::property_tree::ptree &pt);
+        void setNetworkSettings(const nlohmann::json& data);
 #endif

        void resetDefaultSettings();
@@ -79,8 +78,8 @@ namespace api_driver {
        void executeInApi(const std::function<void(proxy::CpProxy&)> &callback);

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

        /**
         * Получить статистику в формате json. Выход будет дописан в вектор
--- 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>
@@ -489,38 +489,29 @@
            </div>
            <button class="action-button" @click="settingsSubmitQoS()">Применить <span class="submit-spinner" v-show="submitStatusQos"></span></button>

-            <h2>Настройки TCP-акселерации</h2>
-            <div class="settings-set-container">
-                <label>
-                    <span>Активировать акселерацию</span>
-                    <span class="toggle-input"><input type="checkbox" v-model="paramTcpaccel.accelEn" /><span class="slider"></span></span>
-                </label>
-                <label><span>Максимальное количество соединений</span><input type="number" v-model="paramTcpaccel.accelMaxConnections" max="4000" step="1"/></label>
-            </div>
-            <button class="action-button" @click="settingsSubmitTcpaccel()">Сохранить <span class="submit-spinner" v-show="submitStatus.tcpaccel"></span></button>
        </div>        <div class="tabs-body-item" v-if="activeTab === 'admin' && settingFetchComplete">
            <h2>Настройки сети</h2>
            <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>
@@ -542,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>
@@ -595,7 +588,6 @@
                    rxtx: false,
                    dpdi: false,
                    buclnb: false,
-                    tcpaccel: false,
                    network: false,
                    firmwareUpload: false,
                    firmwareUpgrade: false,
@@ -612,7 +604,7 @@
                    txIsTestInput: false,
                    txCentralFreq: 0,
                    txBaudrate: 0,
-                    txRolloff: 2,
+                    txRolloff: 20,
                    txGoldan: 0,
                    txAttenuation: -40,
                    dvbServicePacketPeriod: 0,
@@ -635,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,
@@ -655,16 +647,12 @@
                    srvRefClk10M: false,
                    bucLnbAutoStart: false,
                },
-                paramTcpaccel: {
-                    accelEn: false,
-                    accelMaxConnections: 0,
-                },
                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'

@@ -841,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
@@ -875,30 +863,16 @@
                    .catch((reason) => { alert(`Ошибка при применении настроек: ${reason}`) })
                    .finally(() => { this.submitStatus.buclnb = false })
            },
-            settingsSubmitTcpaccel() {
-                if (this.submitStatus.tcpaccel) { return }
-
-                let query = {
-                    "accelEn": this.paramTcpaccel.accelEn,
-                    "accelMaxConnections": this.paramTcpaccel.accelMaxConnections,
-                }
-
-                this.submitStatus.tcpaccel = true
-                fetch('/api/set/tcpaccel', {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.updateTcpaccelSettings(vals) })
-                    .catch((reason) => { alert(`Ошибка при применении настроек: ${reason}`) })
-                    .finally(() => { this.submitStatus.tcpaccel = false })
-            },
            settingsSubmitNetwork() {
                if (this.submitStatus.network) { return }
                { 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
@@ -910,70 +884,65 @@

            updateRxtxSettings(vals) {
                this.submitStatus.rxtx = false
-                this.paramRxtx.isCinC = vals["settings"]["isCinC"]
-                this.paramRxtx.txEn = vals["settings"]["txEn"]
-                this.paramRxtx.txAutoStart = vals["settings"]["txAutoStart"]
-                this.paramRxtx.txModulatorIsTest = vals["settings"]["txModulatorIsTest"]
-                this.paramRxtx.txIsTestInput = vals["settings"]["txIsTestInput"]
-                this.paramRxtx.txCentralFreq = this.inputFormatNumber(vals["settings"]["txCentralFreq"], {min:950000,max:6000000,step:0.01})
-                this.paramRxtx.txBaudrate = this.inputFormatNumber(vals["settings"]["txBaudrate"], {min:200000,max:54000000,})
-                this.paramRxtx.txRolloff = vals["settings"]["txRolloff"]
-                this.paramRxtx.txGoldan = vals["settings"]["txGoldan"]
-                this.paramRxtx.txAttenuation = vals["settings"]["txAttenuation"]
-                this.paramRxtx.dvbServicePacketPeriod = vals["settings"]["dvbServicePacketPeriod"]
-                this.paramRxtx.dvbIsAcm = vals["settings"]["dvbIsAcm"]
-                this.paramRxtx.txFrameSizeNormal = vals["settings"]["txFrameSizeNormal"]
-                this.paramRxtx.txIsPilots = vals["settings"]["txIsPilots"]
-                this.paramRxtx.dvbCcmModulation = vals["settings"]["dvbCcmModulation"]
-                this.paramRxtx.dvbCcmSpeed = vals["settings"]["dvbCcmSpeed"]
-                this.paramRxtx.dvbAcmMinModulation = vals["settings"]["dvbAcmMinModulation"]
-                this.paramRxtx.dvbAcmMinSpeed = vals["settings"]["dvbAcmMinSpeed"]
-                this.paramRxtx.dvbAcmMaxModulation = vals["settings"]["dvbAcmMaxModulation"]
-                this.paramRxtx.dvbAcmMaxSpeed = vals["settings"]["dvbAcmMaxSpeed"]
-                this.paramRxtx.dvbSnrReserve = vals["settings"]["dvbSnrReserve"]
-                this.paramRxtx.aupcEn = vals["settings"]["aupcEn"]
-                this.paramRxtx.aupcMinAttenuation = vals["settings"]["aupcMinAttenuation"]
-                this.paramRxtx.aupcMaxAttenuation = vals["settings"]["aupcMaxAttenuation"]
-                this.paramRxtx.aupcRequiredSnr = vals["settings"]["aupcRequiredSnr"]
-                this.paramRxtx.rxAgcEn = vals["settings"]["rxAgcEn"]
-                this.paramRxtx.rxManualGain = vals["settings"]["rxManualGain"]
-                this.paramRxtx.rxSpectrumInversion = vals["settings"]["rxSpectrumInversion"]
-                this.paramRxtx.rxCentralFreq = this.inputFormatNumber(vals["settings"]["rxCentralFreq"], {min:950000,max:6000000,step:0.01})
-                this.paramRxtx.rxBaudrate = this.inputFormatNumber(vals["settings"]["rxBaudrate"], {min:200000,max:54000000,})
-                this.paramRxtx.rxRolloff = vals["settings"]["rxRolloff"]
-                this.paramRxtx.rxGoldan = vals["settings"]["rxGoldan"]
+                this.paramRxtx.isCinC = vals["settings"]["rxtx"]["isCinC"]
+                this.paramRxtx.txEn = vals["settings"]["rxtx"]["txEn"]
+                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: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"]
+                this.paramRxtx.txAttenuation = vals["settings"]["rxtx"]["txAttenuation"]
+                this.paramRxtx.dvbServicePacketPeriod = vals["settings"]["rxtx"]["dvbServicePacketPeriod"]
+                this.paramRxtx.dvbIsAcm = vals["settings"]["rxtx"]["dvbIsAcm"]
+                this.paramRxtx.txFrameSizeNormal = vals["settings"]["rxtx"]["txFrameSizeNormal"]
+                this.paramRxtx.txIsPilots = vals["settings"]["rxtx"]["txIsPilots"]
+                this.paramRxtx.dvbCcmModulation = vals["settings"]["rxtx"]["dvbCcmModulation"]
+                this.paramRxtx.dvbCcmSpeed = vals["settings"]["rxtx"]["dvbCcmSpeed"]
+                this.paramRxtx.dvbAcmMinModulation = vals["settings"]["rxtx"]["dvbAcmMinModulation"]
+                this.paramRxtx.dvbAcmMinSpeed = vals["settings"]["rxtx"]["dvbAcmMinSpeed"]
+                this.paramRxtx.dvbAcmMaxModulation = vals["settings"]["rxtx"]["dvbAcmMaxModulation"]
+                this.paramRxtx.dvbAcmMaxSpeed = vals["settings"]["rxtx"]["dvbAcmMaxSpeed"]
+                this.paramRxtx.dvbSnrReserve = vals["settings"]["rxtx"]["dvbSnrReserve"]
+                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"]
+                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"]["dpdiIsPositional"]
-                this.paramDpdi.dpdiSearchBandwidth = vals["settings"]["dpdiSearchBandwidth"]
-                this.paramDpdi.dpdiPositionStationLatitude = vals["settings"]["dpdiPositionStationLatitude"]
-                this.paramDpdi.dpdiPositionStationLongitude = vals["settings"]["dpdiPositionStationLongitude"]
-                this.paramDpdi.dpdiPositionSatelliteLongitude = vals["settings"]["dpdiPositionSatelliteLongitude"]
-                this.paramDpdi.dpdiDelayMin = vals["settings"]["dpdiDelayMin"]
-                this.paramDpdi.dpdiDelayMax = vals["settings"]["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
-                this.paramBuclnb.bucRefClk10M = vals["settings"]["bucRefClk10M"]
-                this.paramBuclnb.bucPowering = vals["settings"]["bucPowering"]
-                this.paramBuclnb.lnbRefClk10M = vals["settings"]["lnbRefClk10M"]
-                this.paramBuclnb.lnbPowering = vals["settings"]["lnbPowering"]
-                this.paramBuclnb.srvRefClk10M = vals["settings"]["srvRefClk10M"]
-                this.paramBuclnb.bucLnbAutoStart = vals["settings"]["bucLnbAutoStart"]
-            },
-            updateTcpaccelSettings(vals) {
-                this.submitStatus.tcpaccel = false
-                this.paramTcpaccel.accelEn = vals["settings"]["accelEn"]
-                this.paramTcpaccel.accelMaxConnections = vals["settings"]["accelMaxConnections"]
+                this.paramBuclnb.bucRefClk10M = vals["settings"]["buclnb"]["bucRefClk10M"]
+                this.paramBuclnb.bucPowering = vals["settings"]["buclnb"]["bucPowering"]
+                this.paramBuclnb.lnbRefClk10M = vals["settings"]["buclnb"]["lnbRefClk10M"]
+                this.paramBuclnb.lnbPowering = vals["settings"]["buclnb"]["lnbPowering"]
+                this.paramBuclnb.srvRefClk10M = vals["settings"]["buclnb"]["srvRefClk10M"]
+                this.paramBuclnb.bucLnbAutoStart = vals["settings"]["buclnb"]["bucLnbAutoStart"]
            },
            updateNetworkSettings(vals) {
                this.submitStatus.network = false
-                this.paramNetwork.netManagementIp = vals["settings"]["netManagementIp"]
-                this.paramNetwork.netIsL2 = vals["settings"]["netIsL2"]
-                this.paramNetwork.netDataIp = vals["settings"]["netDataIp"]
-                this.paramNetwork.netDataMtu = vals["settings"]["netDataMtu"]
-                this.paramNetwork.netServerName = vals["settings"]["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'

@@ -998,53 +967,52 @@
                }

                this.lastUpdateTime = new Date();
-                this.initState = vals["mainState"]["initState"]
-                this.isCinC = vals["mainState"]["isCinC"]
+                this.initState = vals["state"]["initState"]
+                this.testState = vals["state"]["testState"]
+                this.isCinC = vals["state"]["isCinC"]

-                this.statRx.state = vals["mainState"]["rx.state"]
-                this.statRx.sym_sync_lock = vals["mainState"]["rx.sym_sync_lock"]
-                this.statRx.freq_search_lock = vals["mainState"]["rx.freq_search_lock"]
-                this.statRx.afc_lock = vals["mainState"]["rx.afc_lock"]
-                this.statRx.pkt_sync = vals["mainState"]["rx.pkt_sync"]
-                this.statRx.snr = vals["mainState"]["rx.snr"]
-                this.statRx.rssi = vals["mainState"]["rx.rssi"]
-                this.statRx.modcod = modcodToStr(vals["mainState"]["rx.modcod"])
-                this.statRx.frameSizeNormal = vals["mainState"]["rx.frameSizeNormal"]
-                this.statRx.isPilots = vals["mainState"]["rx.isPilots"]
-                this.statRx.symError = vals["mainState"]["rx.symError"]
-                this.statRx.freqErr = vals["mainState"]["rx.freqErr"]
-                this.statRx.freqErrAcc = vals["mainState"]["rx.freqErrAcc"]
-                this.statRx.inputSignalLevel = vals["mainState"]["rx.inputSignalLevel"]
-                this.statRx.pllError = vals["mainState"]["rx.pllError"]
-                this.statRx.speedOnRxKbit = vals["mainState"]["rx.speedOnRxKbit"]
-                this.statRx.speedOnIifKbit = vals["mainState"]["rx.speedOnIifKbit"]
-                this.statRx.packetsOk = vals["mainState"]["rx.packetsOk"]
-                this.statRx.packetsBad = vals["mainState"]["rx.packetsBad"]
-                this.statRx.packetsDummy = vals["mainState"]["rx.packetsDummy"]
+                this.statRx.state = vals["state"]["rx"]["state"]
+                this.statRx.sym_sync_lock = vals["state"]["rx"]["sym_sync_lock"]
+                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 = 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 = 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 = 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["mainState"]["tx.state"]
-                this.statTx.snr = vals["mainState"]["tx.snr"]
-                this.statTx.modcod = modcodToStr(vals["mainState"]["tx.modcod"])
-                this.statTx.frameSizeNormal = vals["mainState"]["tx.frameSizeNormal"]
-                this.statTx.isPilots = vals["mainState"]["tx.isPilots"]
-                this.statTx.speedOnTxKbit = vals["mainState"]["tx.speedOnTxKbit"]
-                this.statTx.speedOnIifKbit = vals["mainState"]["tx.speedOnIifKbit"]
+                this.statTx.state = vals["state"]["tx"]["state"]
+                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 = Math.round(vals["state"]["tx"]["speedOnTxKbit"] * 100) / 100
+                this.statTx.speedOnIifKbit = Math.round(vals["state"]["tx"]["speedOnIifKbit"] * 100) / 100

-                this.statCinc.occ = vals["mainState"]["cinc.occ"]
-                this.statCinc.correlator = vals["mainState"]["cinc.correlator"]
-                this.statCinc.correlatorFails = vals["mainState"]["cinc.correlatorFails"]
-                this.statCinc.freqErr = vals["mainState"]["cinc.freqErr"]
-                this.statCinc.freqErrAcc = vals["mainState"]["cinc.freqErrAcc"]
-                this.statCinc.channelDelay = vals["mainState"]["cinc.channelDelay"]
+                this.statCinc.occ = vals["state"]["cinc"]["occ"]
+                this.statCinc.correlator = vals["state"]["cinc"]["correlator"]
+                this.statCinc.correlatorFails = vals["state"]["cinc"]["correlatorFails"]
+                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["mainState"]["device.adrv"]
-                this.statDevice.zynq = vals["mainState"]["device.zynq"]
-                this.statDevice.fpga = vals["mainState"]["device.fpga"]
-
-                this.testState = vals["mainState"]["testState"]
+                this.statDevice.adrv = vals["state"]["device"]["adrv"]
+                this.statDevice.zynq = vals["state"]["device"]["zynq"]
+                this.statDevice.fpga = vals["state"]["device"]["fpga"]

                // аптайм приходит в секундах, надо преобразовать его в человеко-читаемый вид
-                let uptime = vals["sysinfo"]["uptime"]
+                let uptime = vals["state"]["device"]["uptime"]
                if (uptime) {
                    let secs = uptime % 60; uptime = Math.floor(uptime / 60)
                    let mins = uptime % 60; uptime = Math.floor(uptime / 60)
@@ -1056,11 +1024,11 @@
                } else {
                    this.statOs.uptime = '?'
                }
-                this.statOs.load1 = vals["sysinfo"]["load1min"]
-                this.statOs.load5 = vals["sysinfo"]["load5min"]
-                this.statOs.load15 = vals["sysinfo"]["load15min"]
-                this.statOs.totalram = vals["sysinfo"]["totalram"]
-                this.statOs.freeram = vals["sysinfo"]["freeram"]
+                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"]
            },

            resetPacketsStatistics() {
@@ -1156,15 +1124,17 @@
                }
                let query = {
                    "en": this.paramQos.en,
-                    "rt1": [],
-                    "rt2": [],
-                    "rt3": [],
-                    "cd": []
+                    "profile": {
+                        "rt1": [],
+                        "rt2": [],
+                        "rt3": [],
+                        "cd": []
+                    }
                }
-                for (let i = 0; i < this.paramQos.rt1.length; i++) { query.rt1.push(_translateQosClass('rt', this.paramQos.rt1[i])) }
-                for (let i = 0; i < this.paramQos.rt2.length; i++) { query.rt2.push(_translateQosClass('rt', this.paramQos.rt2[i])) }
-                for (let i = 0; i < this.paramQos.rt3.length; i++) { query.rt3.push(_translateQosClass('rt', this.paramQos.rt3[i])) }
-                for (let i = 0; i < this.paramQos.cd.length; i++) { query.cd.push(_translateQosClass('rt', this.paramQos.cd[i])) }
+                for (let i = 0; i < this.paramQos.rt1.length; i++) { query.profile.rt1.push(_translateQosClass('rt', this.paramQos.rt1[i])) }
+                for (let i = 0; i < this.paramQos.rt2.length; i++) { query.profile.rt2.push(_translateQosClass('rt', this.paramQos.rt2[i])) }
+                for (let i = 0; i < this.paramQos.rt3.length; i++) { query.profile.rt3.push(_translateQosClass('rt', this.paramQos.rt3[i])) }
+                for (let i = 0; i < this.paramQos.cd.length; i++) { query.profile.cd.push(_translateQosClass('rt', this.paramQos.cd[i])) }

                //console.log(query)
                fetch('/api/set/qos', {
@@ -1185,9 +1155,9 @@

            updateQosSettings(vals) {
                this.submitStatusQos = false
-                this.paramQos.en = vals["settings"]["qosEnabled"]
+                this.paramQos.en = vals["settings"]["qos"]["en"]

-                const qosProfile = vals["settings"]["qosProfile"]
+                const qosProfile = vals["settings"]["qos"]["profile"]
                if (qosProfile !== null && qosProfile !== undefined) {
                    this.paramQos.rt1 = [] // .splice(0, this.paramQos.rt1.length)
                    this.paramQos.rt2 = [] // .splice(0, this.paramQos.rt2.length)
@@ -1395,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'


@@ -1406,7 +1503,6 @@
                    this.updateRxtxSettings(vals)
                    this.updateDpdiSettings(vals)
                    this.updateBuclnbSettings(vals)
-                    this.updateTcpaccelSettings(vals)
                    this.updateNetworkSettings(vals)
                    this.updateQosSettings(vals)

@@ -1443,11 +1539,11 @@
                try {
                    const fr = await fetch("/api/get/aboutFirmware")
                    const d = await fr.json()
-                    this.about.firmwareVersion = d["fw.version"]
-                    this.about.modemUid = d["fw.modemId"]
-                    this.about.modemSn = d["fw.modemSn"]
-                    this.about.macManagement = d["fw.macMang"]
-                    this.about.macData = d["fw.macData"]
+                    this.about.firmwareVersion = d["firmware"]["version"]
+                    this.about.modemUid = d["firmware"]["modemId"]
+                    this.about.modemSn = d["firmware"]["modemSn"]
+                    this.about.macManagement = d["firmware"]["macMang"]
+                    this.about.macData = d["firmware"]["macData"]
                } catch (e) {
                    console.log('Ошибка загрузки версии ПО', e)
                }
--- 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,36 +545,64 @@
                    .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
-                this.paramRxtx.txEn = vals["settings"]["txEn"]
-                this.paramRxtx.txAutoStart = vals["settings"]["txAutoStart"]
-                this.paramRxtx.txModulatorIsTest = vals["settings"]["txModulatorIsTest"]
-                this.paramRxtx.txIsTestInput = vals["settings"]["txIsTestInput"]
-                this.paramRxtx.txCentralFreq = vals["settings"]["txCentralFreq"]
-                this.paramRxtx.txBaudrate = vals["settings"]["txBaudrate"]
-                this.paramRxtx.txRolloff = vals["settings"]["txRolloff"]
-                this.paramRxtx.txSpreadCoef = vals["settings"]["txSpreadCoef"]
-                this.paramRxtx.txGoldan = vals["settings"]["txGoldan"]
-                this.paramRxtx.txAttenuation = vals["settings"]["txAttenuation"]
-                this.paramRxtx.rxAgcEn = vals["settings"]["rxAgcEn"]
-                this.paramRxtx.rxManualGain = vals["settings"]["rxManualGain"]
-                this.paramRxtx.rxSpectrumInversion = vals["settings"]["rxSpectrumInversion"]
-                this.paramRxtx.rxCentralFreq = vals["settings"]["rxCentralFreq"]
-                this.paramRxtx.rxBaudrate = vals["settings"]["rxBaudrate"]
-                this.paramRxtx.rxRolloff = vals["settings"]["rxRolloff"]
-                this.paramRxtx.rxSpreadCoef = vals["settings"]["rxSpreadCoef"]
-                this.paramRxtx.rxGoldan = vals["settings"]["rxGoldan"]
+                this.paramRxtx.txEn = vals["settings"]["rxtx"]["txEn"]
+                this.paramRxtx.txAutoStart = vals["settings"]["rxtx"]["txAutoStart"]
+                this.paramRxtx.txModulatorIsTest = vals["settings"]["rxtx"]["txModulatorIsTest"]
+                this.paramRxtx.txIsTestInput = vals["settings"]["rxtx"]["txIsTestInput"]
+                this.paramRxtx.txCentralFreq = vals["settings"]["rxtx"]["txCentralFreq"]
+                this.paramRxtx.txBaudrate = vals["settings"]["rxtx"]["txBaudrate"]
+                this.paramRxtx.txRolloff = vals["settings"]["rxtx"]["txRolloff"]
+                this.paramRxtx.txSpreadCoef = vals["settings"]["rxtx"]["txSpreadCoef"]
+                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"]
+                this.paramRxtx.rxCentralFreq = vals["settings"]["rxtx"]["rxCentralFreq"]
+                this.paramRxtx.rxBaudrate = vals["settings"]["rxtx"]["rxBaudrate"]
+                this.paramRxtx.rxRolloff = vals["settings"]["rxtx"]["rxRolloff"]
+                this.paramRxtx.rxSpreadCoef = vals["settings"]["rxtx"]["rxSpreadCoef"]
            },
            updateBuclnbSettings(vals) {
                this.submitStatus.buclnb = false
-                this.paramBuclnb.bucRefClk10M = vals["settings"]["bucRefClk10M"]
-                this.paramBuclnb.bucPowering = vals["settings"]["bucPowering"]
-                this.paramBuclnb.lnbRefClk10M = vals["settings"]["lnbRefClk10M"]
-                this.paramBuclnb.lnbPowering = vals["settings"]["lnbPowering"]
-                this.paramBuclnb.srvRefClk10M = vals["settings"]["srvRefClk10M"]
-                this.paramBuclnb.bucLnbAutoStart = vals["settings"]["bucLnbAutoStart"]
+                this.paramBuclnb.bucRefClk10M = vals["settings"]["buclnb"]["bucRefClk10M"]
+                this.paramBuclnb.bucPowering = vals["settings"]["buclnb"]["bucPowering"]
+                this.paramBuclnb.lnbRefClk10M = vals["settings"]["buclnb"]["lnbRefClk10M"]
+                this.paramBuclnb.lnbPowering = vals["settings"]["buclnb"]["lnbPowering"]
+                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'

@@ -564,44 +627,43 @@
                }

                this.lastUpdateTime = new Date();
-                this.initState = vals["mainState"]["initState"]
+                this.initState = vals["state"]["initState"]
+                this.testState = vals["state"]["testState"]

-                this.statRx.state = vals["mainState"]["rx.state"]
-                this.statRx.sym_sync_lock = vals["mainState"]["rx.sym_sync_lock"]
-                this.statRx.freq_search_lock = vals["mainState"]["rx.freq_search_lock"]
-                this.statRx.afc_lock = vals["mainState"]["rx.afc_lock"]
-                this.statRx.pkt_sync = vals["mainState"]["rx.pkt_sync"]
-                this.statRx.snr = vals["mainState"]["rx.snr"]
-                this.statRx.rssi = vals["mainState"]["rx.rssi"]
-                this.statRx.modcod = modcodToStr(vals["mainState"]["rx.modcod"])
-                this.statRx.frameSizeNormal = vals["mainState"]["rx.frameSizeNormal"]
-                this.statRx.isPilots = vals["mainState"]["rx.isPilots"]
-                this.statRx.symError = vals["mainState"]["rx.symError"]
-                this.statRx.freqErr = vals["mainState"]["rx.freqErr"]
-                this.statRx.freqErrAcc = vals["mainState"]["rx.freqErrAcc"]
-                this.statRx.inputSignalLevel = vals["mainState"]["rx.inputSignalLevel"]
-                this.statRx.pllError = vals["mainState"]["rx.pllError"]
-                this.statRx.speedOnRxKbit = vals["mainState"]["rx.speedOnRxKbit"]
-                this.statRx.speedOnIifKbit = vals["mainState"]["rx.speedOnIifKbit"]
-                this.statRx.packetsOk = vals["mainState"]["rx.packetsOk"]
-                this.statRx.packetsBad = vals["mainState"]["rx.packetsBad"]
-                this.statRx.packetsDummy = vals["mainState"]["rx.packetsDummy"]
+                this.statRx.state = vals["state"]["rx"]["state"]
+                this.statRx.sym_sync_lock = vals["state"]["rx"]["sym_sync_lock"]
+                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 = 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 = 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 = 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["mainState"]["tx.state"]
-                this.statTx.modcod = modcodToStr(vals["mainState"]["tx.modcod"])
-                this.statTx.speedOnTxKbit = vals["mainState"]["tx.speedOnTxKbit"]
-                this.statTx.speedOnIifKbit = vals["mainState"]["tx.speedOnIifKbit"]
-                this.statTx.centerFreq = vals["mainState"]["tx.centerFreq"]
-                this.statTx.symSpeed = vals["mainState"]["tx.symSpeed"]
+                this.statTx.state = vals["state"]["tx"]["state"]
+                this.statTx.modcod = modcodToStr(vals["state"]["tx"]["modcod"])
+                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"]

-                this.statDevice.adrv = vals["mainState"]["device.adrv"]
-                this.statDevice.zynq = vals["mainState"]["device.zynq"]
-                this.statDevice.fpga = vals["mainState"]["device.fpga"]
-
-                this.testState = vals["mainState"]["testState"]
+                this.statDevice.adrv = vals["state"]["device"]["adrv"]
+                this.statDevice.zynq = vals["state"]["device"]["zynq"]
+                this.statDevice.fpga = vals["state"]["device"]["fpga"]

                // аптайм приходит в секундах, надо преобразовать его в человеко-читаемый вид
-                let uptime = vals["sysinfo"]["uptime"]
+                let uptime = vals["state"]["device"]["uptime"]
                if (uptime) {
                    let secs = uptime % 60; uptime = Math.floor(uptime / 60)
                    let mins = uptime % 60; uptime = Math.floor(uptime / 60)
@@ -613,11 +675,11 @@
                } else {
                    this.statOs.uptime = '?'
                }
-                this.statOs.load1 = vals["sysinfo"]["load1min"]
-                this.statOs.load5 = vals["sysinfo"]["load5min"]
-                this.statOs.load15 = vals["sysinfo"]["load15min"]
-                this.statOs.totalram = vals["sysinfo"]["totalram"]
-                this.statOs.freeram = vals["sysinfo"]["freeram"]
+                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"]
            },

            resetPacketsStatistics() {
@@ -696,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'


@@ -706,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']
@@ -740,11 +930,11 @@
                try {
                    const fr = await fetch("/api/get/aboutFirmware")
                    const d = await fr.json()
-                    this.about.firmwareVersion = d["fw.version"]
-                    this.about.modemUid = d["fw.modemId"]
-                    this.about.modemSn = d["fw.modemSn"]
-                    this.about.macManagement = d["fw.macMang"]
-                    this.about.macData = d["fw.macData"]
+                    this.about.firmwareVersion = d["firmware"]["version"]
+                    this.about.modemUid = d["firmware"]["modemId"]
+                    this.about.modemSn = d["firmware"]["modemSn"]
+                    this.about.macManagement = d["firmware"]["macMang"]
+                    this.about.macData = d["firmware"]["macData"]
                } catch (e) {
                    console.log('Ошибка загрузки версии ПО', e)
                }
--- 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
@@ -551,39 +565,41 @@

            updateRxtxSettings(vals) {
                this.submitStatus.rxtx = false
-                this.paramRxtx.txEn = vals["settings"]["txEn"]
-                this.paramRxtx.txModulatorIsTest = vals["settings"]["txModulatorIsTest"]
-                this.paramRxtx.txCentralFreq = this.inputFormatNumber(vals["settings"]["txCentralFreq"], {min:900000,step:0.01})
-                this.paramRxtx.txAttenuation = vals["settings"]["txAttenuation"]
-                this.paramRxtx.rxAgcEn = vals["settings"]["rxAgcEn"]
-                this.paramRxtx.rxManualGain = vals["settings"]["rxManualGain"]
-                this.paramRxtx.rxSpectrumInversion = vals["settings"]["rxSpectrumInversion"]
-                this.paramRxtx.rxCentralFreq = this.inputFormatNumber(vals["settings"]["rxCentralFreq"], {min:900000,step:0.01})
-                this.paramRxtx.rxBaudrate = this.inputFormatNumber(vals["settings"]["rxBaudrate"], {min:200000,max:54000000,step:1})
-                this.paramRxtx.rxRolloff = vals["settings"]["rxRolloff"]
+                this.paramRxtx.txEn = vals["settings"]["rxtx"]["txEn"]
+                this.paramRxtx.txModulatorIsTest = vals["settings"]["rxtx"]["txModulatorIsTest"]
+                this.paramRxtx.txCentralFreq = this.inputFormatNumber(vals["settings"]["rxtx"]["txCentralFreq"], {min:900000,step:0.01})
+                this.paramRxtx.txAttenuation = vals["settings"]["rxtx"]["txAttenuation"]
+                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:900000,step:0.01})
+                this.paramRxtx.rxBaudrate = this.inputFormatNumber(vals["settings"]["rxtx"]["rxBaudrate"], {min:200000,max:54000000,step:1})
+                this.paramRxtx.rxRolloff = vals["settings"]["rxtx"]["rxRolloff"]
            },
            updateBuclnbSettings(vals) {
                this.submitStatus.buclnb = false
-                this.paramBuclnb.bucRefClk10M = vals["settings"]["bucRefClk10M"]
-                this.paramBuclnb.bucPowering = vals["settings"]["bucPowering"]
-                this.paramBuclnb.lnbRefClk10M = vals["settings"]["lnbRefClk10M"]
-                this.paramBuclnb.lnbPowering = vals["settings"]["lnbPowering"]
-                this.paramBuclnb.srvRefClk10M = vals["settings"]["srvRefClk10M"]
-                this.paramBuclnb.bucLnbAutoStart = vals["settings"]["bucLnbAutoStart"]
+                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"]["dpdiIsPositional"]
-                this.paramDpdi.dpdiPositionStationLatitude = vals["settings"]["dpdiPositionStationLatitude"]
-                this.paramDpdi.dpdiPositionStationLongitude = vals["settings"]["dpdiPositionStationLongitude"]
-                this.paramDpdi.dpdiPositionSatelliteLongitude = vals["settings"]["dpdiPositionSatelliteLongitude"]
-                this.paramDpdi.dpdiDelay = vals["settings"]["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"]["netCesPassword"]
-                this.paramNetwork.netManagementIp = vals["settings"]["netManagementIp"]
-                this.paramNetwork.netServerName = vals["settings"]["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'

@@ -608,47 +624,46 @@
                }

                this.lastUpdateTime = new Date();
-                this.initState = vals["mainState"]["initState"]
+                this.initState = vals["state"]["initState"]
+                this.testState = vals["state"]["testState"]

-                this.statRx.state = vals["mainState"]["rx.state"]
-                this.statRx.sym_sync_lock = vals["mainState"]["rx.sym_sync_lock"]
-                this.statRx.freq_search_lock = vals["mainState"]["rx.freq_search_lock"]
-                this.statRx.afc_lock = vals["mainState"]["rx.afc_lock"]
-                this.statRx.pkt_sync = vals["mainState"]["rx.pkt_sync"]
-                this.statRx.snr = vals["mainState"]["rx.snr"]
-                this.statRx.rssi = vals["mainState"]["rx.rssi"]
-                this.statRx.modcod = modcodToStr(vals["mainState"]["rx.modcod"])
-                this.statRx.frameSizeNormal = vals["mainState"]["rx.frameSizeNormal"]
-                this.statRx.isPilots = vals["mainState"]["rx.isPilots"]
-                this.statRx.symError = vals["mainState"]["rx.symError"]
-                this.statRx.freqErr = vals["mainState"]["rx.freqErr"]
-                this.statRx.freqErrAcc = vals["mainState"]["rx.freqErrAcc"]
-                this.statRx.inputSignalLevel = vals["mainState"]["rx.inputSignalLevel"]
-                this.statRx.pllError = vals["mainState"]["rx.pllError"]
-                this.statRx.speedOnRxKbit = vals["mainState"]["rx.speedOnRxKbit"]
-                this.statRx.speedOnIifKbit = vals["mainState"]["rx.speedOnIifKbit"]
-                this.statRx.packetsOk = vals["mainState"]["rx.packetsOk"]
-                this.statRx.packetsBad = vals["mainState"]["rx.packetsBad"]
-                this.statRx.packetsDummy = vals["mainState"]["rx.packetsDummy"]
+                this.statRx.state = vals["state"]["rx"]["state"]
+                this.statRx.sym_sync_lock = vals["state"]["rx"]["sym_sync_lock"]
+                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 = 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 = 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 = 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["mainState"]["tx.state"]
-                this.statTx.modcod = modcodToStr(vals["mainState"]["tx.modcod"])
-                this.statTx.speedOnTxKbit = vals["mainState"]["tx.speedOnTxKbit"]
-                this.statTx.speedOnIifKbit = vals["mainState"]["tx.speedOnIifKbit"]
-                this.statTx.centerFreq = vals["mainState"]["tx.centerFreq"]
-                this.statTx.symSpeed = vals["mainState"]["tx.symSpeed"]
+                this.statTx.state = vals["state"]["tx"]["state"]
+                this.statTx.modcod = modcodToStr(vals["state"]["tx"]["modcod"])
+                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"]

-                this.statDevice.adrv = vals["mainState"]["device.adrv"]
-                this.statDevice.zynq = vals["mainState"]["device.zynq"]
-                this.statDevice.fpga = vals["mainState"]["device.fpga"]
-                this.statDevice.upgradeStatus = vals["mainState"]["device.upgradeStatus"]
-                this.statDevice.upgradePercent = vals["mainState"]["device.upgradePercent"]
-                this.statDevice.upgradeImage = vals["mainState"]["device.upgradeImage"]
-
-                this.testState = vals["mainState"]["testState"]
+                this.statDevice.adrv = vals["state"]["device"]["adrv"]
+                this.statDevice.zynq = vals["state"]["device"]["zynq"]
+                this.statDevice.fpga = vals["state"]["device"]["fpga"]
+                this.statDevice.upgradeStatus = vals["state"]["device"]["upgradeStatus"]
+                this.statDevice.upgradePercent = vals["state"]["device"]["upgradePercent"]
+                this.statDevice.upgradeImage = vals["state"]["device"]["upgradeImage"]

                // аптайм приходит в секундах, надо преобразовать его в человеко-читаемый вид
-                let uptime = vals["sysinfo"]["uptime"]
+                let uptime = vals["state"]["device"]["uptime"]
                if (uptime) {
                    let secs = uptime % 60; uptime = Math.floor(uptime / 60)
                    let mins = uptime % 60; uptime = Math.floor(uptime / 60)
@@ -660,11 +675,11 @@
                } else {
                    this.statOs.uptime = '?'
                }
-                this.statOs.load1 = vals["sysinfo"]["load1min"]
-                this.statOs.load5 = vals["sysinfo"]["load5min"]
-                this.statOs.load15 = vals["sysinfo"]["load15min"]
-                this.statOs.totalram = vals["sysinfo"]["totalram"]
-                this.statOs.freeram = vals["sysinfo"]["freeram"]
+                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"]
            },

            resetPacketsStatistics() {
@@ -753,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'


@@ -799,11 +941,11 @@
                try {
                    const fr = await fetch("/api/get/aboutFirmware")
                    const d = await fr.json()
-                    this.about.firmwareVersion = d["fw.version"]
-                    this.about.modemUid = d["fw.modemId"]
-                    this.about.modemSn = d["fw.modemSn"]
-                    this.about.macManagement = d["fw.macMang"]
-                    this.about.macData = d["fw.macData"]
+                    this.about.firmwareVersion = d["firmware"]["version"]
+                    this.about.modemUid = d["firmware"]["modemId"]
+                    this.about.modemSn = d["firmware"]["modemSn"]
+                    this.about.macManagement = d["firmware"]["macMang"]
+                    this.about.macData = d["firmware"]["macData"]
                } catch (e) {
                    console.log('Ошибка загрузки версии ПО', e)
                }
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
Vladislav Ostapov	4c555d5400	bugfix: исправление ошибки, из-за которой не показываются сведения о ПО и системе	2025-06-04 16:54:40 +03:00
Vladislav Ostapov	38a00173a2	отладочная версия веб-сервера, работает со статистикой и настройкой. Не показывает параметры прошивки	2025-06-04 13:23:27 +03:00
Vladislav Ostapov	e5e6878351	компилируемая версия веб-сервера, находится на стадии отладки	2025-06-04 11:04:51 +03:00
Vladislav Ostapov	55fc322c13	исправления методов-заглушек, часть 1	2025-06-03 18:32:28 +03:00
Vladislav Ostapov	f30e1adb49	компилируемая версия для всех версий модемов, пока без CP Proxy	2025-06-03 16:16:41 +03:00