From 37e552d2075da46993f27a7275b440412637e3ba Mon Sep 17 00:00:00 2001 From: sasha80 Date: Fri, 1 Aug 2025 12:58:19 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?= =?UTF-8?q?=D1=80.=20=D0=98=D0=BC=D0=B5=D0=BD=D0=B0=20=D1=84=D0=B0=D0=B9?= =?UTF-8?q?=D0=BB=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{node_maper.gd => node-maper.gd} | 0 .../{node_maper.gd.uid => node-maper.gd.uid} | 0 scenes/pribor-afsp/pribor-afsp.gd | 2 +- .../{pribor-rtr.gd => pribor-bpo.gd} | 2 +- .../{pribor-rtr.gd.uid => pribor-bpo.gd.uid} | 0 .../{pribor-rtr.tscn => pribor-bpo.tscn} | 63 ++++++++++--------- 6 files changed, 35 insertions(+), 32 deletions(-) rename scenes/pribor-afsp/{node_maper.gd => node-maper.gd} (100%) rename scenes/pribor-afsp/{node_maper.gd.uid => node-maper.gd.uid} (100%) rename scenes/pribor-afsp/{pribor-rtr.gd => pribor-bpo.gd} (96%) rename scenes/pribor-afsp/{pribor-rtr.gd.uid => pribor-bpo.gd.uid} (100%) rename scenes/pribor-afsp/{pribor-rtr.tscn => pribor-bpo.tscn} (82%) diff --git a/scenes/pribor-afsp/node_maper.gd b/scenes/pribor-afsp/node-maper.gd similarity index 100% rename from scenes/pribor-afsp/node_maper.gd rename to scenes/pribor-afsp/node-maper.gd diff --git a/scenes/pribor-afsp/node_maper.gd.uid b/scenes/pribor-afsp/node-maper.gd.uid similarity index 100% rename from scenes/pribor-afsp/node_maper.gd.uid rename to scenes/pribor-afsp/node-maper.gd.uid diff --git a/scenes/pribor-afsp/pribor-afsp.gd b/scenes/pribor-afsp/pribor-afsp.gd index b8018e7..ef2c163 100644 --- a/scenes/pribor-afsp/pribor-afsp.gd +++ b/scenes/pribor-afsp/pribor-afsp.gd @@ -3,7 +3,7 @@ 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') +static var node_maper = load('res://scenes/pribor-afsp/node-maper.gd') func _on_request_completed(result, _response_code, headers, body: PackedByteArray): if result != 0: diff --git a/scenes/pribor-afsp/pribor-rtr.gd b/scenes/pribor-afsp/pribor-bpo.gd similarity index 96% rename from scenes/pribor-afsp/pribor-rtr.gd rename to scenes/pribor-afsp/pribor-bpo.gd index 63aec35..3d0db98 100644 --- a/scenes/pribor-afsp/pribor-rtr.gd +++ b/scenes/pribor-afsp/pribor-bpo.gd @@ -3,7 +3,7 @@ class_name pribor_rtr 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') +static var node_maper = load('res://scenes/pribor-afsp/node-maper.gd') const bort_to_node_name = { diff --git a/scenes/pribor-afsp/pribor-rtr.gd.uid b/scenes/pribor-afsp/pribor-bpo.gd.uid similarity index 100% rename from scenes/pribor-afsp/pribor-rtr.gd.uid rename to scenes/pribor-afsp/pribor-bpo.gd.uid diff --git a/scenes/pribor-afsp/pribor-rtr.tscn b/scenes/pribor-afsp/pribor-bpo.tscn similarity index 82% rename from scenes/pribor-afsp/pribor-rtr.tscn rename to scenes/pribor-afsp/pribor-bpo.tscn index b92a659..e294554 100644 --- a/scenes/pribor-afsp/pribor-rtr.tscn +++ b/scenes/pribor-afsp/pribor-bpo.tscn @@ -1,20 +1,20 @@ [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"] +[ext_resource type="Script" uid="uid://d0jwv5opi3mrk" path="res://scenes/pribor-afsp/pribor-bpo.gd" id="1_bhc4e"] +[ext_resource type="PackedScene" uid="uid://d3iqb5e4g81m5" path="res://scenes/контроль/элемент-г.tscn" id="2_jp6m0"] +[ext_resource type="PackedScene" uid="uid://p2suppildvq0" path="res://scenes/контроль/элемент-в.tscn" id="3_jcpjs"] +[ext_resource type="Script" uid="uid://bux47vkw71w1t" path="res://scenes/pribor-afsp/request.gd" id="4_crej3"] -[node name="pribor_rtr" type="Control"] +[node name="pribor_bpo" type="Control"] layout_mode = 3 anchors_preset = 0 offset_left = 115.0 offset_top = 150.0 offset_right = 115.0 offset_bottom = 150.0 -script = ExtResource("1_soedq") +script = ExtResource("1_bhc4e") -[node name="mod_pit_g1" parent="." instance=ExtResource("2_pspup")] +[node name="mod_pit_g1" parent="." instance=ExtResource("2_jp6m0")] layout_mode = 2 offset_left = 40.0 offset_top = 535.0 @@ -25,14 +25,14 @@ size_flags_vertical = 7 fname = "Модуль электропитания" rname = "G1" -[node name="blok_bpo_a1" parent="." instance=ExtResource("2_pspup")] +[node name="blok_bpo_a1" parent="." instance=ExtResource("2_jp6m0")] layout_mode = 0 offset_left = 40.0 offset_top = 135.0 offset_right = 560.0 offset_bottom = 330.0 show_state = false -fname = "Блок БПО" +fname = "Блок БПО левого борта" rname = "А1" [node name="grid_bpo_a1" type="GridContainer" parent="."] @@ -43,63 +43,63 @@ offset_right = 498.0 offset_bottom = 320.0 columns = 4 -[node name="kanal1" parent="grid_bpo_a1" instance=ExtResource("2_pspup")] +[node name="kanal1" parent="grid_bpo_a1" instance=ExtResource("2_jp6m0")] 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")] +[node name="kanal2" parent="grid_bpo_a1" instance=ExtResource("2_jp6m0")] 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")] +[node name="kanal3" parent="grid_bpo_a1" instance=ExtResource("2_jp6m0")] 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")] +[node name="kanal4" parent="grid_bpo_a1" instance=ExtResource("2_jp6m0")] 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")] +[node name="kanal5" parent="grid_bpo_a1" instance=ExtResource("2_jp6m0")] 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")] +[node name="kanal6" parent="grid_bpo_a1" instance=ExtResource("2_jp6m0")] 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")] +[node name="kanal7" parent="grid_bpo_a1" instance=ExtResource("2_jp6m0")] 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")] +[node name="kanal8" parent="grid_bpo_a1" instance=ExtResource("2_jp6m0")] 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")] +[node name="yas_bpo_a1" parent="." instance=ExtResource("3_jcpjs")] offset_left = 500.0 offset_top = 175.0 offset_right = 550.0 @@ -108,14 +108,14 @@ show_rname = false self_size = Vector2i(50, 145) fname = "Яч. связи" -[node name="blok_bpo_a2" parent="." instance=ExtResource("2_pspup")] +[node name="blok_bpo_a2" parent="." instance=ExtResource("2_jp6m0")] layout_mode = 0 offset_left = 40.0 offset_top = 335.0 offset_right = 560.0 offset_bottom = 530.0 show_state = false -fname = "Блок БПО" +fname = "Блок БПО правого борта" rname = "А2" [node name="grid_bpo_a2" type="GridContainer" parent="."] @@ -126,55 +126,55 @@ offset_right = 498.0 offset_bottom = 520.0 columns = 4 -[node name="kanal1" parent="grid_bpo_a2" instance=ExtResource("2_pspup")] +[node name="kanal1" parent="grid_bpo_a2" instance=ExtResource("2_jp6m0")] layout_mode = 2 size_flags_horizontal = 7 size_flags_vertical = 7 fname = "Канал 1" -[node name="kanal2" parent="grid_bpo_a2" instance=ExtResource("2_pspup")] +[node name="kanal2" parent="grid_bpo_a2" instance=ExtResource("2_jp6m0")] layout_mode = 2 size_flags_horizontal = 7 size_flags_vertical = 7 fname = "Канал 2" -[node name="kanal3" parent="grid_bpo_a2" instance=ExtResource("2_pspup")] +[node name="kanal3" parent="grid_bpo_a2" instance=ExtResource("2_jp6m0")] layout_mode = 2 size_flags_horizontal = 7 size_flags_vertical = 7 fname = "Канал 3" -[node name="kanal4" parent="grid_bpo_a2" instance=ExtResource("2_pspup")] +[node name="kanal4" parent="grid_bpo_a2" instance=ExtResource("2_jp6m0")] layout_mode = 2 size_flags_horizontal = 7 size_flags_vertical = 7 fname = "Канал 4" -[node name="kanal5" parent="grid_bpo_a2" instance=ExtResource("2_pspup")] +[node name="kanal5" parent="grid_bpo_a2" instance=ExtResource("2_jp6m0")] layout_mode = 2 size_flags_horizontal = 7 size_flags_vertical = 7 fname = "Канал 5" -[node name="kanal6" parent="grid_bpo_a2" instance=ExtResource("2_pspup")] +[node name="kanal6" parent="grid_bpo_a2" instance=ExtResource("2_jp6m0")] layout_mode = 2 size_flags_horizontal = 7 size_flags_vertical = 7 fname = "Канал 6" -[node name="kanal7" parent="grid_bpo_a2" instance=ExtResource("2_pspup")] +[node name="kanal7" parent="grid_bpo_a2" instance=ExtResource("2_jp6m0")] layout_mode = 2 size_flags_horizontal = 7 size_flags_vertical = 7 fname = "Канал 7" -[node name="kanal8" parent="grid_bpo_a2" instance=ExtResource("2_pspup")] +[node name="kanal8" parent="grid_bpo_a2" instance=ExtResource("2_jp6m0")] layout_mode = 2 size_flags_horizontal = 7 size_flags_vertical = 7 fname = "Канал 8" -[node name="yas_bpo_a2" parent="." instance=ExtResource("3_gh777")] +[node name="yas_bpo_a2" parent="." instance=ExtResource("3_jcpjs")] offset_left = 500.0 offset_top = 375.0 offset_right = 550.0 @@ -184,7 +184,10 @@ self_size = Vector2i(50, 145) fname = "Яч. связи" [node name="request" type="HTTPRequest" parent="."] -script = ExtResource("4_pspup") +use_threads = true +script = ExtResource("4_crej3") +addr_left = "http://192.168.56.2:8001/selftest" +addr_right = "http://192.168.56.2:8002/selftest" [node name="timer" type="Timer" parent="request"] autostart = true