From 760a6858eee663b44c5ceb8b1ac2ed900047ff0f Mon Sep 17 00:00:00 2001 From: Vladislav Ostapov Date: Sat, 5 Jul 2025 13:54:21 +0300 Subject: [PATCH] =?UTF-8?q?feature:=20LO=20freq=20=D0=B4=D0=BB=D1=8F=20BUC?= =?UTF-8?q?=20=D0=B8=20LNB?= 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 | 6 ++++-- src/api-driver/structs.cpp | 13 ++++++++++++- static/main-tdma.html | 14 ++++++++++++++ 4 files changed, 31 insertions(+), 4 deletions(-) diff --git a/dependencies/control_system_client b/dependencies/control_system_client index 92fcb8a..cb0f743 160000 --- a/dependencies/control_system_client +++ b/dependencies/control_system_client @@ -1 +1 @@ -Subproject commit 92fcb8ab674eb592b6237a7b82af2dfb1a0ae00c +Subproject commit cb0f743535b95b87311318a0b8daf82da9bb7df5 diff --git a/front-generator/render-params.json b/front-generator/render-params.json index 05be67a..cd70e2f 100644 --- a/front-generator/render-params.json +++ b/front-generator/render-params.json @@ -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} ] }, { diff --git a/src/api-driver/structs.cpp b/src/api-driver/structs.cpp index 5accb97..3bc5031 100644 --- a/src/api-driver/structs.cpp +++ b/src/api-driver/structs.cpp @@ -765,6 +765,9 @@ void api_driver::obj::TerminalRxTxSettings::updateBuclnbSettings(const nlohmann: } } buclnb.is_ref_10MHz_buc = data.value("bucRefClk10M", buclnb.is_ref_10MHz_buc); +#ifdef MODEM_IS_TDMA + buclnb.lo_buc_inkHz = data.value("bucLoKhz", buclnb.lo_buc_inkHz); +#endif { // напряжение lnb @@ -784,8 +787,10 @@ void api_driver::obj::TerminalRxTxSettings::updateBuclnbSettings(const nlohmann: default: buclnb.lnb = voltage_lnb::DISABLE; } } - buclnb.is_ref_10MHz_lnb = data.value("lnbRefClk10M", buclnb.is_ref_10MHz_lnb); +#ifdef MODEM_IS_TDMA + buclnb.lo_lnb_inkHz = data.value("lnbLoKhz", buclnb.lo_lnb_inkHz); +#endif buclnb.is_ref_10MHz_output = data.value("srvRefClk10M", buclnb.is_ref_10MHz_output); buclnb.is_save_current_state = data.value("bucLnbAutoStart", buclnb.is_save_current_state); @@ -916,6 +921,9 @@ nlohmann::json api_driver::obj::TerminalRxTxSettings::asJson() const { #endif default: bl["bucPowering"] = 0; } +#ifdef MODEM_IS_TDMA + bl["bucLoKhz"] = buclnb.lo_buc_inkHz; +#endif bl["bucRefClk10M"] = buclnb.is_ref_10MHz_buc; switch (buclnb.lnb) { @@ -925,6 +933,9 @@ nlohmann::json api_driver::obj::TerminalRxTxSettings::asJson() const { default: bl["lnbPowering"] = 0; } bl["lnbRefClk10M"] = buclnb.is_ref_10MHz_lnb; +#ifdef MODEM_IS_TDMA + bl["lnbLoKhz"] = buclnb.lo_lnb_inkHz; +#endif bl["srvRefClk10M"] = buclnb.is_ref_10MHz_output; bl["bucLnbAutoStart"] = buclnb.is_save_current_state; diff --git a/static/main-tdma.html b/static/main-tdma.html index aa05685..d4945e1 100644 --- a/static/main-tdma.html +++ b/static/main-tdma.html @@ -200,6 +200,10 @@ +

Настройки LNB

@@ -216,6 +220,10 @@ +

Сервисные настройки

@@ -347,8 +355,10 @@ paramBuclnb: { bucRefClk10M: false, bucPowering: 0, + bucLoKhz: 0, lnbRefClk10M: false, lnbPowering: 0, + lnbLoKhz: 0, srvRefClk10M: false, bucLnbAutoStart: false, }, @@ -505,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, } @@ -568,8 +580,10 @@ this.submitStatus.buclnb = false this.paramBuclnb.bucRefClk10M = vals["settings"]["buclnb"]["bucRefClk10M"] this.paramBuclnb.bucPowering = vals["settings"]["buclnb"]["bucPowering"] + this.paramBuclnb.bucLoKhz = this.inputFormatNumber(vals["settings"]["buclnb"]["bucLoKhz"], {max:40000000,step:1}) this.paramBuclnb.lnbRefClk10M = vals["settings"]["buclnb"]["lnbRefClk10M"] this.paramBuclnb.lnbPowering = vals["settings"]["buclnb"]["lnbPowering"] + this.paramBuclnb.lnbLoKhz = this.inputFormatNumber(vals["settings"]["buclnb"]["lnbLoKhz"], {max:40000000,step:1}) this.paramBuclnb.srvRefClk10M = vals["settings"]["buclnb"]["srvRefClk10M"] this.paramBuclnb.bucLnbAutoStart = vals["settings"]["buclnb"]["bucLnbAutoStart"] },