feature: LO freq для BUC и LNB

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}
                 ]
               },
               {

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;

static/main-tdma.html

@@ -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>
@@ -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"]
             },