TSMasterAPI 2024.8.7.1162__tar.gz → 2024.8.21.1167__tar.gz

{TSMasterAPI-2024.8.7.1162 → TSMasterAPI-2024.8.21.1167}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: TSMasterAPI
-Version: 2024.8.7.1162
+Version: 2024.8.21.1167
 Summary: Use TSMaster hardware
 Home-page: UNKNOWN
 Author: seven

{TSMasterAPI-2024.8.7.1162 → TSMasterAPI-2024.8.21.1167}/TSMasterAPI/TSDirver.py

@@ -11,6 +11,8 @@ import platform
 
 TSMaster_location = r"Software\TOSUN\TSMaster"
 
+_curr_path = os.path.dirname(__file__)
+
 key = winreg.OpenKey(winreg.HKEY_CURRENT_USER, TSMaster_location)
 
 _arch, _os = platform.architecture()
@@ -42,6 +44,13 @@ if dll_path != '':
         dllPath = os.path.split(dll_path)[0]
         dll = WinDLL(dll_path)
     except Exception as r:
-        print(r"Could not load the TOSUN DLL from '%s'. Error: %s" % (dll_path, r))
+        try:
+            if _arch == '32bit':
+                dll_path = _curr_path + "\\windows\\bin\\TSMaster.dll"
+            else:
+                dll_path = _curr_path + "\\windows\\bin64\\TSMaster.dll"
+            dll = WinDLL(dll_path)
+        except Exception as r:
+            print(r"Could not load the TOSUN DLL from '%s'. Error: %s" % (dll_path, r))
 else:
     print(r"Could not load the TOSUN DLL Error: Registry not found")

{TSMasterAPI-2024.8.7.1162 → TSMasterAPI-2024.8.21.1167}/TSMasterAPI/TSEnum.py

@@ -25,7 +25,8 @@ class _TLIBBusToolDeviceType(CEnum):
     TS_WIRELESS_OBD = 10
     TS_USB_DEVICE_EX = 11
     IXXAT_USB_DEVICE = 12
-    BUS_DEV_TYPE_COUNT = 13
+    TS_ETH_IF_DEVICE = 13
+    BUS_DEV_TYPE_COUNT = 14
 TLIBBusToolDeviceType = c_int32
 PLIBBusToolDeviceType = ps32
 
@@ -260,6 +261,44 @@ class _TSTIMSignalStatus(CEnum):
 TSTIMSignalStatus = c_int32
 PSTIMSignalStatus = ps32
 
+class _TLIBPanelSignalType(CEnum):
+    pstNone = 0
+    pstCANSignal = 1
+    pstLINSignal = 2
+    pstSystemVar = 3
+    pstFlexRaySignal = 4
+    pstAPICall = 5
+TLIBPanelSignalType = c_int32
+PLIBPanelSignalType = ps32
+
+class _TLIBPanelControlType(CEnum):
+    pctText = 0
+    pctImage = 1
+    pctGroupBox = 2
+    pctPanel = 3
+    pctPathButton = 4
+    pctCheckBox = 5
+    pctTrackBar = 6
+    pctScrollBar = 7
+    pctInputOutputBox = 8
+    pctImageButton = 9
+    pctSelector = 10
+    pctButton = 11
+    pctProgressBar = 12
+    pctRadioButton = 13
+    pctStartStopButton = 14
+    pctSwitch = 15
+    pctLED = 16
+    pctPageControl = 17
+    pctGauge = 18
+    pctGraphics = 19
+    pctPie = 20
+    pctRelationChart = 21
+    pctMemo = 22
+    pctScrollBox = 23
+TLIBPanelControlType = c_int32
+PLIBPanelControlType = ps32
+
 class _TLIBCANFDControllerType(CEnum):
     lfdtCAN = 0
     lfdtISOCAN = 1

TSMasterAPI-2024.8.21.1167/TSMasterAPI/__init__.py

@@ -0,0 +1,2 @@
+from .TSAPI import *
+__version__ = 'v2024.8.21.1167'

{TSMasterAPI-2024.8.7.1162 → TSMasterAPI-2024.8.21.1167}/TSMasterAPI.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: TSMasterAPI
-Version: 2024.8.7.1162
+Version: 2024.8.21.1167
 Summary: Use TSMaster hardware
 Home-page: UNKNOWN
 Author: seven

{TSMasterAPI-2024.8.7.1162 → TSMasterAPI-2024.8.21.1167}/TSMasterAPI.egg-info/SOURCES.txt

@@ -12,4 +12,6 @@ TSMasterAPI/__init__.py
 TSMasterAPI.egg-info/PKG-INFO
 TSMasterAPI.egg-info/SOURCES.txt
 TSMasterAPI.egg-info/dependency_links.txt
-TSMasterAPI.egg-info/top_level.txt
+TSMasterAPI.egg-info/top_level.txt
+TSMasterAPI/windows/bin/TSMaster.dll
+TSMasterAPI/windows/bin64/TSMaster.dll

{TSMasterAPI-2024.8.7.1162 → TSMasterAPI-2024.8.21.1167}/setup.py

@@ -29,6 +29,10 @@ setup(name='TSMasterAPI',  # 包名
       install_requires=[],
       license='Apache License',
       packages=find_packages(),
+      data_files=[
+        ('./TSMasterAPI/windows/bin', ['./TSMasterAPI/windows/bin/TSMaster.dll']),
+        ('./TSMasterAPI/windows/bin64', ['./TSMasterAPI/windows/bin64/TSMaster.dll'])
+      ],
       platforms=["WINDOWS"],
       classifiers=[
           'Intended Audience :: Developers',

TSMasterAPI-2024.8.7.1162/TSMasterAPI/__init__.py

@@ -1,2 +0,0 @@
-from .TSAPI import *
-__version__ = 'v2024.8.7.1162'