|
@@ -170,8 +170,8 @@ class NBusBridge:
|
|
|
|
|
|
|
|
:return: dataframe of the network data
|
|
:return: dataframe of the network data
|
|
|
"""
|
|
"""
|
|
|
- resp_length, *response = self.__port.request_bridge(NBusCommand.CMD_GET_DATA, bytearray())
|
|
|
|
|
- return pd.DataFrame([self._parse_bridge_data_from_packet(bytearray(response), False)])
|
|
|
|
|
|
|
+ response = self.__port.request_bridge(NBusCommand.CMD_GET_DATA, bytearray())
|
|
|
|
|
+ return pd.DataFrame([self._parse_bridge_data_from_packet(response[1:], False)])
|
|
|
|
|
|
|
|
def cmd_get_info(self) -> NBusBridgeInfo:
|
|
def cmd_get_info(self) -> NBusBridgeInfo:
|
|
|
"""
|
|
"""
|
|
@@ -298,11 +298,11 @@ class NBusBridge:
|
|
|
while data_offset < packet_size - NBUS_CRC_SIZE:
|
|
while data_offset < packet_size - NBUS_CRC_SIZE:
|
|
|
module_addr = data_packet[data_offset]
|
|
module_addr = data_packet[data_offset]
|
|
|
data_offset += NBUS_MA_SIZE
|
|
data_offset += NBUS_MA_SIZE
|
|
|
- packet_size = self.__slaves_meta[module_addr].packet_size
|
|
|
|
|
- packet = data_packet[data_offset : data_offset + packet_size]
|
|
|
|
|
|
|
+ slave_size = self.__slaves_meta[module_addr].packet_size
|
|
|
|
|
+ packet = data_packet[data_offset : data_offset + slave_size]
|
|
|
|
|
|
|
|
- data |= self._parse_slave_data_from_response(module_addr, packet_size, packet)
|
|
|
|
|
- data_offset += packet_size
|
|
|
|
|
|
|
+ data |= self._parse_slave_data_from_response(module_addr, slave_size, packet)
|
|
|
|
|
+ data_offset += slave_size
|
|
|
|
|
|
|
|
return data
|
|
return data
|
|
|
|
|
|