aj090-hw-tools 0.0.6__tar.gz → 0.0.7__tar.gz

{aj090_hw_tools-0.0.6 → aj090_hw_tools-0.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aj090-hw-tools
-Version: 0.0.6
+Version: 0.0.7
 Project-URL: Documentation, https://github.com/Vasencheg/aj090-hw-tools#readme
 Project-URL: Issues, https://github.com/Vasencheg/aj090-hw-tools/issues
 Project-URL: Source, https://github.com/Vasencheg/aj090-hw-tools

{aj090_hw_tools-0.0.6 → aj090_hw_tools-0.0.7}/src/aj090_hw_tools/__about__.py

@@ -1,4 +1,4 @@
 # SPDX-FileCopyrightText: 2025-present Vasencheg <roman.vasilev@nobitlost.com>
 #
 # SPDX-License-Identifier: MIT
-__version__ = "0.0.6"
+__version__ = "0.0.7"

aj090_hw_tools-0.0.7/src/aj090_hw_tools/common/const.py

@@ -0,0 +1,2 @@
+SERIAL_NUM_PATTERN = r'\w\d{10}'
+SERIAL_INPUT_PATTERN = r'\d{10}'

{aj090_hw_tools-0.0.6 → aj090_hw_tools-0.0.7}/src/aj090_hw_tools/tools/info.py

@@ -58,7 +58,7 @@ async def device_info_get(dut: DUT) -> Optional[DeviceInfo]:
     #     MAC: 64:E8:33:48:EF:C4
     #     serial: XXXXXXXX
     MATCH_PATTERN = re.compile(
-        r'DEVICE_INFO:\s+app version:\s+(\w{{7}})\s+compile time:\s+(\d{{2}}:\d{{2}}:\d{{2}})\s+sha256:\s+(\w{{64}})\s+hw version:\s+(\d{{1}}\.\d{{1}})\s+MAC:\s+(\w{{2}}:\w{{2}}:\w{{2}}:\w{{2}}:\w{{2}}:\w{{2}})\s+serial:\s+({SERIAL_NUM_PATTERN})'.format(SERIAL_NUM_PATTERN=SERIAL_NUM_PATTERN)
+        r'DEVICE_INFO:\s+app version:\s+(\w{{7}}|\w{{7}}-dirty)\s+compile time:\s+(\d{{2}}:\d{{2}}:\d{{2}})\s+sha256:\s+(\w{{64}})\s+hw version:\s+(\d{{1}}\.\d{{1}})\s+MAC:\s+(\w{{2}}:\w{{2}}:\w{{2}}:\w{{2}}:\w{{2}}:\w{{2}})\s+serial:\s+({SERIAL_NUM_PATTERN})'.format(SERIAL_NUM_PATTERN=SERIAL_NUM_PATTERN)
     )
     result = await dut.expect([MATCH_PATTERN, pexpect.TIMEOUT], timeout=5.0, async_=True)
     if result:

{aj090_hw_tools-0.0.6 → aj090_hw_tools-0.0.7}/src/aj090_hw_tools/tools/serial_number.py

@@ -10,7 +10,7 @@ import time
 from esptool.cmds import detect_chip
 from rich.console import Console
 
-from ..common.const import SERIAL_NUM_PATTERN
+from ..common.const import SERIAL_INPUT_PATTERN
 
 __all__ = [
     'serial'
@@ -44,14 +44,24 @@ async def nvs_write(device, bin_file: str, offset: int = 0x11000) -> None:
     loop = asyncio.get_running_loop()
     return await loop.run_in_executor(None, _write) 
 
-async def serial_write(device, serial: str) -> int:
-    match = re.search(SERIAL_NUM_PATTERN, serial)
+def check_serial(serial: str) -> int:
+    INPUT_SERIAL="""Serial number format: YYWWXXXXXX, where:
+YY - 2 digits of the year of manufacture of the product;
+WW - 2 digits of the product production week number;
+XXXXXX - 6 digits of the serial number of the product.
+"""
+    match = re.search(SERIAL_INPUT_PATTERN, serial)
     if match is None:
-        console.print('Wrong serial number format', style='bold red')
+        console.print('Wrong serial number format. Must be: YYWWXXXXXX', style='bold red')
+        console.print(f'{INPUT_SERIAL}')
         return -1
-    serial = match.group(0)
+    
+    return 0
+
+async def serial_write(device, device_type: str, serial: str) -> int:
+    type = 'S' if device_type == "shelf" else "C"
     with tempfile.NamedTemporaryFile(suffix='.csv') as nvs_csv:
-        data = bytes(nvs_partition_template(True, '1.0', serial).encode())
+        data = bytes(nvs_partition_template(True, '1.0', f'{type}{serial}').encode())
         nvs_csv.write(data)
         nvs_csv.seek(0)
         logger.debug(f'CSV file data: {nvs_csv.read()}')
@@ -71,6 +81,8 @@ async def serial_read() -> int:
     return -1
 
 def serial(argv) -> int:
+    if check_serial(argv.serial):
+        return -1
     port     = argv.port if argv.port is not None else esptool.ESPLoader.DEFAULT_PORT
     connects = 10 # NOTE: the workaround to the issue "Could not open /dev/tty..., the port is busy or doesn't exist" 
     for _ in range(connects): 
@@ -78,7 +90,7 @@ def serial(argv) -> int:
             with detect_chip(port=port, connect_attempts=0) as device:
                 match argv.operation:
                     case 'write':
-                        return asyncio.run(serial_write(device, argv.serial))
+                        return asyncio.run(serial_write(device, argv.device, argv.serial))
                     case 'read':
                         return asyncio.run(serial_read(device))
                     case _:

aj090_hw_tools-0.0.6/src/aj090_hw_tools/common/const.py

@@ -1 +0,0 @@
-SERIAL_NUM_PATTERN = r'\d\d{2}\d{2}\d\d{4}'