修复raise语句用法;

添加float数据解析;
更新升级传输方案;
This commit is contained in:
何 泽隆
2024-05-21 20:20:23 +08:00
parent 2582721652
commit 5cf4246338
4 changed files with 80 additions and 37 deletions

View File

@@ -10,6 +10,7 @@ modbus_map = {
# 3 - lnt32
# 4 - str
# 5 - addr
# 6 - float
0x0E: ["故障字1", 1],
0x0F: ["故障字2", 1],
0x10: ["MPPT工作状态", 1],
@@ -25,8 +26,8 @@ modbus_map = {
0x1A: ["输入功率", 3],
0x1C: ["设备温度", 2],
0x1D: ["开关机状态", 1],
0x1E: ["保留", 1],
0x1F: ["保留", 1],
0x1E: ["电池电压", 6],
0x20: ["并机功率限值", 6],
0x60: ["光伏通道使能", 1],
0x61: ["最小启动输入电压", 2],
@@ -98,8 +99,13 @@ modbus_map = {
0xAD: ["保留", 1],
0xAE: ["保留", 1],
0xAF: ["保留", 1],
0x100: ["版本", 4, 16],
0x110: ["型号", 4, 16],
0x100: ["版本", 4, 16],
0x110: ["型号", 4, 16],
0x120: ["硬件", 4, 16],
0x130: ["SN", 4, 16],
0x140: ["MES", 4, 16],
0x150: ["Datetime", 4, 16],
0x160: ["厂商", 4, 16],
}
@@ -184,7 +190,7 @@ class LaminaAdapter:
self.block['data']['step'] = 'start'
self.block['data']['index'] = 0
self.block['data']['file'] = Path(path_bin).read_bytes()
self.block['data']['header_offset'] = 128
self.block['data']['header_offset'] = 184
# 启动帧
frame_master = bytearray(make_frame_dlt645(self.block))
@@ -203,7 +209,7 @@ class LaminaAdapter:
break
if self.block["data"]['file_block_size'] == 0:
raise("Error slave response.")
raise Exception("Error slave response.")
# 避免接收到延迟返回报文
time.sleep(0.4)
@@ -235,10 +241,26 @@ class LaminaAdapter:
frame_slave = None
while not frame_slave:
frame_slave = self.com.read_all()
check_frame_dlt645(frame_slave[:18], self.block)
check_frame_dlt645(frame_slave[:20], self.block)
if __name__=='__main__':
dev_lamina = LaminaAdapter()
dev_lamina = LaminaAdapter(com_name="COM8")
dev_lamina.frame_read(0x0E, 0x14)
dev_lamina.frame_read(0x0100, 0x20)
if 0:
dev_lamina.frame_write_str(0x0130, list("SN20240107546"))
dev_lamina.frame_write_str(0x0140, list("MES20240107546"))
dev_lamina.frame_write_str(0x0150, list("D2024050101030"))
time.sleep(2)
dev_lamina.frame_read(0x0130, 0x30)
if not hasattr(__builtins__,"__IPYTHON__"):
# path_bin = Path(r"D:\WorkingProject\LightStackAdapter\software\lamina_adapter\tools\upgrade\SLCP001_240517_1100_T1.10.bin")
path_bin = Path(r"D:\WorkingProject\LightStackAdapter\software\lamina_adapter\tools\upgrade\SLCP001_240520_0000_T1.11.bin")
# path_bin = Path(r"D:\WorkingProject\LightStackAdapter\software\lamina_adapter\tools\upgrade\DGAPD_240516_0000_V1.10.bin")
dev_lamina.frame_update(path_bin)