Make NVRAM reads and writes produce consistent logging output

Author: puddly

zigpy_znp/tools/nvram_read.py

@@ -40,7 +40,7 @@ async def nvram_read(znp: ZNP):
                 except KeyError:
                     break
 
-                LOGGER.info("%s = %s", key, value)
+                LOGGER.info("%s = %r", key, value.hex())
                 data["LEGACY"][key] = value.hex()
         else:
             try:
@@ -51,7 +51,7 @@ async def nvram_read(znp: ZNP):
                 LOGGER.warning("Read disallowed for %s", nwk_nvid)
                 continue
 
-            LOGGER.info("%s = %s", nwk_nvid, value)
+            LOGGER.info("%s = %r", nwk_nvid, value.hex())
             data["LEGACY"][nwk_nvid.name] = value.hex()
 
     for nvid in ExNvIds:
@@ -71,7 +71,7 @@ async def nvram_read(znp: ZNP):
                 # Once a read fails, no later reads will succeed
                 break
 
-            LOGGER.info("%s[0x%04X] = %s", nvid.name, sub_id, value)
+            LOGGER.info("%s[0x%04X] = %r", nvid.name, sub_id, value.hex())
             data.setdefault(nvid.name, {})[f"0x{sub_id:04X}"] = value.hex()
 
     return data

zigpy_znp/tools/nvram_write.py

@@ -20,9 +20,14 @@ async def nvram_write(znp: ZNP, backup):
             nvid = OsalNvIds[nwk_nvid] + offset
         else:
             nvid = OsalNvIds[nwk_nvid]
+            offset = None
 
-        value = bytes.fromhex(value)
-        await znp.nvram.osal_write(nvid, value, create=True)
+        if offset is not None:
+            LOGGER.info("%s+%s = %r", OsalNvIds[nwk_nvid].name, offset, value)
+        else:
+            LOGGER.info("%s = %r", OsalNvIds[nwk_nvid].name, value)
+
+        await znp.nvram.osal_write(nvid, bytes.fromhex(value), create=True)
 
     for item_name, sub_ids in backup.items():
         item_id = ExNvIds[item_name]
@@ -32,12 +37,12 @@ async def nvram_write(znp: ZNP, backup):
 
         for sub_id, value in sub_ids.items():
             sub_id = int(sub_id, 16)
-            value = bytes.fromhex(value)
+            LOGGER.info("%s[0x%04X] = %r", item_id.name, sub_id, value)
 
             await znp.nvram.write(
                 item_id=item_id,
                 sub_id=sub_id,
-                value=value,
+                value=bytes.fromhex(value),
                 create=True,
             )