From d98eba65cea0a446b056fd21eb85cf699a57d0c8 Mon Sep 17 00:00:00 2001 From: sasha80 Date: Mon, 7 Jul 2025 15:35:40 +0300 Subject: [PATCH 01/20] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5.=20=D0=A0=D0=B5=D1=84=D0=B0?= =?UTF-8?q?=D0=BA=D1=82=D0=BE=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/prd.gd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/prd.gd b/scripts/prd.gd index 151df54..468cc18 100644 --- a/scripts/prd.gd +++ b/scripts/prd.gd @@ -346,7 +346,7 @@ func on_data_capsrpb_received(unit0: capsrpb.CapsRpb): if unit0.json_dic['ts'] != 7: return if not unit0.json_dic.has('msfs'): return - var msfs = unit.json_dic['msfs'] + var msfs = unit0.json_dic['msfs'] for fs in msfs: if fs is Dictionary: if not fs.has('nmfs'): From d7ee776235ea7dffbf04f47c379c140e04dee00e Mon Sep 17 00:00:00 2001 From: sasha80 Date: Mon, 7 Jul 2025 15:36:50 +0300 Subject: [PATCH 02/20] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE?= =?UTF-8?q?=D1=82=D0=BA=D0=B0.=20=D0=A8=D0=B8=D1=80=D0=B8=D0=BD=D0=B0=20?= =?UTF-8?q?=D0=B4=D0=B8=D0=B0=D0=BF=D0=B0=D0=B7=D0=BE=D0=BD=D0=B0=20=D0=BC?= =?UTF-8?q?=D0=BE=D0=B4=D1=83=D0=BB=D0=B5=D0=B9=20=D1=83=D0=B6=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/settings.gd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/settings.gd b/scripts/settings.gd index 3c7b4cb..f595114 100644 --- a/scripts/settings.gd +++ b/scripts/settings.gd @@ -44,7 +44,7 @@ var settings_program: Dictionary const FREQ_MAX: = 6000.0 const FREQ_MIN: = 400.0 -const WIDTH_MAX: = 120.0 +const WIDTH_MAX: = 100.0 const WIDTH_MIN: = 0.0 const DUR_MAX: = 1000000.0 const PERIOD_MAX: = 1000000.0 From d0dcf590f733cab66bc919cf6e2457cf7a4ec8f7 Mon Sep 17 00:00:00 2001 From: sasha80 Date: Mon, 7 Jul 2025 15:37:39 +0300 Subject: [PATCH 03/20] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82?= =?UTF-8?q?=D0=BE=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/pribor-afsp/pribor-rtr.tscn | 34 +++++++++++++++--------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/scenes/pribor-afsp/pribor-rtr.tscn b/scenes/pribor-afsp/pribor-rtr.tscn index 345ec83..031e1b9 100644 --- a/scenes/pribor-afsp/pribor-rtr.tscn +++ b/scenes/pribor-afsp/pribor-rtr.tscn @@ -13,7 +13,7 @@ offset_right = 115.0 offset_bottom = 150.0 script = ExtResource("1_soedq") -[node name="yach_svyzi" parent="." instance=ExtResource("2_pspup")] +[node name="mod_pit_g1" parent="." instance=ExtResource("2_pspup")] layout_mode = 2 offset_left = 40.0 offset_top = 535.0 @@ -42,49 +42,49 @@ offset_right = 498.0 offset_bottom = 320.0 columns = 4 -[node name="a1_kanal1" parent="grid_bpo_a1" instance=ExtResource("2_pspup")] +[node name="kanal1" parent="grid_bpo_a1" instance=ExtResource("2_pspup")] layout_mode = 2 size_flags_horizontal = 7 size_flags_vertical = 7 fname = "Канал 1" -[node name="a1_kanal2" parent="grid_bpo_a1" instance=ExtResource("2_pspup")] +[node name="kanal2" parent="grid_bpo_a1" instance=ExtResource("2_pspup")] layout_mode = 2 size_flags_horizontal = 7 size_flags_vertical = 7 fname = "Канал 2" -[node name="a1_kanal3" parent="grid_bpo_a1" instance=ExtResource("2_pspup")] +[node name="kanal3" parent="grid_bpo_a1" instance=ExtResource("2_pspup")] layout_mode = 2 size_flags_horizontal = 7 size_flags_vertical = 7 fname = "Канал 3" -[node name="a1_kanal4" parent="grid_bpo_a1" instance=ExtResource("2_pspup")] +[node name="kanal4" parent="grid_bpo_a1" instance=ExtResource("2_pspup")] layout_mode = 2 size_flags_horizontal = 7 size_flags_vertical = 7 fname = "Канал 4" -[node name="a1_kanal5" parent="grid_bpo_a1" instance=ExtResource("2_pspup")] +[node name="kanal5" parent="grid_bpo_a1" instance=ExtResource("2_pspup")] layout_mode = 2 size_flags_horizontal = 7 size_flags_vertical = 7 fname = "Канал 5" -[node name="a1_kanal6" parent="grid_bpo_a1" instance=ExtResource("2_pspup")] +[node name="kanal6" parent="grid_bpo_a1" instance=ExtResource("2_pspup")] layout_mode = 2 size_flags_horizontal = 7 size_flags_vertical = 7 fname = "Канал 6" -[node name="a1_kanal7" parent="grid_bpo_a1" instance=ExtResource("2_pspup")] +[node name="kanal7" parent="grid_bpo_a1" instance=ExtResource("2_pspup")] layout_mode = 2 size_flags_horizontal = 7 size_flags_vertical = 7 fname = "Канал 7" -[node name="a1_kanal8" parent="grid_bpo_a1" instance=ExtResource("2_pspup")] +[node name="kanal8" parent="grid_bpo_a1" instance=ExtResource("2_pspup")] layout_mode = 2 size_flags_horizontal = 7 size_flags_vertical = 7 @@ -117,49 +117,49 @@ offset_right = 498.0 offset_bottom = 520.0 columns = 4 -[node name="a1_kanal1" parent="grid_bpo_a2" instance=ExtResource("2_pspup")] +[node name="kanal1" parent="grid_bpo_a2" instance=ExtResource("2_pspup")] layout_mode = 2 size_flags_horizontal = 7 size_flags_vertical = 7 fname = "Канал 1" -[node name="a1_kanal2" parent="grid_bpo_a2" instance=ExtResource("2_pspup")] +[node name="kanal2" parent="grid_bpo_a2" instance=ExtResource("2_pspup")] layout_mode = 2 size_flags_horizontal = 7 size_flags_vertical = 7 fname = "Канал 2" -[node name="a1_kanal3" parent="grid_bpo_a2" instance=ExtResource("2_pspup")] +[node name="kanal3" parent="grid_bpo_a2" instance=ExtResource("2_pspup")] layout_mode = 2 size_flags_horizontal = 7 size_flags_vertical = 7 fname = "Канал 3" -[node name="a1_kanal4" parent="grid_bpo_a2" instance=ExtResource("2_pspup")] +[node name="kanal4" parent="grid_bpo_a2" instance=ExtResource("2_pspup")] layout_mode = 2 size_flags_horizontal = 7 size_flags_vertical = 7 fname = "Канал 4" -[node name="a1_kanal5" parent="grid_bpo_a2" instance=ExtResource("2_pspup")] +[node name="kanal5" parent="grid_bpo_a2" instance=ExtResource("2_pspup")] layout_mode = 2 size_flags_horizontal = 7 size_flags_vertical = 7 fname = "Канал 5" -[node name="a1_kanal6" parent="grid_bpo_a2" instance=ExtResource("2_pspup")] +[node name="kanal6" parent="grid_bpo_a2" instance=ExtResource("2_pspup")] layout_mode = 2 size_flags_horizontal = 7 size_flags_vertical = 7 fname = "Канал 6" -[node name="a1_kanal7" parent="grid_bpo_a2" instance=ExtResource("2_pspup")] +[node name="kanal7" parent="grid_bpo_a2" instance=ExtResource("2_pspup")] layout_mode = 2 size_flags_horizontal = 7 size_flags_vertical = 7 fname = "Канал 7" -[node name="a1_kanal8" parent="grid_bpo_a2" instance=ExtResource("2_pspup")] +[node name="kanal8" parent="grid_bpo_a2" instance=ExtResource("2_pspup")] layout_mode = 2 size_flags_horizontal = 7 size_flags_vertical = 7 From caa91a2f2282edae2b9abf0aca7ec06a046829a2 Mon Sep 17 00:00:00 2001 From: sasha80 Date: Mon, 7 Jul 2025 15:39:34 +0300 Subject: [PATCH 04/20] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE?= =?UTF-8?q?=D1=82=D0=BA=D0=B0.=20=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=BF=D1=80=D0=BE=D1=82=D0=BE=D0=BA=D0=BE?= =?UTF-8?q?=D0=BB=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/pribor-afsp/bort-afsp.tscn | 253 +++++++++++++++--------------- 1 file changed, 128 insertions(+), 125 deletions(-) diff --git a/scenes/pribor-afsp/bort-afsp.tscn b/scenes/pribor-afsp/bort-afsp.tscn index 7150a58..14ab91b 100644 --- a/scenes/pribor-afsp/bort-afsp.tscn +++ b/scenes/pribor-afsp/bort-afsp.tscn @@ -20,6 +20,7 @@ offset_right = 580.0 offset_bottom = 1185.0 script = SubResource("GDScript_y4aoq") metadata/DeviceName = &"" +metadata/_edit_vertical_guides_ = [-1620.0] [node name="konverter" type="NinePatchRect" parent="."] layout_mode = 0 @@ -71,10 +72,10 @@ name_min_size0 = Vector2i(35, 20) name_min_size1 = Vector2i(35, 20) name_min_size2 = Vector2i(35, 20) fname = "Канал 1" -metadata/value0 = "SelfTest[1].SystemList[1].DeviceList[0].TestedParamList[0]['CurrentValue']" -metadata/value1 = "SelfTest[2].SystemList[1].DevList[0].TestedParamList[0]['CurrentValue']" -metadata/value2 = "SelfTest[0].SystemList[1].DeviceList[0]['TestPassed']" -metadata/state = ["SelfTest[0].SystemList[1].DeviceList[0]['TestPassed']", "SelfTest[1].SystemList[1].DeviceList[0]['TestPassed']", "SelfTest[2].SystemList[1].DevList[0]['TestPassed']"] +metadata/value0 = "SelfTest[0].SystemList[1].DevList[0].TestedParamList[0]['CurrentValue']" +metadata/value1 = "SelfTest[0].SystemList[1].DevList[0].TestedParamList[0]['CurrentValue']" +metadata/value2 = "SelfTest[0].SystemList[1].DevList[0]['TestPassed']" +metadata/state = ["SelfTest[0].SystemList[1].DevList[0]['TestPassed']"] [node name="kanal2" parent="konverter/grid" instance=ExtResource("2_dmhrm")] layout_mode = 2 @@ -96,10 +97,10 @@ name_min_size0 = Vector2i(35, 20) name_min_size1 = Vector2i(35, 20) name_min_size2 = Vector2i(35, 20) fname = "Канал 2" -metadata/value0 = "SelfTest[1].SystemList[1].DeviceList[1].TestedParamList[0]['CurrentValue']" +metadata/value0 = "SelfTest[1].SystemList[1].DevList[1].TestedParamList[0]['CurrentValue']" metadata/value1 = "SelfTest[2].SystemList[1].DevList[1].TestedParamList[0]['CurrentValue']" -metadata/value2 = "SelfTest[0].SystemList[1].DeviceList[1]['TestPassed']" -metadata/state = ["SelfTest[0].SystemList[1].DeviceList[1]['TestPassed']", "SelfTest[1].SystemList[1].DeviceList[1]['TestPassed']", "SelfTest[2].SystemList[1].DevList[1]['TestPassed']"] +metadata/value2 = "SelfTest[0].SystemList[1].DevList[1]['TestPassed']" +metadata/state = ["SelfTest[0].SystemList[1].DevList[1]['TestPassed']"] [node name="kanal3" parent="konverter/grid" instance=ExtResource("2_dmhrm")] layout_mode = 2 @@ -121,10 +122,10 @@ name_min_size0 = Vector2i(35, 20) name_min_size1 = Vector2i(35, 20) name_min_size2 = Vector2i(35, 20) fname = "Канал 3" -metadata/value0 = "SelfTest[1].SystemList[1].DeviceList[2].TestedParamList[0]['CurrentValue']" +metadata/value0 = "SelfTest[1].SystemList[1].DevList[2].TestedParamList[0]['CurrentValue']" metadata/value1 = "SelfTest[2].SystemList[1].DevList[2].TestedParamList[0]['CurrentValue']" -metadata/value2 = "SelfTest[0].SystemList[1].DeviceList[2]['TestPassed']" -metadata/state = ["SelfTest[0].SystemList[1].DeviceList[2]['TestPassed']", "SelfTest[1].SystemList[1].DeviceList[2]['TestPassed']", "SelfTest[2].SystemList[1].DevList[2]['TestPassed']"] +metadata/value2 = "SelfTest[0].SystemList[1].DevList[2]['TestPassed']" +metadata/state = ["SelfTest[0].SystemList[1].DevList[2]['TestPassed']"] [node name="kanal4" parent="konverter/grid" instance=ExtResource("2_dmhrm")] layout_mode = 2 @@ -146,10 +147,10 @@ name_min_size0 = Vector2i(35, 20) name_min_size1 = Vector2i(35, 20) name_min_size2 = Vector2i(35, 20) fname = "Канал 4" -metadata/value0 = "SelfTest[1].SystemList[1].DeviceList[3].TestedParamList[0]['CurrentValue']" +metadata/value0 = "SelfTest[1].SystemList[1].DevList[3].TestedParamList[0]['CurrentValue']" metadata/value1 = "SelfTest[2].SystemList[1].DevList[3].TestedParamList[0]['CurrentValue']" -metadata/value2 = "SelfTest[0].SystemList[1].DeviceList[3]['TestPassed']" -metadata/state = ["SelfTest[0].SystemList[1].DeviceList[3]['TestPassed']", "SelfTest[1].SystemList[1].DeviceList[3]['TestPassed']", "SelfTest[2].SystemList[1].DevList[3]['TestPassed']"] +metadata/value2 = "SelfTest[0].SystemList[1].DevList[3]['TestPassed']" +metadata/state = ["SelfTest[0].SystemList[1].DevList[3]['TestPassed']"] [node name="kanal5" parent="konverter/grid" instance=ExtResource("2_dmhrm")] layout_mode = 2 @@ -171,10 +172,10 @@ name_min_size0 = Vector2i(35, 20) name_min_size1 = Vector2i(35, 20) name_min_size2 = Vector2i(35, 20) fname = "Канал 5" -metadata/value0 = "SelfTest[1].SystemList[1].DeviceList[4].TestedParamList[0]['CurrentValue']" +metadata/value0 = "SelfTest[1].SystemList[1].DevList[4].TestedParamList[0]['CurrentValue']" metadata/value1 = "SelfTest[2].SystemList[1].DevList[4].TestedParamList[0]['CurrentValue']" -metadata/value2 = "SelfTest[0].SystemList[1].DeviceList[4]['TestPassed']" -metadata/state = ["SelfTest[0].SystemList[1].DeviceList[4]['TestPassed']", "SelfTest[1].SystemList[1].DeviceList[4]['TestPassed']", "SelfTest[2].SystemList[1].DevList[4]['TestPassed']"] +metadata/value2 = "SelfTest[0].SystemList[1].DevList[4]['TestPassed']" +metadata/state = ["SelfTest[0].SystemList[1].DevList[4]['TestPassed']"] [node name="kanal6" parent="konverter/grid" instance=ExtResource("2_dmhrm")] layout_mode = 2 @@ -196,10 +197,10 @@ name_min_size0 = Vector2i(35, 20) name_min_size1 = Vector2i(35, 20) name_min_size2 = Vector2i(35, 20) fname = "Канал 6" -metadata/value0 = "SelfTest[1].SystemList[1].DeviceList[5].TestedParamList[0]['CurrentValue']" +metadata/value0 = "SelfTest[1].SystemList[1].DevList[5].TestedParamList[0]['CurrentValue']" metadata/value1 = "SelfTest[2].SystemList[1].DevList[5].TestedParamList[0]['CurrentValue']" -metadata/value2 = "SelfTest[0].SystemList[1].DeviceList[5]['TestPassed']" -metadata/state = ["SelfTest[0].SystemList[1].DeviceList[5]['TestPassed']", "SelfTest[1].SystemList[1].DeviceList[5]['TestPassed']", "SelfTest[2].SystemList[1].DevList[5]['TestPassed']"] +metadata/value2 = "SelfTest[0].SystemList[1].DevList[5]['TestPassed']" +metadata/state = ["SelfTest[0].SystemList[1].DevList[5]['TestPassed']"] [node name="kanal7" parent="konverter/grid" instance=ExtResource("2_dmhrm")] layout_mode = 2 @@ -221,10 +222,10 @@ name_min_size0 = Vector2i(35, 20) name_min_size1 = Vector2i(35, 20) name_min_size2 = Vector2i(35, 20) fname = "Канал 7" -metadata/value0 = "SelfTest[1].SystemList[1].DeviceList[6].TestedParamList[0]['CurrentValue']" +metadata/value0 = "SelfTest[1].SystemList[1].DevList[6].TestedParamList[0]['CurrentValue']" metadata/value1 = "SelfTest[2].SystemList[1].DevList[6].TestedParamList[0]['CurrentValue']" -metadata/value2 = "SelfTest[0].SystemList[1].DeviceList[6]['TestPassed']" -metadata/state = ["SelfTest[0].SystemList[1].DeviceList[6]['TestPassed']", "SelfTest[1].SystemList[1].DeviceList[6]['TestPassed']", "SelfTest[2].SystemList[1].DevList[6]['TestPassed']"] +metadata/value2 = "SelfTest[0].SystemList[1].DevList[6]['TestPassed']" +metadata/state = ["SelfTest[0].SystemList[1].DevList[6]['TestPassed']"] [node name="kanal8" parent="konverter/grid" instance=ExtResource("2_dmhrm")] layout_mode = 2 @@ -246,10 +247,10 @@ name_min_size0 = Vector2i(35, 20) name_min_size1 = Vector2i(35, 20) name_min_size2 = Vector2i(35, 20) fname = "Канал 8" -metadata/value0 = "SelfTest[1].SystemList[1].DeviceList[7].TestedParamList[0]['CurrentValue']" +metadata/value0 = "SelfTest[1].SystemList[1].DevList[7].TestedParamList[0]['CurrentValue']" metadata/value1 = "SelfTest[2].SystemList[1].DevList[7].TestedParamList[0]['CurrentValue']" -metadata/value2 = "SelfTest[0].SystemList[1].DeviceList[7]['TestPassed']" -metadata/state = ["SelfTest[0].SystemList[1].DeviceList[7]['TestPassed']", "SelfTest[1].SystemList[1].DeviceList[7]['TestPassed']", "SelfTest[2].SystemList[1].DevList[7]['TestPassed']"] +metadata/value2 = "SelfTest[0].SystemList[1].DevList[7]['TestPassed']" +metadata/state = ["SelfTest[0].SystemList[1].DevList[7]['TestPassed']"] [node name="antenna1" type="NinePatchRect" parent="."] layout_mode = 0 @@ -292,9 +293,9 @@ max_value1 = 10.0 value_name0 = "А" value_name1 = "φ" fname = "Элемент 1" -metadata/value0 = "SelfTest[3].SystemList[0].SystemList[0].DevList[0].TestedParamList[0]['CurrentValue']" -metadata/value1 = "SelfTest[3].SystemList[0].SystemList[0].DevList[0].TestedParamList[1]['CurrentValue']" -metadata/state = ["SelfTest[3].SystemList[0].SystemList[0].DevList[0]['TestPassed']"] +metadata/value0 = "SelfTest[1].SystemList[0].SystemList[0].DevList[0].TestedParamList[1]['CurrentValue']" +metadata/value1 = "SelfTest[1].SystemList[0].SystemList[0].DevList[0].TestedParamList[0]['CurrentValue']" +metadata/state = ["SelfTest[1].SystemList[0].SystemList[0].DevList[0]['TestPassed']"] [node name="yelement2" parent="antenna1/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -307,9 +308,9 @@ max_value1 = 10.0 value_name0 = "А" value_name1 = "φ" fname = "Элемент 2" -metadata/value0 = "SelfTest[3].SystemList[0].SystemList[0].DevList[1].TestedParamList[0]['CurrentValue']" -metadata/value1 = "SelfTest[3].SystemList[0].SystemList[0].DevList[1].TestedParamList[1]['CurrentValue']" -metadata/state = ["SelfTest[3].SystemList[0].SystemList[0].DevList[1]['TestPassed']"] +metadata/value0 = "SelfTest[1].SystemList[0].SystemList[0].DevList[1].TestedParamList[1]['CurrentValue']" +metadata/value1 = "SelfTest[1].SystemList[0].SystemList[0].DevList[1].TestedParamList[0]['CurrentValue']" +metadata/state = ["SelfTest[1].SystemList[0].SystemList[0].DevList[1]['TestPassed']"] [node name="yelement3" parent="antenna1/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -322,9 +323,9 @@ max_value1 = 10.0 value_name0 = "А" value_name1 = "φ" fname = "Элемент 3" -metadata/value0 = "SelfTest[3].SystemList[0].SystemList[0].DevList[2].TestedParamList[0]['CurrentValue']" -metadata/value1 = "SelfTest[3].SystemList[0].SystemList[0].DevList[2].TestedParamList[1]['CurrentValue']" -metadata/state = ["SelfTest[3].SystemList[0].SystemList[0].DevList[2]['TestPassed']"] +metadata/value0 = "SelfTest[1].SystemList[0].SystemList[0].DevList[2].TestedParamList[1]['CurrentValue']" +metadata/value1 = "SelfTest[1].SystemList[0].SystemList[0].DevList[2].TestedParamList[0]['CurrentValue']" +metadata/state = ["SelfTest[1].SystemList[0].SystemList[0].DevList[2]['TestPassed']"] [node name="yelement4" parent="antenna1/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -337,9 +338,9 @@ max_value1 = 10.0 value_name0 = "А" value_name1 = "φ" fname = "Элемент 4" -metadata/value0 = "SelfTest[3].SystemList[0].SystemList[0].DevList[3].TestedParamList[0]['CurrentValue']" -metadata/value1 = "SelfTest[3].SystemList[0].SystemList[0].DevList[3].TestedParamList[1]['CurrentValue']" -metadata/state = ["SelfTest[3].SystemList[0].SystemList[0].DevList[3]['TestPassed']"] +metadata/value0 = "SelfTest[1].SystemList[0].SystemList[0].DevList[3].TestedParamList[1]['CurrentValue']" +metadata/value1 = "SelfTest[1].SystemList[0].SystemList[0].DevList[3].TestedParamList[0]['CurrentValue']" +metadata/state = ["SelfTest[1].SystemList[0].SystemList[0].DevList[3]['TestPassed']"] [node name="yelement5" parent="antenna1/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -352,9 +353,9 @@ max_value1 = 10.0 value_name0 = "А" value_name1 = "φ" fname = "Элемент 5" -metadata/value0 = "SelfTest[3].SystemList[0].SystemList[0].DevList[4].TestedParamList[0]['CurrentValue']" -metadata/value1 = "SelfTest[3].SystemList[0].SystemList[0].DevList[4].TestedParamList[1]['CurrentValue']" -metadata/state = ["SelfTest[3].SystemList[0].SystemList[0].DevList[4]['TestPassed']"] +metadata/value0 = "SelfTest[1].SystemList[0].SystemList[0].DevList[4].TestedParamList[1]['CurrentValue']" +metadata/value1 = "SelfTest[1].SystemList[0].SystemList[0].DevList[4].TestedParamList[0]['CurrentValue']" +metadata/state = ["SelfTest[1].SystemList[0].SystemList[0].DevList[4]['TestPassed']"] [node name="yelement6" parent="antenna1/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -367,9 +368,9 @@ max_value1 = 10.0 value_name0 = "А" value_name1 = "φ" fname = "Элемент 6" -metadata/value0 = "SelfTest[3].SystemList[0].SystemList[0].DevList[5].TestedParamList[0]['CurrentValue']" -metadata/value1 = "SelfTest[3].SystemList[0].SystemList[0].DevList[5].TestedParamList[1]['CurrentValue']" -metadata/state = ["SelfTest[3].SystemList[0].SystemList[0].DevList[5]['TestPassed']"] +metadata/value0 = "SelfTest[1].SystemList[0].SystemList[0].DevList[5].TestedParamList[1]['CurrentValue']" +metadata/value1 = "SelfTest[1].SystemList[0].SystemList[0].DevList[5].TestedParamList[0]['CurrentValue']" +metadata/state = ["SelfTest[1].SystemList[0].SystemList[0].DevList[5]['TestPassed']"] [node name="yelement7" parent="antenna1/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -382,9 +383,9 @@ max_value1 = 10.0 value_name0 = "А" value_name1 = "φ" fname = "Элемент 7" -metadata/value0 = "SelfTest[3].SystemList[0].SystemList[0].DevList[6].TestedParamList[0]['CurrentValue']" -metadata/value1 = "SelfTest[3].SystemList[0].SystemList[0].DevList[6].TestedParamList[1]['CurrentValue']" -metadata/state = ["SelfTest[3].SystemList[0].SystemList[0].DevList[6]['TestPassed']"] +metadata/value0 = "SelfTest[1].SystemList[0].SystemList[0].DevList[6].TestedParamList[1]['CurrentValue']" +metadata/value1 = "SelfTest[1].SystemList[0].SystemList[0].DevList[6].TestedParamList[0]['CurrentValue']" +metadata/state = ["SelfTest[1].SystemList[0].SystemList[0].DevList[6]['TestPassed']"] [node name="yelement8" parent="antenna1/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -397,9 +398,9 @@ max_value1 = 10.0 value_name0 = "А" value_name1 = "φ" fname = "Элемент 8" -metadata/value0 = "SelfTest[3].SystemList[0].SystemList[0].DevList[7].TestedParamList[0]['CurrentValue']" -metadata/value1 = "SelfTest[3].SystemList[0].SystemList[0].DevList[7].TestedParamList[1]['CurrentValue']" -metadata/state = ["SelfTest[3].SystemList[0].SystemList[0].DevList[7]['TestPassed']"] +metadata/value0 = "SelfTest[1].SystemList[0].SystemList[0].DevList[7].TestedParamList[1]['CurrentValue']" +metadata/value1 = "SelfTest[1].SystemList[0].SystemList[0].DevList[7].TestedParamList[0]['CurrentValue']" +metadata/state = ["SelfTest[1].SystemList[0].SystemList[0].DevList[7]['TestPassed']"] [node name="yelement9" parent="antenna1/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -412,9 +413,9 @@ max_value1 = 10.0 value_name0 = "А" value_name1 = "φ" fname = "Элемент 9" -metadata/value0 = "SelfTest[3].SystemList[0].SystemList[0].DevList[8].TestedParamList[0]['CurrentValue']" -metadata/value1 = "SelfTest[3].SystemList[0].SystemList[0].DevList[8].TestedParamList[1]['CurrentValue']" -metadata/state = ["SelfTest[3].SystemList[0].SystemList[0].DevList[8]['TestPassed']"] +metadata/value0 = "SelfTest[1].SystemList[0].SystemList[0].DevList[8].TestedParamList[1]['CurrentValue']" +metadata/value1 = "SelfTest[1].SystemList[0].SystemList[0].DevList[8].TestedParamList[0]['CurrentValue']" +metadata/state = ["SelfTest[1].SystemList[0].SystemList[0].DevList[8]['TestPassed']"] [node name="yelement10" parent="antenna1/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -427,9 +428,9 @@ max_value1 = 10.0 value_name0 = "А" value_name1 = "φ" fname = "Элемент 10" -metadata/value0 = "SelfTest[3].SystemList[0].SystemList[0].DevList[9].TestedParamList[0]['CurrentValue']" -metadata/value1 = "SelfTest[3].SystemList[0].SystemList[0].DevList[9].TestedParamList[1]['CurrentValue']" -metadata/state = ["SelfTest[3].SystemList[0].SystemList[0].DevList[9]['TestPassed']"] +metadata/value0 = "SelfTest[1].SystemList[0].SystemList[0].DevList[9].TestedParamList[1]['CurrentValue']" +metadata/value1 = "SelfTest[1].SystemList[0].SystemList[0].DevList[9].TestedParamList[0]['CurrentValue']" +metadata/state = ["SelfTest[1].SystemList[0].SystemList[0].DevList[9]['TestPassed']"] [node name="yelement11" parent="antenna1/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -442,9 +443,9 @@ max_value1 = 10.0 value_name0 = "А" value_name1 = "φ" fname = "Элемент 11" -metadata/value0 = "SelfTest[3].SystemList[0].SystemList[0].DevList[10].TestedParamList[0]['CurrentValue']" -metadata/value1 = "SelfTest[3].SystemList[0].SystemList[0].DevList[10].TestedParamList[1]['CurrentValue']" -metadata/state = ["SelfTest[3].SystemList[0].SystemList[0].DevList[10]['TestPassed']"] +metadata/value0 = "SelfTest[1].SystemList[0].SystemList[0].DevList[10].TestedParamList[1]['CurrentValue']" +metadata/value1 = "SelfTest[1].SystemList[0].SystemList[0].DevList[10].TestedParamList[0]['CurrentValue']" +metadata/state = ["SelfTest[1].SystemList[0].SystemList[0].DevList[10]['TestPassed']"] [node name="yelement12" parent="antenna1/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -457,9 +458,9 @@ max_value1 = 10.0 value_name0 = "А" value_name1 = "φ" fname = "Элемент 12" -metadata/value0 = "SelfTest[3].SystemList[0].SystemList[0].DevList[11].TestedParamList[0]['CurrentValue']" -metadata/value1 = "SelfTest[3].SystemList[0].SystemList[0].DevList[11].TestedParamList[1]['CurrentValue']" -metadata/state = ["SelfTest[3].SystemList[0].SystemList[0].DevList[11]['TestPassed']"] +metadata/value0 = "SelfTest[1].SystemList[0].SystemList[0].DevList[11].TestedParamList[1]['CurrentValue']" +metadata/value1 = "SelfTest[1].SystemList[0].SystemList[0].DevList[11].TestedParamList[0]['CurrentValue']" +metadata/state = ["SelfTest[1].SystemList[0].SystemList[0].DevList[11]['TestPassed']"] [node name="yelement13" parent="antenna1/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -472,9 +473,9 @@ max_value1 = 10.0 value_name0 = "А" value_name1 = "φ" fname = "Элемент 13" -metadata/value0 = "SelfTest[3].SystemList[0].SystemList[0].DevList[12].TestedParamList[0]['CurrentValue']" -metadata/value1 = "SelfTest[3].SystemList[0].SystemList[0].DevList[12].TestedParamList[1]['CurrentValue']" -metadata/state = ["SelfTest[3].SystemList[0].SystemList[0].DevList[12]['TestPassed']"] +metadata/value0 = "SelfTest[1].SystemList[0].SystemList[0].DevList[12].TestedParamList[1]['CurrentValue']" +metadata/value1 = "SelfTest[1].SystemList[0].SystemList[0].DevList[12].TestedParamList[0]['CurrentValue']" +metadata/state = ["SelfTest[1].SystemList[0].SystemList[0].DevList[12]['TestPassed']"] [node name="yelement14" parent="antenna1/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -487,9 +488,9 @@ max_value1 = 10.0 value_name0 = "А" value_name1 = "φ" fname = "Элемент 14" -metadata/value0 = "SelfTest[3].SystemList[0].SystemList[0].DevList[13].TestedParamList[0]['CurrentValue']" -metadata/value1 = "SelfTest[3].SystemList[0].SystemList[0].DevList[13].TestedParamList[1]['CurrentValue']" -metadata/state = ["SelfTest[3].SystemList[0].SystemList[0].DevList[13]['TestPassed']"] +metadata/value0 = "SelfTest[1].SystemList[0].SystemList[0].DevList[13].TestedParamList[1]['CurrentValue']" +metadata/value1 = "SelfTest[1].SystemList[0].SystemList[0].DevList[13].TestedParamList[0]['CurrentValue']" +metadata/state = ["SelfTest[1].SystemList[0].SystemList[0].DevList[13]['TestPassed']"] [node name="yelement15" parent="antenna1/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -502,9 +503,9 @@ max_value1 = 10.0 value_name0 = "А" value_name1 = "φ" fname = "Элемент 15" -metadata/value0 = "SelfTest[3].SystemList[0].SystemList[0].DevList[14].TestedParamList[0]['CurrentValue']" -metadata/value1 = "SelfTest[3].SystemList[0].SystemList[0].DevList[14].TestedParamList[1]['CurrentValue']" -metadata/state = ["SelfTest[3].SystemList[0].SystemList[0].DevList[14]['TestPassed']"] +metadata/value0 = "SelfTest[1].SystemList[0].SystemList[0].DevList[14].TestedParamList[1]['CurrentValue']" +metadata/value1 = "SelfTest[1].SystemList[0].SystemList[0].DevList[14].TestedParamList[0]['CurrentValue']" +metadata/state = ["SelfTest[1].SystemList[0].SystemList[0].DevList[14]['TestPassed']"] [node name="yelement16" parent="antenna1/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -517,9 +518,9 @@ max_value1 = 10.0 value_name0 = "А" value_name1 = "φ" fname = "Элемент 16" -metadata/value0 = "SelfTest[3].SystemList[0].SystemList[0].DevList[15].TestedParamList[0]['CurrentValue']" -metadata/value1 = "SelfTest[3].SystemList[0].SystemList[0].DevList[15].TestedParamList[1]['CurrentValue']" -metadata/state = ["SelfTest[3].SystemList[0].SystemList[0].DevList[15]['TestPassed']"] +metadata/value0 = "SelfTest[1].SystemList[0].SystemList[0].DevList[15].TestedParamList[1]['CurrentValue']" +metadata/value1 = "SelfTest[1].SystemList[0].SystemList[0].DevList[15].TestedParamList[0]['CurrentValue']" +metadata/state = ["SelfTest[1].SystemList[0].SystemList[0].DevList[15]['TestPassed']"] [node name="antenna2" type="NinePatchRect" parent="."] layout_mode = 0 @@ -562,9 +563,9 @@ max_value1 = 10.0 value_name0 = "А" value_name1 = "φ" fname = "Элемент 1" -metadata/value0 = "SelfTest[3].SystemList[0].SystemList[1].DevList[0].TestedParamList[0]['CurrentValue']" -metadata/value1 = "SelfTest[3].SystemList[0].SystemList[1].DevList[0].TestedParamList[1]['CurrentValue']" -metadata/state = ["SelfTest[3].SystemList[0].SystemList[1].DevList[0]['TestPassed']"] +metadata/value0 = "SelfTest[1].SystemList[0].SystemList[1].DevList[0].TestedParamList[1]['CurrentValue']" +metadata/value1 = "SelfTest[1].SystemList[0].SystemList[1].DevList[0].TestedParamList[0]['CurrentValue']" +metadata/state = ["SelfTest[1].SystemList[0].SystemList[1].DevList[0]['TestPassed']"] [node name="yelement2" parent="antenna2/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -577,9 +578,9 @@ max_value1 = 10.0 value_name0 = "А" value_name1 = "φ" fname = "Элемент 2" -metadata/value0 = "SelfTest[3].SystemList[0].SystemList[1].DevList[1].TestedParamList[0]['CurrentValue']" -metadata/value1 = "SelfTest[3].SystemList[0].SystemList[1].DevList[1].TestedParamList[1]['CurrentValue']" -metadata/state = ["SelfTest[3].SystemList[0].SystemList[1].DevList[1]['TestPassed']"] +metadata/value0 = "SelfTest[1].SystemList[0].SystemList[1].DevList[1].TestedParamList[1]['CurrentValue']" +metadata/value1 = "SelfTest[1].SystemList[0].SystemList[1].DevList[1].TestedParamList[0]['CurrentValue']" +metadata/state = ["SelfTest[1].SystemList[0].SystemList[1].DevList[1]['TestPassed']"] [node name="yelement3" parent="antenna2/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -592,9 +593,9 @@ max_value1 = 10.0 value_name0 = "А" value_name1 = "φ" fname = "Элемент 3" -metadata/value0 = "SelfTest[3].SystemList[0].SystemList[1].DevList[2].TestedParamList[0]['CurrentValue']" -metadata/value1 = "SelfTest[3].SystemList[0].SystemList[1].DevList[2].TestedParamList[1]['CurrentValue']" -metadata/state = ["SelfTest[3].SystemList[0].SystemList[1].DevList[2]['TestPassed']"] +metadata/value0 = "SelfTest[1].SystemList[0].SystemList[1].DevList[2].TestedParamList[1]['CurrentValue']" +metadata/value1 = "SelfTest[1].SystemList[0].SystemList[1].DevList[2].TestedParamList[0]['CurrentValue']" +metadata/state = ["SelfTest[1].SystemList[0].SystemList[1].DevList[2]['TestPassed']"] [node name="yelement4" parent="antenna2/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -607,9 +608,9 @@ max_value1 = 10.0 value_name0 = "А" value_name1 = "φ" fname = "Элемент 4" -metadata/value0 = "SelfTest[3].SystemList[0].SystemList[1].DevList[3].TestedParamList[0]['CurrentValue']" -metadata/value1 = "SelfTest[3].SystemList[0].SystemList[1].DevList[3].TestedParamList[1]['CurrentValue']" -metadata/state = ["SelfTest[3].SystemList[0].SystemList[1].DevList[3]['TestPassed']"] +metadata/value0 = "SelfTest[1].SystemList[0].SystemList[1].DevList[3].TestedParamList[1]['CurrentValue']" +metadata/value1 = "SelfTest[1].SystemList[0].SystemList[1].DevList[3].TestedParamList[0]['CurrentValue']" +metadata/state = ["SelfTest[1].SystemList[0].SystemList[1].DevList[3]['TestPassed']"] [node name="yelement5" parent="antenna2/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -622,9 +623,9 @@ max_value1 = 10.0 value_name0 = "А" value_name1 = "φ" fname = "Элемент 5" -metadata/value0 = "SelfTest[3].SystemList[0].SystemList[1].DevList[4].TestedParamList[0]['CurrentValue']" -metadata/value1 = "SelfTest[3].SystemList[0].SystemList[1].DevList[4].TestedParamList[1]['CurrentValue']" -metadata/state = ["SelfTest[3].SystemList[0].SystemList[1].DevList[4]['TestPassed']"] +metadata/value0 = "SelfTest[1].SystemList[0].SystemList[1].DevList[4].TestedParamList[1]['CurrentValue']" +metadata/value1 = "SelfTest[1].SystemList[0].SystemList[1].DevList[4].TestedParamList[0]['CurrentValue']" +metadata/state = ["SelfTest[1].SystemList[0].SystemList[1].DevList[4]['TestPassed']"] [node name="yelement6" parent="antenna2/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -637,9 +638,9 @@ max_value1 = 10.0 value_name0 = "А" value_name1 = "φ" fname = "Элемент 6" -metadata/value0 = "SelfTest[3].SystemList[0].SystemList[1].DevList[5].TestedParamList[0]['CurrentValue']" -metadata/value1 = "SelfTest[3].SystemList[0].SystemList[1].DevList[5].TestedParamList[1]['CurrentValue']" -metadata/state = ["SelfTest[3].SystemList[0].SystemList[1].DevList[5]['TestPassed']"] +metadata/value0 = "SelfTest[1].SystemList[0].SystemList[1].DevList[5].TestedParamList[1]['CurrentValue']" +metadata/value1 = "SelfTest[1].SystemList[0].SystemList[1].DevList[5].TestedParamList[0]['CurrentValue']" +metadata/state = ["SelfTest[1].SystemList[0].SystemList[1].DevList[5]['TestPassed']"] [node name="yelement7" parent="antenna2/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -652,9 +653,9 @@ max_value1 = 10.0 value_name0 = "А" value_name1 = "φ" fname = "Элемент 7" -metadata/value0 = "SelfTest[3].SystemList[0].SystemList[1].DevList[6].TestedParamList[0]['CurrentValue']" -metadata/value1 = "SelfTest[3].SystemList[0].SystemList[1].DevList[6].TestedParamList[1]['CurrentValue']" -metadata/state = ["SelfTest[3].SystemList[0].SystemList[1].DevList[6]['TestPassed']"] +metadata/value0 = "SelfTest[1].SystemList[0].SystemList[1].DevList[6].TestedParamList[1]['CurrentValue']" +metadata/value1 = "SelfTest[1].SystemList[0].SystemList[1].DevList[6].TestedParamList[0]['CurrentValue']" +metadata/state = ["SelfTest[1].SystemList[0].SystemList[1].DevList[6]['TestPassed']"] [node name="yelement8" parent="antenna2/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -667,9 +668,9 @@ max_value1 = 10.0 value_name0 = "А" value_name1 = "φ" fname = "Элемент 8" -metadata/value0 = "SelfTest[3].SystemList[0].SystemList[1].DevList[7].TestedParamList[0]['CurrentValue']" -metadata/value1 = "SelfTest[3].SystemList[0].SystemList[1].DevList[7].TestedParamList[1]['CurrentValue']" -metadata/state = ["SelfTest[3].SystemList[0].SystemList[1].DevList[7]['TestPassed']"] +metadata/value0 = "SelfTest[1].SystemList[0].SystemList[1].DevList[7].TestedParamList[1]['CurrentValue']" +metadata/value1 = "SelfTest[1].SystemList[0].SystemList[1].DevList[7].TestedParamList[0]['CurrentValue']" +metadata/state = ["SelfTest[1].SystemList[0].SystemList[1].DevList[7]['TestPassed']"] [node name="yelement9" parent="antenna2/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -682,9 +683,9 @@ max_value1 = 10.0 value_name0 = "А" value_name1 = "φ" fname = "Элемент 9" -metadata/value0 = "SelfTest[3].SystemList[0].SystemList[1].DevList[8].TestedParamList[0]['CurrentValue']" -metadata/value1 = "SelfTest[3].SystemList[0].SystemList[1].DevList[8].TestedParamList[1]['CurrentValue']" -metadata/state = ["SelfTest[3].SystemList[0].SystemList[1].DevList[8]['TestPassed']"] +metadata/value0 = "SelfTest[1].SystemList[0].SystemList[1].DevList[8].TestedParamList[1]['CurrentValue']" +metadata/value1 = "SelfTest[1].SystemList[0].SystemList[1].DevList[8].TestedParamList[0]['CurrentValue']" +metadata/state = ["SelfTest[1].SystemList[0].SystemList[1].DevList[8]['TestPassed']"] [node name="yelement10" parent="antenna2/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -697,9 +698,9 @@ max_value1 = 10.0 value_name0 = "А" value_name1 = "φ" fname = "Элемент 10" -metadata/value0 = "SelfTest[3].SystemList[0].SystemList[1].DevList[9].TestedParamList[0]['CurrentValue']" -metadata/value1 = "SelfTest[3].SystemList[0].SystemList[1].DevList[9].TestedParamList[1]['CurrentValue']" -metadata/state = ["SelfTest[3].SystemList[0].SystemList[1].DevList[9]['TestPassed']"] +metadata/value0 = "SelfTest[1].SystemList[0].SystemList[1].DevList[9].TestedParamList[1]['CurrentValue']" +metadata/value1 = "SelfTest[1].SystemList[0].SystemList[1].DevList[9].TestedParamList[0]['CurrentValue']" +metadata/state = ["SelfTest[1].SystemList[0].SystemList[1].DevList[9]['TestPassed']"] [node name="yelement11" parent="antenna2/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -712,9 +713,9 @@ max_value1 = 10.0 value_name0 = "А" value_name1 = "φ" fname = "Элемент 11" -metadata/value0 = "SelfTest[3].SystemList[0].SystemList[1].DevList[10].TestedParamList[0]['CurrentValue']" -metadata/value1 = "SelfTest[3].SystemList[0].SystemList[1].DevList[10].TestedParamList[1]['CurrentValue']" -metadata/state = ["SelfTest[3].SystemList[0].SystemList[1].DevList[10]['TestPassed']"] +metadata/value0 = "SelfTest[1].SystemList[0].SystemList[1].DevList[10].TestedParamList[1]['CurrentValue']" +metadata/value1 = "SelfTest[1].SystemList[0].SystemList[1].DevList[10].TestedParamList[0]['CurrentValue']" +metadata/state = ["SelfTest[1].SystemList[0].SystemList[1].DevList[10]['TestPassed']"] [node name="yelement12" parent="antenna2/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -727,9 +728,9 @@ max_value1 = 10.0 value_name0 = "А" value_name1 = "φ" fname = "Элемент 12" -metadata/value0 = "SelfTest[3].SystemList[0].SystemList[1].DevList[11].TestedParamList[0]['CurrentValue']" -metadata/value1 = "SelfTest[3].SystemList[0].SystemList[1].DevList[11].TestedParamList[1]['CurrentValue']" -metadata/state = ["SelfTest[3].SystemList[0].SystemList[1].DevList[11]['TestPassed']"] +metadata/value0 = "SelfTest[1].SystemList[0].SystemList[1].DevList[11].TestedParamList[1]['CurrentValue']" +metadata/value1 = "SelfTest[1].SystemList[0].SystemList[1].DevList[11].TestedParamList[0]['CurrentValue']" +metadata/state = ["SelfTest[1].SystemList[0].SystemList[1].DevList[11]['TestPassed']"] [node name="yelement13" parent="antenna2/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -742,9 +743,9 @@ max_value1 = 10.0 value_name0 = "А" value_name1 = "φ" fname = "Элемент 13" -metadata/value0 = "SelfTest[3].SystemList[0].SystemList[1].DevList[12].TestedParamList[0]['CurrentValue']" -metadata/value1 = "SelfTest[3].SystemList[0].SystemList[1].DevList[12].TestedParamList[1]['CurrentValue']" -metadata/state = ["SelfTest[3].SystemList[0].SystemList[1].DevList[12]['TestPassed']"] +metadata/value0 = "SelfTest[1].SystemList[0].SystemList[1].DevList[12].TestedParamList[1]['CurrentValue']" +metadata/value1 = "SelfTest[1].SystemList[0].SystemList[1].DevList[12].TestedParamList[0]['CurrentValue']" +metadata/state = ["SelfTest[1].SystemList[0].SystemList[1].DevList[12]['TestPassed']"] [node name="yelement14" parent="antenna2/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -757,9 +758,9 @@ max_value1 = 10.0 value_name0 = "А" value_name1 = "φ" fname = "Элемент 14" -metadata/value0 = "SelfTest[3].SystemList[0].SystemList[1].DevList[13].TestedParamList[0]['CurrentValue']" -metadata/value1 = "SelfTest[3].SystemList[0].SystemList[1].DevList[13].TestedParamList[1]['CurrentValue']" -metadata/state = ["SelfTest[3].SystemList[0].SystemList[1].DevList[13]['TestPassed']"] +metadata/value0 = "SelfTest[1].SystemList[0].SystemList[1].DevList[13].TestedParamList[1]['CurrentValue']" +metadata/value1 = "SelfTest[1].SystemList[0].SystemList[1].DevList[13].TestedParamList[0]['CurrentValue']" +metadata/state = ["SelfTest[1].SystemList[0].SystemList[1].DevList[13]['TestPassed']"] [node name="yelement15" parent="antenna2/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -772,9 +773,9 @@ max_value1 = 10.0 value_name0 = "А" value_name1 = "φ" fname = "Элемент 15" -metadata/value0 = "SelfTest[3].SystemList[0].SystemList[1].DevList[14].TestedParamList[0]['CurrentValue']" -metadata/value1 = "SelfTest[3].SystemList[0].SystemList[1].DevList[14].TestedParamList[1]['CurrentValue']" -metadata/state = ["SelfTest[3].SystemList[0].SystemList[1].DevList[14]['TestPassed']"] +metadata/value0 = "SelfTest[1].SystemList[0].SystemList[1].DevList[14].TestedParamList[1]['CurrentValue']" +metadata/value1 = "SelfTest[1].SystemList[0].SystemList[1].DevList[14].TestedParamList[0]['CurrentValue']" +metadata/state = ["SelfTest[1].SystemList[0].SystemList[1].DevList[14]['TestPassed']"] [node name="yelement16" parent="antenna2/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -787,9 +788,9 @@ max_value1 = 10.0 value_name0 = "А" value_name1 = "φ" fname = "Элемент 16" -metadata/value0 = "SelfTest[3].SystemList[0].SystemList[1].DevList[15].TestedParamList[0]['CurrentValue']" -metadata/value1 = "SelfTest[3].SystemList[0].SystemList[1].DevList[15].TestedParamList[1]['CurrentValue']" -metadata/state = ["SelfTest[3].SystemList[0].SystemList[1].DevList[15]['TestPassed']"] +metadata/value0 = "SelfTest[1].SystemList[0].SystemList[1].DevList[15].TestedParamList[1]['CurrentValue']" +metadata/value1 = "SelfTest[1].SystemList[0].SystemList[1].DevList[15].TestedParamList[0]['CurrentValue']" +metadata/state = ["SelfTest[1].SystemList[0].SystemList[1].DevList[15]['TestPassed']"] [node name="adc" parent="." instance=ExtResource("4_mtf2n")] layout_mode = 0 @@ -799,6 +800,7 @@ offset_right = 580.0 offset_bottom = 115.0 tooltip_text = "Плата АЦП ADCS500" fname = "АЦП" +state = 1 metadata/state = ["SelfTest[4].SystemList[0].DevList[1]['TestPassed']"] [node name="dsp" parent="." instance=ExtResource("4_mtf2n")] @@ -808,6 +810,7 @@ offset_right = 580.0 offset_bottom = 60.0 tooltip_text = "Плата цифровой обработки сигналов BPL" fname = "Сигн. проц." +state = 1 metadata/state = ["SelfTest[4].SystemList[0].DevList[0]['TestPassed']"] [node name="gen" parent="." instance=ExtResource("2_dmhrm")] @@ -826,9 +829,9 @@ name_min_size0 = Vector2i(35, 20) name_min_size1 = Vector2i(35, 20) name_min_size2 = Vector2i(35, 20) fname = "Генератор" -metadata/value0 = "SelfTest[1].SystemList[2].DeviceList[0].TestedParamList[0]['CurrentValue']" +metadata/value0 = "SelfTest[1].SystemList[2].DevList[0].TestedParamList[0]['CurrentValue']" metadata/value1 = "SelfTest[2].SystemList[2].DevList[0].TestedParamList[0]['CurrentValue']" -metadata/state = ["SelfTest[0].SystemList[2].DeviceList[0]['TestPassed']"] +metadata/state = ["SelfTest[0].SystemList[2].DevList[0]['TestPassed']"] [node name="rpu" parent="." instance=ExtResource("2_dmhrm")] layout_mode = 2 @@ -847,9 +850,9 @@ name_min_size0 = Vector2i(35, 20) name_min_size1 = Vector2i(35, 20) name_min_size2 = Vector2i(35, 20) fname = "Приёмник 20...1000 МГц" -metadata/value0 = "SelfTest[1].SystemList[0].DeviceList[0]['TestPassed']" +metadata/value0 = "SelfTest[1].SystemList[0].DevList[0]['TestPassed']" metadata/value1 = "SelfTest[2].SystemList[0].DevList[0]['TestPassed']" -metadata/state = ["SelfTest[0].SystemList[0].DeviceList[0]['TestPassed']"] +metadata/state = ["SelfTest[0].SystemList[0].DevList[3]['TestPassed']"] [connection signal="pressed" from="konverter/grid/kanal1" to="." method="_on_item_pressed"] [connection signal="pressed" from="konverter/grid/kanal2" to="." method="_on_item_pressed"] From add8c014d2fd43236c6ca2665d71ff6440d251f4 Mon Sep 17 00:00:00 2001 From: sasha80 Date: Mon, 7 Jul 2025 17:50:00 +0300 Subject: [PATCH 05/20] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82?= =?UTF-8?q?=D0=BE=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/pribor-uf/pribor_uf.gd | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scenes/pribor-uf/pribor_uf.gd b/scenes/pribor-uf/pribor_uf.gd index 7eec3bf..5f10eb9 100644 --- a/scenes/pribor-uf/pribor_uf.gd +++ b/scenes/pribor-uf/pribor_uf.gd @@ -1,4 +1,4 @@ -extends "res://scenes/контроль/прибор.gd" +extends 'res://scenes/контроль/прибор.gd' enum STATE_VAL { NONE = 0, @@ -53,8 +53,8 @@ func Control_VK() -> void: for element in out_pci: out_pci_str += element - out_usb_str = out_usb_str.split("\n") - out_pci_str = out_pci_str.split("\n") + out_usb_str = out_usb_str.split('\n') + out_pci_str = out_pci_str.split('\n') var i: int = 0 @@ -93,10 +93,10 @@ func status_uf() -> void: var status_ip27:int = $ref_uf/ref_kassetav13/ref_A12_IP27B.state if (status_yay == 1) and (status_bu == 1) and (status_kems == 1) \ - and (status_ems0 == 1) and (status_ems1 == 1) and (status_ip5 == 1) and (status_ip27 == 1): - $lbl_header2.text = "Прибор исправен" + and (status_ems0 == 1) and (status_ems1 == 1) and (status_ip5 == 1) and (status_ip27 == 1): + $lbl_header2.text = 'Прибор исправен' $lbl_header2.modulate = Color(0,1,0,1) else: - $lbl_header2.text = "Прибор не исправен" + $lbl_header2.text = 'Прибор не исправен' $lbl_header2.modulate = Color(1,0,0,1) $lbl_header2.visible = true From 2e1987a8581d2025340e412a88cb4ddec292a715 Mon Sep 17 00:00:00 2001 From: sasha80 Date: Mon, 7 Jul 2025 18:50:35 +0300 Subject: [PATCH 06/20] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE?= =?UTF-8?q?=D1=82=D0=BA=D0=B0.=20=D0=90=D0=B4=D1=80=D0=B5=D1=81=20=D0=BA?= =?UTF-8?q?=D0=BE=D0=BD=D1=82=D1=80=D0=BE=D0=BB=D1=8F=20=D0=91=D0=9F=D0=9E?= =?UTF-8?q?/=D0=90=D0=A4=D0=A1=D0=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- project.godot | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/project.godot b/project.godot index 31c3bfb..f4b71d7 100644 --- a/project.godot +++ b/project.godot @@ -33,8 +33,8 @@ config/mod_bus_driver_port="48000" config/mod_bus_driver_address="localhost" interfer/resend_timeout=1000.0 config/external_cu=false -config/unit_afsp_left_bort="http://127.0.0.1:8080/reports/left_SelfTestReport.json" -config/unit_afsp_right_bort="http://127.0.0.1:8080/reports/right_SelfTestReport.json" +config/unit_afsp_left_bort="http://172.20.22.10:8081/selftest" +config/unit_afsp_right_bort="http://172.20.22.11:8081/selftest" config/unit_rr_request_period=5.0 config/kems_files_path="user://kems/" config/emsg_files_path="user://emsg/" @@ -84,6 +84,8 @@ gdscript/warnings/integer_division=0 window/size/viewport_width=1600 window/size/viewport_height=1200 +window/size/mode=4 +window/size/window_height_override=768 window/subwindows/embed_subwindows=false window/stretch/mode="canvas_items" window/dpi/allow_hidpi=false From 90a32f4251ac48ebafc14654e249a1270006d587 Mon Sep 17 00:00:00 2001 From: sasha80 Date: Mon, 7 Jul 2025 18:51:22 +0300 Subject: [PATCH 07/20] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82?= =?UTF-8?q?=D0=BE=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/pribor-uyep/pribor-uyep.gd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scenes/pribor-uyep/pribor-uyep.gd b/scenes/pribor-uyep/pribor-uyep.gd index 809e0cd..3b91095 100644 --- a/scenes/pribor-uyep/pribor-uyep.gd +++ b/scenes/pribor-uyep/pribor-uyep.gd @@ -1 +1 @@ -extends "res://scenes/контроль/прибор.gd" +extends 'res://scenes/контроль/прибор.gd' From 4cd51a528ff7325bf0a2a0e1858e585e9299ea49 Mon Sep 17 00:00:00 2001 From: sasha80 Date: Mon, 7 Jul 2025 18:51:38 +0300 Subject: [PATCH 08/20] Godot4.4 --- scenes/работа/работа.tscn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scenes/работа/работа.tscn b/scenes/работа/работа.tscn index 442c2dc..1b179b1 100644 --- a/scenes/работа/работа.tscn +++ b/scenes/работа/работа.tscn @@ -288,6 +288,6 @@ texture_pressed = ExtResource("13_ggrwd") [connection signal="drag_continue" from="." to="." method="_on_drag_continue"] [connection signal="toggled" from="btn_view" to="." method="on_button_view_toggled"] [connection signal="toggled" from="chk_auto" to="." method="on_value_changed"] -[connection signal="toggled" from="btn_activate" to="." method="on_btn_activate_toggled"] [connection signal="toggled" from="btn_activate" to="." method="on_btn_activate"] +[connection signal="toggled" from="btn_activate" to="." method="on_btn_activate_toggled"] [connection signal="toggled" from="btn_center" to="." method="on_btn_center_toggled"] From 3b938f76133f74a626410c7e88ab2e5fd99ffc31 Mon Sep 17 00:00:00 2001 From: sasha80 Date: Wed, 9 Jul 2025 01:04:23 +0300 Subject: [PATCH 09/20] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE?= =?UTF-8?q?=D1=82=D0=BA=D0=B0.=20=D0=A1=D0=BE=D0=BE=D0=B1=D1=89=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20"=D0=A2=D0=B8=D0=BF=208"=20=D0=B4=D0=BB?= =?UTF-8?q?=D1=8F=20=D0=9A=D0=90=D0=9F=D0=A1-=D0=A0=D0=9F=D0=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/interfer.gd | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/scripts/interfer.gd b/scripts/interfer.gd index b7bb848..3e4eb09 100644 --- a/scripts/interfer.gd +++ b/scripts/interfer.gd @@ -25,6 +25,7 @@ const SOURCE_INTERFER = ['th','fs','cu'] const ID_INTERFERS_LEN = 63 ## Размер пула номеров целей. const INTERFER_OFF = 'off' var msg_num: int = 0 ## Счётчик сообщений. +var msg8_num: int = 0 ## Счётчик сообщений "тип 8" var id_array: Array ## Массив id воздействий. var thrs: Dictionary ## Словарь воздействия для целей, ключ - id воздействия. var fs: Dictionary ## Словарь воздействий для секторов, ключ - id воздействия. @@ -105,27 +106,46 @@ func _ready() -> void: for i in ID_INTERFERS_LEN: # Заполняет массив ID целей id_array.append(i + 1) var unit_key = settings.get_unit_key('уарэп-капсрпб') - var unit = network.units[unit_key] + var unit_caps = network.units[unit_key] var unit_5p28_key = settings.get_unit_key('уарэп-5п28') var unit_5p28 = network.units_tcp[unit_5p28_key] var timer_check_state: = Timer.new() add_child(timer_check_state) var resend_timeout = ProjectSettings.get_setting('application/interfer/resend_timeout', 1000.0) - timer_check_state.connect('timeout', Callable(self, 'on_timer_check_state').bind(unit, ecms, resend_timeout)) + timer_check_state.connect('timeout', Callable(self, 'on_timer_check_state').bind(unit_caps, ecms, resend_timeout)) timer_check_state.start(resend_timeout / 1000.0) - unit.connect('data_received', Callable(self, 'on_data_capsrpb_received').bind(ecms)) + unit_caps.connect('data_received', Callable(self, 'on_data_capsrpb_received').bind(ecms)) unit_5p28.connect('get_interfers', Callable(self, 'on_get_interfers').bind(unit_5p28, ecms)) - signaller.connect('interfer_create', Callable(self, 'on_interfer_create').bind(unit, ecms)) + signaller.connect('interfer_create', Callable(self, 'on_interfer_create').bind(unit_caps, ecms)) signaller.connect('interfer_rcv', Callable(self, 'on_interfer_rcv').bind(unit_5p28, ecms)) - signaller.connect('interfer_new', Callable(self, 'send_ecm').bind(unit)) - signaller.connect('interfer_off_all', Callable(self, 'on_interfer_off_all').bind(unit, ecms)) - signaller.connect('th_aoa_update', Callable(self, 'on_th_aoa_update').bind(ecms, unit)) + signaller.connect('interfer_new', Callable(self, 'send_ecm').bind(unit_caps)) + signaller.connect('interfer_off_all', Callable(self, 'on_interfer_off_all').bind(unit_caps, ecms)) + signaller.connect('th_aoa_update', Callable(self, 'on_th_aoa_update').bind(ecms, unit_caps)) signaller.connect('interfer_off', Callable(self, 'on_interfer_off')) signaller.connect('manual_control', Callable(self, 'on_manual_control')) signaller.connect('full_auto', Callable(self, 'on_full_auto')) signaller.connect('interfer_prinuditelno', Callable(self, 'on_interfer_prinuditelno')) signaller.connect('emit_changed', Callable(self, 'on_emit_changed').bind(ecms)) - threats.connect('threat_lost', Callable(self, 'on_threats_lost').bind(ecms, unit)) + threats.connect('threat_lost', Callable(self, 'on_threats_lost').bind(ecms, unit_caps)) + var key = settings.get_unit_key('навигация') + var unit_nav = network.units[key] + unit_nav.connect('data_received', on_nav_data_received.bind()) + + +func on_nav_data_received(coords: Dictionary, unit_caps): + var data_to_json = { + 'ts': 8, + 'ss': msg8_num, + 'roll': coords.get('bk', 0), + 'trim': coords.get('kk', 0), + 'long': coords.get('longitude', 0), + 'lat': coords.get('latitude', 0), + 'course': coords.get('k', 0), + 'speed': coords.get('speed', 0) } + var json_data = JSON.stringify(data_to_json).to_utf8_buffer() + unit_caps.tx_stack.append(json_data) + msg8_num += 1 + msg8_num %= 0xffffffff ## Проверяет состояние отправки пакета и если не доставлен, повторяет отправку. From 5d3bb34e52e84c7748b74643f6f7dfdf0a6ae9c1 Mon Sep 17 00:00:00 2001 From: sasha80 Date: Wed, 9 Jul 2025 01:05:42 +0300 Subject: [PATCH 10/20] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE?= =?UTF-8?q?=D1=82=D0=BA=D0=B0.=20=D0=A0=D0=B5=D0=B6=D0=B8=D0=BC=20"=D0=9A?= =?UTF-8?q?=D0=BE=D0=BD=D1=82=D1=80=D0=BE=D0=BB=D1=8C".=20=D0=9E=D1=82?= =?UTF-8?q?=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=81?= =?UTF-8?q?=D0=BE=D1=81=D1=82=D0=BE=D1=8F=D0=BD=D0=B8=D1=8F=20=D0=91=D0=9F?= =?UTF-8?q?=D0=9E.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/pribor-afsp/bort-afsp.tscn | 2 - scenes/pribor-afsp/node_maper.gd | 40 +++++++++++ scenes/pribor-afsp/node_maper.gd.uid | 1 + scenes/pribor-afsp/pribor-afsp-1.tscn | 2 +- scenes/pribor-afsp/pribor-afsp.gd | 98 +++++---------------------- scenes/pribor-afsp/pribor-rtr.gd | 46 ++++++++++++- scenes/pribor-afsp/pribor-rtr.tscn | 21 +++++- scenes/pribor-uyep/spt25-view.gd | 2 +- scenes/работа/работа.tscn | 2 +- scripts/tools.gd | 28 ++++++++ 10 files changed, 153 insertions(+), 89 deletions(-) create mode 100644 scenes/pribor-afsp/node_maper.gd create mode 100644 scenes/pribor-afsp/node_maper.gd.uid diff --git a/scenes/pribor-afsp/bort-afsp.tscn b/scenes/pribor-afsp/bort-afsp.tscn index 14ab91b..8d55d61 100644 --- a/scenes/pribor-afsp/bort-afsp.tscn +++ b/scenes/pribor-afsp/bort-afsp.tscn @@ -800,7 +800,6 @@ offset_right = 580.0 offset_bottom = 115.0 tooltip_text = "Плата АЦП ADCS500" fname = "АЦП" -state = 1 metadata/state = ["SelfTest[4].SystemList[0].DevList[1]['TestPassed']"] [node name="dsp" parent="." instance=ExtResource("4_mtf2n")] @@ -810,7 +809,6 @@ offset_right = 580.0 offset_bottom = 60.0 tooltip_text = "Плата цифровой обработки сигналов BPL" fname = "Сигн. проц." -state = 1 metadata/state = ["SelfTest[4].SystemList[0].DevList[0]['TestPassed']"] [node name="gen" parent="." instance=ExtResource("2_dmhrm")] diff --git a/scenes/pribor-afsp/node_maper.gd b/scenes/pribor-afsp/node_maper.gd new file mode 100644 index 0000000..b42f189 --- /dev/null +++ b/scenes/pribor-afsp/node_maper.gd @@ -0,0 +1,40 @@ +extends Node + + +static func map_value_to_item(data, item, value_name: StringName): + var meta = item.get_meta(value_name, '') + if meta == '': + return + if not (meta is String): + return + var paths: = Array() + tools.map_solid_to_array(meta, paths) + var ret_val: = [null, false, 0] + var paths_copy = paths.duplicate(true) + tools.get_value_by_path(data, paths, ret_val) + if ret_val[1]: + item.set(value_name, ret_val[0]) + else: + push_error('не найден путь %s (%s) для $%s.%s (%s)' % [paths_copy, ret_val[2], item.name, value_name, item.tooltip_text]) + + +static func map_error_codes_to_item(data, item, value_name: StringName, value_init: int): + var metas = item.get_meta(value_name, '') + if not (metas is Array): + return + var paths: = Array() + var values: = Array() + for meta in metas: + tools.map_solid_to_array(meta, paths) + var ret_val: = [null, false, 0] + var paths_copy = paths.duplicate(true) + tools.get_value_by_path(data, paths, ret_val) + if ret_val[1]: + values.append(ret_val[0]) + else: + push_error('не найден путь %s(%s) для $%s.%s (%s)' % [paths_copy, ret_val[2], item.name, value_name, item.tooltip_text]) + if values.size() == metas.size(): + var test_res = 1 if values.count(true) == values.size() else 2 + item.set(value_name, test_res) + else: + item.set(value_name, value_init) diff --git a/scenes/pribor-afsp/node_maper.gd.uid b/scenes/pribor-afsp/node_maper.gd.uid new file mode 100644 index 0000000..973fc93 --- /dev/null +++ b/scenes/pribor-afsp/node_maper.gd.uid @@ -0,0 +1 @@ +uid://bcjneo1tbiygo diff --git a/scenes/pribor-afsp/pribor-afsp-1.tscn b/scenes/pribor-afsp/pribor-afsp-1.tscn index 907863f..8577aa7 100644 --- a/scenes/pribor-afsp/pribor-afsp-1.tscn +++ b/scenes/pribor-afsp/pribor-afsp-1.tscn @@ -36,6 +36,6 @@ offset_bottom = 1216.78 metadata/DeviceName = &"Устройство РР левого борта" [connection signal="child_entered_tree" from="request" to="request" method="_on_child_entered_tree"] -[connection signal="request_completed" from="request" to="." method="_on_request_rtr_request_completed"] +[connection signal="request_completed" from="request" to="." method="_on_request_completed"] [connection signal="timeout" from="request/timer" to="request" method="_on_request_timer"] [connection signal="pressed" from="bort" to="." method="_on_item_pressed"] diff --git a/scenes/pribor-afsp/pribor-afsp.gd b/scenes/pribor-afsp/pribor-afsp.gd index ca717ba..ed443ad 100644 --- a/scenes/pribor-afsp/pribor-afsp.gd +++ b/scenes/pribor-afsp/pribor-afsp.gd @@ -3,36 +3,9 @@ class_name pribor_afsp extends 'res://scenes/контроль/прибор.gd' @export var prefix_path: String = 'DeviceDescripton[DeviceName]' static var json_conv: JSON = JSON.new() +static var node_maper = load('res://scenes/pribor-afsp/node_maper.gd') -## Преобразует путь в виде целой строки в массив отдельных элементов пути.[br] -## [param solid] - Входная строка содержащая путь, которая имеет следующий примерный вид:[br] -## [code]SelfTest[1].DevList[2]['CurrentValue'][/code][br] -## [param paths] - Массив содержащий отдельные элементы пути.[br] -## [param tokens] - Разделители используемые во входной строке для разделения элементов пути.[br] -func map_solid_to_array(solid: String, paths: Array, tokens: Array = ['[', ']', '.']) -> void: - paths.clear() - var i_chs = [] - for sep in tokens: - var i = 0 - while i != -1: - i = solid.find(sep, i + 1) - i_chs.append(i) - i_chs.pop_back() - i_chs.sort() - - var i0 = 0 - for i1 in i_chs: - var ss: = [String()] - tools.get_string_slice(solid, ss, i0, i1) - if ss[0].is_valid_int(): - paths.append(ss[0].to_int()) - else: - if ss[0]: - paths.append(ss[0]) - i0 = i1 + 1 - - -func _on_request_rtr_request_completed(result, _response_code, headers, body: PackedByteArray): +func _on_request_completed(result, _response_code, headers, body: PackedByteArray): if result != 0: var rs = $request.get_result_string(result) log.error('\"%s\"' % rs) @@ -50,7 +23,7 @@ func _on_request_rtr_request_completed(result, _response_code, headers, body: Pa return var pp = [] - map_solid_to_array(prefix_path, pp) + tools.map_solid_to_array(prefix_path, pp) var ret_val = [null, false, 0] var pp_copy = pp.duplicate(true) tools.get_value_by_path(json_conv.data, pp, ret_val) @@ -65,61 +38,22 @@ func _on_request_rtr_request_completed(result, _response_code, headers, body: Pa return for child in $bort.get_node('konverter/grid').get_children(): - map_value_to_item(json_conv.data, child, 'value0') - map_value_to_item(json_conv.data, child, 'value1') - map_value_to_item(json_conv.data, child, 'value2') - map_error_codes_to_item(json_conv.data, child, 'state', 0) + node_maper.map_value_to_item(json_conv.data, child, 'value0') + node_maper.map_value_to_item(json_conv.data, child, 'value1') + node_maper.map_value_to_item(json_conv.data, child, 'value2') + node_maper.map_error_codes_to_item(json_conv.data, child, 'state', 0) for child in $bort.get_node('antenna1/grid').get_children(): - map_value_to_item(json_conv.data, child, 'value0') - map_value_to_item(json_conv.data, child, 'value1') - map_error_codes_to_item(json_conv.data, child, 'state', 0) + node_maper.map_value_to_item(json_conv.data, child, 'value0') + node_maper.map_value_to_item(json_conv.data, child, 'value1') + node_maper.map_error_codes_to_item(json_conv.data, child, 'state', 0) for child in $bort.get_node('antenna2/grid').get_children(): - map_value_to_item(json_conv.data, child, 'value0') - map_value_to_item(json_conv.data, child, 'value1') - map_error_codes_to_item(json_conv.data, child, 'state', 0) + node_maper.map_value_to_item(json_conv.data, child, 'value0') + node_maper.map_value_to_item(json_conv.data, child, 'value1') + node_maper.map_error_codes_to_item(json_conv.data, child, 'state', 0) for child in $bort.get_children(): - map_value_to_item(json_conv.data, child, 'value0') - map_value_to_item(json_conv.data, child, 'value1') - map_error_codes_to_item(json_conv.data, child, 'state', 0) - - -func map_value_to_item(data, item, value_name: StringName): - var meta = item.get_meta(value_name, '') - if meta == '': - return - if not (meta is String): - return - var paths: = Array() - map_solid_to_array(meta, paths) - var ret_val: = [null, false, 0] - var paths_copy = paths.duplicate(true) - tools.get_value_by_path(data, paths, ret_val) - if ret_val[1]: - item.set(value_name, ret_val[0]) - else: - push_error('не найден путь %s (%s) для $%s.%s (%s)' % [paths_copy, ret_val[2], item.name, value_name, item.tooltip_text]) - - -func map_error_codes_to_item(data, item, value_name: StringName, value_init: int): - var metas = item.get_meta(value_name, '') - if not (metas is Array): - return - var paths: = Array() - var values: = Array() - for meta in metas: - map_solid_to_array(meta, paths) - var ret_val: = [null, false, 0] - var paths_copy = paths.duplicate(true) - tools.get_value_by_path(data, paths, ret_val) - if ret_val[1]: - values.append(ret_val[0]) - else: - push_error('не найден путь %s(%s) для $%s.%s (%s)' % [paths_copy, ret_val[2], item.name, value_name, item.tooltip_text]) - if values.size() == metas.size(): - var test_res = 1 if values.count(true) == values.size() else 2 - item.set(value_name, test_res) - else: - item.set(value_name, value_init) + node_maper.map_value_to_item(json_conv.data, child, 'value0') + node_maper.map_value_to_item(json_conv.data, child, 'value1') + node_maper.map_error_codes_to_item(json_conv.data, child, 'state', 0) ## Вызывается при клике мыши на элементе контроля. diff --git a/scenes/pribor-afsp/pribor-rtr.gd b/scenes/pribor-afsp/pribor-rtr.gd index 12f04cd..63aec35 100644 --- a/scenes/pribor-afsp/pribor-rtr.gd +++ b/scenes/pribor-afsp/pribor-rtr.gd @@ -1,3 +1,47 @@ class_name pribor_rtr extends 'res://scenes/контроль/прибор.gd' -@export var prefix_path: String = '' +@export var prefix_path: String = 'DeviceDescripton[DeviceName]' + +static var json_conv: JSON = JSON.new() +static var node_maper = load('res://scenes/pribor-afsp/node_maper.gd') + + +const bort_to_node_name = { + 'Устройство РР левого борта': 'grid_bpo_a1', + 'Устройство РР правого борта': 'grid_bpo_a2'} + + +func _on_request_completed(result, _response_code, headers, body: PackedByteArray): + if result != 0: + var rs = $request.get_result_string(result) + log.error('\"%s\"' % rs) + return + + var json_str: String = body.get_string_from_utf8() + if not json_str: + push_error('не удаётся получить строку из utf8-данных (%s)' % headers) + return + + var rc = json_conv.parse(json_str) + if rc != Error.OK: + var err = json_conv.get_error_message() + push_error('разбор json прерван - \"%s\" (%s)' % [err, headers]) + return + + var pp = [] + tools.map_solid_to_array(prefix_path, pp) + var ret_val = [null, false, 0] + var pp_copy = pp.duplicate(true) + tools.get_value_by_path(json_conv.data, pp, ret_val) + if not ret_val[1]: + push_error('путь %s не найден (%s)' % [pp_copy, ret_val[2]]) + return + + if not bort_to_node_name.has(ret_val[0]): + return + + var node_name = bort_to_node_name[ret_val[0]] + var bort_node = get_node(node_name) + + for item in bort_node.get_children(): + node_maper.map_value_to_item(json_conv.data, item, 'state') diff --git a/scenes/pribor-afsp/pribor-rtr.tscn b/scenes/pribor-afsp/pribor-rtr.tscn index 031e1b9..df3e780 100644 --- a/scenes/pribor-afsp/pribor-rtr.tscn +++ b/scenes/pribor-afsp/pribor-rtr.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=4 format=3 uid="uid://5uv1idl3lqea"] +[gd_scene load_steps=5 format=3 uid="uid://5uv1idl3lqea"] [ext_resource type="Script" uid="uid://d0jwv5opi3mrk" path="res://scenes/pribor-afsp/pribor-rtr.gd" id="1_soedq"] [ext_resource type="PackedScene" uid="uid://d3iqb5e4g81m5" path="res://scenes/контроль/элемент-г.tscn" id="2_pspup"] [ext_resource type="PackedScene" uid="uid://p2suppildvq0" path="res://scenes/контроль/элемент-в.tscn" id="3_gh777"] +[ext_resource type="Script" uid="uid://bux47vkw71w1t" path="res://scenes/pribor-afsp/request.gd" id="4_pspup"] [node name="pribor_rtr" type="Control"] layout_mode = 3 @@ -47,48 +48,56 @@ layout_mode = 2 size_flags_horizontal = 7 size_flags_vertical = 7 fname = "Канал 1" +metadata/state = "SelfTest[0].SystemList[0].DevList[0]['TestPassed']" [node name="kanal2" parent="grid_bpo_a1" instance=ExtResource("2_pspup")] layout_mode = 2 size_flags_horizontal = 7 size_flags_vertical = 7 fname = "Канал 2" +metadata/state = "SelfTest[0].SystemList[0].DevList[1]['TestPassed']" [node name="kanal3" parent="grid_bpo_a1" instance=ExtResource("2_pspup")] layout_mode = 2 size_flags_horizontal = 7 size_flags_vertical = 7 fname = "Канал 3" +metadata/state = "SelfTest[0].SystemList[0].DevList[2]['TestPassed']" [node name="kanal4" parent="grid_bpo_a1" instance=ExtResource("2_pspup")] layout_mode = 2 size_flags_horizontal = 7 size_flags_vertical = 7 fname = "Канал 4" +metadata/state = "SelfTest[0].SystemList[0].DevList[3]['TestPassed']" [node name="kanal5" parent="grid_bpo_a1" instance=ExtResource("2_pspup")] layout_mode = 2 size_flags_horizontal = 7 size_flags_vertical = 7 fname = "Канал 5" +metadata/state = "SelfTest[0].SystemList[0].DevList[4]['TestPassed']" [node name="kanal6" parent="grid_bpo_a1" instance=ExtResource("2_pspup")] layout_mode = 2 size_flags_horizontal = 7 size_flags_vertical = 7 fname = "Канал 6" +metadata/state = "SelfTest[0].SystemList[0].DevList[5]['TestPassed']" [node name="kanal7" parent="grid_bpo_a1" instance=ExtResource("2_pspup")] layout_mode = 2 size_flags_horizontal = 7 size_flags_vertical = 7 fname = "Канал 7" +metadata/state = "SelfTest[0].SystemList[0].DevList[6]['TestPassed']" [node name="kanal8" parent="grid_bpo_a1" instance=ExtResource("2_pspup")] layout_mode = 2 size_flags_horizontal = 7 size_flags_vertical = 7 fname = "Канал 8" +metadata/state = "SelfTest[0].SystemList[0].DevList[7]['TestPassed']" [node name="yas_bpo_a1" parent="." instance=ExtResource("3_gh777")] offset_left = 500.0 @@ -173,3 +182,13 @@ offset_bottom = 520.0 show_rname = false self_size = Vector2i(50, 145) fname = "Яч. связи" + +[node name="request" type="HTTPRequest" parent="."] +script = ExtResource("4_pspup") + +[node name="timer" type="Timer" parent="request"] +wait_time = 4.168 +autostart = true + +[connection signal="request_completed" from="request" to="." method="_on_request_completed"] +[connection signal="timeout" from="request/timer" to="request" method="_on_request_timer"] diff --git a/scenes/pribor-uyep/spt25-view.gd b/scenes/pribor-uyep/spt25-view.gd index f537b1c..30066a9 100644 --- a/scenes/pribor-uyep/spt25-view.gd +++ b/scenes/pribor-uyep/spt25-view.gd @@ -1,6 +1,6 @@ @tool -extends "res://scenes/контроль/элемент-я.gd" +extends 'res://scenes/контроль/элемент-я.gd' func on_line_changed(unit0): diff --git a/scenes/работа/работа.tscn b/scenes/работа/работа.tscn index 1b179b1..442c2dc 100644 --- a/scenes/работа/работа.tscn +++ b/scenes/работа/работа.tscn @@ -288,6 +288,6 @@ texture_pressed = ExtResource("13_ggrwd") [connection signal="drag_continue" from="." to="." method="_on_drag_continue"] [connection signal="toggled" from="btn_view" to="." method="on_button_view_toggled"] [connection signal="toggled" from="chk_auto" to="." method="on_value_changed"] -[connection signal="toggled" from="btn_activate" to="." method="on_btn_activate"] [connection signal="toggled" from="btn_activate" to="." method="on_btn_activate_toggled"] +[connection signal="toggled" from="btn_activate" to="." method="on_btn_activate"] [connection signal="toggled" from="btn_center" to="." method="on_btn_center_toggled"] diff --git a/scripts/tools.gd b/scripts/tools.gd index dca07aa..ec7d553 100644 --- a/scripts/tools.gd +++ b/scripts/tools.gd @@ -35,6 +35,34 @@ func allways(val: bool, msg: String = '<не указано>'): get_tree().quit(Error.FAILED) +## Преобразует путь в виде целой строки в массив отдельных элементов пути.[br] +## [param solid] - Входная строка содержащая путь, которая имеет следующий примерный вид:[br] +## [code]SelfTest[1].DevList[2]['CurrentValue'][/code][br] +## [param paths] - Массив содержащий отдельные элементы пути.[br] +## [param tokens] - Разделители используемые во входной строке для разделения элементов пути.[br] +func map_solid_to_array(solid: String, paths: Array, tokens: Array = ['[', ']', '.']) -> void: + paths.clear() + var i_chs = [] + for sep in tokens: + var i = 0 + while i != -1: + i = solid.find(sep, i + 1) + i_chs.append(i) + i_chs.pop_back() + i_chs.sort() + + var i0 = 0 + for i1 in i_chs: + var ss: = [String()] + get_string_slice(solid, ss, i0, i1) + if ss[0].is_valid_int(): + paths.append(ss[0].to_int()) + else: + if ss[0]: + paths.append(ss[0]) + i0 = i1 + 1 + + func check_index(obj, index) -> bool: if obj is Dictionary: if obj.has(index): From 3549ca2644395fc7086bfed81be60ffc350a9633 Mon Sep 17 00:00:00 2001 From: sasha80 Date: Wed, 9 Jul 2025 13:16:01 +0300 Subject: [PATCH 11/20] Godot4.4 --- scenes/работа/работа.tscn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scenes/работа/работа.tscn b/scenes/работа/работа.tscn index 442c2dc..1b179b1 100644 --- a/scenes/работа/работа.tscn +++ b/scenes/работа/работа.tscn @@ -288,6 +288,6 @@ texture_pressed = ExtResource("13_ggrwd") [connection signal="drag_continue" from="." to="." method="_on_drag_continue"] [connection signal="toggled" from="btn_view" to="." method="on_button_view_toggled"] [connection signal="toggled" from="chk_auto" to="." method="on_value_changed"] -[connection signal="toggled" from="btn_activate" to="." method="on_btn_activate_toggled"] [connection signal="toggled" from="btn_activate" to="." method="on_btn_activate"] +[connection signal="toggled" from="btn_activate" to="." method="on_btn_activate_toggled"] [connection signal="toggled" from="btn_center" to="." method="on_btn_center_toggled"] From b800983615d58c29e7c0a9fde1f40b213b59ac8f Mon Sep 17 00:00:00 2001 From: sasha80 Date: Wed, 9 Jul 2025 13:16:27 +0300 Subject: [PATCH 12/20] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE?= =?UTF-8?q?=D1=82=D0=BA=D0=B0.=20=D0=A1=D0=BE=D0=BE=D0=B1=D1=89=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20"=D0=A2=D0=B8=D0=BF=208"=20=D0=B4=D0=BB?= =?UTF-8?q?=D1=8F=20=D0=9A=D0=90=D0=9F=D0=A1-=D0=A0=D0=9F=D0=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/interfer.gd | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/interfer.gd b/scripts/interfer.gd index 3e4eb09..2c39bc4 100644 --- a/scripts/interfer.gd +++ b/scripts/interfer.gd @@ -129,7 +129,7 @@ func _ready() -> void: threats.connect('threat_lost', Callable(self, 'on_threats_lost').bind(ecms, unit_caps)) var key = settings.get_unit_key('навигация') var unit_nav = network.units[key] - unit_nav.connect('data_received', on_nav_data_received.bind()) + unit_nav.connect('data_received', on_nav_data_received.bind(unit_caps)) func on_nav_data_received(coords: Dictionary, unit_caps): @@ -142,6 +142,7 @@ func on_nav_data_received(coords: Dictionary, unit_caps): 'lat': coords.get('latitude', 0), 'course': coords.get('k', 0), 'speed': coords.get('speed', 0) } + print_debug(data_to_json) var json_data = JSON.stringify(data_to_json).to_utf8_buffer() unit_caps.tx_stack.append(json_data) msg8_num += 1 From 0724447a5bfddd904db012f102230d4068e5e975 Mon Sep 17 00:00:00 2001 From: sasha80 Date: Thu, 10 Jul 2025 10:29:49 +0300 Subject: [PATCH 13/20] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82?= =?UTF-8?q?=D0=BE=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/interfer.gd | 8 ++++---- scripts/network.gd | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/interfer.gd b/scripts/interfer.gd index 2c39bc4..802841c 100644 --- a/scripts/interfer.gd +++ b/scripts/interfer.gd @@ -24,7 +24,7 @@ const ITERFER_MODE = { const SOURCE_INTERFER = ['th','fs','cu'] const ID_INTERFERS_LEN = 63 ## Размер пула номеров целей. const INTERFER_OFF = 'off' -var msg_num: int = 0 ## Счётчик сообщений. +var msg6_num: int = 0 ## Счётчик сообщений "тип 6" var msg8_num: int = 0 ## Счётчик сообщений "тип 8" var id_array: Array ## Массив id воздействий. var thrs: Dictionary ## Словарь воздействия для целей, ключ - id воздействия. @@ -93,11 +93,11 @@ signal interfer_resized(ecms: Dictionary) ## Вызывается пр func on_get_interfers(unit, ecms) -> void: unit.pack_interfers(cu, ecms) -## Автмат выключен +## Автомат выключен func on_manual_control() -> void: auto_enabled = false -## Автмат отключен +## Автомат отключен func on_full_auto() -> void: auto_enabled = true @@ -251,7 +251,7 @@ func on_interfer_rcv(interfer_params: Array, unit0, ecms) -> void: param['width'] = interfer_params[5] if (param['width'] < settings.WIDTH_MIN) and (param['width'] > settings.WIDTH_MAX): err = true - var interfer_name: String + var interfer_name: = '' for key in ITERFER_MODE: if ITERFER_MODE[key][2] == mode: interfer_name = key diff --git a/scripts/network.gd b/scripts/network.gd index c349ac9..1465ca4 100644 --- a/scripts/network.gd +++ b/scripts/network.gd @@ -297,15 +297,15 @@ func get_tcp_data(sock: SocketTCP, peer, len_rx): func _process(_delta: float) -> void: tick = Time.get_ticks_msec() RenderingServer.global_shader_parameter_set('tick_curent', tick) - for addr in units_udp: - var unit_udp = units_udp[addr] + for key in units_udp: + var unit_udp = units_udp[key] if Error.OK == unit_udp.process(tick): var sock = send_sockets[unit_udp.name] - var dst_port = dst_ports[addr] + var dst_port = dst_ports[key] var tx_data = unit_udp.tx_data.slice(0, unit_udp.tx_len) - sock.send_to([addr[0], dst_port], tx_data) - for addr in units_udprx: - var unit_udprx = units_udprx[addr] + sock.send_to([key[0], dst_port], tx_data) + for key in units_udprx: + var unit_udprx = units_udprx[key] unit_udprx.process(tick) for key in units_serial: var unit_serial = units_serial[key] From 0f19f18f2c010251edf5fa57253bf51cb364ca6e Mon Sep 17 00:00:00 2001 From: sasha80 Date: Thu, 10 Jul 2025 10:30:02 +0300 Subject: [PATCH 14/20] =?UTF-8?q?=D0=A7=D0=B8=D1=81=D1=82=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/pribor-afsp/pribor-afsp-1.tscn | 1 - scenes/pribor-afsp/pribor-afsp.gd | 1 - scenes/pribor-afsp/pribor-rtr.tscn | 1 - scripts/interfer.gd | 10 +++------- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/scenes/pribor-afsp/pribor-afsp-1.tscn b/scenes/pribor-afsp/pribor-afsp-1.tscn index 8577aa7..8267382 100644 --- a/scenes/pribor-afsp/pribor-afsp-1.tscn +++ b/scenes/pribor-afsp/pribor-afsp-1.tscn @@ -25,7 +25,6 @@ metadata/DeviceName = &"Устройство РР левого борта" script = ExtResource("2_4vyhj") [node name="timer" type="Timer" parent="request"] -wait_time = 4.168 autostart = true script = SubResource("GDScript_yhnwg") diff --git a/scenes/pribor-afsp/pribor-afsp.gd b/scenes/pribor-afsp/pribor-afsp.gd index ed443ad..b8018e7 100644 --- a/scenes/pribor-afsp/pribor-afsp.gd +++ b/scenes/pribor-afsp/pribor-afsp.gd @@ -60,7 +60,6 @@ func _on_request_completed(result, _response_code, headers, body: PackedByteArra ## [param block_a] - Кликнутый элемент контроля. func _on_item_pressed(block_a: Control): var metas = block_a.get_meta_list() - print_debug(block_a) for n in metas: var v = block_a.get_meta(n) print_debug('%s:%s' % [n, v]) diff --git a/scenes/pribor-afsp/pribor-rtr.tscn b/scenes/pribor-afsp/pribor-rtr.tscn index df3e780..b92a659 100644 --- a/scenes/pribor-afsp/pribor-rtr.tscn +++ b/scenes/pribor-afsp/pribor-rtr.tscn @@ -187,7 +187,6 @@ fname = "Яч. связи" script = ExtResource("4_pspup") [node name="timer" type="Timer" parent="request"] -wait_time = 4.168 autostart = true [connection signal="request_completed" from="request" to="." method="_on_request_completed"] diff --git a/scripts/interfer.gd b/scripts/interfer.gd index 802841c..608a79d 100644 --- a/scripts/interfer.gd +++ b/scripts/interfer.gd @@ -142,7 +142,6 @@ func on_nav_data_received(coords: Dictionary, unit_caps): 'lat': coords.get('latitude', 0), 'course': coords.get('k', 0), 'speed': coords.get('speed', 0) } - print_debug(data_to_json) var json_data = JSON.stringify(data_to_json).to_utf8_buffer() unit_caps.tx_stack.append(json_data) msg8_num += 1 @@ -294,10 +293,7 @@ func interfer_create(u, interfer_name, ecms, param, kni, id, dict, source_interf ecm.powp = 100.0 ecm.source_interfer = source_interfer ecm.modulation = emit_enable - if param.has('um'): - ecm.um = param['um'] - else: - ecm.um = 15.0 # Значение по умолчанию + ecm.um = param.get('um', 15.0) # Значение по умолчанию signaller.emit_signal('interfer_new', ecm) if interfer_name == 'off': signaller.emit_signal('interfer_off', ecm, ecms, thrs) @@ -307,8 +303,8 @@ func interfer_create(u, interfer_name, ecms, param, kni, id, dict, source_interf func send_ecm(ecm, unit0) -> void: - msg_num += 1 - var json_data = ecm.get_msg6_data(msg_num) + msg6_num += 1 + var json_data = ecm.get_msg6_data(msg6_num) unit0.tx_stack.append(json_data) From bea0af1d8103532217e57241b653c39d545f0aaf Mon Sep 17 00:00:00 2001 From: sasha80 Date: Mon, 14 Jul 2025 15:35:58 +0300 Subject: [PATCH 15/20] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5.=20=D0=9D=D0=B5=D1=82=20=D0=BE?= =?UTF-8?q?=D1=82=D0=B2=D0=B5=D1=82=D0=B0=20=D0=B4=D0=BB=D1=8F=20=D0=BF?= =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=BE=D0=B3=D0=BE=20=D0=B1=D0=BE=D1=80=D1=82?= =?UTF-8?q?=D0=B0=20=D0=90=D0=A4=D0=A1=D0=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/pribor-afsp/pribor-afsp-2.tscn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scenes/pribor-afsp/pribor-afsp-2.tscn b/scenes/pribor-afsp/pribor-afsp-2.tscn index 6e0c434..5efaa84 100644 --- a/scenes/pribor-afsp/pribor-afsp-2.tscn +++ b/scenes/pribor-afsp/pribor-afsp-2.tscn @@ -38,6 +38,6 @@ offset_bottom = 1130.0 metadata/DeviceName = &"Устройство РР правого борта" [connection signal="child_entered_tree" from="request" to="request" method="_on_child_entered_tree"] -[connection signal="request_completed" from="request" to="." method="_on_request_rtr_request_completed"] +[connection signal="request_completed" from="request" to="." method="_on_request_completed"] [connection signal="timeout" from="request/timer" to="request" method="_on_request_timer"] [connection signal="pressed" from="bort" to="." method="_on_item_pressed"] From 26cf54c9b0a3c65caa0458723b9b9b14d079194a Mon Sep 17 00:00:00 2001 From: sasha80 Date: Mon, 14 Jul 2025 16:36:26 +0300 Subject: [PATCH 16/20] =?UTF-8?q?=D0=A7=D0=B8=D1=81=D1=82=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/pribor-afsp/pribor-afsp-2.tscn | 1 - 1 file changed, 1 deletion(-) diff --git a/scenes/pribor-afsp/pribor-afsp-2.tscn b/scenes/pribor-afsp/pribor-afsp-2.tscn index 5efaa84..8b82266 100644 --- a/scenes/pribor-afsp/pribor-afsp-2.tscn +++ b/scenes/pribor-afsp/pribor-afsp-2.tscn @@ -25,7 +25,6 @@ metadata/DeviceName = &"Устройство РР правого борта" script = ExtResource("2_miwrd") [node name="timer" type="Timer" parent="request"] -wait_time = 4.168 autostart = true script = SubResource("GDScript_yhnwg") From 931db3e57efb5b13e98279e7ab69ec94d284bdd4 Mon Sep 17 00:00:00 2001 From: sasha80 Date: Mon, 14 Jul 2025 16:37:58 +0300 Subject: [PATCH 17/20] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE?= =?UTF-8?q?=D1=82=D0=BA=D0=B0.=20=D0=9F=D1=83=D1=82=D0=B8=20=D0=BA=20?= =?UTF-8?q?=D1=84=D0=B0=D0=B9=D0=BB=D0=B0=D0=BC=20=D0=BA=D0=BE=D0=BD=D1=82?= =?UTF-8?q?=D1=80=D0=BE=D0=BB=D1=8F=20=D0=90=D0=A4=D0=A1=D0=9F=20=D0=BF?= =?UTF-8?q?=D0=BE=20=D1=83=D0=BC=D0=BE=D0=BB=D1=87=D0=B0=D0=BD=D0=B8=D1=8E?= =?UTF-8?q?,=20=D0=B4=D0=BB=D1=8F=20=D0=BE=D1=82=D0=BB=D0=B0=D0=B4=D0=BA?= =?UTF-8?q?=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- project.godot | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/project.godot b/project.godot index f4b71d7..375b656 100644 --- a/project.godot +++ b/project.godot @@ -33,8 +33,8 @@ config/mod_bus_driver_port="48000" config/mod_bus_driver_address="localhost" interfer/resend_timeout=1000.0 config/external_cu=false -config/unit_afsp_left_bort="http://172.20.22.10:8081/selftest" -config/unit_afsp_right_bort="http://172.20.22.11:8081/selftest" +config/unit_afsp_left_bort="http://127.0.0.1:8000/selftest_left.json" +config/unit_afsp_right_bort="http://127.0.0.1:8000/selftest_right.json" config/unit_rr_request_period=5.0 config/kems_files_path="user://kems/" config/emsg_files_path="user://emsg/" @@ -84,7 +84,6 @@ gdscript/warnings/integer_division=0 window/size/viewport_width=1600 window/size/viewport_height=1200 -window/size/mode=4 window/size/window_height_override=768 window/subwindows/embed_subwindows=false window/stretch/mode="canvas_items" From 270486f5aa7d9bba76ded5aa2e43562463dc9cf1 Mon Sep 17 00:00:00 2001 From: sasha80 Date: Tue, 15 Jul 2025 11:16:12 +0300 Subject: [PATCH 18/20] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE?= =?UTF-8?q?=D1=82=D0=BA=D0=B0.=20=D0=A7=D0=B0=D1=81=D1=82=D0=BE=D1=82?= =?UTF-8?q?=D1=8B=20=D0=BF=D0=BE=20=D0=BF=D1=80=D0=BE=D1=82=D0=BE=D0=BA?= =?UTF-8?q?=D0=BE=D0=BB=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/prd.gd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/prd.gd b/scripts/prd.gd index 468cc18..8ad82cc 100644 --- a/scripts/prd.gd +++ b/scripts/prd.gd @@ -30,13 +30,13 @@ const FS_SECTORS: Dictionary = { 1: [270.0, 360.0] } const FS_FREQ: Dictionary = { - 0: [390.0, 800.0, 433.0], - 1: [800.0, 1065.0, 860.0], + 0: [390.0, 510.0, 450.0], + 1: [800.0, 1065.0, 932.0], 2: [1065.0, 1210.0, 1137.0], - 3: [1150.0, 1490.0, 1227.0], + 3: [1150.0, 1280.0, 1215.0], 4: [1490.0, 2000.0, 1575.0], - 5: [2000.0, 3500.0, 2450.0], - 6: [3500.0, 6000.0, 5800.0] } + 5: [2000.0, 3500.0, 2750.0], + 6: [3500.0, 6000.0, 4750.0] } ## Названия приборов ПРД const PRD_NAMES: Array = [ From 1027c2bbe8a73a6844e5a9bff74fd1303d835de3 Mon Sep 17 00:00:00 2001 From: sasha80 Date: Fri, 25 Jul 2025 14:01:27 +0300 Subject: [PATCH 19/20] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE?= =?UTF-8?q?=D1=82=D0=BA=D0=B0.=20=D0=A1=D0=9A=D0=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index e4b2bb6..41d1abc 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,6 @@ scripts/commit.gd # python специфичное modbus/pymodbus/__pycache__ modbus/serial/__pycache__ +/scenes/pribor-prd-k/kasseta-fs-kd.tscn.bak +/scenes/pribor-prd-k/pribor-prd-k.tscn.bak +/scenes/pribor-prd-n/kasseta-fs-nd.tscn.bak From c490cb46cf905d0b62984616cc3f514200f8b29a Mon Sep 17 00:00:00 2001 From: sasha80 Date: Fri, 25 Jul 2025 14:04:47 +0300 Subject: [PATCH 20/20] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE?= =?UTF-8?q?=D1=82=D0=BA=D0=B0.=20=D0=92=20=D0=BF=D1=80=D0=BE=D1=86=D0=B5?= =?UTF-8?q?=D1=81=D1=81=D0=B5.=20=D0=9A=D0=BE=D0=BD=D1=82=D1=80=D0=BE?= =?UTF-8?q?=D0=BB=D1=8C=20=D0=9F=D0=A0=D0=94-=D0=9A.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/pribor-prd-k/pribor-prd-k.gd | 23 +++++++++++++++++++++++ scenes/pribor-prd-k/pribor-prd-k.gd.uid | 1 + 2 files changed, 24 insertions(+) create mode 100644 scenes/pribor-prd-k/pribor-prd-k.gd create mode 100644 scenes/pribor-prd-k/pribor-prd-k.gd.uid diff --git a/scenes/pribor-prd-k/pribor-prd-k.gd b/scenes/pribor-prd-k/pribor-prd-k.gd new file mode 100644 index 0000000..ddaf634 --- /dev/null +++ b/scenes/pribor-prd-k/pribor-prd-k.gd @@ -0,0 +1,23 @@ +@tool +extends "res://scenes/контроль/прибор.gd" + +enum STATE_VAL { + NONE = 0, + GOOD = 1, + ERROR = 2 } + + +func set_default_state(): + $utm80_A9.state = STATE_VAL.NONE + $um1535_A10.state = STATE_VAL.NONE + $um1535_A11.state = STATE_VAL.NONE + $um1535_A12.state = STATE_VAL.NONE + $um1535_A13.state = STATE_VAL.NONE + $um1535_A14.state = STATE_VAL.NONE + $um1535_A15.state = STATE_VAL.NONE + $um1535_A16.state = STATE_VAL.NONE + $um1535_A17.state = STATE_VAL.NONE + $um1535_A18.state = STATE_VAL.NONE + $um1535_A19.state = STATE_VAL.NONE + $um1535_A20.state = STATE_VAL.NONE + $um1535_A21.state = STATE_VAL.NONE diff --git a/scenes/pribor-prd-k/pribor-prd-k.gd.uid b/scenes/pribor-prd-k/pribor-prd-k.gd.uid new file mode 100644 index 0000000..6d9d32f --- /dev/null +++ b/scenes/pribor-prd-k/pribor-prd-k.gd.uid @@ -0,0 +1 @@ +uid://dlcma54gh7fsk