taotoolkit 1.0.0__tar.gz → 1.0.2__tar.gz

{taotoolkit-1.0.0 → taotoolkit-1.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: taotoolkit
-Version: 1.0.0
+Version: 1.0.2
 Summary: Tao ToolKit
 Author-email: taotaoli <taotaoli@asrmicro.com>
 License-Expression: MIT

{taotoolkit-1.0.0 → taotoolkit-1.0.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "taotoolkit"
-version = "1.0.0"
+version = "1.0.2"
 description = "Tao ToolKit"
 readme = "README.md"
 requires-python = ">=3.8"

{taotoolkit-1.0.0 → taotoolkit-1.0.2}/taotoolkit/tao_camDvt.py

@@ -70,7 +70,7 @@ class CamDvt(asrCamOp):
             else:
                 return 1
         except Exception as e:
-            loge(str(e))
+            loge(e)
             return 1
 
     def createOutFolder(self, folderName="result"):

{taotoolkit-1.0.0 → taotoolkit-1.0.2}/taotoolkit/tao_common.py

@@ -1,3 +1,7 @@
+#!/usr/bin/env python
+# -*- encoding: utf-8 -*-
+"""公共工具层：日志、命令执行、缓存、文件与字符串辅助函数。"""
+
 import os
 import re
 import subprocess

{taotoolkit-1.0.0 → taotoolkit-1.0.2}/taotoolkit/tao_device.py

@@ -158,7 +158,7 @@ class DevOp:
                 eExit("no devices detect")
             return devices
         except subprocess.CalledProcessError as e:
-            loge(str(e))
+            loge(e)
             return None
 
     def getSerial(self):
@@ -495,7 +495,7 @@ class DevOp:
         fileList = []
         cmd = f"adb -s {self.serial} shell ls -t {path}"
         allFileList = rCmd(cmd)[0].split("\n")[0:-1]
-        logd(str(allFileList))
+        logd(allFileList)
         for file in allFileList:
             for i in suffix:
                 if file.lower().endswith(i) and "thumb" not in file:

{taotoolkit-1.0.0 → taotoolkit-1.0.2}/taotoolkit/tao_flash.py

@@ -56,7 +56,7 @@ class jenkinsTool:
             self.downloadPath = "/home/local/Downloads/jenkin"  # 下载路径和解压路径
             self.extractPath = "/home/local/Downloads/jenkin"
             self.aimgTool = "aimgtool"
-        elif sysVersion == "Windows":
+        else:
             self.downloadPath = r"D:\jenkin"  # 下载路径和解压路径
             self.extractPath = r"D:\jenkin"
             self.aimgTool = "aimgtool.exe"
@@ -637,7 +637,7 @@ class jenkinsTool:
         cmd = ""
         if sysVersion == "Linux":
             cmd = f"./{self.aimgTool} download -t {finalCfg}"
-        elif sysVersion == "Windows":
+        else:
             cmd = f"{self.aimgTool} download -t {finalCfg}"
         logi(cmd)
         oCmd(cmd)
@@ -728,16 +728,14 @@ def CLI_downJKS(argsList):
     parser.add_argument("-n", "--num", type=int, default=0, help="jenkins上的编译号,0表示最新编译结果")
     parser.add_argument("-b", "--board", type=str, default="larkpro_phone-sp01-userdebug", help="烧录板卡")
     parser.add_argument("-t", "--type", type=str, default="db", choices=["db", "ci"], help="编译类型 db/ci")
-    parser.add_argument(
-        "-a", "--android", type=str, default="16", choices=["16", "15", "16sdk", "15sdk"], help="安卓分支"
-    )
+    parser.add_argument("-a", "--android", type=str, default="16", choices=["17", "16", "15", "17sdk", "16sdk", "15sdk"], help="安卓分支")
     parser.add_argument("-u", "--user", type=str, default="taotaoli", help="触发用户")
     parser.add_argument("-d", "--debug", type=str, default="1", choices=["0", "1"], help="是否烧录debug版本")
     parser.add_argument("-r", "--ratain", type=str, default="0", choices=["0", "1"], help="烧录是否保留userdata")
     parser.add_argument("--username", type=str, default=None, help="jenkins用户名")
     parser.add_argument("--password", type=str, default=None, help="jenkins密码或API Token")
     args = parser.parse_args(argsList)
-    buildBranch = ("16", "15", "16sdk", "15sdk")
+    buildBranch = ("17", "16", "15", "17sdk", "16sdk", "15sdk")
     ad = args.android
     if ad not in buildBranch:
         eExit(f"{ad} not in {buildBranch}")
@@ -746,6 +744,8 @@ def CLI_downJKS(argsList):
         "15": "adroid15.0",
         "16": "adroid16.0",
         "16sdk": "adroid16_sdk_r1",
+        "17": "adroid17.0",
+        "17sdk": "adroid17_sdk_r1",
     }
     branch = branchDict.get(ad)
     jenks = jenkinsTool(branch, args.type, args.user, args.debug, args.username, args.password)

{taotoolkit-1.0.0 → taotoolkit-1.0.2}/taotoolkit/tao_tuning.py

@@ -542,7 +542,7 @@ class asrCamOp(DevOp):
         super().__init__(**kwargs)
         if sysVersion == "Linux":
             self.tuning_assistant = "tuning_assistant64.out"
-        elif sysVersion == "Windows":
+        else:
             self.tuning_assistant = "tuning_assistant64.exe"
         self.soc = self.getASRDevice()
         self.lcdOnAndUnlock()
@@ -654,7 +654,7 @@ class asrCamOp(DevOp):
                 out = rCmd("ifconfig")[0]
                 ip = out.split("\n")[1].strip().split(" ")[1]
                 logi(f"{ip} : 12218")
-            elif sysVersion == "Windows":
+            else:
                 loge("windows unsupport")
                 return
             else:
@@ -672,7 +672,7 @@ class asrCamOp(DevOp):
                     splitCmd=False,
                 )
                 rCmd(f"adb -s {self.serial} forward --remove tcp:10000", showCmd=True, logLevel="info")
-            elif sysVersion == "Windows":
+            else:
                 self.resetNet()
                 rCmd(f"adb -s {self.serial} forward --remove tcp:10000")
                 rCmd("netsh interface portproxy reset", showRet=False)
@@ -689,7 +689,7 @@ class asrCamOp(DevOp):
         sleep(2)
         self.tuningGetModuleGroup()
 
-    def readIsp(self, CFliter: str, param: str, row=0, col=0, is_float=False, showCmd=False, module=0, group=0):
+    def readIsp(self, CFliter: str, param: str, row=0, col=0, is_float=False, showCmd=False, module=0, group=0)-> Union[int, float]:
         if sysVersion == "Linux":
             eExit("tuning_assistant not support linux")
         cmd = f"{self.tuning_assistant} 127.0.0.1 t 3000 3000 3000 r m{module}_g{group} {CFliter} {param} {row} {col}"
@@ -706,14 +706,14 @@ class asrCamOp(DevOp):
                     tmp = ctypes.c_int(value_f)
                     result = ctypes.cast(ctypes.pointer(tmp), ctypes.POINTER(ctypes.c_float)).contents.value
                     return float(result)
-                return float(cmdResult)
+                return int(cmdResult)
             logCallErr(f"{cmd}, please check the command.")
-            return 0.0
+            return 0
             # self.tcpRemove()
             # raise Exception("cmd fail")
         except Exception as e:
-            logCallErr(str(e))
-            return 0.0
+            logCallErr(e)
+            return 0
 
     def writeIsp(self, CFliter: str, param: str, row: int, col: int, value: Union[int, float], showCmd=False):
         if sysVersion == "Linux":
@@ -1178,7 +1178,7 @@ def CLI_saveTuning(argsList):
         try:
             otpEn = asrCam.readIsp("CDigitalGainFirmwareFilter", "m_bWhiteBalanceOTPEnable")
         except Exception as exc:
-            loge(str(exc))
+            loge(exc)
             otpEn = 0
     else:
         otpEn = 0

{taotoolkit-1.0.0 → taotoolkit-1.0.2}/taotoolkit.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: taotoolkit
-Version: 1.0.0
+Version: 1.0.2
 Summary: Tao ToolKit
 Author-email: taotaoli <taotaoli@asrmicro.com>
 License-Expression: MIT