solax-py-library 1.0.0.2515__tar.gz → 1.0.0.2516__tar.gz

{solax_py_library-1.0.0.2515 → solax_py_library-1.0.0.2516}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: solax-py-library
-Version: 1.0.0.2515
+Version: 1.0.0.2516
 Summary: some common tool
 Author: shenlvyu
 Author-email: 13296718439@163.com

{solax_py_library-1.0.0.2515 → solax_py_library-1.0.0.2516}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "solax-py-library"
-version = "1.0.0.2515"
+version = "1.0.0.2516"
 description = "some common tool"
 authors = ["shenlvyu <13296718439@163.com>", "x5m8944pjl <371630856@qq.com>"]
 readme = "README.md"

{solax_py_library-1.0.0.2515 → solax_py_library-1.0.0.2516}/solax_py_library/utils/struct_util.py

@@ -3,15 +3,15 @@ import struct
 from typing import List
 
 format_map = {
-    "int8": "bb",
-    "uint8": "BB",
-    "int16": "h",
-    "uint16": "H",
-    "int32": "i",
-    "uint32": "I",
-    "int64": "q",
-    "uint64": "Q",
-    "float": "f",
+    "int8": {"format_str": "bb", "length": 1},
+    "uint8": {"format_str": "BB", "length": 1},
+    "int16": {"format_str": "h", "length": 1},
+    "uint16": {"format_str": "H", "length": 1},
+    "int32": {"format_str": "i", "length": 2},
+    "uint32": {"format_str": "I", "length": 2},
+    "int64": {"format_str": "q", "length": 4},
+    "uint64": {"format_str": "Q", "length": 4},
+    "float": {"format_str": "f", "length": 1},
 }
 
 
@@ -27,25 +27,16 @@ def unpack(data: List, data_format, reversed=False):
         raise Exception("暂不支持")
     pack_str = ("<" if reversed else ">") + "H" * len(cur_data)
     to_pack_data = struct.pack(pack_str, *cur_data)
-    struct_format = ("<" if reversed else ">") + format_map[data_format]
+    struct_format = ("<" if reversed else ">") + format_map[data_format]["format_str"]
     return struct.unpack(struct_format, to_pack_data)
 
 
-def struct_transform(value, fmt, order="big"):
+def pack(value, fmt, order="big"):
     """将10进制的原始值转换为modbus协议需要的精度与类型的值"""
     opt = "<" if order == "little" else ">"
-    try:
-        value = int(value)
-        if fmt in format_map:
-            ret = struct.pack(f"{opt}{format_map[fmt]}", value)
-            ret_list = struct.unpack(f"{opt}H", ret)
-        else:
-            ret_list = [0]
-    except Exception:
-        if "16" in fmt:
-            ret_list = [0]
-        elif "32" in fmt:
-            ret_list = [0, 0]
-        else:
-            ret_list = [0, 0, 0, 0]
+    if fmt not in format_map:
+        raise Exception("暂不支持")
+    value = int(value)
+    ret = struct.pack(f'{opt}{format_map[fmt]["format_str"]}', value)
+    ret_list = struct.unpack(f'{opt}{"H" * format_map[fmt]["length"]}', ret)
     return list(ret_list)