diff --git a/PRD_MP550.tscn b/PRD_MP550.tscn index 9dcfdb1..a6d11e2 100644 --- a/PRD_MP550.tscn +++ b/PRD_MP550.tscn @@ -806,25 +806,26 @@ script = ExtResource("2_vmbyo") [node name="load_boadr" type="ColorRect" parent="TabContainer/EMS_G"] layout_mode = 0 -offset_left = 27.0 -offset_top = 148.0 -offset_right = 1596.0 -offset_bottom = 717.0 +offset_left = 35.0 +offset_top = 58.0 +offset_right = 1604.0 +offset_bottom = 782.0 color = Color(0, 0, 0, 0.596078) +metadata/_edit_lock_ = true [node name="load" type="Sprite2D" parent="TabContainer/EMS_G/load_boadr"] material = SubResource("ShaderMaterial_slcfo") -position = Vector2(786, 284.5) -scale = Vector2(24.4688, 8.89063) +position = Vector2(785.001, 361.5) +scale = Vector2(24.5313, 11.2656) texture = SubResource("GradientTexture2D_0pk2o") metadata/_edit_lock_ = true [node name="Load_text" type="Label" parent="TabContainer/EMS_G/load_boadr"] layout_mode = 0 offset_left = 693.0 -offset_top = 277.0 +offset_top = 341.0 offset_right = 849.0 -offset_bottom = 316.0 +offset_bottom = 380.0 theme_override_colors/font_color = Color(1, 1, 1, 1) theme_override_colors/font_shadow_color = Color(0.427493, 0.427493, 0.427493, 1) theme_override_font_sizes/font_size = 28 diff --git a/scripts/FS.gd b/scripts/FS.gd index a1f4219..bb8f0b0 100644 --- a/scripts/FS.gd +++ b/scripts/FS.gd @@ -71,7 +71,8 @@ class FGOS: const CMD_OFFSET: int = 0x1 const COUNTER_OFFSET: int = 0x4 const PAYLOAD_OFFSET: int = 0x8 - + const INIT: int = 0xFFFFFFFF + const FINAL_XOR_VALUE: int = 0x00000000 signal line_changed(unit: FGOS) ## Вызывается когда меняется состояние связи с ячейкой @@ -82,12 +83,12 @@ class FGOS: func crc32(data: PackedByteArray) -> int: - var crc = Constants.INIT + var crc = INIT for byte in data: var index = (crc ^ byte) & 0xFF - crc = (Constants.CRC32_TABLE[index] ^ (crc >> 8)) & 0xFFFFFFFF + crc = (CRC32_TABLE[index] ^ (crc >> 8)) & 0xFFFFFFFF # Возвращаем только последние 4 байта в обратном порядке - var final_crc = crc ^ Constants.FINAL_XOR_VALUE + var final_crc = crc ^ FINAL_XOR_VALUE return final_crc @@ -132,7 +133,7 @@ class FGOS: func start_session(): counter = 0 - var packet = _form_packet(Constants.GROUP.BASE, Constants.CMD.START_SESSION, 0xC) + var packet = _form_packet(GROUP.BASE, CmdCode.START_SESSION, 0xC) _send_packet(packet) get_gen_state() get_att_batch() @@ -141,7 +142,7 @@ class FGOS: func set_gen_state(button_state: bool): var index_size = 0x1C - var packet = _form_packet(Constants.GROUP.GENERATOR, Constants.CMD.SET_GEN_STATUS, index_size) + var packet = _form_packet(GROUP.GENERATOR, CmdCode.SET_GEN_STATUS, index_size) packet.encode_u16(0x8, 0x0010) packet.encode_u32(0xC, button_state) ## MODE GEN STATUS _send_packet(packet) @@ -150,7 +151,7 @@ class FGOS: func set_carrier(installation_frequency: int): var index_size = 0x1C - var packet = _form_packet(Constants.GROUP.BASE, Constants.CMD.SET_CARRIER, index_size) + var packet = _form_packet(GROUP.BASE, CmdCode.SET_CARRIER, index_size) packet.encode_u16(0x8, 0x10) packet.encode_u64(0xC, installation_frequency) ## uint64_t freq low dword/high dword _send_packet(packet) @@ -158,27 +159,27 @@ class FGOS: func set_att_batch(attenuation: float): var index_size = 0x1C - var packet = _form_packet(Constants.GROUP.RF, Constants.CMD.SET_ATT, index_size) + var packet = _form_packet(GROUP.RF, CmdCode.SET_ATT, index_size) packet.encode_u16(0x8, 0x10) packet.encode_float(0x18, attenuation) _send_packet(packet) func get_carrier(): - var packet = _form_packet(Constants.GROUP.BASE, Constants.CMD.READ_CARRIER, INDEX_SIZE) + var packet = _form_packet(GROUP.BASE, CmdCode.READ_CARRIER, INDEX_SIZE) _send_packet(packet) func get_att_batch(): - var packet = _form_packet(Constants.GROUP.RF, Constants.CMD.READ_ATT, INDEX_SIZE) + var packet = _form_packet(GROUP.RF, CmdCode.READ_ATT, INDEX_SIZE) _send_packet(packet) func get_gen_state(): - var packet = _form_packet(Constants.GROUP.GENERATOR, Constants.CMD.READ_GEN_STATUS, INDEX_SIZE) + var packet = _form_packet(GROUP.GENERATOR, CmdCode.READ_GEN_STATUS, INDEX_SIZE) _send_packet(packet) func base_get_current_temp(): - var packet = _form_packet(Constants.GROUP.BASE, Constants.CMD.BASE_GET_CURRENT_TEMP, INDEX_SIZE) + var packet = _form_packet(GROUP.BASE, CmdCode.BASE_GET_CURRENT_TEMP, INDEX_SIZE) _send_packet(packet) diff --git a/scripts/PRD.gd b/scripts/PRD.gd index 7154cc7..45df211 100644 --- a/scripts/PRD.gd +++ b/scripts/PRD.gd @@ -150,6 +150,8 @@ func _ready() -> void: node_select_yau_07b_2.get_node2(1, 5).get_child(1, false).connect('toggled', Callable(self, '_on_fgos_2')) node_select_fs_1.get_node2(1, 4).get_child(1, false).connect('toggled', Callable(self, '_on_get_status_1')) + node_select_fs_1.get_node2(1, 3).connect('text_submitted', Callable(self, '_on_set_att')) + node_select_fs_1.get_node2(1, 2).connect('text_submitted', Callable(self, '_on_set_ferq')) func draw_control_panel_prd(mode) -> void: @@ -524,11 +526,14 @@ func _on_get_status_1(toggled_btn): unit_fs_1.get_gen_state() -func _on_set_ferq(): - var freq = int($set_space/write_to_set_freq.get_text()) * 1_000_000 - unit_fs_1.set_carrier(freq) +func _on_set_ferq(freq): + unit_fs_1.set_carrier(int(freq) * 1_000_000) + unit_fs_1.base_get_current_temp() + unit_fs_1.get_carrier() -func _on_set_att(): - var att = float($set_space/write_to_set_att.get_text()) - unit_fs_1.set_att_batch(att) +func _on_set_att(att): + unit_fs_1.set_att_batch(float(att)) + unit_fs_1.base_get_current_temp() + unit_fs_1.base_get_current_temp() + unit_fs_1.get_att_batch() diff --git a/scripts/constants.gd b/scripts/constants.gd index 12279cd..65eaef1 100644 --- a/scripts/constants.gd +++ b/scripts/constants.gd @@ -247,50 +247,14 @@ enum STATE { var EMS_G_PORT_DATA_HOLDER: Array = [] -# Таблица CRC-32 для модуля ФС -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 PORT_FS = 1201 -const INIT: int = 0xFFFFFFFF -const FINAL_XOR_VALUE: int = 0x00000000 enum GROUP { BASE = 0x00, GENERATOR = 0x03, RF = 0x06, } + enum CMD { START_SESSION = 0x0, READ_CARRIER = 0x1F, @@ -300,4 +264,4 @@ enum CMD { READ_GEN_STATUS = 0x05, SET_GEN_STATUS = 0x06, BASE_GET_CURRENT_TEMP = 0x36, -} + } diff --git a/scripts/ems_g.gd b/scripts/ems_g.gd index 0821155..d6c68a2 100644 --- a/scripts/ems_g.gd +++ b/scripts/ems_g.gd @@ -115,8 +115,12 @@ func process_sockets_horizon(blank: int, imp: int, count: int, col: int, parent_ if i == 1: set_frame(get_specific_node(parent_node2, 5), frame_type) + var CI_2_UF = parent_node2.get_child(3).get_child(0).get_child(0).get_child(0).get_child(2).get_node2(1, 6).get_child(1) + set_frame(CI_2_UF, frame_type) if i == 2: set_frame(get_specific_node(parent_node2, 6), frame_type) + var CI_3_UF = parent_node2.get_child(3).get_child(0).get_child(0).get_child(1).get_child(2).get_node2(1, 6).get_child(1) + set_frame(CI_3_UF, frame_type) if i == 4: set_frame(get_specific_node(parent_node2, 7), frame_type) if i == 5: @@ -139,12 +143,8 @@ func process_sockets_vert(blank: int, imp: int, count: int, col: int, parent_nod if i == 1: set_frame(get_specific_node(parent_node2, 1), frame_type) - var CI_2_UF = parent_node2.get_child(3).get_child(0).get_child(0).get_child(0).get_child(2).get_node2(1, 6).get_child(1) - set_frame(CI_2_UF, frame_type) if i == 2: set_frame(get_specific_node(parent_node2, 2), frame_type) - var CI_3_UF = parent_node2.get_child(3).get_child(0).get_child(0).get_child(1).get_child(2).get_node2(1, 6).get_child(1) - set_frame(CI_3_UF, frame_type) if i == 9: set_frame(get_specific_node(parent_node2, 3), frame_type) var CI_2_FS = parent_node2.get_child(3).get_child(0).get_child(0).get_child(0).get_child(0).get_node2(1, 6).get_child(1) diff --git a/table/node.tscn b/table/node.tscn index f0db82f..e2b91cf 100644 --- a/table/node.tscn +++ b/table/node.tscn @@ -31,6 +31,7 @@ caret_blink = true caret_blink_interval = 0.5 [node name="Color_Ems_g" type="ColorRect" parent="."] +visible = false layout_mode = 0 offset_right = 1933.0 offset_bottom = 1088.0