From 531b488c2ea6900498d3b67f64229656ae8f8744 Mon Sep 17 00:00:00 2001 From: MaD_CaT Date: Thu, 21 Nov 2024 09:19:29 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A7=D0=B8=D1=81=D1=82=D0=BA=D0=B0,=20=D1=83?= =?UTF-8?q?=D0=B4=D0=B0=D0=BB=D1=91=D0=BD=20=D0=B7=D0=B0=D0=BA=D0=BE=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D1=82=D0=B0=D1=80=D0=B5=D0=BD=D0=BD=D1=8B=D0=B9=20?= =?UTF-8?q?=D0=BA=D0=BE=D0=B4=20=D0=B2=20yems-board.gd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modbus/client-serial-modbus.py | 2 +- scenes/button-flat/button-flat.tscn | 14 +++++++------- scenes/работа/работа.tscn | 1 - scripts/yems-boards.gd | 3 --- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/modbus/client-serial-modbus.py b/modbus/client-serial-modbus.py index 982065f..a28e253 100644 --- a/modbus/client-serial-modbus.py +++ b/modbus/client-serial-modbus.py @@ -15,7 +15,7 @@ from threading import Timer import logger from pymodbus.client.sync import ModbusSerialClient -DEF_SERIAL = 'COM1' if os.name == 'nt' else '/dev/tty0' +DEF_SERIAL = 'COM3' if os.name == 'nt' else '/dev/tty0' log_file_dir = os.path.join(os.path.expanduser('~')) log = logger.get_logger(__file__, log_file_dir) EXCEPT_MSGS = { diff --git a/scenes/button-flat/button-flat.tscn b/scenes/button-flat/button-flat.tscn index 955e3f4..d1a610a 100644 --- a/scenes/button-flat/button-flat.tscn +++ b/scenes/button-flat/button-flat.tscn @@ -41,15 +41,15 @@ extends Sprite2D get: return material.get('shader_parameter/rotation') " -[sub_resource type="StyleBoxEmpty" id="6"] +[sub_resource type="StyleBoxEmpty" id="4"] + +[sub_resource type="StyleBoxEmpty" id="5"] [sub_resource type="StyleBoxEmpty" id="2"] [sub_resource type="StyleBoxEmpty" id="3"] -[sub_resource type="StyleBoxEmpty" id="5"] - -[sub_resource type="StyleBoxEmpty" id="4"] +[sub_resource type="StyleBoxEmpty" id="6"] [node name="container" type="PanelContainer"] offset_right = 20.0 @@ -79,11 +79,11 @@ axis_stretch_vertical = 2 layout_mode = 2 theme_override_colors/font_outline_color = Color(0, 0, 0, 1) theme_override_constants/outline_size = 4 -theme_override_styles/normal = SubResource("6") +theme_override_styles/focus = SubResource("4") +theme_override_styles/disabled = SubResource("5") theme_override_styles/hover = SubResource("2") theme_override_styles/pressed = SubResource("3") -theme_override_styles/disabled = SubResource("5") -theme_override_styles/focus = SubResource("4") +theme_override_styles/normal = SubResource("6") toggle_mode = true clip_text = true diff --git a/scenes/работа/работа.tscn b/scenes/работа/работа.tscn index c775be4..15faac2 100644 --- a/scenes/работа/работа.tscn +++ b/scenes/работа/работа.tscn @@ -52,7 +52,6 @@ offset_right = 1106.0 offset_bottom = 1170.0 tooltip_text = "Кнопки выбора типа помехи" mouse_filter = 0 -metadata/_edit_lock_ = true [node name="count_all_pad" parent="." instance=ExtResource("6_e3re7")] layout_mode = 0 diff --git a/scripts/yems-boards.gd b/scripts/yems-boards.gd index 803a7e6..a7ab17c 100644 --- a/scripts/yems-boards.gd +++ b/scripts/yems-boards.gd @@ -147,8 +147,6 @@ class EmsBoard: elif (state_cmd == WRITE_FLASH) and (unit_ems.cmd_code_rx == unit_ems.CmdCode.WRITE_FLASH_MP550): state_board = WAIT state_cmd = WAIT - #load_flash() - #emit_signal('write_msg', 'Произведена запись в ПЗУ ячейки ЯУ-07') # Выбор текущего устройства и проверка правильности его номера func check_dev_number(): @@ -264,4 +262,3 @@ class EmsBoard: else: continue if ports.has('%d'%(base_addr_isa + 10)): cur_dev.ports_data[base_addr_isa + 10] = int(ports['%d'%(base_addr_isa + 10)]) - else: continue