pig/pig-house-controller
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新proto

Browse Source
This commit is contained in:
huang
2025-10-09 14:00:38 +08:00
parent 46922e8505
commit f30d0e0865
2 changed files with 74 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/proto/client.proto
View File

@@ -24,7 +24,7 @@ message BatchCollectCommand {
// CollectTask
// 定义了单个采集任务的“意图”。
message CollectTask {
Raw485Command command = 2; // 平台生成的原始485指令
Raw485Command command = 1; // 平台生成的原始485指令
}
// CollectResult

89
main/proto/client_pb.py
View File

@@ -8,6 +8,7 @@
import struct
# --- Protobuf基础类型辅助函数 ---
def encode_varint(value):
@@ -19,6 +20,7 @@ def encode_varint(value):
buf.append(value & 0x7F)
return buf
def decode_varint(buf, pos=0):
"""解码varint整数"""
result = 0
@@ -32,12 +34,14 @@ def decode_varint(buf, pos=0):
shift += 7
return result, pos
def encode_string(value):
"""编码字符串"""
value_bytes = value.encode('utf-8')
length = encode_varint(len(value_bytes))
return length + value_bytes
def decode_string(buf, pos=0):
"""解码字符串"""
length, pos = decode_varint(buf, pos)
@@ -45,6 +49,7 @@ def decode_string(buf, pos=0):
pos += length
return value, pos
# --- 消息编码/解码函数 ---
def encode_raw_485_command(bus_number, command_bytes):
@@ -66,6 +71,7 @@ def encode_raw_485_command(bus_number, command_bytes):
result.extend(command_bytes)
return result
def decode_raw_485_command(buf):
"""
解码Raw485Command消息
@@ -93,11 +99,16 @@ def decode_raw_485_command(buf):
result['command_bytes'] = value
else:
# 跳过未知字段
if wire_type == 0: _, pos = decode_varint(buf, pos)
elif wire_type == 2: length, pos = decode_varint(buf, pos); pos += length
else: pos += 1
if wire_type == 0:
_, pos = decode_varint(buf, pos)
elif wire_type == 2:
length, pos = decode_varint(buf, pos);
pos += length
else:
pos += 1
return result
def encode_collect_task(command_msg):
"""
编码CollectTask消息
@@ -107,13 +118,14 @@ def encode_collect_task(command_msg):
bytearray: 编码后的数据
"""
result = bytearray()
# command (field 2, wire type 2)
# command (field 1, wire type 2)
encoded_command = encode_raw_485_command(command_msg['bus_number'], command_msg['command_bytes'])
result.extend(encode_varint((2 << 3) | 2))
result.extend(encode_varint((1 << 3) | 2)) # 字段编号已改为1
result.extend(encode_varint(len(encoded_command)))
result.extend(encoded_command)
return result
def decode_collect_task(buf):
"""
解码CollectTask消息
@@ -129,18 +141,23 @@ def decode_collect_task(buf):
field_number = tag >> 3
wire_type = tag & 0x07
if field_number == 2: # command
if field_number == 1: # command
if wire_type == 2:
length, pos = decode_varint(buf, pos)
value_buf = buf[pos:pos + length]
pos += length
result['command'] = decode_raw_485_command(value_buf)
else:
if wire_type == 0: _, pos = decode_varint(buf, pos)
elif wire_type == 2: length, pos = decode_varint(buf, pos); pos += length
else: pos += 1
if wire_type == 0:
_, pos = decode_varint(buf, pos)
elif wire_type == 2:
length, pos = decode_varint(buf, pos);
pos += length
else:
pos += 1
return result
def encode_batch_collect_command(correlation_id, tasks):
"""
编码BatchCollectCommand消息
@@ -162,6 +179,7 @@ def encode_batch_collect_command(correlation_id, tasks):
result.extend(encoded_task)
return result
def decode_batch_collect_command(buf):
"""
解码BatchCollectCommand消息
@@ -188,11 +206,16 @@ def decode_batch_collect_command(buf):
pos += length
result['tasks'].append(decode_collect_task(value_buf))
else:
if wire_type == 0: _, pos = decode_varint(buf, pos)
elif wire_type == 2: length, pos = decode_varint(buf, pos); pos += length
else: pos += 1
if wire_type == 0:
_, pos = decode_varint(buf, pos)
elif wire_type == 2:
length, pos = decode_varint(buf, pos);
pos += length
else:
pos += 1
return result
def encode_collect_result(correlation_id, values):
"""
编码CollectResult消息
@@ -212,6 +235,7 @@ def encode_collect_result(correlation_id, values):
result.extend(struct.pack('<f', value)) # 小端序浮点数
return result
def decode_collect_result(buf):
"""
解码CollectResult消息
@@ -237,12 +261,18 @@ def decode_collect_result(buf):
pos += 4
result['values'].append(value)
else:
if wire_type == 0: _, pos = decode_varint(buf, pos)
elif wire_type == 5: pos += 4 # fixed32
elif wire_type == 2: length, pos = decode_varint(buf, pos); pos += length
else: pos += 1
if wire_type == 0:
_, pos = decode_varint(buf, pos)
elif wire_type == 5:
pos += 4 # fixed32
elif wire_type == 2:
length, pos = decode_varint(buf, pos);
pos += length
else:
pos += 1
return result
def encode_instruction(payload_type, payload_data):
"""
编码Instruction消息 (包含oneof字段)
@@ -271,6 +301,7 @@ def encode_instruction(payload_type, payload_data):
result.extend(encoded_payload)
return result
def decode_instruction(buf):
"""
解码Instruction消息
@@ -299,12 +330,18 @@ def decode_instruction(buf):
result['collect_result'] = decode_collect_result(value_buf)
else:
# 跳过未知字段
if wire_type == 0: _, pos = decode_varint(buf, pos)
elif wire_type == 5: pos += 4
elif wire_type == 2: length, pos = decode_varint(buf, pos); pos += length
else: pos += 1
if wire_type == 0:
_, pos = decode_varint(buf, pos)
elif wire_type == 5:
pos += 4
elif wire_type == 2:
length, pos = decode_varint(buf, pos);
pos += length
else:
pos += 1
return result
# --- 单元测试与使用范例 ---
if __name__ == "__main__":
print("--- 测试 Raw485Command ---")
@@ -331,7 +368,8 @@ if __name__ == "__main__":
{'command': {'bus_number': 2, 'command_bytes': b'\x02\x03\x00\x01\x00\x01\xd5\xfa'}}
]
}
encoded_batch_collect = encode_batch_collect_command(batch_collect_data['correlation_id'], batch_collect_data['tasks'])
encoded_batch_collect = encode_batch_collect_command(batch_collect_data['correlation_id'],
batch_collect_data['tasks'])
print(f"编码后 BatchCollectCommand: {encoded_batch_collect.hex()}")
decoded_batch_collect = decode_batch_collect_command(encoded_batch_collect)
print(f"解码后 BatchCollectCommand: {decoded_batch_collect}")
@@ -363,7 +401,8 @@ if __name__ == "__main__":
print(f"编码后 Instruction (BatchCollectCommand): {instruction_batch_collect.hex()}")
decoded_instruction_batch_collect = decode_instruction(instruction_batch_collect)
print(f"解码后 Instruction (BatchCollectCommand): {decoded_instruction_batch_collect}")
assert decoded_instruction_batch_collect['batch_collect_command']['correlation_id'] == batch_collect_data['correlation_id']
assert decoded_instruction_batch_collect['batch_collect_command']['correlation_id'] == batch_collect_data[
'correlation_id']
assert len(decoded_instruction_batch_collect['batch_collect_command']['tasks']) == len(batch_collect_data['tasks'])
print("\n--- 测试 Instruction (内含CollectResult) ---")
@@ -371,8 +410,10 @@ if __name__ == "__main__":
print(f"编码后 Instruction (CollectResult): {instruction_collect_result.hex()}")
decoded_instruction_collect_result = decode_instruction(instruction_collect_result)
print(f"解码后 Instruction (CollectResult): {decoded_instruction_collect_result}")
assert decoded_instruction_collect_result['collect_result']['correlation_id'] == collect_result_data['correlation_id']
assert decoded_instruction_collect_result['collect_result']['correlation_id'] == collect_result_data[
'correlation_id']
for i in range(len(collect_result_data['values'])):
assert abs(decoded_instruction_collect_result['collect_result']['values'][i] - collect_result_data['values'][i]) < 1e-5
assert abs(
decoded_instruction_collect_result['collect_result']['values'][i] - collect_result_data['values'][i]) < 1e-5
print("\n所有测试均已通过!")