From 46604b09979cfe9377c96c7001c94ae2a1324b30 Mon Sep 17 00:00:00 2001
From: hank9999 <hank9999@qq.com>
Date: Sat, 24 Feb 2024 03:02:14 +0800
Subject: [PATCH] refactor: better way to implement `offset` `extra`
 calculation

---
 functions.py    | 20 +++++++-------------
 serial_utils.py | 15 +++++++--------
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/functions.py b/functions.py
index c87b9a8..d7a46e0 100644
--- a/functions.py
+++ b/functions.py
@@ -40,16 +40,16 @@ def todo_function():
     return
 
 
-def check_eeprom_writeable(serial_port: serial.Serial, offset: int, extra: int) -> bool:
+def check_eeprom_writeable(serial_port: serial.Serial, addr: int) -> bool:
     # 读取原始数据
-    read_data = serial_utils.read_extra_eeprom(serial_port, offset, extra, 8)
+    read_data = serial_utils.read_extra_eeprom(serial_port, addr, 8)
     # 写入随机数据
     random_bytes = bytes([random.randint(0, 255) for _ in range(8)])
-    serial_utils.write_extra_eeprom(serial_port, offset, extra, random_bytes)
+    serial_utils.write_extra_eeprom(serial_port, addr, random_bytes)
     # 读取写入的数据
-    read_write_data = serial_utils.read_extra_eeprom(serial_port, offset, extra, 8)
+    read_write_data = serial_utils.read_extra_eeprom(serial_port, addr, 8)
     # 恢复原始数据
-    serial_utils.write_extra_eeprom(serial_port, offset, extra, read_data)
+    serial_utils.write_extra_eeprom(serial_port, addr, read_data)
 
     return read_write_data == random_bytes
 
@@ -114,7 +114,6 @@ def write_data(serial_port: Serial, start_addr: int, data: Union[bytes, List[int
     total_page = data_len // 128
     addr = start_addr
     current_step = 0
-    offset = 0
     while addr < start_addr + data_len:
         percent_float = (current_step / total_page) * 100
         percent = int(percent_float)
@@ -127,9 +126,7 @@ def write_data(serial_port: Serial, start_addr: int, data: Union[bytes, List[int
         if start_addr + data_len < 0x10000:
             serial_utils.write_eeprom(serial_port, addr, writing_data)
         else:
-            if addr - offset * 0x10000 >= 0x10000:
-                offset += 1
-            serial_utils.write_extra_eeprom(serial_port, offset, addr - offset * 0x10000, writing_data)
+            serial_utils.write_extra_eeprom(serial_port, addr, writing_data)
         addr += step
         current_step += 1
     progress['value'] = 0
@@ -672,7 +669,6 @@ def backup_eeprom(serial_port_text: str, window: tk.Tk, progress: ttk.Progressba
         total_steps = (target_eeprom_offset - start_addr) // 128  # 计算总步数
         current_step = 0
         addr = start_addr
-        offset = 0
 
         backup_data = b''
 
@@ -680,9 +676,7 @@ def backup_eeprom(serial_port_text: str, window: tk.Tk, progress: ttk.Progressba
             if target_eeprom_offset < 0x10000:
                 read_data = serial_utils.read_eeprom(serial_port, addr, 128)
             else:
-                if addr - offset * 0x10000 >= 0x10000:
-                    offset += 1
-                read_data = serial_utils.read_extra_eeprom(serial_port, offset, addr - offset * 0x10000, 128)
+                read_data = serial_utils.read_extra_eeprom(serial_port, addr, 128)
             backup_data += read_data
             addr += 128
             current_step += 1
diff --git a/serial_utils.py b/serial_utils.py
index 13ee5eb..31550a4 100644
--- a/serial_utils.py
+++ b/serial_utils.py
@@ -102,10 +102,10 @@ def read_eeprom(serial_port: serial.Serial, offset: int, length: int):
     return o[8:]
 
 
-def read_extra_eeprom(serial_port: serial.Serial, offset: int, extra: int, length: int):
-    if extra > 0xFFFF:
-        offset = extra >> 16
-        extra = extra & 0xFFFF
+def read_extra_eeprom(serial_port: serial.Serial, addr: int, length: int):
+    offset = addr >> 16
+    extra = addr & 0xFFFF
+    extra = struct.pack("<H", extra)
     extra_bytes = struct.pack("<H", extra)
     read_mem = b"\x2b\x05\x08\x00" + \
                struct.pack("<HBB", offset, length, 0) + \
@@ -135,10 +135,9 @@ def write_eeprom(serial_port: serial.Serial, offset: int, data: bytes):
         raise Exception("写入前8KiB EEPROM响应错误！")
 
 
-def write_extra_eeprom(serial_port: serial.Serial, offset: int, extra: int, data: bytes):
-    if extra > 0xFFFF:
-        offset = extra >> 16
-        extra = extra & 0xFFFF
+def write_extra_eeprom(serial_port: serial.Serial, addr: int, data: bytes):
+    offset = addr >> 16
+    extra = addr & 0xFFFF
     extra = struct.pack("<H", extra)
     length = len(data) + len(extra)