From 51431210f04bd06884dca9910fdb10761aad273d Mon Sep 17 00:00:00 2001
From: Vladislav Ostapov <Vlados.ost.31@yandex.ru>
Date: Tue, 1 Apr 2025 17:51:35 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=D1=8C?=
 =?UTF-8?q?=D0=BD=D1=8B=D0=B9=20=D1=82=D0=B8=D0=BF=20=D0=BF=D0=BE=D0=BB?=
 =?UTF-8?q?=D1=8F=20=D0=B2=20TDMA=20=D0=B2=D0=B5=D0=B1=D0=BA=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front-generator/render-params.json |  6 +++---
 static/main-tdma.html              | 31 +++++++++++++++++++-----------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/front-generator/render-params.json b/front-generator/render-params.json
index dc89edf..7edd28b 100644
--- a/front-generator/render-params.json
+++ b/front-generator/render-params.json
@@ -21,7 +21,7 @@
                     "widget": "select", "label": "Режим работы модулятора", "name": "txModulatorIsTest",
                     "values": [{"label": "Нормальный", "value": "false"}, {"label": "Тест (CW)", "value": "true"}]
                   },
-                  {"widget": "number", "label": "Центральная частота, КГц", "name": "txCentralFreq", "min": 900000, "step": 0.01, "v_show": "paramRxtx.txModulatorIsTest"},
+                  {"widget": "number-int", "label": "Центральная частота, КГц", "name": "txCentralFreq", "min": 900000, "step": 0.01, "v_show": "paramRxtx.txModulatorIsTest"},
                   {"widget": "number", "label": "Ослабление, дБ", "name": "txAttenuation", "max": 0, "min": -40, "step": 1}
                 ]
               },
@@ -38,8 +38,8 @@
                   },
                   {"widget": "number", "label": "Ручное усиление, дБ", "name": "rxManualGain", "v_show": "!paramRxtx.rxAgcEn", "min":  -40},
                   {"widget": "checkbox", "label": "Инверсия спектра", "name": "rxSpectrumInversion"},
-                  {"widget": "number", "label": "Центральная частота, КГц", "name": "rxCentralFreq", "min": 900000, "step": 0.01},
-                  {"widget": "number", "label": "Символьная скорость, Бод", "name": "rxBaudrate", "min": 0, "step": 1},
+                  {"widget": "number-int", "label": "Центральная частота, КГц", "name": "rxCentralFreq", "min": 900000, "step": 0.01},
+                  {"widget": "number-int", "label": "Символьная скорость, Бод", "name": "rxBaudrate", "min": 0, "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"}]
diff --git a/static/main-tdma.html b/static/main-tdma.html
index 5d03f54..1962842 100644
--- a/static/main-tdma.html
+++ b/static/main-tdma.html
@@ -123,7 +123,10 @@
                             <option :value="true">Тест (CW)</option>
                         </select>
                     </label>
-                    <label v-show="paramRxtx.txModulatorIsTest"><span>Центральная частота, КГц</span><input type="number" v-model="paramRxtx.txCentralFreq" min="900000" step="0.01"/></label>
+                    <label v-show="paramRxtx.txModulatorIsTest">
+                        <span>Центральная частота, КГц</span>
+                        <input type="text" v-model.lazy="paramRxtx.txCentralFreq" @change="e => paramRxtx.txCentralFreq = inputFormatNumber(inputFormatNumber(e.target.value, {min:900000,step:0.01}), {min:900000,step:0.01})"/>
+                    </label>
                     <label><span>Ослабление, дБ</span><input type="number" v-model="paramRxtx.txAttenuation" min="-40" step="1"/></label>
                 </div>
                 <div class="settings-set-container">
@@ -140,8 +143,14 @@
                         <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="900000" step="0.01"/></label>
-                    <label><span>Символьная скорость, Бод</span><input type="number" v-model="paramRxtx.rxBaudrate" step="1"/></label>
+                    <label>
+                        <span>Центральная частота, КГц</span>
+                        <input type="text" v-model.lazy="paramRxtx.rxCentralFreq" @change="e => paramRxtx.rxCentralFreq = inputFormatNumber(inputFormatNumber(e.target.value, {min:900000,step:0.01}), {min:900000,step:0.01})"/>
+                    </label>
+                    <label>
+                        <span>Символьная скорость, Бод</span>
+                        <input type="text" v-model.lazy="paramRxtx.rxBaudrate" @change="e => paramRxtx.rxBaudrate = inputFormatNumber(inputFormatNumber(e.target.value, {step:1}), {step:1})"/>
+                    </label>
                     <label>
                         <span>Roll-off</span>
                         <select v-model="paramRxtx.rxRolloff">
@@ -321,12 +330,12 @@
                 paramRxtx: {
                     txEn: false,
                     txModulatorIsTest: false,
-                    txCentralFreq: 900000,
+                    txCentralFreq: 0,
                     txAttenuation: -40,
                     rxAgcEn: true,
                     rxManualGain: -40,
                     rxSpectrumInversion: false,
-                    rxCentralFreq: 900000,
+                    rxCentralFreq: 0,
                     rxBaudrate: 0,
                     rxRolloff: 2,
                 },
@@ -468,13 +477,13 @@
                 let query = {
                     "txEn": this.paramRxtx.txEn,
                     "txModulatorIsTest": this.paramRxtx.txModulatorIsTest,
-                    "txCentralFreq": this.paramRxtx.txCentralFreq,
+                    "txCentralFreq": parseFloat(this.paramRxtx.txCentralFreq.replace(/[^0-9,.]/g, '').replace(',', '.')),
                     "txAttenuation": this.paramRxtx.txAttenuation,
                     "rxAgcEn": this.paramRxtx.rxAgcEn,
                     "rxManualGain": this.paramRxtx.rxManualGain,
                     "rxSpectrumInversion": this.paramRxtx.rxSpectrumInversion,
-                    "rxCentralFreq": this.paramRxtx.rxCentralFreq,
-                    "rxBaudrate": this.paramRxtx.rxBaudrate,
+                    "rxCentralFreq": parseFloat(this.paramRxtx.rxCentralFreq.replace(/[^0-9,.]/g, '').replace(',', '.')),
+                    "rxBaudrate": parseFloat(this.paramRxtx.rxBaudrate.replace(/[^0-9,.]/g, '').replace(',', '.')),
                     "rxRolloff": this.paramRxtx.rxRolloff,
                 }
 
@@ -543,13 +552,13 @@
                 this.submitStatus.rxtx = false
                 this.paramRxtx.txEn = vals["settings"]["txEn"]
                 this.paramRxtx.txModulatorIsTest = vals["settings"]["txModulatorIsTest"]
-                this.paramRxtx.txCentralFreq = vals["settings"]["txCentralFreq"]
+                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 = vals["settings"]["rxCentralFreq"]
-                this.paramRxtx.rxBaudrate = vals["settings"]["rxBaudrate"]
+                this.paramRxtx.rxCentralFreq = this.inputFormatNumber(vals["settings"]["rxCentralFreq"], {min:900000,step:0.01})
+                this.paramRxtx.rxBaudrate = this.inputFormatNumber(vals["settings"]["rxBaudrate"], {step:1})
                 this.paramRxtx.rxRolloff = vals["settings"]["rxRolloff"]
             },
             updateBuclnbSettings(vals) {