From fa0a2f4b24425cb0116813f80d59167fc38e9887 Mon Sep 17 00:00:00 2001
From: MaD_CaT <madcat90@list.ru>
Date: Fri, 1 Aug 2025 13:44:33 +0300
Subject: [PATCH] =?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=9A=D0=BE=D0=BD=D1=82=D1=80=D0=BE=D0=BB?=
 =?UTF-8?q?=D1=8C=20=D1=81=D0=BE=D0=B4=D0=B5=D1=80=D0=B6=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F=20=D1=84=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2=20=D0=B4=D0=BB?=
 =?UTF-8?q?=D1=8F=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B8=20?=
 =?UTF-8?q?=D0=AD=D0=9C=D0=A1-=D0=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scenes/эмс/yems-boards.gd | 14 ++++++++------
 scenes/эмс/эмс.gd         |  9 ++++++---
 scripts/prd.gd            | 11 ++++++++---
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/scenes/эмс/yems-boards.gd b/scenes/эмс/yems-boards.gd
index 4b818f47..eac8030a 100644
--- a/scenes/эмс/yems-boards.gd
+++ b/scenes/эмс/yems-boards.gd
@@ -297,15 +297,17 @@ class EmsBoard:
             if not check_dev_number(): continue
             if ports.has('%d'%(base_addr_isa + 4)):
                 cur_dev.ports_data[base_addr_isa + 4] = int(ports['%d'%(base_addr_isa + 4)])
-            else: continue
+            else: return false
             if ports.has('%d'%(base_addr_isa + 6)):
-                    cur_dev.ports_data[base_addr_isa + 6] = int(ports['%d'%(base_addr_isa + 6)])
-            else: continue
+                cur_dev.ports_data[base_addr_isa + 6] = int(ports['%d'%(base_addr_isa + 6)])
+            else: return false
             if ports.has('%d'%(base_addr_isa + 8)):
-                    cur_dev.ports_data[base_addr_isa + 8] = int(ports['%d'%(base_addr_isa + 8)])
-            else: continue
+                cur_dev.ports_data[base_addr_isa + 8] = int(ports['%d'%(base_addr_isa + 8)])
+            else: return false
             if ports.has('%d'%(base_addr_isa + 10)):
-                    cur_dev.ports_data[base_addr_isa + 10] = int(ports['%d'%(base_addr_isa + 10)])
+                cur_dev.ports_data[base_addr_isa + 10] = int(ports['%d'%(base_addr_isa + 10)])
+            else: return false
+        return true
 
     func set_load_done():
         state_board = LOADING
diff --git a/scenes/эмс/эмс.gd b/scenes/эмс/эмс.gd
index 5878e921..78f067aa 100644
--- a/scenes/эмс/эмс.gd
+++ b/scenes/эмс/эмс.gd
@@ -655,6 +655,9 @@ func _on_btn_load_pressed() -> void:
                 if not json_data.has(str(board.id_board)):
                     return
                 var data = json_data[str(board.id_board)]
-                board.btn_load(data)
-                board.need_write = true
-            log.message(log.INFO, 'Произведено чтение настроек ЭМС из файла: %s' %fl_name)
+                var read_ok = board.btn_load(data)
+                if read_ok:
+                    board.need_write = true
+                    log.message(log.INFO, 'Произведено чтение настроек ЭМС из файла: %s, для платы %s' %[fl_name, board.id_board])
+                else:
+                    log.message(log.ERROR, 'Ошибка чтение настроек ЭМС из файла: %s' %fl_name)
diff --git a/scripts/prd.gd b/scripts/prd.gd
index 406fc7ed..5bf1ae00 100644
--- a/scripts/prd.gd
+++ b/scripts/prd.gd
@@ -242,9 +242,14 @@ class PRD:
             var json_data = json_conv.get_data()
             yemsg_board.need_write = true
             yemsg_board.ems_load = yemsg_board.LoadState.IN_PROCESS
-            yemsg_board.btn_load(json_data)
-            yemsg_board.state_board = yemsg_board.WRITE
-            yemsg_board.start_rw_kems(false)
+            var read_ok = yemsg_board.btn_load(json_data)
+            if read_ok:
+                yemsg_board.state_board = yemsg_board.WRITE
+                yemsg_board.start_rw_kems(false)
+            else:
+                yemsg_board.ems_load = yemsg_board.LoadState.FAIL
+                yemsg_board.set_wait()
+                log.error('Не удалось прочитать файл настроек ячейки ЭМС-Г %s' %abs_dir)
         else:
             yemsg_board.ems_load = yemsg_board.LoadState.FAIL
             yemsg_board.set_wait()