From ccbf5fa368bd591d5b58f7ec42e1e923ac0fcdd2 Mon Sep 17 00:00:00 2001 From: Maxim Date: Wed, 29 Jan 2025 07:29:27 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=BE=D1=80=D1=80=D0=B5=D0=BA=D1=82?= =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B0=20=D0=BA=D0=BE=D0=BD=D1=82?= =?UTF-8?q?=D1=80=D0=BE=D0=BB=D1=8C=20=D0=BF=D0=B0=D0=BD=D0=B5=D0=BB=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PRD_MP550.tscn | 246 ++++++++++++++++++++++++++++--------------- kasseta-fs-kd.tscn | 50 +-------- scripts/FS.gd | 119 +++++++++++++++------ scripts/PRD.gd | 51 ++++----- scripts/constants.gd | 32 ++++-- scripts/ems_g.gd | 4 +- scripts/modul_fs.gd | 1 - 7 files changed, 296 insertions(+), 207 deletions(-) diff --git a/PRD_MP550.tscn b/PRD_MP550.tscn index 284b086..4d259da 100644 --- a/PRD_MP550.tscn +++ b/PRD_MP550.tscn @@ -416,6 +416,15 @@ text = "ДКМ ДОУ 3" [node name="Ray_set2" type="OptionButton" parent="TabContainer/PRD/Grid"] layout_mode = 2 +[node name="data_from_dev" type="Label" parent="TabContainer/PRD"] +layout_mode = 0 +offset_left = 48.0 +offset_top = 658.0 +offset_right = 1464.0 +offset_bottom = 810.0 +text = "From dev: " +autowrap_mode = 2 + [node name="ControlPanel" type="Panel" parent="TabContainer"] visible = false layout_mode = 2 @@ -434,11 +443,11 @@ text = "Контроль исправности прибора ПРД-Н" horizontal_alignment = 1 vertical_alignment = 1 -[node name="sockets" type="NinePatchRect" parent="TabContainer/ControlPanel"] +[node name="soc_y5" type="NinePatchRect" parent="TabContainer/ControlPanel"] layout_mode = 0 -offset_left = 536.0 +offset_left = 199.0 offset_top = 103.0 -offset_right = 840.0 +offset_right = 516.0 offset_bottom = 293.0 texture = ExtResource("9_0r2qk") patch_margin_left = 16 @@ -446,72 +455,140 @@ patch_margin_top = 16 patch_margin_right = 16 patch_margin_bottom = 16 -[node name="ref_A26" parent="TabContainer/ControlPanel/sockets" instance=ExtResource("11_fg7ul")] -offset_left = 5.0 +[node name="ref_A24" parent="TabContainer/ControlPanel/soc_y5" instance=ExtResource("11_fg7ul")] +offset_left = 9.0 offset_top = 34.0 -offset_right = 55.0 +offset_right = 59.0 +offset_bottom = 184.0 +textures = Array[Texture]([]) +fname = "ИП-25" +rname = "A24" +metadata/_edit_lock_ = true + +[node name="ref_A30" parent="TabContainer/ControlPanel/soc_y5" instance=ExtResource("11_fg7ul")] +offset_left = 59.0 +offset_top = 34.0 +offset_right = 109.0 offset_bottom = 184.0 textures = Array[Texture]([]) fname = "ЯУ-07" +rname = "A30" metadata/_edit_lock_ = true -[node name="ref_A23" parent="TabContainer/ControlPanel/sockets" instance=ExtResource("11_fg7ul")] -offset_left = 53.0 +[node name="ref_A26" parent="TabContainer/ControlPanel/soc_y5" instance=ExtResource("11_fg7ul")] +offset_left = 109.0 offset_top = 34.0 -offset_right = 103.0 +offset_right = 159.0 offset_bottom = 184.0 textures = Array[Texture]([]) fname = "ЭМС-Г" +rname = "A26" metadata/_edit_lock_ = true -[node name="ref_A24" parent="TabContainer/ControlPanel/sockets" instance=ExtResource("11_fg7ul")] -offset_left = 104.0 +[node name="ref_A27" parent="TabContainer/ControlPanel/soc_y5" instance=ExtResource("11_fg7ul")] +offset_left = 159.0 offset_top = 34.0 -offset_right = 154.0 +offset_right = 209.0 offset_bottom = 184.0 textures = Array[Texture]([]) fname = "УГ" +rname = "A27" metadata/_edit_lock_ = true -[node name="ref_A25" parent="TabContainer/ControlPanel/sockets" instance=ExtResource("11_fg7ul")] -offset_left = 154.0 -offset_top = 33.0 -offset_right = 204.0 +[node name="ref_A28" parent="TabContainer/ControlPanel/soc_y5" instance=ExtResource("11_fg7ul")] +offset_left = 209.0 +offset_top = 34.0 +offset_right = 259.0 offset_bottom = 183.0 textures = Array[Texture]([]) +self_size = Vector2i(50, 149) fname = "УКП-1" +rname = "A28" metadata/_edit_lock_ = true -[node name="ref_A27" parent="TabContainer/ControlPanel/sockets" instance=ExtResource("11_fg7ul")] -offset_left = 205.0 -offset_top = 33.0 -offset_right = 255.0 -offset_bottom = 183.0 +[node name="ref_A29" parent="TabContainer/ControlPanel/soc_y5" instance=ExtResource("11_fg7ul")] +offset_left = 259.0 +offset_top = 34.0 +offset_right = 309.0 +offset_bottom = 184.0 textures = Array[Texture]([]) fname = "УКП-2" +rname = "A29" metadata/_edit_lock_ = true -[node name="lbl_fname" type="Label" parent="TabContainer/ControlPanel/sockets"] +[node name="lbl_fname" type="Label" parent="TabContainer/ControlPanel/soc_y5"] self_modulate = Color(1, 1, 1, 0.62) layout_mode = 0 offset_left = 7.0 offset_top = 8.0 -offset_right = 291.0 +offset_right = 309.0 offset_bottom = 33.0 -text = "Ячейки" +text = "Кассета У5" +horizontal_alignment = 1 +vertical_alignment = 1 + +[node name="soc_fs-nkvd" parent="TabContainer/ControlPanel" instance=ExtResource("10_tdh2s")] +layout_mode = 0 +offset_left = 198.0 +offset_top = 311.0 +offset_right = 516.0 +offset_bottom = 538.0 +script = null + +[node name="lbl_fname" type="Label" parent="TabContainer/ControlPanel/soc_fs-nkvd"] +self_modulate = Color(1, 1, 1, 0.62) +layout_mode = 0 +offset_left = 7.0 +offset_top = 8.0 +offset_right = 299.0 +offset_bottom = 33.0 +text = "Кассета ФС-НД" horizontal_alignment = 1 vertical_alignment = 1 metadata/_edit_lock_ = true -[node name="kasseta_fs_kd" parent="TabContainer/ControlPanel" instance=ExtResource("10_tdh2s")] -layout_mode = 0 -offset_left = 297.0 -offset_top = 311.0 -offset_right = 515.0 -offset_bottom = 538.0 -script = null +[node name="ref_A3" parent="TabContainer/ControlPanel/soc_fs-nkvd" instance=ExtResource("11_fg7ul")] +offset_left = 109.0 +offset_top = 68.0 +offset_right = 159.0 +offset_bottom = 218.0 +textures = Array[Texture]([]) +fname = "ФС-2" +rname = "A3" +metadata/_edit_lock_ = true -[node name="kasseta_p_1" type="NinePatchRect" parent="TabContainer/ControlPanel"] +[node name="ref_A1" parent="TabContainer/ControlPanel/soc_fs-nkvd" instance=ExtResource("11_fg7ul")] +offset_left = 159.0 +offset_top = 68.0 +offset_right = 209.0 +offset_bottom = 218.0 +textures = Array[Texture]([]) +fname = "Модуль" +rname = "A1" +metadata/_edit_lock_ = true + +[node name="ref_A2" parent="TabContainer/ControlPanel/soc_fs-nkvd" instance=ExtResource("11_fg7ul")] +offset_left = 209.0 +offset_top = 68.0 +offset_right = 259.0 +offset_bottom = 217.0 +textures = Array[Texture]([]) +self_size = Vector2i(50, 149) +fname = "Модуль" +rname = "A2" +metadata/_edit_lock_ = true + +[node name="ref_A4" parent="TabContainer/ControlPanel/soc_fs-nkvd" instance=ExtResource("11_fg7ul")] +offset_left = 259.0 +offset_top = 68.0 +offset_right = 309.0 +offset_bottom = 218.0 +textures = Array[Texture]([]) +fname = "ФС-3" +rname = "A4" +metadata/_edit_lock_ = true + +[node name="soc_P1" type="NinePatchRect" parent="TabContainer/ControlPanel"] layout_mode = 0 offset_left = 96.0 offset_top = 560.0 @@ -523,7 +600,7 @@ patch_margin_top = 16 patch_margin_right = 16 patch_margin_bottom = 16 -[node name="lbl_fname" type="Label" parent="TabContainer/ControlPanel/kasseta_p_1"] +[node name="lbl_fname" type="Label" parent="TabContainer/ControlPanel/soc_P1"] self_modulate = Color(1, 1, 1, 0.62) layout_mode = 0 offset_left = 7.0 @@ -535,7 +612,7 @@ horizontal_alignment = 1 vertical_alignment = 1 metadata/_edit_lock_ = true -[node name="ref_A23" parent="TabContainer/ControlPanel/kasseta_p_1" instance=ExtResource("11_fg7ul")] +[node name="ref_A23" parent="TabContainer/ControlPanel/soc_P1" instance=ExtResource("11_fg7ul")] offset_left = 9.0 offset_top = 34.0 offset_right = 59.0 @@ -544,7 +621,7 @@ textures = Array[Texture]([]) self_size = Vector2i(50, 174) metadata/_edit_lock_ = true -[node name="ref_A24" parent="TabContainer/ControlPanel/kasseta_p_1" instance=ExtResource("11_fg7ul")] +[node name="ref_A24" parent="TabContainer/ControlPanel/soc_P1" instance=ExtResource("11_fg7ul")] offset_left = 59.0 offset_top = 34.0 offset_right = 109.0 @@ -553,7 +630,7 @@ textures = Array[Texture]([]) self_size = Vector2i(50, 174) metadata/_edit_lock_ = true -[node name="ref_A25" parent="TabContainer/ControlPanel/kasseta_p_1" instance=ExtResource("11_fg7ul")] +[node name="ref_A25" parent="TabContainer/ControlPanel/soc_P1" instance=ExtResource("11_fg7ul")] offset_left = 109.0 offset_top = 34.0 offset_right = 159.0 @@ -562,7 +639,7 @@ textures = Array[Texture]([]) self_size = Vector2i(50, 174) metadata/_edit_lock_ = true -[node name="ref_A26" parent="TabContainer/ControlPanel/kasseta_p_1" instance=ExtResource("11_fg7ul")] +[node name="ref_A26" parent="TabContainer/ControlPanel/soc_P1" instance=ExtResource("11_fg7ul")] offset_left = 159.0 offset_top = 34.0 offset_right = 209.0 @@ -571,7 +648,7 @@ textures = Array[Texture]([]) self_size = Vector2i(50, 174) metadata/_edit_lock_ = true -[node name="ref_A27" parent="TabContainer/ControlPanel/kasseta_p_1" instance=ExtResource("11_fg7ul")] +[node name="ref_A27" parent="TabContainer/ControlPanel/soc_P1" instance=ExtResource("11_fg7ul")] offset_left = 209.0 offset_top = 34.0 offset_right = 259.0 @@ -580,7 +657,7 @@ textures = Array[Texture]([]) self_size = Vector2i(50, 174) metadata/_edit_lock_ = true -[node name="ref_A28" parent="TabContainer/ControlPanel/kasseta_p_1" instance=ExtResource("11_fg7ul")] +[node name="ref_A28" parent="TabContainer/ControlPanel/soc_P1" instance=ExtResource("11_fg7ul")] offset_left = 259.0 offset_top = 34.0 offset_right = 309.0 @@ -589,7 +666,7 @@ textures = Array[Texture]([]) self_size = Vector2i(50, 174) metadata/_edit_lock_ = true -[node name="ref_A29" parent="TabContainer/ControlPanel/kasseta_p_1" instance=ExtResource("11_fg7ul")] +[node name="ref_A29" parent="TabContainer/ControlPanel/soc_P1" instance=ExtResource("11_fg7ul")] offset_left = 309.0 offset_top = 34.0 offset_right = 359.0 @@ -598,7 +675,7 @@ textures = Array[Texture]([]) self_size = Vector2i(50, 174) metadata/_edit_lock_ = true -[node name="ref_A30" parent="TabContainer/ControlPanel/kasseta_p_1" instance=ExtResource("11_fg7ul")] +[node name="ref_A30" parent="TabContainer/ControlPanel/soc_P1" instance=ExtResource("11_fg7ul")] offset_left = 359.0 offset_top = 34.0 offset_right = 409.0 @@ -608,36 +685,12 @@ self_size = Vector2i(50, 174) rname = "A30" metadata/_edit_lock_ = true -[node name="ref_ZZ3" type="NinePatchRect" parent="TabContainer/ControlPanel"] -layout_mode = 0 -offset_left = 536.0 -offset_top = 562.0 -offset_right = 997.0 -offset_bottom = 776.0 -texture = ExtResource("9_0r2qk") -patch_margin_left = 16 -patch_margin_top = 16 -patch_margin_right = 16 -patch_margin_bottom = 16 - -[node name="label" type="Label" parent="TabContainer/ControlPanel/ref_ZZ3"] -self_modulate = Color(0.996078, 1, 1, 0.627451) -layout_mode = 0 -offset_left = 8.0 -offset_top = 8.0 -offset_right = 453.0 -offset_bottom = 206.0 -text = "Панель -предохранителей" -horizontal_alignment = 1 -vertical_alignment = 1 - [node name="Signal_EMS_G" type="NinePatchRect" parent="TabContainer/ControlPanel"] layout_mode = 0 offset_left = 536.0 -offset_top = 311.0 -offset_right = 996.0 -offset_bottom = 538.0 +offset_top = 550.0 +offset_right = 1055.0 +offset_bottom = 777.0 texture = ExtResource("9_0r2qk") patch_margin_left = 16 patch_margin_top = 16 @@ -649,83 +702,102 @@ self_modulate = Color(1, 1, 1, 0.62) layout_mode = 0 offset_left = 7.0 offset_top = 8.0 -offset_right = 448.0 +offset_right = 508.0 offset_bottom = 33.0 text = "ЭМС-Г" horizontal_alignment = 1 vertical_alignment = 1 +metadata/_edit_lock_ = true [node name="ref_A22" parent="TabContainer/ControlPanel/Signal_EMS_G" instance=ExtResource("11_d60jk")] -offset_left = 8.0 +offset_left = 9.0 offset_top = 38.0 -offset_right = 58.0 +offset_right = 59.0 offset_bottom = 216.0 self_size = Vector2i(50, 178) rname = "A22" +metadata/_edit_lock_ = true [node name="ref_A23" parent="TabContainer/ControlPanel/Signal_EMS_G" instance=ExtResource("11_d60jk")] -offset_left = 57.0 +offset_left = 59.0 offset_top = 38.0 -offset_right = 107.0 +offset_right = 109.0 offset_bottom = 216.0 self_size = Vector2i(50, 178) rname = "A23" +metadata/_edit_lock_ = true [node name="ref_A26" parent="TabContainer/ControlPanel/Signal_EMS_G" instance=ExtResource("11_d60jk")] -offset_left = 106.0 +offset_left = 109.0 offset_top = 38.0 -offset_right = 156.0 +offset_right = 159.0 offset_bottom = 216.0 self_size = Vector2i(50, 178) rname = "A26" +metadata/_edit_lock_ = true [node name="ref_A27" parent="TabContainer/ControlPanel/Signal_EMS_G" instance=ExtResource("11_d60jk")] -offset_left = 155.0 +offset_left = 159.0 offset_top = 38.0 -offset_right = 205.0 +offset_right = 209.0 offset_bottom = 216.0 self_size = Vector2i(50, 178) rname = "A27" +metadata/_edit_lock_ = true [node name="ref_A28" parent="TabContainer/ControlPanel/Signal_EMS_G" instance=ExtResource("11_d60jk")] -offset_left = 204.0 +offset_left = 209.0 offset_top = 38.0 -offset_right = 254.0 +offset_right = 259.0 offset_bottom = 216.0 self_size = Vector2i(50, 178) rname = "A28" +metadata/_edit_lock_ = true [node name="ref_A29" parent="TabContainer/ControlPanel/Signal_EMS_G" instance=ExtResource("11_d60jk")] -offset_left = 254.0 +offset_left = 259.0 offset_top = 38.0 -offset_right = 304.0 +offset_right = 309.0 offset_bottom = 216.0 self_size = Vector2i(50, 178) rname = "A29" +metadata/_edit_lock_ = true [node name="ref_A31" parent="TabContainer/ControlPanel/Signal_EMS_G" instance=ExtResource("11_d60jk")] -offset_left = 304.0 +offset_left = 309.0 offset_top = 38.0 -offset_right = 354.0 +offset_right = 359.0 offset_bottom = 216.0 self_size = Vector2i(50, 178) rname = "УМ2" +metadata/_edit_lock_ = true [node name="ref_A32" parent="TabContainer/ControlPanel/Signal_EMS_G" instance=ExtResource("11_d60jk")] -offset_left = 354.0 +offset_left = 359.0 offset_top = 38.0 -offset_right = 404.0 +offset_right = 409.0 offset_bottom = 216.0 self_size = Vector2i(50, 178) rname = "УМ3" +metadata/_edit_lock_ = true [node name="ref_A33" parent="TabContainer/ControlPanel/Signal_EMS_G" instance=ExtResource("11_d60jk")] -offset_left = 405.0 +offset_left = 409.0 offset_top = 38.0 -offset_right = 455.0 +offset_right = 459.0 offset_bottom = 216.0 self_size = Vector2i(50, 178) rname = "A33" +metadata/_edit_lock_ = true + +[node name="ref_A34" parent="TabContainer/ControlPanel/Signal_EMS_G" instance=ExtResource("11_d60jk")] +offset_left = 459.0 +offset_top = 38.0 +offset_right = 509.0 +offset_bottom = 216.0 +self_size = Vector2i(50, 178) +rname = "A33" +metadata/_edit_lock_ = true [node name="EMS_G" type="Panel" parent="TabContainer"] visible = false diff --git a/kasseta-fs-kd.tscn b/kasseta-fs-kd.tscn index 6dea7de..20c9779 100644 --- a/kasseta-fs-kd.tscn +++ b/kasseta-fs-kd.tscn @@ -1,8 +1,7 @@ -[gd_scene load_steps=4 format=3 uid="uid://bdb0bhfu7366l"] +[gd_scene load_steps=3 format=3 uid="uid://bdb0bhfu7366l"] [ext_resource type="Texture2D" uid="uid://cgtg4gbqnuxrc" path="res://nine-patch-round.png" id="1_1jljp"] [ext_resource type="Script" path="res://scripts/кассета.gd" id="2_20xal"] -[ext_resource type="PackedScene" uid="uid://p2suppildvq0" path="res://table/элемент-в.tscn" id="3_kqnvt"] [node name="kasseta_fs_kd" type="NinePatchRect"] offset_top = -32.0 @@ -15,50 +14,3 @@ patch_margin_right = 16 patch_margin_bottom = 16 script = ExtResource("2_20xal") metadata/Fname = "" - -[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 = 218.0 -offset_bottom = 33.0 -text = "Кассета ФС" -horizontal_alignment = 1 -vertical_alignment = 1 - -[node name="ref_A4" parent="." instance=ExtResource("3_kqnvt")] -offset_left = 9.0 -offset_top = 39.0 -offset_right = 59.0 -offset_bottom = 215.0 -self_size = Vector2i(50, 176) -fname = "Модуль ФС" -rname = "A2" - -[node name="ref_A6" parent="." instance=ExtResource("3_kqnvt")] -offset_left = 59.0 -offset_top = 39.0 -offset_right = 109.0 -offset_bottom = 215.0 -self_size = Vector2i(50, 176) -fname = "Блок ФС-6" -rname = "A5" - -[node name="ref_A5" parent="." instance=ExtResource("3_kqnvt")] -offset_left = 109.0 -offset_top = 39.0 -offset_right = 159.0 -offset_bottom = 215.0 -self_size = Vector2i(50, 176) -fname = "Модуль ФС" -rname = "A3" - -[node name="ref_A7" parent="." instance=ExtResource("3_kqnvt")] -offset_left = 159.0 -offset_top = 39.0 -offset_right = 209.0 -offset_bottom = 215.0 -self_size = Vector2i(50, 176) -fname = "Блок ФС-2" -rname = "A6" diff --git a/scripts/FS.gd b/scripts/FS.gd index 2f3d68b..11e45f5 100644 --- a/scripts/FS.gd +++ b/scripts/FS.gd @@ -1,38 +1,7 @@ extends Node -const CRC32_TABLE: Array = [ - 0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3, - 0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91, - 0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE, 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7, - 0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5, - 0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172, 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B, - 0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59, - 0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F, - 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, 0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D, - 0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433, - 0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01, - 0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457, - 0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65, - 0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB, - 0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0, 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9, - 0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F, - 0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD, - 0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, 0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683, - 0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8, 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1, - 0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7, - 0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC, 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5, - 0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B, - 0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79, - 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, 0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F, - 0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D, - 0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713, - 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21, - 0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777, - 0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45, - 0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2, 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB, - 0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9, - 0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF, - 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94, 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D] +const ONLINE_TIMEOUT = 5.0 ## Время ожидания пакета от ячейки, секунды +const RETRY_COUNT = 5 ## Количество повторных отправок ## Блок управления ФС @@ -64,13 +33,52 @@ class FGOS: FAIL ## Команда не выполнена } + const CRC32_TABLE: Array = [ + 0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3, + 0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91, + 0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE, 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7, + 0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5, + 0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172, 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B, + 0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59, + 0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F, + 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, 0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D, + 0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433, + 0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01, + 0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457, + 0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65, + 0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB, + 0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0, 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9, + 0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F, + 0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD, + 0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, 0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683, + 0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8, 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1, + 0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7, + 0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC, 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5, + 0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B, + 0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79, + 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, 0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F, + 0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D, + 0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713, + 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21, + 0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777, + 0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45, + 0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2, 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB, + 0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9, + 0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF, + 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94, 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D] const INDEX_SIZE: int = 0xC const GROUP_OFFSET: int = 0x0 const CMD_OFFSET: int = 0x1 const COUNTER_OFFSET: int = 0x4 const PAYLOAD_OFFSET: int = 0x8 + + signal line_changed(unit: FGOS) ## Вызывается когда меняется состояние связи с ячейкой + var counter: int = 0 + var online: bool = false ## Состояние связи с ячейкой + var status: = PackedByteArray() ## Поле "состояние прибора" + #var fgos_data = {} ## Результат выполнения команды "читать порт" func crc32(data: PackedByteArray) -> int: @@ -102,8 +110,49 @@ class FGOS: Network.command_stack.append(packet) - func _parse_data(data: PackedByteArray): - pass + func _parse(rx_data: PackedByteArray): + + if not online: + online = true + emit_signal('line_changed', self) + + + var status_len = rx_data.decode_u16(6) # Длина массива байтового "состояние прибора" + + var i: = 0 + var len_rx_data: = rx_data.size() + status.resize(status_len) + while i < status_len: + var byte_i = i + 8 + if byte_i < len_rx_data: + status[i] = rx_data[byte_i] # Массив байтовый "состояние прибора" + i += 1 + emit_signal('data_received', self) + + + #var GRP = data.decode_u8(0x0) + #var CMD = data.decode_u8(0x1) + #match CMD: + #Constants.CMD.READ_CARRIER: + #if GRP == Constants.GROUP.BASE: + #$manage_panel/get_freq/freq_ind.text = str(data.decode_u64(0xC)) + ' Гц' + #Constants.CMD.READ_ATT: + #if GRP == Constants.GROUP.RF: + #$manage_panel/get_att/att_ind.text = '-' + str(data.decode_float(0x18)) + ' dB' + #Constants.CMD.READ_GEN_STATUS: + #if GRP == Constants.GROUP.GENERATOR: + #if data.decode_u32(0xC) == 0: + #$manage_panel/get_gen_status/status_ind.text = 'Включен' + #$manage_panel/get_gen_status/status_ind.modulate = Color.GREEN + #else: + #$manage_panel/get_gen_status/status_ind.text = 'Выключен' + #$manage_panel/get_gen_status/status_ind.modulate = Color.RED + #Constants.CMD.BASE_GET_CURRENT_TEMP: + #if GRP == Constants.GROUP.BASE: + #$temp_1.text = '%.2f' % data.decode_float(0xC) + ' °C' + #$temp_2.text = str(data.decode_float(0x10)) + ' °C' + #$temp_3.text = str(data.decode_float(0x14)) + ' °C' + #$read.text = str(data.hex_encode()) func start_session(): diff --git a/scripts/PRD.gd b/scripts/PRD.gd index 8d92402..14b7081 100644 --- a/scripts/PRD.gd +++ b/scripts/PRD.gd @@ -45,7 +45,7 @@ func _ready() -> void: $TabContainer/PRD/Grid/Ray_set.add_item(key) $TabContainer/PRD/Grid/Ray_set2.add_item(key) - draw_panel_prd(Constants.ADDRESSES[0][3]) + draw_control_panel_prd(Constants.ADDRESSES[0][3]) $TabContainer/PRD/Grid/Zapret.connect('toggled', Callable(self, '_on_zapret').bind($TabContainer/PRD/Grid/Zapret)) $TabContainer/PRD/Grid/Zapret2.connect('toggled', Callable(self, '_on_zapret').bind($TabContainer/PRD/Grid/Zapret2)) @@ -56,7 +56,7 @@ func _ready() -> void: Network.connect('yau_read_isa', Callable(self, '_on_read_isa')) -func draw_panel_prd(mode) -> void: +func draw_control_panel_prd(mode) -> void: for node_path in Constants.NODE_MAP: var index = Constants.NODE_MAP[node_path] var node = get_node(node_path) @@ -71,14 +71,13 @@ func draw_panel_prd(mode) -> void: ## From Network status about yau-07 func _on_yau_status(yau_status: bool) -> void: if yau_status: - $TabContainer/ControlPanel/sockets/ref_A26/light_ind.button_pressed = true - $TabContainer/ControlPanel/sockets/ref_A26/light_ind.disabled = false + $TabContainer/ControlPanel/soc_y5/ref_A30/light_ind.button_pressed = true + $TabContainer/ControlPanel/soc_y5/ref_A30/light_ind.disabled = false flag_yau_control = true else: - $TabContainer/ControlPanel/sockets/ref_A26/light_ind.button_pressed = false - $TabContainer/ControlPanel/sockets/ref_A26/light_ind.disabled = true - #for dev in (Constants.CONTROL_DEVICE.size() - 1): - + $TabContainer/ControlPanel/soc_y5/ref_A30/light_ind.button_pressed = false + $TabContainer/ControlPanel/soc_y5/ref_A30/light_ind.disabled = true + flag_yau_control = false @@ -121,6 +120,7 @@ func _process(_delta: float) -> void: func _on_data_received(data_from_yau_07): + $TabContainer/PRD/data_from_dev.text = 'From dev: %s' % data_from_yau_07 if flag_yau_control: var status_board = data_from_yau_07.decode_u8(Constants.DataIndices.STATUS_BOARD) var dry_contact: int = data_from_yau_07.decode_u16(Constants.DataIndices.DRY_CONTACT) # Контроль сухих контактов (УГ) @@ -132,10 +132,10 @@ func _on_data_received(data_from_yau_07): ## SOCKETS BOARDS for i in 4: - var sockets_ind = [$TabContainer/ControlPanel/sockets/ref_A23/light_ind, - $TabContainer/ControlPanel/sockets/ref_A24/light_ind, - $TabContainer/ControlPanel/sockets/ref_A25/light_ind, - $TabContainer/ControlPanel/sockets/ref_A27/light_ind] + var sockets_ind = [$TabContainer/ControlPanel/soc_y5/ref_A26/light_ind, + $TabContainer/ControlPanel/soc_y5/ref_A27/light_ind, + $TabContainer/ControlPanel/soc_y5/ref_A28/light_ind, + $TabContainer/ControlPanel/soc_y5/ref_A29/light_ind] var j = int(status_board & (1 << i) == 0 and flag_yau_control) if j == 0: sockets_ind[i].button_pressed = true @@ -146,14 +146,14 @@ func _on_data_received(data_from_yau_07): ## Блок ИП for i in 8: - var node_power_ind = [$TabContainer/ControlPanel/kasseta_p_1/ref_A23/light_ind, - $TabContainer/ControlPanel/kasseta_p_1/ref_A24/light_ind, - $TabContainer/ControlPanel/kasseta_p_1/ref_A25/light_ind, - $TabContainer/ControlPanel/kasseta_p_1/ref_A26/light_ind, - $TabContainer/ControlPanel/kasseta_p_1/ref_A27/light_ind, - $TabContainer/ControlPanel/kasseta_p_1/ref_A28/light_ind, - $TabContainer/ControlPanel/kasseta_p_1/ref_A29/light_ind, - $TabContainer/ControlPanel/kasseta_p_1/ref_A30/light_ind] + var node_power_ind = [$TabContainer/ControlPanel/soc_P1/ref_A23/light_ind, + $TabContainer/ControlPanel/soc_P1/ref_A24/light_ind, + $TabContainer/ControlPanel/soc_P1/ref_A25/light_ind, + $TabContainer/ControlPanel/soc_P1/ref_A26/light_ind, + $TabContainer/ControlPanel/soc_P1/ref_A27/light_ind, + $TabContainer/ControlPanel/soc_P1/ref_A28/light_ind, + $TabContainer/ControlPanel/soc_P1/ref_A29/light_ind, + $TabContainer/ControlPanel/soc_y5/ref_A24/light_ind] var j = int(not(dry_contact & (1 << i) == 0 and flag_yau_control)) if j == 0: node_power_ind[i].button_pressed = true @@ -172,12 +172,13 @@ func _on_data_received(data_from_yau_07): var TMP = Constants.CONST_MIN_TEMP + (Constants.MAXIMUM_CODE_ADC - temperature_ukp_1) * Constants.TEMP node_select1.set_node_text(1, i+1, '%d' % TMP) - for i in range(8): ## Мощность от УКП_2 - var power_ukp_2 = data_from_yau_07.decode_u16(Constants.DataIndices.POWER_UKP_2 + 2 * i) - node_select2.set_node_text(0, i+1, '%d' % power_ukp_2) + for i_pow in range(8): ## Мощность от УКП_2 + if len(data_from_yau_07) > Constants.DataIndices.POWER_UKP_2 + 2 * i_pow: + var power_ukp_2 = data_from_yau_07.decode_u16(Constants.DataIndices.POWER_UKP_2 + 2 * i_pow) + node_select2.set_node_text(0, i_pow+1, '%d' % power_ukp_2) for row in range(8): ## Температура от УКП_2 - if len(data_from_yau_07) > 79 + 2 * row: + if len(data_from_yau_07) > Constants.DataIndices.TEMPERATURE_UKP_2 + 2 * row: var temperature_ukp_2 = data_from_yau_07.decode_u16(Constants.DataIndices.TEMPERATURE_UKP_2 + 2 * row) var TMP = Constants.CONST_MIN_TEMP + (Constants.MAXIMUM_CODE_ADC - temperature_ukp_2) * Constants.TEMP node_select2.set_node_text(1, row+1, '%d' % TMP) @@ -218,7 +219,7 @@ func on_btn_select(intem_from_sector: int) -> void: var meta = get_select_device.get_item_metadata(intem_from_sector) Network.on_command_change_device(meta) flag_mode = meta[2] - draw_panel_prd(flag_mode) + draw_control_panel_prd(flag_mode) func fill_item(node: Node, i_column: int, i_row: int, arr: Dictionary, select: int = 0) -> void: diff --git a/scripts/constants.gd b/scripts/constants.gd index c60d4ee..7008e0f 100644 --- a/scripts/constants.gd +++ b/scripts/constants.gd @@ -109,6 +109,10 @@ const SIGNS_PRD: Array = [ 'СИ7 от ФС', 'СИ6 в УФ', 'СИ7 в УФ', + 'Мод. УМ 6', + 'Мод. УМ 7', + 'ФГОЗ 6', + 'Мод. УМ 1', 'МАА №1', 'МАА №2', 'ИП9-50 №1', @@ -131,6 +135,10 @@ const SIGNS_PRD: Array = [ 'СИ5 от ФС', 'СИ4 в УФ', 'СИ5 в УФ', + 'Мод. УМ 4', + 'Мод. УМ 5', + 'ФГОЗ 4', + 'ФГОЗ 5', 'МАА №1', 'МАА №2', 'ИП9-50 №1', @@ -153,6 +161,10 @@ const SIGNS_PRD: Array = [ 'СИ3 от ФС', 'СИ2 в УФ', 'СИ3 в УФ', + 'Мод. УМ 2', + 'Мод. УМ 3', + 'ФГОЗ 3', + '-', 'МАА №1', 'МАА №2', 'ИП9-50 №1', @@ -174,14 +186,18 @@ var NODE_MAP = { 'TabContainer/ControlPanel/Signal_EMS_G/ref_A27': 8, 'TabContainer/ControlPanel/Signal_EMS_G/ref_A28': 9, 'TabContainer/ControlPanel/Signal_EMS_G/ref_A29': 10, - 'TabContainer/ControlPanel/kasseta_p_1/ref_A23': 11, - 'TabContainer/ControlPanel/kasseta_p_1/ref_A24': 12, - 'TabContainer/ControlPanel/kasseta_p_1/ref_A25': 13, - 'TabContainer/ControlPanel/kasseta_p_1/ref_A26': 14, - 'TabContainer/ControlPanel/kasseta_p_1/ref_A27': 15, - 'TabContainer/ControlPanel/kasseta_p_1/ref_A28': 16, - 'TabContainer/ControlPanel/kasseta_p_1/ref_A29': 17, - 'TabContainer/ControlPanel/kasseta_p_1/ref_A30': 18, + 'TabContainer/ControlPanel/Signal_EMS_G/ref_A31': 11, + 'TabContainer/ControlPanel/Signal_EMS_G/ref_A32': 12, + 'TabContainer/ControlPanel/Signal_EMS_G/ref_A33': 13, + 'TabContainer/ControlPanel/Signal_EMS_G/ref_A34': 14, + 'TabContainer/ControlPanel/soc_P1/ref_A23': 15, + 'TabContainer/ControlPanel/soc_P1/ref_A24': 16, + 'TabContainer/ControlPanel/soc_P1/ref_A25': 17, + 'TabContainer/ControlPanel/soc_P1/ref_A26': 18, + 'TabContainer/ControlPanel/soc_P1/ref_A27': 19, + 'TabContainer/ControlPanel/soc_P1/ref_A28': 20, + 'TabContainer/ControlPanel/soc_P1/ref_A29': 21, + 'TabContainer/ControlPanel/soc_P1/ref_A30': 22, } enum MODE { PRD_K, diff --git a/scripts/ems_g.gd b/scripts/ems_g.gd index d293de6..ce8a574 100644 --- a/scripts/ems_g.gd +++ b/scripts/ems_g.gd @@ -98,7 +98,7 @@ func _on_data_received(data_from_yau_07): var parent_node2 = get_parent().get_parent() process_sockets_vert(in_blank, in_imp, 16, 1, parent_node2) - process_sockets_horizon(out_blank, out_imp, 16, 2, parent_node2) + #process_sockets_horizon(out_blank, out_imp, 16, 2, parent_node2) func process_sockets_horizon(blank: int, imp: int, count: int, col: int, parent_node2: Node): @@ -148,7 +148,7 @@ func process_sockets_vert(blank: int, imp: int, count: int, col: int, parent_nod func get_specific_node(parent_node2: Node, child_index: int)-> Node: - return parent_node2.get_child(3, false).get_child(1).get_child(5).get_child(child_index).get_child(3) + return parent_node2.get_child(3, false).get_child(1).get_child(4).get_child(child_index).get_child(3) func _process(_delta: float) -> void: diff --git a/scripts/modul_fs.gd b/scripts/modul_fs.gd index 50fc385..a102c00 100644 --- a/scripts/modul_fs.gd +++ b/scripts/modul_fs.gd @@ -66,7 +66,6 @@ func _on_get_att() -> void: func _on_start(): - #Network.disconnect_fs(Network.client_fs_1) unit_fs.start_session() unit_fs.base_get_current_temp()