From 897ea6a13ddbf5bb7aa052961a875b96224c9ac5 Mon Sep 17 00:00:00 2001 From: MaD_CaT Date: Wed, 2 Jul 2025 11:22:31 +0300 Subject: [PATCH 1/3] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=BA=D0=B0.=20=D0=A1=D0=BE=D1=81=D1=82=D0=BE=D1=8F=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=BF=D1=80=D0=B8=D0=B1=D0=BE=D1=80=D0=BE=D0=B2?= =?UTF-8?q?=20=D0=B2=20=D0=BA=D0=BE=D0=BD=D1=82=D1=80=D0=BE=D0=BB=D0=B5=20?= =?UTF-8?q?=D0=A93=20=D0=BF=D0=BE=20=D1=83=D0=BC=D0=BE=D0=BB=D1=87=D0=B0?= =?UTF-8?q?=D0=BD=D0=B8=D1=8E=20=D0=B2=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD?= =?UTF-8?q?=D0=BE.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/pribor-uyep/sch3.tscn | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/scenes/pribor-uyep/sch3.tscn b/scenes/pribor-uyep/sch3.tscn index f74e094..a175a03 100644 --- a/scenes/pribor-uyep/sch3.tscn +++ b/scenes/pribor-uyep/sch3.tscn @@ -142,6 +142,7 @@ material = SubResource("ShaderMaterial_c1mqk") layout_mode = 2 size_flags_horizontal = 2 tooltip_text = "Выключатель питания УФ" +button_pressed = true action_mode = 0 script = ExtResource("7_l6esm") metadata/bits = [0, 0, 2, 0] @@ -171,6 +172,7 @@ material = SubResource("ShaderMaterial_c1mqk") layout_mode = 2 size_flags_horizontal = 0 tooltip_text = "Выключатель питания РТР" +button_pressed = true action_mode = 0 script = ExtResource("7_l6esm") metadata/bits = [0, 1, 2, 1] @@ -199,6 +201,7 @@ material = SubResource("ShaderMaterial_c1mqk") layout_mode = 2 size_flags_horizontal = 2 tooltip_text = "Выключатель питания ПРД-Н.1" +button_pressed = true action_mode = 0 script = ExtResource("7_l6esm") metadata/bits = [0, 2, 2, 2] @@ -228,6 +231,7 @@ material = SubResource("ShaderMaterial_c1mqk") layout_mode = 2 size_flags_horizontal = 0 tooltip_text = "Выключатель питания ПРД-Н.2" +button_pressed = true action_mode = 0 script = ExtResource("7_l6esm") metadata/bits = [0, 3, 2, 3] @@ -257,6 +261,7 @@ material = SubResource("ShaderMaterial_c1mqk") layout_mode = 2 size_flags_horizontal = 2 tooltip_text = "Выключатель питания ПРД-Н.3" +button_pressed = true action_mode = 0 script = ExtResource("7_l6esm") metadata/bits = [0, 4, 2, 4] @@ -286,6 +291,7 @@ material = SubResource("ShaderMaterial_c1mqk") layout_mode = 2 size_flags_horizontal = 0 tooltip_text = "Выключатель питания ПРД-Н.4" +button_pressed = true action_mode = 0 script = ExtResource("7_l6esm") metadata/bits = [0, 5, 2, 5] @@ -315,6 +321,7 @@ material = SubResource("ShaderMaterial_vdwfd") layout_mode = 2 size_flags_horizontal = 2 tooltip_text = "Выключатель питания ПРД-В.1" +button_pressed = true action_mode = 0 script = ExtResource("7_l6esm") metadata/bits = [0, 6, 2, 6] @@ -344,6 +351,7 @@ material = SubResource("ShaderMaterial_c1mqk") layout_mode = 2 size_flags_horizontal = 0 tooltip_text = "Выключатель питания ПРД-В.2" +button_pressed = true action_mode = 0 script = ExtResource("7_l6esm") metadata/bits = [0, 7, 2, 7] @@ -373,6 +381,7 @@ material = SubResource("ShaderMaterial_c1mqk") layout_mode = 2 size_flags_horizontal = 2 tooltip_text = "Выключатель питания ПРД-В.3" +button_pressed = true action_mode = 0 script = ExtResource("7_l6esm") metadata/bits = [0, 8, 2, 8] @@ -402,6 +411,7 @@ material = SubResource("ShaderMaterial_c1mqk") layout_mode = 2 size_flags_horizontal = 0 tooltip_text = "Выключатель питания ПРД-В.4" +button_pressed = true action_mode = 0 script = ExtResource("7_l6esm") metadata/bits = [0, 9, 2, 9] @@ -431,6 +441,7 @@ material = SubResource("ShaderMaterial_c1mqk") layout_mode = 2 size_flags_horizontal = 2 tooltip_text = "Выключатель питания ПРД-К.1" +button_pressed = true action_mode = 0 script = ExtResource("7_l6esm") metadata/bits = [0, 10, 2, 10] @@ -460,6 +471,7 @@ material = SubResource("ShaderMaterial_c1mqk") layout_mode = 2 size_flags_horizontal = 0 tooltip_text = "Выключатель питания ПРД-К.2" +button_pressed = true action_mode = 0 script = ExtResource("7_l6esm") metadata/bits = [0, 11, 2, 11] @@ -489,6 +501,7 @@ material = SubResource("ShaderMaterial_c1mqk") layout_mode = 2 size_flags_horizontal = 2 tooltip_text = "Выключатель питания ПРД-К.3" +button_pressed = true action_mode = 0 script = ExtResource("7_l6esm") metadata/bits = [1, 0, 3, 0] @@ -518,6 +531,7 @@ material = SubResource("ShaderMaterial_c1mqk") layout_mode = 2 size_flags_horizontal = 0 tooltip_text = "Выключатель питания ПРД-К.4" +button_pressed = true action_mode = 0 script = ExtResource("7_l6esm") metadata/bits = [1, 1, 3, 1] From b367a92e0f9978528aaf521e7b34bacdcc1fbcb1 Mon Sep 17 00:00:00 2001 From: MaD_CaT Date: Fri, 4 Jul 2025 10:01:40 +0300 Subject: [PATCH 2/3] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=BA=D0=B0.=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82?= =?UTF-8?q?=D1=80=D0=B0=20get=20=D0=B2=20=D0=BF=D0=BE=D1=81=D1=82=D0=B0?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=BA=D1=83=20=D0=BF=D0=BE=D0=BC=D0=B5=D1=85?= =?UTF-8?q?=D0=B8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/работа/работа.tscn | 2 +- scripts/interfer.gd | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scenes/работа/работа.tscn b/scenes/работа/работа.tscn index 442c2dc..1b179b1 100644 --- a/scenes/работа/работа.tscn +++ b/scenes/работа/работа.tscn @@ -288,6 +288,6 @@ texture_pressed = ExtResource("13_ggrwd") [connection signal="drag_continue" from="." to="." method="_on_drag_continue"] [connection signal="toggled" from="btn_view" to="." method="on_button_view_toggled"] [connection signal="toggled" from="chk_auto" to="." method="on_value_changed"] -[connection signal="toggled" from="btn_activate" to="." method="on_btn_activate_toggled"] [connection signal="toggled" from="btn_activate" to="." method="on_btn_activate"] +[connection signal="toggled" from="btn_activate" to="." method="on_btn_activate_toggled"] [connection signal="toggled" from="btn_center" to="." method="on_btn_center_toggled"] diff --git a/scripts/interfer.gd b/scripts/interfer.gd index b7bb848..30fd250 100644 --- a/scripts/interfer.gd +++ b/scripts/interfer.gd @@ -59,7 +59,9 @@ class Interfer: if krp != INTERFER_OFF: data_to_json['kni'] = kni data_to_json['powp'] = powp # TODO: Необходимо добавить управление мощностью - data_to_json['get'] = [] + if get_params.size() < 1: + get_params.append('soc_temp') + data_to_json['get'] = get_params data_to_json['params'] = params var pac = JSON.stringify(data_to_json).to_utf8_buffer() return pac From 388db24fc62d96e21f630d3ec6b10033d59851a5 Mon Sep 17 00:00:00 2001 From: MaD_CaT Date: Fri, 4 Jul 2025 10:02:46 +0300 Subject: [PATCH 3/3] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=BA=D0=B0.=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82?= =?UTF-8?q?=D1=80=D0=B0=20get=20=D0=B2=20=D0=BF=D0=BE=D1=81=D1=82=D0=B0?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=BA=D1=83=20=D0=BF=D0=BE=D0=BC=D0=B5=D1=85?= =?UTF-8?q?=D0=B8=20=D0=B2=20=D1=80=D0=B5=D0=B6=D0=B8=D0=BC=D0=B5=20off=20?= =?UTF-8?q?=D0=B2=20=D1=82=D0=BE=D0=BC=20=D1=87=D0=B8=D1=81=D0=BB=D0=B5.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/interfer.gd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/interfer.gd b/scripts/interfer.gd index 30fd250..5366e90 100644 --- a/scripts/interfer.gd +++ b/scripts/interfer.gd @@ -56,12 +56,12 @@ class Interfer: data_to_json['ss'] = msg_num data_to_json['ispp'] = ispp data_to_json['krp'] = krp + if get_params.size() < 1: + get_params.append('soc_temp') + data_to_json['get'] = get_params if krp != INTERFER_OFF: data_to_json['kni'] = kni data_to_json['powp'] = powp # TODO: Необходимо добавить управление мощностью - if get_params.size() < 1: - get_params.append('soc_temp') - data_to_json['get'] = get_params data_to_json['params'] = params var pac = JSON.stringify(data_to_json).to_utf8_buffer() return pac