diff --git a/front-generator/render-params.json b/front-generator/render-params.json index 64c2104..4e0e623 100644 --- a/front-generator/render-params.json +++ b/front-generator/render-params.json @@ -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}, { diff --git a/front-generator/render.py b/front-generator/render.py index d1d4d4c..14704a5 100644 --- a/front-generator/render.py +++ b/front-generator/render.py @@ -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') diff --git a/front-generator/template/common/widgets.j2 b/front-generator/template/common/widgets.j2 index 78e9bbc..c481d71 100644 --- a/front-generator/template/common/widgets.j2 +++ b/front-generator/template/common/widgets.j2 @@ -3,6 +3,7 @@ {% endmacro %} +{# https://ru.stackoverflow.com/questions/1241064 #} {% macro build_widget_number(param_group, widget) %}{{ widget.label }}{% endmacro %} {% macro build_widget_select(param_group, widget) %} diff --git a/src/terminal_api_driver.h b/src/terminal_api_driver.h index c173070..4685532 100644 --- a/src/terminal_api_driver.h +++ b/src/terminal_api_driver.h @@ -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& callback); diff --git a/static/fields.css b/static/fields.css index 4a477b4..065faa9 100644 --- a/static/fields.css +++ b/static/fields.css @@ -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; } diff --git a/static/main-tdma.html b/static/main-tdma.html index 32ccccb..31911c0 100644 --- a/static/main-tdma.html +++ b/static/main-tdma.html @@ -127,8 +127,8 @@ - - + +
@@ -140,11 +140,11 @@ + -