From 12fbb1fd557adf62e8bf3e3422e5916882fafad6 Mon Sep 17 00:00:00 2001
From: sasha80 <sasha@mail.ru>
Date: Tue, 9 Dec 2025 08:49:21 +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=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=BE=20=D0=BE=D0=B6=D0=B8=D0=B4=D0=B0=D0=BD=D0=B8=D0=B5?=
 =?UTF-8?q?=20=D0=B2=D1=8B=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F?=
 =?UTF-8?q?=20=D0=BA=D0=BE=D0=BC=D0=B0=D0=BD=D0=B4=D1=8B=20=D0=BF=D0=BE=20?=
 =?UTF-8?q?=D0=B5=D1=91=20=D0=BA=D0=BE=D0=B4=D1=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/yau07.gd | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/scripts/yau07.gd b/scripts/yau07.gd
index 54e02478..9c5e2fb8 100644
--- a/scripts/yau07.gd
+++ b/scripts/yau07.gd
@@ -303,24 +303,24 @@ class YaU07 extends unit.Unit:
         if cmd_result != 1:                                 # Команда не выполнена
             return false
 
-        var cmd_code: CmdCode = rx_data[cmd_code_pos] as CmdCode       # "код команды"
-        var rc: = true
-        if (cmd_code == CmdCode.READ_ISA) or (cmd_code == CmdCode.WRITE_ISA):
-            rc = parse_isa(rx_data, status_len)
+        var cmd_code: int = rx_data[cmd_code_pos]            # Код команды
 
-        elif (cmd_code == CmdCode.READ_BLOCK) or (cmd_code == CmdCode.WRITE_BLOCK):
-            rc = parse_block(rx_data, status_len)
+        if (cmd_state == CmdState.WAIT) and (cmd_num_rx == cmd_num_tx) and (cmd_code == cmd_code_tx):
+            cmd_code_rx = cmd_code
+            cmd_state = CmdState.DONE
+            var rc: = true
+            if (cmd_code == CmdCode.READ_ISA) or (cmd_code == CmdCode.WRITE_ISA):
+                rc = parse_isa(rx_data, status_len)
+            elif (cmd_code == CmdCode.READ_BLOCK) or (cmd_code == CmdCode.WRITE_BLOCK):
+                rc = parse_block(rx_data, status_len)
+            elif (cmd_code == CmdCode.ERASE_FLASH) or (cmd_code == CmdCode.WRITE_FLASH) \
+                or (cmd_code == CmdCode.READ_FLASH_MP550) or (cmd_code == CmdCode.WRITE_FLASH_MP550) \
+                or (cmd_code == CmdCode.READ_FLASH) or (cmd_code == CmdCode.LOAD_FLASH):
+                rc = parse_flash(rx_data, status_len, cmd_code)
 
-        elif (cmd_code == CmdCode.ERASE_FLASH) or (cmd_code == CmdCode.WRITE_FLASH) \
-            or (cmd_code == CmdCode.READ_FLASH_MP550) or (cmd_code == CmdCode.WRITE_FLASH_MP550) \
-            or (cmd_code == CmdCode.READ_FLASH) or (cmd_code == CmdCode.LOAD_FLASH):
-            rc = parse_flash(rx_data, status_len, cmd_code)
-
-        if rc:
-            if (cmd_state == CmdState.WAIT) and (cmd_num_rx == cmd_num_tx):
-                cmd_state = CmdState.DONE
-                cmd_code_rx = cmd_code
+            if rc:
                 emit_signal('command_done', self)
-        else:
-            emit_signal('parse_failed', self)
+            else:
+                emit_signal('parse_failed', self)
+
         return true