diff --git a/scripts/yau07.gd b/scripts/yau07.gd
index 328c4563..c44b7e7c 100644
--- a/scripts/yau07.gd
+++ b/scripts/yau07.gd
@@ -80,14 +80,14 @@ class YaU07 extends unit.Unit:
                 rc = Error.FAILED
         return rc
 
-    func send_flash(cmd_code: int, fl_data: Array, num_byte_rd: int, id_sector: int = 0) -> bool:
+    func send_flash(cmd_code: CmdCode, fl_data: Array, num_byte_rd: int, id_sector: int = 0) -> bool:
         if (cmd_state == CmdState.WAIT) \
         or (cmd_state == CmdState.SEND) \
         or (cmd_state == CmdState.UNCK):
             return false
-        if not ((cmd_code == CmdCode.ERASE_FLASH) or (cmd_code == CmdCode.WRITE_FLASH) \
-            or (cmd_code == CmdCode.READ_FLASH) or (cmd_code == CmdCode.LOAD_FLASH)
-            or (cmd_code == CmdCode.READ_FLASH_MP550) or (cmd_code == CmdCode.WRITE_FLASH_MP550)):
+        if not cmd_code in [CmdCode.ERASE_FLASH,
+            CmdCode.WRITE_FLASH, CmdCode.READ_FLASH, CmdCode.LOAD_FLASH,
+            CmdCode.READ_FLASH_MP550, CmdCode.WRITE_FLASH_MP550]:
             return false
         cmd_num_tx = (cmd_num_rx + 1) % 0xffff
         tx_data.encode_u16(0, cmd_retry)
@@ -122,7 +122,7 @@ class YaU07 extends unit.Unit:
         cmd_code_tx = cmd_code
         return true
 
-    func send_isa(cmd_code: int, ports_data: Array) -> bool:
+    func send_isa(cmd_code: CmdCode, ports_data: Array) -> bool:
         if (cmd_state == CmdState.WAIT) \
         or (cmd_state == CmdState.SEND) \
         or (cmd_state == CmdState.UNCK):
@@ -150,7 +150,7 @@ class YaU07 extends unit.Unit:
         cmd_code_tx = cmd_code
         return true
 
-    func send_block(cmd_code: int, block_len: int, port: Array) -> bool:
+    func send_block(cmd_code: CmdCode, block_len: int, port: Array) -> bool:
         if (cmd_state == CmdState.WAIT) \
         or (cmd_state == CmdState.SEND) \
         or (cmd_state == CmdState.UNCK):
@@ -173,7 +173,7 @@ class YaU07 extends unit.Unit:
         cmd_code_tx = cmd_code
         return true
 
-    func send_load_ems_done(cmd_code: int) -> bool:
+    func send_load_ems_done(cmd_code: CmdCode) -> bool:
         if (cmd_state == CmdState.WAIT) \
         or (cmd_state == CmdState.SEND) \
         or (cmd_state == CmdState.UNCK):