diff --git a/scenes/pribor-prd-k/pribor-prd-k.tscn b/scenes/pribor-prd-k/pribor-prd-k.tscn index e1dda62d..c5f1f934 100644 --- a/scenes/pribor-prd-k/pribor-prd-k.tscn +++ b/scenes/pribor-prd-k/pribor-prd-k.tscn @@ -3,7 +3,7 @@ [ext_resource type="PackedScene" uid="uid://d3iqb5e4g81m5" path="res://scenes/контроль/элемент-г.tscn" id="1_8dmgr"] [ext_resource type="Script" path="res://scenes/контроль/прибор.gd" id="1_ufjwe"] [ext_resource type="Texture2D" uid="uid://c4mdrmk7h638f" path="res://data/nine-patch-round.png" id="2_14h25"] -[ext_resource type="PackedScene" uid="uid://bk1655p4e8y4u" path="res://scenes/контроль/кассета-у-5.tscn" id="3_7orfk"] +[ext_resource type="PackedScene" uid="uid://cm5jd4gjrrpba" path="res://scenes/контроль/кассета-у-5-к.tscn" id="2_tb85r"] [ext_resource type="PackedScene" uid="uid://bkxblfoj7ejv0" path="res://scenes/контроль/блок-а.tscn" id="6_fmhtx"] [ext_resource type="PackedScene" uid="uid://dbxdb7lo7kofv" path="res://scenes/контроль/кассета-п-1.tscn" id="7_cjjs2"] [ext_resource type="PackedScene" uid="uid://bmagw8nd0ulhj" path="res://scenes/pribor-prd-k/kasseta-fs-kd.tscn" id="7_ia27q"] @@ -18,6 +18,13 @@ offset_right = 15.0 offset_bottom = 30.0 script = ExtResource("1_ufjwe") +[node name="kasseta_u5" parent="." instance=ExtResource("2_tb85r")] +layout_mode = 0 +offset_left = 175.0 +offset_top = 242.0 +offset_right = 485.0 +offset_bottom = 432.0 + [node name="lbl_header" type="Label" parent="."] layout_mode = 0 offset_left = 20.0 @@ -32,36 +39,36 @@ vertical_alignment = 1 [node name="maa2000_A22" parent="." instance=ExtResource("1_8dmgr")] layout_mode = 0 offset_left = 485.0 -offset_top = 877.0 +offset_top = 907.0 offset_right = 645.0 -offset_bottom = 942.0 +offset_bottom = 949.0 fname = "MAA2000" rname = "A22" [node name="dou2_A7" parent="." instance=ExtResource("1_8dmgr")] layout_mode = 0 -offset_left = 485.0 -offset_top = 812.0 -offset_right = 645.0 -offset_bottom = 877.0 +offset_left = 8.0 +offset_top = 862.0 +offset_right = 175.0 +offset_bottom = 907.0 fname = "ДОУ-6" rname = "A7" [node name="maa2000_A23" parent="." instance=ExtResource("1_8dmgr")] layout_mode = 0 -offset_left = 15.0 -offset_top = 877.0 +offset_left = 8.0 +offset_top = 907.0 offset_right = 175.0 -offset_bottom = 942.0 +offset_bottom = 949.0 fname = "MAA2000" rname = "A23" [node name="dou2_A8" parent="." instance=ExtResource("1_8dmgr")] layout_mode = 0 -offset_left = 15.0 +offset_left = 8.0 offset_top = 812.0 offset_right = 175.0 -offset_bottom = 877.0 +offset_bottom = 860.0 fname = "ДОУ-7" rname = "A8" @@ -70,7 +77,7 @@ layout_mode = 0 offset_left = 175.0 offset_top = 812.0 offset_right = 485.0 -offset_bottom = 942.0 +offset_bottom = 949.0 texture = ExtResource("2_14h25") patch_margin_left = 16 patch_margin_top = 16 @@ -203,9 +210,28 @@ name_min_size1 = Vector2i(35, 20) fname = "УМ1535Б" rname = "A15" +[node name="utm80_A9" parent="." instance=ExtResource("6_fmhtx")] +layout_mode = 0 +offset_left = 485.0 +offset_top = 812.0 +offset_right = 645.0 +offset_bottom = 907.0 +value0 = 28.0 +value1 = 57.0 +max_value0 = 99.0 +max_value1 = 99.0 +step0 = 1.0 +step1 = 1.0 +value_name0 = "°C" +value_name1 = "P, %" +name_min_size0 = Vector2i(35, 20) +name_min_size1 = Vector2i(35, 20) +fname = "УТМ80" +rname = "A9" + [node name="um1535_A16" parent="." instance=ExtResource("6_fmhtx")] layout_mode = 0 -offset_left = 15.0 +offset_left = 8.0 offset_top = 242.0 offset_right = 175.0 offset_bottom = 337.0 @@ -219,14 +245,14 @@ value_name0 = "°C" value_name1 = "P, %" name_min_size0 = Vector2i(35, 20) name_min_size1 = Vector2i(35, 20) -fname = "УМ1535Б" +fname = "РМ16-20М" rname = "A16" [node name="um1535_A17" parent="." instance=ExtResource("6_fmhtx")] layout_mode = 0 -offset_left = 15.0 +offset_left = 8.0 offset_top = 337.0 -offset_right = 175.0 +offset_right = 173.0 offset_bottom = 432.0 value0 = 28.0 value1 = 57.0 @@ -238,12 +264,12 @@ value_name0 = "°C" value_name1 = "P, %" name_min_size0 = Vector2i(35, 20) name_min_size1 = Vector2i(35, 20) -fname = "УМ1535Б" +fname = "РМ16-20М" rname = "A17" [node name="um1535_A18" parent="." instance=ExtResource("6_fmhtx")] layout_mode = 0 -offset_left = 15.0 +offset_left = 8.0 offset_top = 432.0 offset_right = 175.0 offset_bottom = 527.0 @@ -257,12 +283,12 @@ value_name0 = "°C" value_name1 = "P, %" name_min_size0 = Vector2i(35, 20) name_min_size1 = Vector2i(35, 20) -fname = "УМ1535Б" +fname = "РМ16-20М" rname = "A18" [node name="um1535_A19" parent="." instance=ExtResource("6_fmhtx")] layout_mode = 0 -offset_left = 15.0 +offset_left = 8.0 offset_top = 527.0 offset_right = 175.0 offset_bottom = 622.0 @@ -276,12 +302,12 @@ value_name0 = "°C" value_name1 = "P, %" name_min_size0 = Vector2i(35, 20) name_min_size1 = Vector2i(35, 20) -fname = "УМ1535Б" +fname = "РМ16-20М" rname = "A19" [node name="um1535_A20" parent="." instance=ExtResource("6_fmhtx")] layout_mode = 0 -offset_left = 15.0 +offset_left = 8.0 offset_top = 622.0 offset_right = 175.0 offset_bottom = 717.0 @@ -295,12 +321,12 @@ value_name0 = "°C" value_name1 = "P, %" name_min_size0 = Vector2i(35, 20) name_min_size1 = Vector2i(35, 20) -fname = "УМ1535Б" +fname = "РМ16-20М" rname = "A20" [node name="um1535_A21" parent="." instance=ExtResource("6_fmhtx")] layout_mode = 0 -offset_left = 15.0 +offset_left = 8.0 offset_top = 717.0 offset_right = 175.0 offset_bottom = 812.0 @@ -314,17 +340,9 @@ value_name0 = "°C" value_name1 = "P, %" name_min_size0 = Vector2i(35, 20) name_min_size1 = Vector2i(35, 20) -fname = "УМ1535Б" +fname = "РМ16-20М" rname = "A21" -[node name="kasseta_u5" parent="." instance=ExtResource("3_7orfk")] -layout_mode = 0 -offset_left = 175.0 -offset_top = 242.0 -offset_right = 485.0 -offset_bottom = 432.0 -fname = "Кассета У5" - [node name="kasseta_fs_kd" parent="." instance=ExtResource("7_ia27q")] layout_mode = 0 offset_left = 175.0 diff --git a/scenes/pribor-prd-n/pribor-prd-n.tscn b/scenes/pribor-prd-n/pribor-prd-n.tscn index 1a1c81cd..e8e9d7e3 100644 --- a/scenes/pribor-prd-n/pribor-prd-n.tscn +++ b/scenes/pribor-prd-n/pribor-prd-n.tscn @@ -3,7 +3,7 @@ [ext_resource type="Script" path="res://scenes/контроль/прибор.gd" id="1_mcea3"] [ext_resource type="PackedScene" uid="uid://d3iqb5e4g81m5" path="res://scenes/контроль/элемент-г.tscn" id="2_lpj3d"] [ext_resource type="Texture2D" uid="uid://c4mdrmk7h638f" path="res://data/nine-patch-round.png" id="4_i1no5"] -[ext_resource type="PackedScene" uid="uid://bk1655p4e8y4u" path="res://scenes/контроль/кассета-у-5.tscn" id="5_ej152"] +[ext_resource type="PackedScene" uid="uid://bk1655p4e8y4u" path="res://scenes/контроль/кассета-у-5-нв.tscn" id="5_ej152"] [ext_resource type="PackedScene" uid="uid://cd5sue1e8iyrv" path="res://scenes/pribor-prd-n/kasseta-fs-nd.tscn" id="6_1p3pi"] [ext_resource type="PackedScene" uid="uid://dbxdb7lo7kofv" path="res://scenes/контроль/кассета-п-1.tscn" id="7_klldp"] [ext_resource type="PackedScene" uid="uid://bkxblfoj7ejv0" path="res://scenes/контроль/блок-а.tscn" id="8_u7eqo"] diff --git a/scenes/pribor-prd-v/pribor-prd-v.tscn b/scenes/pribor-prd-v/pribor-prd-v.tscn index c1b9fe14..359d924b 100644 --- a/scenes/pribor-prd-v/pribor-prd-v.tscn +++ b/scenes/pribor-prd-v/pribor-prd-v.tscn @@ -3,7 +3,7 @@ [ext_resource type="Script" path="res://scenes/контроль/прибор.gd" id="1_dl7rt"] [ext_resource type="PackedScene" uid="uid://d3iqb5e4g81m5" path="res://scenes/контроль/элемент-г.tscn" id="2_xpo4b"] [ext_resource type="Texture2D" uid="uid://c4mdrmk7h638f" path="res://data/nine-patch-round.png" id="3_wyy1b"] -[ext_resource type="PackedScene" uid="uid://bk1655p4e8y4u" path="res://scenes/контроль/кассета-у-5.tscn" id="4_gl2bl"] +[ext_resource type="PackedScene" uid="uid://bk1655p4e8y4u" path="res://scenes/контроль/кассета-у-5-нв.tscn" id="4_gl2bl"] [ext_resource type="PackedScene" uid="uid://cd5sue1e8iyrv" path="res://scenes/pribor-prd-n/kasseta-fs-nd.tscn" id="5_nhd2k"] [ext_resource type="PackedScene" uid="uid://dbxdb7lo7kofv" path="res://scenes/контроль/кассета-п-1.tscn" id="6_d3awr"] [ext_resource type="PackedScene" uid="uid://bkxblfoj7ejv0" path="res://scenes/контроль/блок-а.tscn" id="7_e22c6"] diff --git a/scenes/контроль/кассета-у-5-к.tscn b/scenes/контроль/кассета-у-5-к.tscn new file mode 100644 index 00000000..b32a91c3 --- /dev/null +++ b/scenes/контроль/кассета-у-5-к.tscn @@ -0,0 +1,74 @@ +[gd_scene load_steps=4 format=3 uid="uid://cm5jd4gjrrpba"] + +[ext_resource type="Texture2D" uid="uid://c4mdrmk7h638f" path="res://data/nine-patch-round.png" id="1_bdojw"] +[ext_resource type="Script" path="res://scenes/контроль/кассета.gd" id="2_csgh4"] +[ext_resource type="PackedScene" uid="uid://p2suppildvq0" path="res://scenes/контроль/элемент-в.tscn" id="3_wtlpi"] + +[node name="kasseta_u5" type="NinePatchRect"] +offset_right = 310.0 +offset_bottom = 190.0 +texture = ExtResource("1_bdojw") +patch_margin_left = 16 +patch_margin_top = 16 +patch_margin_right = 16 +patch_margin_bottom = 16 +script = ExtResource("2_csgh4") + +[node name="lbl_fname" type="Label" parent="."] +self_modulate = Color(1, 1, 1, 0.62) +layout_mode = 0 +offset_left = 5.0 +offset_top = 7.0 +offset_right = 305.0 +offset_bottom = 35.0 +text = "Кассета" +horizontal_alignment = 1 +vertical_alignment = 1 + +[node name="ref_A31" parent="." instance=ExtResource("3_wtlpi")] +offset_left = 5.0 +offset_top = 32.0 +offset_right = 55.0 +offset_bottom = 182.0 +fname = "ИП5-25" +rname = "A31" + +[node name="ref_A37" parent="." instance=ExtResource("3_wtlpi")] +offset_left = 55.0 +offset_top = 32.0 +offset_right = 105.0 +offset_bottom = 182.0 +fname = "ЯУ-07Б" +rname = "A37" + +[node name="ref_A33" parent="." instance=ExtResource("3_wtlpi")] +offset_left = 105.0 +offset_top = 32.0 +offset_right = 155.0 +offset_bottom = 182.0 +fname = "ЭМС-Г" +rname = "A33" + +[node name="ref_A34" parent="." instance=ExtResource("3_wtlpi")] +offset_left = 155.0 +offset_top = 32.0 +offset_right = 205.0 +offset_bottom = 182.0 +fname = "УГ" +rname = "A34" + +[node name="ref_A35" parent="." instance=ExtResource("3_wtlpi")] +offset_left = 205.0 +offset_top = 32.0 +offset_right = 255.0 +offset_bottom = 182.0 +fname = "УКП" +rname = "A35" + +[node name="ref_A36" parent="." instance=ExtResource("3_wtlpi")] +offset_left = 254.0 +offset_top = 32.0 +offset_right = 304.0 +offset_bottom = 182.0 +fname = "УКП" +rname = "A36" diff --git a/scenes/контроль/кассета-у-5.tscn b/scenes/контроль/кассета-у-5-нв.tscn similarity index 95% rename from scenes/контроль/кассета-у-5.tscn rename to scenes/контроль/кассета-у-5-нв.tscn index 61cab59e..99f06312 100644 --- a/scenes/контроль/кассета-у-5.tscn +++ b/scenes/контроль/кассета-у-5-нв.tscn @@ -31,7 +31,7 @@ offset_top = 32.0 offset_right = 55.0 offset_bottom = 182.0 fname = "ИП5-25" -rname = "A31" +rname = "A24" [node name="ref_A37" parent="." instance=ExtResource("3_picsk")] offset_left = 55.0 @@ -39,7 +39,7 @@ offset_top = 32.0 offset_right = 105.0 offset_bottom = 182.0 fname = "ЯУ-07Б" -rname = "A37" +rname = "A30" [node name="ref_A33" parent="." instance=ExtResource("3_picsk")] offset_left = 105.0 @@ -47,7 +47,7 @@ offset_top = 32.0 offset_right = 155.0 offset_bottom = 182.0 fname = "ЭМС-Г" -rname = "A33" +rname = "A26" [node name="ref_A34" parent="." instance=ExtResource("3_picsk")] offset_left = 155.0 @@ -55,7 +55,7 @@ offset_top = 32.0 offset_right = 205.0 offset_bottom = 182.0 fname = "УГ" -rname = "A34" +rname = "A27" [node name="ref_A35" parent="." instance=ExtResource("3_picsk")] offset_left = 205.0 @@ -63,7 +63,7 @@ offset_top = 32.0 offset_right = 255.0 offset_bottom = 182.0 fname = "УКП" -rname = "A35" +rname = "A29" [node name="ref_A36" parent="." instance=ExtResource("3_picsk")] offset_left = 254.0 @@ -71,4 +71,4 @@ offset_top = 32.0 offset_right = 304.0 offset_bottom = 182.0 fname = "УКП" -rname = "A36" +rname = "A28" diff --git a/scripts/repnetwork.gd b/scripts/repnetwork.gd index 14408ad9..2103139e 100644 --- a/scripts/repnetwork.gd +++ b/scripts/repnetwork.gd @@ -84,7 +84,7 @@ func _ready() -> void: dst_ports[unit_key] = settings[2][1] else: dst_ports[unit_key] = settings[2][0] - + if proto in TCP_PROTO: var unit = TCP_PROTO[proto].new(unit_name) var unit_key = repsettings.get_unit_key(unit_name) @@ -94,7 +94,7 @@ func _ready() -> void: unit.connect('command_fail', Callable(logger_page, 'on_command_fail').bind(unit_key)) tcp_sockets.append([create_tcpsocket('уарэп-5п28'), units_tcp[repsettings.get_unit_key('уарэп-5п28')]]) - + for key in units: log.info('%s %s:%d' % [units[key].name, key[0], key[1]]) for key in units_tcp: log.info('%s %s:%d' % [units_tcp[key].name, key[0], key[1]]) for key in dst_ports: diff --git a/scripts/repsettings.gd b/scripts/repsettings.gd index dced683f..1ab93814 100644 --- a/scripts/repsettings.gd +++ b/scripts/repsettings.gd @@ -26,7 +26,7 @@ class_name rep_settings extends Node # Название | Протокол | Адрес | Порт получения | Порт отправки | Комментарий 'уарэп-щ3': ['udp-json-mbcs', '127.0.0.1', [48000, 44100], false, true, 'IP-адрес и порты через которые производят обмен сообщения с драйвером клиента Modbus Serial'], - + # Название | Протокол | Имя порта | Скорость, бод | Чётность | Комментарий 'уарэп-спт25-1': ['uart', '/dev/tty2', 115200, false, 'Адрес прибора СПТ-25 (G1)'], 'уарэп-спт25-2': ['uart', '/dev/tty3', 115200, false, 'Адрес прибора СПТ-25 (G2)'],