fix Eigen Fw Download bug

dustin007442 · dustin007442 · commit cdbda3a3945b · 2023-11-17T14:07:11.000+08:00
diff --git a/thonnycontrib/quecpython/fw/__init__.py b/thonnycontrib/quecpython/fw/__init__.py
@@ -201,17 +201,17 @@ def EigenFwDownload(self):
 
             ap_application_addr = config.get('File_1', 'START_ADDR')
             ap_application_max = config.get('File_1', 'MAX_SIZE')
-            flexfile2 = ap_application_addr + " " + ap_application_max
+            flexfile2 = [ap_application_addr, ap_application_max]
             extra['flexfile2'] = flexfile2
 
             ap_updater_addr = config.get('File_2', 'START_ADDR')
             ap_updater_max = config.get('File_2', 'MAX_SIZE')
-            flexfile3 = ap_updater_addr + " " + ap_updater_max
+            flexfile3 = [ap_updater_addr, ap_updater_max]
             extra['flexfile3'] = flexfile3
 
             customer_fs_addr = config.get('File_3', 'START_ADDR')
             customer_fs_max = config.get('File_3', 'MAX_SIZE')
-            flexfile4 = customer_fs_addr + " " + customer_fs_max
+            flexfile4 = [customer_fs_addr, customer_fs_max]
             extra['flexfile4'] = flexfile4
 
             binpkg_config = configparser.ConfigParser(interpolation=None)
@@ -224,8 +224,7 @@ def EigenFwDownload(self):
             binpkg_config.set('system', 'syspath', str(Path(tmp_path) / "sysloadskip = 0"))
             binpkg_config.set('cp_system', 'cp_syspath', str(Path(tmp_path) / "cp_sysloadskip = 0"))
 
-            binpkg_config.set('flexfile2', 'filepath',
-                                   str(Path(tmp_path) / "fw/ap_application.bin"))
+            binpkg_config.set('flexfile2', 'filepath', str(Path(tmp_path) / "fw/ap_application.bin"))
             binpkg_config.set('flexfile2', 'burnaddr', ap_application_addr)
 
             binpkg_config.set('flexfile3', 'filepath', str(Path(tmp_path) / "fw/ap_updater.bin"))
@@ -237,7 +236,7 @@ def EigenFwDownload(self):
             if File_Count == 4:
                 customer_backup_fs_addr = config.get('File_4', 'START_ADDR')
                 customer_backup_fs_max = config.get('File_4', 'MAX_SIZE')
-                flexfile5 = customer_backup_fs_addr + " " + customer_backup_fs_max
+                flexfile5 = [customer_backup_fs_addr, customer_backup_fs_max]
                 extra['flexfile5'] = flexfile5
 
                 binpkg_config.set('flexfile5', 'filepath',
diff --git a/thonnycontrib/quecpython/fw/proc.py b/thonnycontrib/quecpython/fw/proc.py
@@ -291,7 +291,7 @@ def progress_rate(self):
             # 下载 ap_application.bin文件
             logger.info("---------- Download ap_application.bin flasherase ----------")
             flexfile2 = self.extra['flexfile2']
-            cmd4 = self.cmd[:1] + ["--skipconnect", "1"] + self.cmd[1:] + ["flasherase"] + [flexfile2]
+            cmd4 = self.cmd[:1] + ["--skipconnect", "1"] + self.cmd[1:] + ["flasherase"] + flexfile2
             logger.info('cmd4: {}'.format(cmd4))
             p = Process(cmd4)
             p.run()
@@ -314,7 +314,7 @@ def progress_rate(self):
             # 下载 ap_updater.bin文件
             logger.info("---------- Download ap_updater.bin flasherase ----------")
             flexfile3 = self.extra['flexfile3']
-            cmd6 = self.cmd[:1] + ["--skipconnect", "1"] + self.cmd[1:] + ["flasherase"] + [flexfile3]
+            cmd6 = self.cmd[:1] + ["--skipconnect", "1"] + self.cmd[1:] + ["flasherase"] + flexfile3
             logger.info('cmd6: {}'.format(cmd6))
             p = Process(cmd6)
             p.run()
@@ -337,7 +337,7 @@ def progress_rate(self):
             # 下载 customer_fs.bin文件
             logger.info("---------- Download customer_fs.bin flasherase ----------")
             flexfile4 = self.extra['flexfile4']
-            cmd8 = self.cmd[:1] + ["--skipconnect", "1"] + self.cmd[1:] + ["flasherase"] + [flexfile4]
+            cmd8 = self.cmd[:1] + ["--skipconnect", "1"] + self.cmd[1:] + ["flasherase"] + flexfile4
             logger.info('cmd8: {}'.format(cmd8))
             p = Process(cmd8)
             p.run()
@@ -361,7 +361,7 @@ def progress_rate(self):
                 # 下载 customer_backup_fs.bin 文件
                 logger.info("---------- Download customer_backup_fs.bin flasherase ----------")
                 flexfile5 = self.extra['flexfile5']
-                cmd10 = self.cmd[:1] + ["--skipconnect", "1"] + self.cmd[1:] + ["flasherase"] + [flexfile5]
+                cmd10 = self.cmd[:1] + ["--skipconnect", "1"] + self.cmd[1:] + ["flasherase"] + flexfile5
                 logger.info('cmd10: {}'.format(cmd10))
                 p = Process(cmd10)
                 p.run()
@@ -392,7 +392,7 @@ def progress_rate(self):
                 logger.info(line)
                 self.parse(line)
                 yield line, self.progress
-            yield line, 100
+            yield 'download process finished.', 100
 
     def parse(self, line):
         if "RtsConditionAssign" in line:
