Browse Source

Data fetcg bugfix

xnecas 1 day ago
parent
commit
f6cbae8b3d

+ 2 - 3
examples/example_bridge.py

@@ -20,7 +20,6 @@ BRIDGE_STREAM_INTERVAL = 5.0
 if __name__ == "__main__":
     # create port
     port = NBusSerialPort(NBusSerialConfig(**config))
-
     # create module
     bridge = NBusBridge(port, BRIDGE_ACQUIRE_WAIT)
 
@@ -61,8 +60,8 @@ if __name__ == "__main__":
         df.to_csv("data.csv", index=False)
 
     except Exception as e:
-        print(e)
-
+        print(str(e))
+        
     finally:
         port.flush()
         port.close()

BIN
nbus_api/__pycache__/nbus_bridge.cpython-313.pyc


+ 6 - 6
nbus_api/nbus_bridge.py

@@ -170,8 +170,8 @@ class NBusBridge:
 
         :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:
         """
@@ -298,11 +298,11 @@ class NBusBridge:
             while data_offset < packet_size - NBUS_CRC_SIZE:
                 module_addr = data_packet[data_offset]
                 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
 

BIN
nbus_hal/nbus_serial/__pycache__/serial_port.cpython-313.pyc


+ 1 - 1
nbus_hal/nbus_serial/serial_port.py

@@ -143,7 +143,7 @@ class NBusSerialPort(NBusPort):
         :param command: command id
         :param data: command data to send
         """
-        request = self._create_packet(bytearray([0, NBUS_BROADCAST_ADDR, NBUS_BRIDGE_ADDR, command.value]), data)
+        request = self._create_packet(bytearray([0, NBUS_BROADCAST_ADDR, NBUS_BROADCAST_ADDR, command.value]), data)
         self._log("DATA", f"{request[0]:3}", "\tARQ>", list(request[1:]))
         self._port.write(request)  # send message