Index: leahi_dialin/ui/dd_messaging.py =================================================================== diff -u -r6c90336ac2cd8cf34ac620cff431a847d9ddf557 -rc1d85920b494cf842198287dd74c886aafafc50e --- leahi_dialin/ui/dd_messaging.py (.../dd_messaging.py) (revision 6c90336ac2cd8cf34ac620cff431a847d9ddf557) +++ leahi_dialin/ui/dd_messaging.py (.../dd_messaging.py) (revision c1d85920b494cf842198287dd74c886aafafc50e) @@ -141,19 +141,23 @@ self.can_interface.send(message, 0) - def dd_levels(self, d6Level : int, - d63Level: int, - d46Level: int): + def dd_levels(self, d46Level : int, + d63Level : int, + d98Level : int, + d6Level : int, + bicardLevel: int): """ Broadcasts the current DD Level Sensor data (Msg ID: 0x29, 41) Args: d6Level (int ): floater switch low, medium and high status d63Level (int ): bicarb level low or high status d46Level (int ): Spent dialysate air separation chamber level low or high status """ - payload = conversions.unsigned_integer_to_bytearray(d6Level ) - payload += conversions.unsigned_integer_to_bytearray(d63Level ) - payload += conversions.unsigned_integer_to_bytearray(d46Level ) + payload = conversions.unsigned_integer_to_bytearray(d46Level ) + payload += conversions.unsigned_integer_to_bytearray(d63Level ) + payload += conversions.unsigned_integer_to_bytearray(d98Level ) + payload += conversions.unsigned_integer_to_bytearray(d6Level ) + payload += conversions.unsigned_integer_to_bytearray(bicardLevel ) message = CAN.CanMessage.build_message( channel_id=CAN.CanChannels.dd_sync_broadcast_ch_id, @@ -162,20 +166,13 @@ self.can_interface.send(message, 0) - def dd_pressure(self, m1Pressure : float, - m3Pressure : float, - d9Pressure : float, + + def dd_pressure(self, d9Pressure : float, d66Pressure : float, d51Pressure : float, d18Pressure : float, - d41Pressure : float, - m1PresTemp : float, - m3PresTemp : float, - d9PresTemp : float, - d66PresTemp : float, - d51PresTemp : float, - d18PresTemp : float, - d41PresTemp : float): + d41Pressure : float, + d87Pressure : float): """ Broadcasts the current DD Level Sensor data (Msg ID: 0x1C, 28) Args: @@ -194,20 +191,12 @@ d18PresTemp (float): Fresh Dialysate temperature d41PresTemp (float): Transmembrane temperature """ - payload = conversions.float_to_bytearray(m1Pressure ) - payload += conversions.float_to_bytearray(m3Pressure ) - payload += conversions.float_to_bytearray(d9Pressure ) - payload += conversions.float_to_bytearray(d66Pressure ) - payload += conversions.float_to_bytearray(d51Pressure ) - payload += conversions.float_to_bytearray(d18Pressure ) - payload += conversions.float_to_bytearray(d41Pressure ) - payload += conversions.float_to_bytearray(m1PresTemp ) - payload += conversions.float_to_bytearray(m3PresTemp ) - payload += conversions.float_to_bytearray(d9PresTemp ) - payload += conversions.float_to_bytearray(d66PresTemp ) - payload += conversions.float_to_bytearray(d51PresTemp ) - payload += conversions.float_to_bytearray(d18PresTemp ) - payload += conversions.float_to_bytearray(d41PresTemp ) + payload = conversions.float_to_bytearray(d9Pressure ) + payload += conversions.float_to_bytearray(d66Pressure) + payload += conversions.float_to_bytearray(d51Pressure) + payload += conversions.float_to_bytearray(d18Pressure) + payload += conversions.float_to_bytearray(d41Pressure) + payload += conversions.float_to_bytearray(d87Pressure) message = CAN.CanMessage.build_message( channel_id=CAN.CanChannels.dd_sync_broadcast_ch_id, @@ -216,21 +205,30 @@ self.can_interface.send(message, 0) - def dd_temperature(self, d1Temp : float, - x6Temp : float, - d4Temp : float, - d50Temp : float, - boardTemp : float, - baroTemp : float, - d16CondTemp : float, - d28CondTemp : float, - d30CondTemp : float, - d44CondTemp : float, - d75CondTemp : float, - d4AvgTemp : float, - d50AvgTemp : float, - d28AvgTemp : float, - d30AvgTemp : float): + + def dd_temperature(self, d1Temperature : float, + d78Temperature : float, + d4Temperature : float, + d50Temperature : float, + d99Temperature : float, + boardTemperature : float, + d16Conductivity : float, + d28Conductivity : float, + d30Conductivity : float, + d44Conductivity : float, + d75Conductivity : float, + d4MovingAverage : float, + d50MovingAverage : float, + d99MovingAverage : float, + d28MovingAverage : float, + d30MovingAverage : float, + d78MovingAverage : float, + d9PressureAverage : float, + d66PressureAverage: float, + d51PressureAverage: float, + d18PressureAverage: float, + d41PressureAverage: float, + d87PressureAverage: float): """ Broadcasts the current DD Level Sensor data (Msg ID: 0x26, 38) Args: @@ -250,21 +248,29 @@ d28AvgTemp (float) : D28 moving average temperature value d30AvgTemp (float) : D30 moving average temperature value """ - payload = conversions.float_to_bytearray(d1Temp ) - payload += conversions.float_to_bytearray(x6Temp ) - payload += conversions.float_to_bytearray(d4Temp ) - payload += conversions.float_to_bytearray(d50Temp ) - payload += conversions.float_to_bytearray(boardTemp ) - payload += conversions.float_to_bytearray(baroTemp ) - payload += conversions.float_to_bytearray(d16CondTemp ) - payload += conversions.float_to_bytearray(d28CondTemp ) - payload += conversions.float_to_bytearray(d30CondTemp ) - payload += conversions.float_to_bytearray(d44CondTemp ) - payload += conversions.float_to_bytearray(d75CondTemp ) - payload += conversions.float_to_bytearray(d4AvgTemp ) - payload += conversions.float_to_bytearray(d50AvgTemp ) - payload += conversions.float_to_bytearray(d28AvgTemp ) - payload += conversions.float_to_bytearray(d30AvgTemp ) + payload = conversions.float_to_bytearray(d1Temperature ) + payload += conversions.float_to_bytearray(d78Temperature ) + payload += conversions.float_to_bytearray(d4Temperature ) + payload += conversions.float_to_bytearray(d50Temperature ) + payload += conversions.float_to_bytearray(d99Temperature ) + payload += conversions.float_to_bytearray(boardTemperature ) + payload += conversions.float_to_bytearray(d16Conductivity ) + payload += conversions.float_to_bytearray(d28Conductivity ) + payload += conversions.float_to_bytearray(d30Conductivity ) + payload += conversions.float_to_bytearray(d44Conductivity ) + payload += conversions.float_to_bytearray(d75Conductivity ) + payload += conversions.float_to_bytearray(d4MovingAverage ) + payload += conversions.float_to_bytearray(d50MovingAverage ) + payload += conversions.float_to_bytearray(d99MovingAverage ) + payload += conversions.float_to_bytearray(d28MovingAverage ) + payload += conversions.float_to_bytearray(d30MovingAverage ) + payload += conversions.float_to_bytearray(d78MovingAverage ) + payload += conversions.float_to_bytearray(d9PressureAverage ) + payload += conversions.float_to_bytearray(d66PressureAverage) + payload += conversions.float_to_bytearray(d51PressureAverage) + payload += conversions.float_to_bytearray(d18PressureAverage) + payload += conversions.float_to_bytearray(d41PressureAverage) + payload += conversions.float_to_bytearray(d87PressureAverage) message = CAN.CanMessage.build_message( channel_id=CAN.CanChannels.dd_sync_broadcast_ch_id,