diff --git a/dependencies/control_system_client_shps b/dependencies/control_system_client_shps index 9241716..6fb944f 160000 --- a/dependencies/control_system_client_shps +++ b/dependencies/control_system_client_shps @@ -1 +1 @@ -Subproject commit 92417169312526456fdad4668c9d3bb04e64de70 +Subproject commit 6fb944f93015c30ba4fef1e88f793f0d6a02c1aa diff --git a/front-generator/render-params.json b/front-generator/render-params.json index 9518c38..f72f7b8 100644 --- a/front-generator/render-params.json +++ b/front-generator/render-params.json @@ -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} ] } diff --git a/src/api-driver/structs.cpp b/src/api-driver/structs.cpp index c2bedd6..87ef0d9 100644 --- a/src/api-driver/structs.cpp +++ b/src/api-driver/structs.cpp @@ -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 diff --git a/static/main-shps.html b/static/main-shps.html index e1ab009..871cacd 100644 --- a/static/main-shps.html +++ b/static/main-shps.html @@ -199,7 +199,7 @@ - + @@ -378,7 +378,7 @@ rxBaudrate: 0, rxRolloff: 20, rxSpreadCoef: 8, - rxFftShift: 256, + rxFftShift: 1, rxFieldsDataPreamble: 1, }, paramBuclnb: {