Merge e3cd58a837 into 66bb0d52ee

mtkclient/Library/DA/xml/xml_lib.py

@@ -967,10 +967,7 @@ class DAXML(metaclass=LogBase):
             self.ack_value(length)
             cmd, result = self.get_command_result()
             if type(result) is DwnFile:
-                if fh:
-                    data = fh.read(length)
-                else:
-                    data = wdata
+                data = fh.read(length)
                 if not self.upload(result, data, raw=True):
                     self.error("Error on writing flash at 0x%08X" % addr)
                     return False

mtkclient/Library/pltools.py

@@ -101,7 +101,7 @@ class PLTools(metaclass=LogBase):
             return False
         else:
             self.error(f"Error on sending payload: {filename}")
-            self.error(f"Error, payload answered instead: {hexlify(response_ack).decode('utf-8')}")
+            self.error(f"Error, payload answered instead: {hexlify(ack).decode('utf-8')}")
             return False
 
     def runbrute(self, args):

mtkclient/config/brom_config.py

@@ -346,7 +346,7 @@ hwconfig = {
         dacode=0x0598,
         name="ELBRUS/MT0598"),
     0x992: Chipconfig(  # var1
-        watchdog=0x10007000,
+        # watchdog
         # uart
         # brom_payload_addr
         # da_payload_addr
@@ -355,10 +355,9 @@ hwconfig = {
         # cqdma_base
         # ap_dma_mem
         # blacklist
-        efuse_addr=0x11EC0000,
         damode=DAmodes.XFLASH,
         dacode=0x0992,
-        name="MT6880/MT6890"),
+        name="MT0992"),
     0x2601: Chipconfig(
         var1=0xA,  # Smartwatch, confirmed
         watchdog=0x10007000,