косметические изменения
This commit is contained in:
parent
2c9d513613
commit
456faedf7d
@ -24,8 +24,8 @@
|
||||
{"label": "Тест", "value": "true"}
|
||||
]
|
||||
},
|
||||
{"widget": "number", "label": "Центральная частота, КГц", "name": "txCentralFreq", "min": 900000, "step": 0.01},
|
||||
{"widget": "number", "label": "Символьная скорость, Бод", "name": "txBaudrate", "min": 0, "step": 1},
|
||||
{"widget": "number", "label": "Центральная частота, КГц", "name": "txCentralFreq", "min": 900000, "step": 0.01, "v_show": "paramRxrx.txIsTestInput"},
|
||||
{"widget": "number", "label": "Символьная скорость, Бод", "name": "txBaudrate", "min": 0, "step": 1, "v_show": "paramRxrx.txIsTestInput"},
|
||||
{"widget": "number", "label": "Ослабление, дБ", "name": "txAttenuation", "min": 0, "step": 1}
|
||||
]
|
||||
},
|
||||
@ -40,8 +40,8 @@
|
||||
{"label": "РРУ", "value": "false"}
|
||||
]
|
||||
},
|
||||
{"widget": "checkbox", "label": "Инверсия спектра", "name": "rxSpectrumInversion"},
|
||||
{"widget": "number", "label": "Ручное усиление, дБ", "name": "rxManualGain", "v_show": "!paramRxtx.rxAgcEn", "min": -40},
|
||||
{"widget": "checkbox", "label": "Инверсия спектра", "name": "rxSpectrumInversion"},
|
||||
{"widget": "number", "label": "Центральная частота, КГц", "name": "rxCentralFreq", "min": 900000, "step": 0.01},
|
||||
{"widget": "number", "label": "Символьная скорость, Бод", "name": "rxBaudrate", "min": 0, "step": 1},
|
||||
{
|
||||
|
||||
@ -3,6 +3,9 @@ from jinja2 import Environment, FileSystemLoader
|
||||
import sys
|
||||
import os
|
||||
|
||||
with open('render-params.json') as f:
|
||||
GLOBAL_CONFIG = json.load(f)
|
||||
|
||||
|
||||
def extract_param_names(mc):
|
||||
result = []
|
||||
@ -66,12 +69,10 @@ def extract_param_groups(mc):
|
||||
|
||||
|
||||
def build_modem_env(modem):
|
||||
with open('render-params.json') as f:
|
||||
config = json.load(f)
|
||||
if modem not in config['modem_types']:
|
||||
if modem not in GLOBAL_CONFIG['modem_types']:
|
||||
raise RuntimeError(f"Modem '{modem}' is not exist in config!")
|
||||
|
||||
mc = config['modem_types'][modem]
|
||||
mc = GLOBAL_CONFIG['modem_types'][modem]
|
||||
|
||||
add_submit_widgets(mc['params'])
|
||||
|
||||
@ -99,9 +100,8 @@ def render_modem(modem):
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
render_modem('scpc')
|
||||
render_modem('tdma')
|
||||
|
||||
os.system('cp -u main-tdma.html ../static')
|
||||
os.system('cp -u main-scpc.html ../static')
|
||||
for mt in GLOBAL_CONFIG['modem_types']:
|
||||
print(f'Generating {mt} modem...')
|
||||
render_modem(mt)
|
||||
os.system(f'cp -u main-{mt}.html ../static')
|
||||
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
<span class="toggle-input"><input type="checkbox" v-model="param{{ param_group | title }}.{{ widget.name }}" /><span class="slider"></span></span>
|
||||
</label>{% endmacro %}
|
||||
|
||||
{# https://ru.stackoverflow.com/questions/1241064 #}
|
||||
{% macro build_widget_number(param_group, widget) %}<label{% if widget.v_show %} v-show="{{ widget.v_show }}"{% endif %}><span>{{ widget.label }}</span><input type="number" v-model="param{{ param_group | title }}.{{ widget.name }}"{% if widget['min'] %} min="{{ widget['min'] }}"{% endif %}{% if widget['max'] %} max="{{ widget['max'] }}"{% endif %}{% if widget['step'] %} step="{{ widget['step'] }}"{% endif %}/></label>{% endmacro %}
|
||||
|
||||
{% macro build_widget_select(param_group, widget) %}<label{% if widget.v_show %} v-show="{{ widget.v_show }}"{% endif %}>
|
||||
|
||||
@ -64,8 +64,6 @@ namespace api_driver {
|
||||
|
||||
void setNetworkSettings(boost::property_tree::ptree & pt);
|
||||
|
||||
void setDebugSendSettings(boost::property_tree::ptree & pt);
|
||||
|
||||
void resetDefaultSettings();
|
||||
|
||||
void executeInApi(const std::function<void(TSID sid)>& callback);
|
||||
|
||||
@ -135,7 +135,7 @@ select * {
|
||||
}
|
||||
|
||||
.settings-set-container th, .settings-set-container td {
|
||||
border-bottom: solid 1px var(--text-color2);
|
||||
border-bottom: solid 1px var(--bg-element);
|
||||
}
|
||||
.settings-set-container table { border-collapse: collapse; }
|
||||
|
||||
|
||||
@ -127,8 +127,8 @@
|
||||
<option :value="true">Тест</option>
|
||||
</select>
|
||||
</label>
|
||||
<label><span>Центральная частота, КГц</span><input type="number" v-model="paramRxtx.txCentralFreq" min="900000" step="0.01"/></label>
|
||||
<label><span>Символьная скорость, Бод</span><input type="number" v-model="paramRxtx.txBaudrate" step="1"/></label>
|
||||
<label v-show="paramRxrx.txIsTestInput"><span>Центральная частота, КГц</span><input type="number" v-model="paramRxtx.txCentralFreq" min="900000" step="0.01"/></label>
|
||||
<label v-show="paramRxrx.txIsTestInput"><span>Символьная скорость, Бод</span><input type="number" v-model="paramRxtx.txBaudrate" step="1"/></label>
|
||||
<label><span>Ослабление, дБ</span><input type="number" v-model="paramRxtx.txAttenuation" step="1"/></label>
|
||||
</div>
|
||||
<div class="settings-set-container">
|
||||
@ -140,11 +140,11 @@
|
||||
<option :value="false">РРУ</option>
|
||||
</select>
|
||||
</label>
|
||||
<label v-show="!paramRxtx.rxAgcEn"><span>Ручное усиление, дБ</span><input type="number" v-model="paramRxtx.rxManualGain" min="-40"/></label>
|
||||
<label>
|
||||
<span>Инверсия спектра</span>
|
||||
<span class="toggle-input"><input type="checkbox" v-model="paramRxtx.rxSpectrumInversion" /><span class="slider"></span></span>
|
||||
</label>
|
||||
<label v-show="!paramRxtx.rxAgcEn"><span>Ручное усиление, дБ</span><input type="number" v-model="paramRxtx.rxManualGain" min="-40"/></label>
|
||||
<label><span>Центральная частота, КГц</span><input type="number" v-model="paramRxtx.rxCentralFreq" min="900000" step="0.01"/></label>
|
||||
<label><span>Символьная скорость, Бод</span><input type="number" v-model="paramRxtx.rxBaudrate" step="1"/></label>
|
||||
<label>
|
||||
@ -297,8 +297,8 @@
|
||||
txBaudrate: 0,
|
||||
txAttenuation: 0,
|
||||
rxAgcEn: true,
|
||||
rxSpectrumInversion: false,
|
||||
rxManualGain: -40,
|
||||
rxSpectrumInversion: false,
|
||||
rxCentralFreq: 900000,
|
||||
rxBaudrate: 0,
|
||||
rxRolloff: 2,
|
||||
@ -427,8 +427,8 @@
|
||||
"txBaudrate": this.paramRxtx.txBaudrate,
|
||||
"txAttenuation": this.paramRxtx.txAttenuation,
|
||||
"rxAgcEn": this.paramRxtx.rxAgcEn,
|
||||
"rxSpectrumInversion": this.paramRxtx.rxSpectrumInversion,
|
||||
"rxManualGain": this.paramRxtx.rxManualGain,
|
||||
"rxSpectrumInversion": this.paramRxtx.rxSpectrumInversion,
|
||||
"rxCentralFreq": this.paramRxtx.rxCentralFreq,
|
||||
"rxBaudrate": this.paramRxtx.rxBaudrate,
|
||||
"rxRolloff": this.paramRxtx.rxRolloff,
|
||||
@ -485,8 +485,8 @@
|
||||
this.paramRxtx.txBaudrate = vals["settings"]["txBaudrate"]
|
||||
this.paramRxtx.txAttenuation = vals["settings"]["txAttenuation"]
|
||||
this.paramRxtx.rxAgcEn = vals["settings"]["rxAgcEn"]
|
||||
this.paramRxtx.rxSpectrumInversion = vals["settings"]["rxSpectrumInversion"]
|
||||
this.paramRxtx.rxManualGain = vals["settings"]["rxManualGain"]
|
||||
this.paramRxtx.rxSpectrumInversion = vals["settings"]["rxSpectrumInversion"]
|
||||
this.paramRxtx.rxCentralFreq = vals["settings"]["rxCentralFreq"]
|
||||
this.paramRxtx.rxBaudrate = vals["settings"]["rxBaudrate"]
|
||||
this.paramRxtx.rxRolloff = vals["settings"]["rxRolloff"]
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user