fix get_com_port function error and append test information for firmware download

dustin007442 · dustin007442 · commit ecbe700017a2 · 2023-11-17T11:48:31.000+08:00
diff --git a/thonnycontrib/quecpython/fw/proc.py b/thonnycontrib/quecpython/fw/proc.py
@@ -225,7 +225,7 @@ def parse(self, line):
             raise Exception('Unisoc FW Download Failed.')
 
 
-class _360WExecutor(BaseExecutor):
+class _FCM360WExecutor(BaseExecutor):
 
     def parse(self, line):
         try:
@@ -241,7 +241,7 @@ def parse(self, line):
             elif data['Status'] == 'Finished' and data['Message'] == 'Success':
                 return line, 100
             else:
-                raise Exception('360W Download Failed!')
+                raise Exception('FCM360W Download Failed!\n{}'.format(line.strip()))
 
 
 class _EIGENExecutor(BaseExecutor):
@@ -392,7 +392,7 @@ def progress_rate(self):
                 logger.info(line)
                 self.parse(line)
                 yield line, self.progress
-            yield 100
+            yield line, 100
 
     def parse(self, line):
         if "RtsConditionAssign" in line:
@@ -407,19 +407,26 @@ def run_cmd(cmd, platform, cwd, **extra):
     logger.info('enter run_cmd method, args: {}'.format((cmd, platform, cwd,)))
 
     if platform.upper() in ["ASR", "ASR1601", "ASR1606"]:
+        # EC600M-CNLA test passed with `EC600MCNLAR01A01M08_XBND_OCPU_QPY_BETA0831`
         executor = _AsrExecutor(cmd, cwd)
     elif platform.upper() in ["UNISOC", "UNISOC8910", "UNISOC8850"]:
+        # EG912U-GLAA test passed with `QPY_BETA0001_EG912U_GLAA_FW`
         executor = _UnisocExecutor(cmd, cwd)
     elif platform.upper() == "RDA8908A":
+        # BC25PA test passed with `QPY_V0003_BC25PA_FW`
         executor = _NBExecutor(cmd, cwd)
     elif platform.upper() == "ASR1803S":
+        # EC200A-EUHA test passed with `QPY_V0002_EC200A_AUHA_FW` and `QPY_V0003_EC200A_AUHA_FW`
         executor = _200AExecutor(cmd, cwd)
     elif platform.upper() == "MDM9X05":
+        # BG95M3-LA test passed with `QPY_OCPU_BETA0002_BG95M3_FW` and `QPY_OCPU_BETA0003_BG95M3_FW`
         executor = _BG95Executor(cmd, cwd)
     elif platform.upper() == "EIGEN":
+        # EC800E-CNLC test passed with `EC800ECNLCR02A01M04_OCPU_QPY_BETA0713`
         executor = _EIGENExecutor(cmd, cwd, **extra)
     elif platform.upper() == "FCM360W":
-        executor = _360WExecutor(cmd, cwd)
+        # FCM360WAAMD-OP-04 test passed with `QPY_OCPU_BETA0001_FCM360W_FW`
+        executor = _FCM360WExecutor(cmd, cwd)
     else:
         pass
 
diff --git a/thonnycontrib/quecpython/fw/utils.py b/thonnycontrib/quecpython/fw/utils.py
@@ -146,7 +146,7 @@ def makeCleanDir(Dir):
             return False
 
 
-def get_com_port(fw_file_path, platform):
+def get_com_port(platform):
     cmd = 'at+qdownload=1'
     fw_config = json.load(open(str(Path(__file__).with_name('fw_config.json')), 'r'))
     if platform.upper() in ["UNISOC", "UNISOC8910", "UNISOC8850"]:
diff --git a/thonnycontrib/quecpython/view.py b/thonnycontrib/quecpython/view.py
@@ -184,8 +184,8 @@ def list_valid_ports(self):
         else:
             self.port_combobox.current(0)
 
-    def get_validated_com_port(self, fw_file_path, platform):
-        comport = get_com_port(fw_file_path, platform)
+    def get_validated_com_port(self, platform):
+        comport = get_com_port(platform)
         logger.info('detect comport is: {}'.format(comport))
         if comport is None:
             messagebox.showerror(
@@ -266,7 +266,7 @@ def download_firmware_handler(self):
         logger.info('fw file: {}'.format(fw_file_path))
         logger.info('platform: {}'.format(platform))
 
-        com_info = self.get_validated_com_port(fw_file_path, platform)
+        com_info = self.get_validated_com_port(platform)
         if not com_info:
             return
 
@@ -290,7 +290,7 @@ def update_progress(self, payload):
                 return
             self.progress_stringvar.set("{}%".format(payload.data[1]))
             self.bar["value"] = payload.data[1]
-            self.log_stringvar.set('{:100s}'.format(payload.data[0].strip()))
+            self.log_stringvar.set('{:100s}'.format(payload.data[0].strip()[:100]))
             # self.update()
         elif payload.code == DownLoadFWApi.EXIT:
             if payload.exec:
