добавил установку задержки до спутника в вебке TDMA
This commit is contained in:
parent
3a4c7363b3
commit
fe3b45dc9e
2
dependencies/control_system_client
vendored
2
dependencies/control_system_client
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 2ded1a0c97dfcb39c2a538579f4c5b17dc940613
|
Subproject commit 1780093e8bee4de09d68e702c8d5ee759d8f4de0
|
@ -47,6 +47,13 @@
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"widget": "settings-container",
|
||||||
|
"childs": [
|
||||||
|
{"widget": "h3", "label": "Настройки позиционирования"},
|
||||||
|
{"widget": "number", "label": "Задержка до спутника, мс", "name": "rxTxSatDelay", "min": 0, "step": 1, "max": 600}
|
||||||
|
]
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"buclnb": [
|
"buclnb": [
|
||||||
|
@ -337,7 +337,6 @@ private:
|
|||||||
} else {
|
} else {
|
||||||
s.isL2 = true;
|
s.isL2 = true;
|
||||||
}
|
}
|
||||||
logCpApiError("api_driver::TerminalApiDaemon::unsafeLoadNetworkSettings()->CP_GetNetwork(mode)", CP_GetNetwork(sid, "mode", &nm));
|
|
||||||
s.dataMtu = 1500;
|
s.dataMtu = 1500;
|
||||||
logCpApiError("api_driver::TerminalApiDaemon::unsafeLoadNetworkSettings()->CP_GetNetwork(name_serv)", CP_GetNetwork(sid, "name_serv", &s.serverName));
|
logCpApiError("api_driver::TerminalApiDaemon::unsafeLoadNetworkSettings()->CP_GetNetwork(name_serv)", CP_GetNetwork(sid, "name_serv", &s.serverName));
|
||||||
if (s.serverName.empty()) {
|
if (s.serverName.empty()) {
|
||||||
@ -1071,6 +1070,10 @@ std::string api_driver::ApiDriver::loadSettings() const {
|
|||||||
result << ",\"cincDelayMax\":" << dpdiSettings.max_delay;
|
result << ",\"cincDelayMax\":" << dpdiSettings.max_delay;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef MODEM_IS_TDMA
|
||||||
|
result << ",\n\"rxTxSatDelay\":" << static_cast<int>(demodSettings.delay_ms);
|
||||||
|
#endif
|
||||||
|
|
||||||
result << ",\n\"rxAgcEn\":" << boolAsStr(demodSettings.is_aru_on);
|
result << ",\n\"rxAgcEn\":" << boolAsStr(demodSettings.is_aru_on);
|
||||||
result << ",\"rxSpectrumInversion\":" << boolAsStr(demodSettings.is_rvt_iq);
|
result << ",\"rxSpectrumInversion\":" << boolAsStr(demodSettings.is_rvt_iq);
|
||||||
result << ",\"rxManualGain\":"; writeDouble(result, demodSettings.gain);
|
result << ",\"rxManualGain\":"; writeDouble(result, demodSettings.gain);
|
||||||
@ -1202,6 +1205,10 @@ void api_driver::ApiDriver::setRxTxSettings(boost::property_tree::ptree &pt) {
|
|||||||
demod.gold_seq_is_active = pt.get<unsigned int>("rxGoldan");
|
demod.gold_seq_is_active = pt.get<unsigned int>("rxGoldan");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef MODEM_IS_TDMA
|
||||||
|
demod.delay_ms = pt.get<unsigned int>("rxTxSatDelay");
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef MODEM_IS_SCPC
|
#ifdef MODEM_IS_SCPC
|
||||||
// ACM
|
// ACM
|
||||||
acm.period_pack_acm = pt.get<uint32_t>("dvbServicePacketPeriod");
|
acm.period_pack_acm = pt.get<uint32_t>("dvbServicePacketPeriod");
|
||||||
|
@ -155,6 +155,10 @@
|
|||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="settings-set-container">
|
||||||
|
<h3>Настройки позиционирования</h3>
|
||||||
|
<label><span>Задержка до спутника, мс</span><input type="number" v-model="paramRxtx.rxTxSatDelay" max="600" step="1"/></label>
|
||||||
|
</div>
|
||||||
<button class="action-button" @click="settingsSubmitRxtx()">Сохранить <span class="submit-spinner" v-show="submitStatus.rxtx"></span></button>
|
<button class="action-button" @click="settingsSubmitRxtx()">Сохранить <span class="submit-spinner" v-show="submitStatus.rxtx"></span></button>
|
||||||
<h2>Настройки питания и опорного генератора</h2>
|
<h2>Настройки питания и опорного генератора</h2>
|
||||||
<div class="tabs-item-flex-container">
|
<div class="tabs-item-flex-container">
|
||||||
@ -300,6 +304,7 @@
|
|||||||
rxCentralFreq: 900000,
|
rxCentralFreq: 900000,
|
||||||
rxBaudrate: 0,
|
rxBaudrate: 0,
|
||||||
rxRolloff: 2,
|
rxRolloff: 2,
|
||||||
|
rxTxSatDelay: 0,
|
||||||
},
|
},
|
||||||
paramBuclnb: {
|
paramBuclnb: {
|
||||||
bucRefClk10M: false,
|
bucRefClk10M: false,
|
||||||
@ -440,6 +445,7 @@
|
|||||||
"rxCentralFreq": this.paramRxtx.rxCentralFreq,
|
"rxCentralFreq": this.paramRxtx.rxCentralFreq,
|
||||||
"rxBaudrate": this.paramRxtx.rxBaudrate,
|
"rxBaudrate": this.paramRxtx.rxBaudrate,
|
||||||
"rxRolloff": this.paramRxtx.rxRolloff,
|
"rxRolloff": this.paramRxtx.rxRolloff,
|
||||||
|
"rxTxSatDelay": this.paramRxtx.rxTxSatDelay,
|
||||||
}
|
}
|
||||||
|
|
||||||
this.submitStatus.rxtx = true
|
this.submitStatus.rxtx = true
|
||||||
@ -498,6 +504,7 @@
|
|||||||
this.paramRxtx.rxCentralFreq = vals["settings"]["rxCentralFreq"]
|
this.paramRxtx.rxCentralFreq = vals["settings"]["rxCentralFreq"]
|
||||||
this.paramRxtx.rxBaudrate = vals["settings"]["rxBaudrate"]
|
this.paramRxtx.rxBaudrate = vals["settings"]["rxBaudrate"]
|
||||||
this.paramRxtx.rxRolloff = vals["settings"]["rxRolloff"]
|
this.paramRxtx.rxRolloff = vals["settings"]["rxRolloff"]
|
||||||
|
this.paramRxtx.rxTxSatDelay = vals["settings"]["rxTxSatDelay"]
|
||||||
},
|
},
|
||||||
updateBuclnbSettings(vals) {
|
updateBuclnbSettings(vals) {
|
||||||
this.submitStatus.buclnb = false
|
this.submitStatus.buclnb = false
|
||||||
|
Loading…
x
Reference in New Issue
Block a user