обновление ШПС вебки: добавление новых полей, удаление полей из мониторинга и обновление страницы настроек

2025-09-05 16:09:37 +03:00
parent 7cd096a269
commit b580ac6b37
6 changed files with 91 additions and 46 deletions
--- a/dependencies/control_system_client_shps
+++ b/dependencies/control_system_client_shps
--- a/front-generator/render-params.json
+++ b/front-generator/render-params.json
@@ -364,19 +364,20 @@
                    "widget": "select", "label": "Режим работы модулятора", "name": "txModulatorIsTest",
                    "values": [{"label": "Нормальный", "value": "false"}, {"label": "Тест (CW)", "value": "true"}]
                  },
+                  {"widget": "number", "label": "Ослабление, дБ", "name": "txAttenuation", "max": 0, "min": -40, "step": 0.25},
                  {
                    "widget": "select", "label": "Входные данные", "name": "txIsTestInput",
                    "values": [{"label": "Ethernet", "value": "false"}, {"label": "Тест", "value": "true"}]
                  },
                  {"widget": "h3", "label": "Параметры передачи"},
-                  {"widget": "number", "label": "Центральная частота, КГц", "name": "txCentralFreq", "min": 100000, "max": 6000000, "step": 0.01},
-                  {"widget": "number", "label": "Символьная скорость, Бод", "name": "txBaudrate", "min": 200000, "max": 54000000},
+                  {"widget": "number", "label": "Центральная частота, КГц", "name": "txCentralFreq", "min": 70000, "max": 6000000, "step": 100},
+                  {"widget": "number", "label": "Символьная скорость, Бод", "name": "txBaudrate", "min": 128000, "max": 30000000},
                  {
                    "widget": "select", "label": "Roll-off", "name": "txRolloff",
-                    "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"}]
+                    "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"}, {"label": "0.30", "value": "300"}, {"label": "0.35", "value": "350"}]
                  },
-                  {"widget": "number", "label": "Коэф. расширения", "name": "txSpreadCoef", "max": 1000, "min": -1000, "step": 0.01},
-                  {"widget": "number", "label": "Ослабление, дБ", "name": "txAttenuation", "max": 0, "min": -40, "step": 0.25}
+                  {"widget": "number", "label": "Коэф. расширения", "name": "txSpreadCoef", "max": 1024, "min": 8, "step": 2},
+                  {"widget": "number", "label": "Кол-во пакетов на преамбулу", "name": "txFieldsDataPreamble", "max": 255, "min": 1, "step": 1}
                ]
              },
              {
@@ -400,13 +401,15 @@
                  {"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": 100000, "max": 6000000, "step": 0.01},
-                  {"widget": "number", "label": "Символьная скорость, Бод", "name": "rxBaudrate", "min": 200000, "max": 54000000},
+                  {"widget": "number", "label": "Центральная частота, КГц", "name": "rxCentralFreq", "min": 70000, "max": 6000000, "step": 100},
+                  {"widget": "number", "label": "Символьная скорость, Бод", "name": "rxBaudrate", "min": 128000, "max": 30000000},
                  {
                    "widget": "select", "label": "Roll-off", "name": "rxRolloff",
-                    "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"}]
+                    "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"}, {"label": "0.30", "value": "300"}, {"label": "0.35", "value": "350"}]
                  },
-                  {"widget": "number", "label": "Коэф. расширения", "name": "rxSpreadCoef", "max": 1000, "min": -1000, "step": 0.01}
+                  {"widget": "number", "label": "Коэф. расширения", "name": "rxSpreadCoef", "max": 1024, "min": 8, "step": 2},
+                  {"widget": "number", "label": "Порог коррелятора", "name": "rxFftShift", "max": 4096, "min": 256, "step": 1},
+                  {"widget": "number", "label": "Кол-во пакетов на преамбулу", "name": "rxFieldsDataPreamble", "max": 255, "min": 1, "step": 1}
                ]
              }
            ]
--- a/front-generator/template/common/monitoring.html.j2
+++ b/front-generator/template/common/monitoring.html.j2
@@ -3,7 +3,7 @@
            <div class="settings-set-container statistics-container">
                <h2>Статистика приема</h2>
                <table>
-                    <tbody>
+                    <tbody>{% endraw %}{% if modem != 'shps' %}{% raw %}
                    <tr><th>Прием</th><td><span :class="{ indicator_bad: statRx.state === false, indicator_good: statRx.state === true, indicator: true }"></span></td></tr>
                    <tr><th>Захват символьной</th><td><span :class="{ indicator_bad: statRx.sym_sync_lock === false, indicator_good: statRx.sym_sync_lock === true, indicator: true }"></span></td></tr>
                    <tr><th>Захват ФАПЧ</th><td><span :class="{ indicator_bad: statRx.afc_lock === false, indicator_good: statRx.afc_lock === true, indicator: true }"></span></td></tr>
@@ -22,7 +22,17 @@
                    <tr><td colspan="2" style="padding-top: 1em; text-align: center">Статистика пакетов</td></tr>
                    <tr><th>Качественных пакетов</th><td>{{ statRx.packetsOk }}</td></tr>
                    <tr><th>Поврежденных пакетов</th><td>{{ statRx.packetsBad }}</td></tr>
-                    <tr><th>DUMMY</th><td>{{ statRx.packetsDummy }}</td></tr>
+                    <tr><th>DUMMY</th><td>{{ statRx.packetsDummy }}</td></tr>{% endraw %}{% else %}{% raw %}
+                    <tr><th>Прием</th><td><span :class="{ indicator_bad: statRx.state === false, indicator_good: statRx.state === true, indicator: true }"></span></td></tr>
+                    <tr><th>ОСШ/RSSI</th><td>{{ statRx.snr }} / {{ statRx.rssi }}</td></tr>
+                    <tr><th>Частотная ошибка, Гц</th><td>{{ statRx.freqErrAcc }}</td></tr>
+                    <tr><th>Ур. входного сигнала</th><td>{{ statRx.inputSignalLevel }}</td></tr>
+                    <tr><th>Ошибка ФАПЧ</th><td>{{ statRx.pllError }}</td></tr>
+                    <tr><th>Инф. скорость на приеме</th><td>{{ statRx.speedOnRxKbit }} кбит/с</td></tr>
+                    <tr><th>Инф. скорость на интерфейсе</th><td>{{ statRx.speedOnIifKbit }} кбит/с</td></tr>
+                    <tr><td colspan="2" style="padding-top: 1em; text-align: center">Статистика пакетов</td></tr>
+                    <tr><th>Качественных пакетов</th><td>{{ statRx.packetsOk }}</td></tr>
+                    <tr><th>Поврежденных пакетов</th><td>{{ statRx.packetsBad }}</td></tr>{% endraw %}{% endif %}{% raw %}
                    </tbody>
                </table>
                <button class="action-button" @click="resetPacketsStatistics()"> Сброс статистики </button>
@@ -39,7 +49,7 @@
                    <tr><th>Инф. скорость на передаче</th><td>{{ statTx.speedOnTxKbit }} кбит/с</td></tr>
                    <tr><th>Инф. скорость на интерфейсе</th><td>{{ statTx.speedOnIifKbit }} кбит/с</td></tr>
                    </tbody>
-                </table>{% endraw %}{% else %}{% raw %}
+                </table>{% endraw %}{% elif modem == 'tdma' %}{% raw %}
                <table>
                    <tbody>
                    <tr><th>Передача</th><td><span :class="{ indicator_bad: statTx.state === false, indicator_good: statTx.state === true, indicator: true }"></span></td></tr>
@@ -49,6 +59,15 @@
                    <tr><th>Центральная частота</th><td>{{ statTx.centerFreq }} кГц</td></tr>
                    <tr><th>Символьная скорость</th><td>{{ statTx.symSpeed }} ksymb</td></tr>
                    </tbody>
+                </table>{% endraw %}{% elif modem == 'shps' %}{% raw %}
+                <table>
+                    <tbody>
+                    <tr><th>Передача</th><td><span :class="{ indicator_bad: statTx.state === false, indicator_good: statTx.state === true, indicator: true }"></span></td></tr>
+                    <tr><th>Инф. скорость на передаче</th><td>{{ statTx.speedOnTxKbit }} кбит/с</td></tr>
+                    <tr><th>Инф. скорость на интерфейсе</th><td>{{ statTx.speedOnIifKbit }} кбит/с</td></tr>
+                    <tr><th>Центральная частота</th><td>{{ statTx.centerFreq }} кГц</td></tr>
+                    <tr><th>Символьная скорость</th><td>{{ statTx.symSpeed }} ksymb</td></tr>
+                    </tbody>
                </table>{% endraw %}{% endif %}{% raw %}
            </div>{% endraw %}{% if modem == 'scpc' %}{% raw %}
            <div class="settings-set-container statistics-container" v-if="paramRxtx.isCinC === true">
--- a/src/api-driver/structs.cpp
+++ b/src/api-driver/structs.cpp
@@ -354,19 +354,23 @@ void api_driver::obj::TerminalState::updateCallback(proxy::CpProxy& cp) {
    }

    fRxState = demod.locks.sym_sync_lock && demod.locks.freq_lock && demod.locks.afc_lock && demod.locks.pkt_sync;
+#ifndef MODEM_IS_SHPS
    fRxSymSyncLock = demod.locks.sym_sync_lock;
    fRxFreqSearchLock = demod.locks.freq_lock;
    fRxAfcLock = demod.locks.afc_lock;
    fRxPktSync = demod.locks.pkt_sync;
+#endif

    fRxSnr = demod.snr;
    fRxRssi = demod.rssi;
+#ifndef MODEM_IS_SHPS
    fRxModcod = demod.modcod;
    fRxFrameSizeNormal = !demod.is_short;
    fRxIsPilots = demod.is_pilots;

    fRxSymError = demod.sym_err;
    fRxFreqErr = demod.crs_freq_err;
+#endif
    fRxFreqErrAcc = demod.fine_freq_err;
    fRxInputSignalLevel = demod.if_overload;
    fRxPllError = demod.afc_err;
@@ -374,9 +378,10 @@ void api_driver::obj::TerminalState::updateCallback(proxy::CpProxy& cp) {
    fRxSpeedOnIifKbit = static_cast<double>(demod.speed_in_bytes_rx_iface) / 128.0;
    fRxPacketsOk = demod.packet_ok_cnt;
    fRxPacketsBad = demod.packet_bad_cnt;
+#ifndef MODEM_IS_SHPS
    fRxPacketsDummy = demod.dummy_cnt;
-
    fTxModcod = mod.modcod;
+#endif
    fTxSpeedOnTxKbit = static_cast<double>(mod.speed_in_bytes_tx) / 128.0;
    fTxSpeedOnIifKbit = static_cast<double>(mod.speed_in_bytes_tx_iface) / 128.0;
 #ifdef MODEM_IS_SCPC
@@ -404,19 +409,23 @@ nlohmann::json api_driver::obj::TerminalState::asJson() {
 #endif

    res["rx"]["state"] = fRxState;
+#ifndef MODEM_IS_SHPS
    res["rx"]["sym_sync_lock"] = fRxSymSyncLock;
    res["rx"]["freq_search_lock"] = fRxFreqSearchLock;
    res["rx"]["afc_lock"] = fRxAfcLock;
    res["rx"]["pkt_sync"] = fRxPktSync;
+#endif

    res["rx"]["snr"] = fRxSnr;
    res["rx"]["rssi"] = fRxRssi;
+#ifndef MODEM_IS_SHPS
    res["rx"]["modcod"] = fRxModcod;
    res["rx"]["frameSizeNormal"] = fRxFrameSizeNormal;
    res["rx"]["isPilots"] = fRxIsPilots;

    res["rx"]["symError"] = fRxSymError;
    res["rx"]["freqErr"] = fRxFreqErr;
+#endif
    res["rx"]["freqErrAcc"] = fRxFreqErrAcc;
    res["rx"]["inputSignalLevel"] = fRxInputSignalLevel;
    res["rx"]["pllError"] = fRxPllError;
@@ -424,9 +433,10 @@ nlohmann::json api_driver::obj::TerminalState::asJson() {
    res["rx"]["speedOnIifKbit"] = fRxSpeedOnIifKbit;
    res["rx"]["packetsOk"] = fRxPacketsOk;
    res["rx"]["packetsBad"] = fRxPacketsBad;
+#ifndef MODEM_IS_SHPS
    res["rx"]["packetsDummy"] = fRxPacketsDummy;
-
    res["tx"]["modcod"] = fTxModcod;
+#endif
    res["tx"]["state"] = fTxState;
    res["tx"]["speedOnTxKbit"] = fTxSpeedOnTxKbit;
    res["tx"]["speedOnIifKbit"] = fTxSpeedOnIifKbit;
@@ -657,6 +667,7 @@ void api_driver::obj::TerminalRxTxSettings::updateMainSettings(const nlohmann::j
 #endif
 #ifdef MODEM_IS_SHPS
    mod.koef_spread = data.value("txSpreadCoef", mod.koef_spread);
+    mod.txFieldsDataPreamble = data.value("txFieldsDataPreamble", mod.txFieldsDataPreamble);
 #endif

    // демодулятор
@@ -671,6 +682,7 @@ void api_driver::obj::TerminalRxTxSettings::updateMainSettings(const nlohmann::j
 #endif
 #ifdef MODEM_IS_SHPS
    dem.koef_spread = data.value("rxSpreadCoef", dem.koef_spread);
+    dem.rxFftShift = data.value("rxFftShift", dem.rxFftShift);
 #endif

 #ifdef API_STRUCT_ACM_ENABLE
@@ -837,6 +849,7 @@ nlohmann::json api_driver::obj::TerminalRxTxSettings::asJson() const {
        rxtx["txAttenuation"] = mod.attenuation;
 #ifdef MODEM_IS_SHPS
        rxtx["txSpreadCoef"] = mod.koef_spread;
+        rxtx["txFieldsDataPreamble"] = mod.txFieldsDataPreamble;
 #endif

 #if defined(MODEM_IS_SCPC) || defined(MODEM_IS_SHPS)
@@ -861,8 +874,8 @@ nlohmann::json api_driver::obj::TerminalRxTxSettings::asJson() const {
        rxtx["rxGoldan"] = dem.gold_seq_is_active ? 1 : 0;
 #endif
 #ifdef MODEM_IS_SHPS
-        rxtx["txSpreadCoef"] = mod.koef_spread;
        rxtx["rxSpreadCoef"] = dem.koef_spread;
+        rxtx["rxFftShift"] = dem.rxFftShift;
 #endif

 #ifdef API_STRUCT_ACM_ENABLE
--- a/src/api-driver/structs.h
+++ b/src/api-driver/structs.h
@@ -134,19 +134,22 @@ namespace api_driver::obj {
 #endif

        bool fRxState{};
+#ifndef MODEM_IS_SHPS
        bool fRxSymSyncLock{};
        bool fRxFreqSearchLock{};
        bool fRxAfcLock{};
        bool fRxPktSync{};
+#endif

        float fRxSnr{};
        float fRxRssi{};
+#ifndef MODEM_IS_SHPS
        uint16_t fRxModcod{};
        bool fRxFrameSizeNormal{};
        bool fRxIsPilots{};
-
        double fRxSymError{};
        double fRxFreqErr{};
+#endif
        double fRxFreqErrAcc{};
        double fRxInputSignalLevel{};
        double fRxPllError{};
@@ -154,9 +157,10 @@ namespace api_driver::obj {
        double fRxSpeedOnIifKbit{};
        uint32_t fRxPacketsOk{};
        uint32_t fRxPacketsBad{};
+#ifndef MODEM_IS_SHPS
        uint32_t fRxPacketsDummy{};
-
        uint16_t fTxModcod{};
+#endif
        double fTxSpeedOnTxKbit{};
        double fTxSpeedOnIifKbit{};
 #ifdef MODEM_IS_SCPC
--- a/static/main-shps.html
+++ b/static/main-shps.html
@@ -58,16 +58,8 @@
                <table>
                    <tbody>
                    <tr><th>Прием</th><td><span :class="{ indicator_bad: statRx.state === false, indicator_good: statRx.state === true, indicator: true }"></span></td></tr>
-                    <tr><th>Захват символьной</th><td><span :class="{ indicator_bad: statRx.sym_sync_lock === false, indicator_good: statRx.sym_sync_lock === true, indicator: true }"></span></td></tr>
-                    <tr><th>Захват ФАПЧ</th><td><span :class="{ indicator_bad: statRx.afc_lock === false, indicator_good: statRx.afc_lock === true, indicator: true }"></span></td></tr>
-                    <tr><th>Захват поиска по частоте</th><td><span :class="{ indicator_bad: statRx.freq_search_lock === false, indicator_good: statRx.freq_search_lock === true, indicator: true }"></span></td></tr>
-                    <tr><th>Захват пакетной синхр.</th><td><span :class="{ indicator_bad: statRx.pkt_sync === false, indicator_good: statRx.pkt_sync === true, indicator: true }"></span></td></tr>
                    <tr><th>ОСШ/RSSI</th><td>{{ statRx.snr }} / {{ statRx.rssi }}</td></tr>
-                    <tr><th>Modcod</th><td>{{ statRx.modcod }}</td></tr>
-                    <tr><th>Размер кадра</th><td>{{ statRx.frameSizeNormal ? 'normal' : 'short' }}</td></tr>
-                    <tr><th>Пилот-символы</th><td>{{ statRx.isPilots ? 'pilots' : 'no pilots' }}</td></tr>
-                    <tr><th>Символьная ошибка</th><td>{{ statRx.symError }}</td></tr>
-                    <tr><th>Грубая/точная част. ошибка, Гц</th><td>{{ statRx.freqErr }} / {{ statRx.freqErrAcc }}</td></tr>
+                    <tr><th>Частотная ошибка, Гц</th><td>{{ statRx.freqErrAcc }}</td></tr>
                    <tr><th>Ур. входного сигнала</th><td>{{ statRx.inputSignalLevel }}</td></tr>
                    <tr><th>Ошибка ФАПЧ</th><td>{{ statRx.pllError }}</td></tr>
                    <tr><th>Инф. скорость на приеме</th><td>{{ statRx.speedOnRxKbit }} кбит/с</td></tr>
@@ -75,7 +67,6 @@
                    <tr><td colspan="2" style="padding-top: 1em; text-align: center">Статистика пакетов</td></tr>
                    <tr><th>Качественных пакетов</th><td>{{ statRx.packetsOk }}</td></tr>
                    <tr><th>Поврежденных пакетов</th><td>{{ statRx.packetsBad }}</td></tr>
-                    <tr><th>DUMMY</th><td>{{ statRx.packetsDummy }}</td></tr>
                    </tbody>
                </table>
                <button class="action-button" @click="resetPacketsStatistics()"> Сброс статистики </button>
@@ -85,7 +76,6 @@
                <table>
                    <tbody>
                    <tr><th>Передача</th><td><span :class="{ indicator_bad: statTx.state === false, indicator_good: statTx.state === true, indicator: true }"></span></td></tr>
-                    <tr><th>Modcod</th><td>{{ statTx.modcod }}</td></tr>
                    <tr><th>Инф. скорость на передаче</th><td>{{ statTx.speedOnTxKbit }} кбит/с</td></tr>
                    <tr><th>Инф. скорость на интерфейсе</th><td>{{ statTx.speedOnIifKbit }} кбит/с</td></tr>
                    <tr><th>Центральная частота</th><td>{{ statTx.centerFreq }} кГц</td></tr>
@@ -127,6 +117,7 @@
                            <option :value="true">Тест (CW)</option>
                        </select>
                    </label>
+                    <label><span>Ослабление, дБ</span><input type="number" v-model="paramRxtx.txAttenuation" min="-40" step="0.25"/></label>
                    <label>
                        <span>Входные данные</span>
                        <select v-model="paramRxtx.txIsTestInput">
@@ -135,8 +126,8 @@
                        </select>
                    </label>
                    <h3>Параметры передачи</h3>
-                    <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>Центральная частота, КГц</span><input type="number" v-model="paramRxtx.txCentralFreq" min="70000" max="6000000" step="100"/></label>
+                    <label><span>Символьная скорость, Бод</span><input type="number" v-model="paramRxtx.txBaudrate" min="128000" max="30000000"/></label>
                    <label>
                        <span>Roll-off</span>
                        <select v-model="paramRxtx.txRolloff">
@@ -146,10 +137,12 @@
                            <option :value="150">0.15</option>
                            <option :value="200">0.20</option>
                            <option :value="250">0.25</option>
+                            <option :value="300">0.30</option>
+                            <option :value="350">0.35</option>
                        </select>
                    </label>
-                    <label><span>Коэф. расширения</span><input type="number" v-model="paramRxtx.txSpreadCoef" min="-1000" max="1000" step="0.01"/></label>
-                    <label><span>Ослабление, дБ</span><input type="number" v-model="paramRxtx.txAttenuation" min="-40" step="0.25"/></label>
+                    <label><span>Коэф. расширения</span><input type="number" v-model="paramRxtx.txSpreadCoef" min="8" max="1024" step="2"/></label>
+                    <label><span>Кол-во пакетов на преамбулу</span><input type="number" v-model="paramRxtx.txFieldsDataPreamble" min="1" max="255" step="1"/></label>
                </div>
                <div class="settings-set-container">
                    <h3>Авто-регулировка мощности</h3>
@@ -178,8 +171,8 @@
                        <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="100000" max="6000000" step="0.01"/></label>
-                    <label><span>Символьная скорость, Бод</span><input type="number" v-model="paramRxtx.rxBaudrate" min="200000" max="54000000"/></label>
+                    <label><span>Центральная частота, КГц</span><input type="number" v-model="paramRxtx.rxCentralFreq" min="70000" max="6000000" step="100"/></label>
+                    <label><span>Символьная скорость, Бод</span><input type="number" v-model="paramRxtx.rxBaudrate" min="128000" max="30000000"/></label>
                    <label>
                        <span>Roll-off</span>
                        <select v-model="paramRxtx.rxRolloff">
@@ -189,9 +182,13 @@
                            <option :value="150">0.15</option>
                            <option :value="200">0.20</option>
                            <option :value="250">0.25</option>
+                            <option :value="300">0.30</option>
+                            <option :value="350">0.35</option>
                        </select>
                    </label>
-                    <label><span>Коэф. расширения</span><input type="number" v-model="paramRxtx.rxSpreadCoef" min="-1000" max="1000" step="0.01"/></label>
+                    <label><span>Коэф. расширения</span><input type="number" v-model="paramRxtx.rxSpreadCoef" min="8" max="1024" step="2"/></label>
+                    <label><span>Порог коррелятора</span><input type="number" v-model="paramRxtx.rxFftShift" min="256" max="4096" step="1"/></label>
+                    <label><span>Кол-во пакетов на преамбулу</span><input type="number" v-model="paramRxtx.rxFieldsDataPreamble" min="1" max="255" step="1"/></label>
                </div>
            </div>
            <button class="action-button" @click="settingsSubmitRxtx()">Сохранить <span class="submit-spinner" v-show="submitStatus.rxtx"></span></button>
@@ -351,12 +348,13 @@
                    txEn: false,
                    txAutoStart: false,
                    txModulatorIsTest: false,
-                    txIsTestInput: false,
-                    txCentralFreq: 100000,
-                    txBaudrate: 200000,
-                    txRolloff: 20,
-                    txSpreadCoef: -1000,
                    txAttenuation: -40,
+                    txIsTestInput: false,
+                    txCentralFreq: 70000,
+                    txBaudrate: 128000,
+                    txRolloff: 20,
+                    txSpreadCoef: 8,
+                    txFieldsDataPreamble: 1,
                    aupcEn: false,
                    aupcMinAttenuation: 0,
                    aupcMaxAttenuation: 0,
@@ -364,10 +362,12 @@
                    rxAgcEn: false,
                    rxManualGain: -40,
                    rxSpectrumInversion: false,
-                    rxCentralFreq: 100000,
-                    rxBaudrate: 200000,
+                    rxCentralFreq: 70000,
+                    rxBaudrate: 128000,
                    rxRolloff: 20,
-                    rxSpreadCoef: -1000,
+                    rxSpreadCoef: 8,
+                    rxFftShift: 256,
+                    rxFieldsDataPreamble: 1,
                },
                paramBuclnb: {
                    bucRefClk10M: false,
@@ -501,12 +501,13 @@
                    "txEn": this.paramRxtx.txEn,
                    "txAutoStart": this.paramRxtx.txAutoStart,
                    "txModulatorIsTest": this.paramRxtx.txModulatorIsTest,
+                    "txAttenuation": this.paramRxtx.txAttenuation,
                    "txIsTestInput": this.paramRxtx.txIsTestInput,
                    "txCentralFreq": this.paramRxtx.txCentralFreq,
                    "txBaudrate": this.paramRxtx.txBaudrate,
                    "txRolloff": this.paramRxtx.txRolloff,
                    "txSpreadCoef": this.paramRxtx.txSpreadCoef,
-                    "txAttenuation": this.paramRxtx.txAttenuation,
+                    "txFieldsDataPreamble": this.paramRxtx.txFieldsDataPreamble,
                    "aupcEn": this.paramRxtx.aupcEn,
                    "aupcMinAttenuation": this.paramRxtx.aupcMinAttenuation,
                    "aupcMaxAttenuation": this.paramRxtx.aupcMaxAttenuation,
@@ -518,6 +519,8 @@
                    "rxBaudrate": this.paramRxtx.rxBaudrate,
                    "rxRolloff": this.paramRxtx.rxRolloff,
                    "rxSpreadCoef": this.paramRxtx.rxSpreadCoef,
+                    "rxFftShift": this.paramRxtx.rxFftShift,
+                    "rxFieldsDataPreamble": this.paramRxtx.rxFieldsDataPreamble,
                }

                this.submitStatus.rxtx = true
@@ -569,12 +572,13 @@
                this.paramRxtx.txEn = vals["settings"]["rxtx"]["txEn"]
                this.paramRxtx.txAutoStart = vals["settings"]["rxtx"]["txAutoStart"]
                this.paramRxtx.txModulatorIsTest = vals["settings"]["rxtx"]["txModulatorIsTest"]
+                this.paramRxtx.txAttenuation = vals["settings"]["rxtx"]["txAttenuation"]
                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.txFieldsDataPreamble = vals["settings"]["rxtx"]["txFieldsDataPreamble"]
                this.paramRxtx.aupcEn = vals["settings"]["rxtx"]["aupcEn"]
                this.paramRxtx.aupcMinAttenuation = vals["settings"]["rxtx"]["aupcMinAttenuation"]
                this.paramRxtx.aupcMaxAttenuation = vals["settings"]["rxtx"]["aupcMaxAttenuation"]
@@ -586,6 +590,8 @@
                this.paramRxtx.rxBaudrate = vals["settings"]["rxtx"]["rxBaudrate"]
                this.paramRxtx.rxRolloff = vals["settings"]["rxtx"]["rxRolloff"]
                this.paramRxtx.rxSpreadCoef = vals["settings"]["rxtx"]["rxSpreadCoef"]
+                this.paramRxtx.rxFftShift = vals["settings"]["rxtx"]["rxFftShift"]
+                this.paramRxtx.rxFieldsDataPreamble = vals["settings"]["rxtx"]["rxFieldsDataPreamble"]
            },
            updateBuclnbSettings(vals) {
                this.submitStatus.buclnb = false