diff --git a/dependencies/control_system_client_tdma b/dependencies/control_system_client_tdma index 4eefdaf..e91aac8 160000 --- a/dependencies/control_system_client_tdma +++ b/dependencies/control_system_client_tdma @@ -1 +1 @@ -Subproject commit 4eefdaf82edd0ddca2e3a1f5843a7cb1a66eb5a0 +Subproject commit e91aac881a141a2ff43d76a16be099429e9be5f2 diff --git a/front-generator/render-params.json b/front-generator/render-params.json index cfaeb24..6684922 100644 --- a/front-generator/render-params.json +++ b/front-generator/render-params.json @@ -23,6 +23,7 @@ }, {"widget": "number-int", "label": "Центральная частота, КГц", "name": "txCentralFreq", "min": 900000, "step": 0.01, "v_show": "paramRxtx.txModulatorIsTest"}, {"widget": "number", "label": "Ослабление, дБ", "name": "txAttenuation", "max": 0, "min": -90, "step": 1}, + {"widget": "number", "label": "Ослабление для запросных слотов, дБ", "name": "txAttenuationAck", "max": 0, "min": -90, "step": 1}, {"widget": "number", "label": "Ограничение ослабления", "name": "txAttenuationLimit", "max": 0, "min": -40, "step": 0.25} ] }, diff --git a/src/api-driver/structs.cpp b/src/api-driver/structs.cpp index 71320f3..81659c3 100644 --- a/src/api-driver/structs.cpp +++ b/src/api-driver/structs.cpp @@ -657,6 +657,9 @@ void api_driver::obj::TerminalRxTxSettings::updateMainSettings(const nlohmann::j mod.gold_seq_is_active = data.value("txGoldan", mod.gold_seq_is_active ? 1 : 0); #endif mod.attenuation = data.value("txAttenuation", mod.attenuation); +#ifdef MODEM_IS_TDMA + mod.attenuation_acq = data.value("txAttenuationAck", mod.attenuation_acq); +#endif #if defined(MODEM_IS_SCPC) || defined(MODEM_IS_SHPS) bool acmIsFrameSizeNormal = extractModcodFrameSizeNormal(mod.modcod_tx); @@ -857,6 +860,9 @@ nlohmann::json api_driver::obj::TerminalRxTxSettings::asJson() const { rxtx["txSpreadCoef"] = mod.koef_spread; rxtx["txFieldsDataPreamble"] = mod.txFieldsDataPreamble; #endif +#ifdef MODEM_IS_TDMA + rxtx["txAttenuationAck"] = mod.attenuation_acq; +#endif #if defined(MODEM_IS_SCPC) || defined(MODEM_IS_SHPS) const bool acmIsFrameSizeNormal = extractModcodFrameSizeNormal(mod.modcod_tx); diff --git a/static/main-tdma.html b/static/main-tdma.html index 3ba6d62..4923f87 100644 --- a/static/main-tdma.html +++ b/static/main-tdma.html @@ -132,6 +132,7 @@ +
@@ -380,6 +381,7 @@ txModulatorIsTest: false, txCentralFreq: 0, txAttenuation: -90, + txAttenuationAck: -90, txAttenuationLimit: -40, rxAgcEn: true, rxManualGain: -40, @@ -537,6 +539,7 @@ "txModulatorIsTest": this.paramRxtx.txModulatorIsTest, "txCentralFreq": parseFloat(this.paramRxtx.txCentralFreq.replace(/[^0-9,.]/g, '').replace(',', '.')), "txAttenuation": this.paramRxtx.txAttenuation, + "txAttenuationAck": this.paramRxtx.txAttenuationAck, "txAttenuationLimit": this.paramRxtx.txAttenuationLimit, "rxAgcEn": this.paramRxtx.rxAgcEn, "rxManualGain": this.paramRxtx.rxManualGain, @@ -612,6 +615,7 @@ this.paramRxtx.txModulatorIsTest = vals["settings"]["rxtx"]["txModulatorIsTest"] this.paramRxtx.txCentralFreq = this.inputFormatNumber(vals["settings"]["rxtx"]["txCentralFreq"], {min:900000,step:0.01}) this.paramRxtx.txAttenuation = vals["settings"]["rxtx"]["txAttenuation"] + this.paramRxtx.txAttenuationAck = vals["settings"]["rxtx"]["txAttenuationAck"] this.paramRxtx.txAttenuationLimit = vals["settings"]["rxtx"]["txAttenuationLimit"] this.paramRxtx.rxAgcEn = vals["settings"]["rxtx"]["rxAgcEn"] this.paramRxtx.rxManualGain = vals["settings"]["rxtx"]["rxManualGain"]