From fe3b45dc9edacfb1fca7f88757dfa39d72269966 Mon Sep 17 00:00:00 2001
From: Vladislav Ostapov <Vlados.ost.31@yandex.ru>
Date: Tue, 1 Apr 2025 14:54:39 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D1=83=D1=81=D1=82=D0=B0=D0=BD=D0=BE=D0=B2=D0=BA=D1=83=20=D0=B7?=
 =?UTF-8?q?=D0=B0=D0=B4=D0=B5=D1=80=D0=B6=D0=BA=D0=B8=20=D0=B4=D0=BE=20?=
 =?UTF-8?q?=D1=81=D0=BF=D1=83=D1=82=D0=BD=D0=B8=D0=BA=D0=B0=20=D0=B2=20?=
 =?UTF-8?q?=D0=B2=D0=B5=D0=B1=D0=BA=D0=B5=20TDMA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dependencies/control_system_client | 2 +-
 front-generator/render-params.json | 7 +++++++
 src/terminal_api_driver.cpp        | 9 ++++++++-
 static/main-tdma.html              | 7 +++++++
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/dependencies/control_system_client b/dependencies/control_system_client
index 2ded1a0..1780093 160000
--- a/dependencies/control_system_client
+++ b/dependencies/control_system_client
@@ -1 +1 @@
-Subproject commit 2ded1a0c97dfcb39c2a538579f4c5b17dc940613
+Subproject commit 1780093e8bee4de09d68e702c8d5ee759d8f4de0
diff --git a/front-generator/render-params.json b/front-generator/render-params.json
index a5d5461..363845e 100644
--- a/front-generator/render-params.json
+++ b/front-generator/render-params.json
@@ -47,6 +47,13 @@
                 ]
               }
             ]
+          },
+          {
+            "widget": "settings-container",
+            "childs": [
+              {"widget": "h3", "label": "Настройки позиционирования"},
+              {"widget": "number", "label": "Задержка до спутника, мс", "name": "rxTxSatDelay", "min": 0, "step": 1, "max":  600}
+            ]
           }
         ],
         "buclnb": [
diff --git a/src/terminal_api_driver.cpp b/src/terminal_api_driver.cpp
index e0a9be0..d968de0 100644
--- a/src/terminal_api_driver.cpp
+++ b/src/terminal_api_driver.cpp
@@ -337,7 +337,6 @@ private:
         } else {
             s.isL2 = true;
         }
-        logCpApiError("api_driver::TerminalApiDaemon::unsafeLoadNetworkSettings()->CP_GetNetwork(mode)", CP_GetNetwork(sid, "mode", &nm));
         s.dataMtu = 1500;
         logCpApiError("api_driver::TerminalApiDaemon::unsafeLoadNetworkSettings()->CP_GetNetwork(name_serv)", CP_GetNetwork(sid, "name_serv", &s.serverName));
         if (s.serverName.empty()) {
@@ -1071,6 +1070,10 @@ std::string api_driver::ApiDriver::loadSettings() const {
     result << ",\"cincDelayMax\":" << dpdiSettings.max_delay;
 #endif
 
+#ifdef MODEM_IS_TDMA
+    result << ",\n\"rxTxSatDelay\":" << static_cast<int>(demodSettings.delay_ms);
+#endif
+
     result << ",\n\"rxAgcEn\":" << boolAsStr(demodSettings.is_aru_on);
     result << ",\"rxSpectrumInversion\":" << boolAsStr(demodSettings.is_rvt_iq);
     result << ",\"rxManualGain\":"; writeDouble(result, demodSettings.gain);
@@ -1202,6 +1205,10 @@ void api_driver::ApiDriver::setRxTxSettings(boost::property_tree::ptree &pt) {
     demod.gold_seq_is_active = pt.get<unsigned int>("rxGoldan");
 #endif
 
+#ifdef MODEM_IS_TDMA
+    demod.delay_ms = pt.get<unsigned int>("rxTxSatDelay");
+#endif
+
 #ifdef MODEM_IS_SCPC
     // ACM
     acm.period_pack_acm = pt.get<uint32_t>("dvbServicePacketPeriod");
diff --git a/static/main-tdma.html b/static/main-tdma.html
index 27f2858..f55bc29 100644
--- a/static/main-tdma.html
+++ b/static/main-tdma.html
@@ -155,6 +155,10 @@
                     </label>
                 </div>
             </div>
+            <div class="settings-set-container">
+                <h3>Настройки позиционирования</h3>
+                <label><span>Задержка до спутника, мс</span><input type="number" v-model="paramRxtx.rxTxSatDelay" max="600" step="1"/></label>
+            </div>
             <button class="action-button" @click="settingsSubmitRxtx()">Сохранить <span class="submit-spinner" v-show="submitStatus.rxtx"></span></button>
             <h2>Настройки питания и опорного генератора</h2>
             <div class="tabs-item-flex-container">
@@ -300,6 +304,7 @@
                     rxCentralFreq: 900000,
                     rxBaudrate: 0,
                     rxRolloff: 2,
+                    rxTxSatDelay: 0,
                 },
                 paramBuclnb: {
                     bucRefClk10M: false,
@@ -440,6 +445,7 @@
                     "rxCentralFreq": this.paramRxtx.rxCentralFreq,
                     "rxBaudrate": this.paramRxtx.rxBaudrate,
                     "rxRolloff": this.paramRxtx.rxRolloff,
+                    "rxTxSatDelay": this.paramRxtx.rxTxSatDelay,
                 }
 
                 this.submitStatus.rxtx = true
@@ -498,6 +504,7 @@
                 this.paramRxtx.rxCentralFreq = vals["settings"]["rxCentralFreq"]
                 this.paramRxtx.rxBaudrate = vals["settings"]["rxBaudrate"]
                 this.paramRxtx.rxRolloff = vals["settings"]["rxRolloff"]
+                this.paramRxtx.rxTxSatDelay = vals["settings"]["rxTxSatDelay"]
             },
             updateBuclnbSettings(vals) {
                 this.submitStatus.buclnb = false