VladislavOstapov/terminal-web-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

обновление ШПС вебки: исправил порог коррелятора по просьбе @hernayo, обновление control system api

Browse Source
This commit is contained in:
Vladislav Ostapov
2025-09-08 11:27:35 +03:00
parent 00a9692b3d
commit eb1e4609bb
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dependencies/control_system_client_shps vendored

Submodule dependencies/control_system_client_shps updated: 9241716931...6fb944f930

2
front-generator/render-params.json
View File

@@ -408,7 +408,7 @@
"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": 1024, "min": 8, "step": 2},
{"widget": "number", "label": "Порог коррелятора", "name": "rxFftShift", "max": 10, "min": 0, "step": 0.1},
{"widget": "number", "label": "Порог коррелятора", "name": "rxFftShift", "max": 10, "min": 1, "step": 0.125},
{"widget": "number", "label": "Кол-во пакетов на преамбулу", "name": "rxFieldsDataPreamble", "max": 255, "min": 1, "step": 1}
]
}

2
src/api-driver/structs.cpp
View File

@@ -683,6 +683,7 @@ void api_driver::obj::TerminalRxTxSettings::updateMainSettings(const nlohmann::j
#ifdef MODEM_IS_SHPS
dem.koef_spread = data.value("rxSpreadCoef", dem.koef_spread);
dem.rxFftShift = data.value("rxFftShift", dem.rxFftShift);
dem.rxFieldsDataPreamble = data.value("rxFieldsDataPreamble", dem.rxFieldsDataPreamble);
#endif
#ifdef API_STRUCT_ACM_ENABLE
@@ -876,6 +877,7 @@ nlohmann::json api_driver::obj::TerminalRxTxSettings::asJson() const {
#ifdef MODEM_IS_SHPS
rxtx["rxSpreadCoef"] = dem.koef_spread;
rxtx["rxFftShift"] = dem.rxFftShift;
rxtx["rxFieldsDataPreamble"] = dem.rxFieldsDataPreamble;
#endif
#ifdef API_STRUCT_ACM_ENABLE

4
static/main-shps.html
View File

@@ -199,7 +199,7 @@
</select>
</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.rxFftShift" min="1" max="10" step="0.125"/></label>
<label><span>Кол-во пакетов на преамбулу</span><input type="number" v-model="paramRxtx.rxFieldsDataPreamble" min="1" max="255" step="1"/></label>
</div>
</div>
@@ -378,7 +378,7 @@
rxBaudrate: 0,
rxRolloff: 20,
rxSpreadCoef: 8,
rxFftShift: 256,
rxFftShift: 1,
rxFieldsDataPreamble: 1,
},
paramBuclnb: {