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

tdma: добавил еще одно ослабление

Browse Source
This commit is contained in:
Vladislav Ostapov
2025-10-15 10:58:24 +03:00
parent 06c7972b22
commit 9c1fdd83f3
4 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dependencies/control_system_client_tdma vendored

Submodule dependencies/control_system_client_tdma updated: 4eefdaf82e...e91aac881a

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

@@ -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}
]
},

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

@@ -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);

4
static/main-tdma.html
View File

@@ -132,6 +132,7 @@
<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="-90" step="1"/></label>
<label><span>Ослабление для запросных слотов, дБ</span><input type="number" v-model="paramRxtx.txAttenuationAck" min="-90" step="1"/></label>
<label><span>Ограничение ослабления</span><input type="number" v-model="paramRxtx.txAttenuationLimit" min="-40" step="0.25"/></label>
</div>
<div class="settings-set-container">
@@ -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"]