Index: leahi_dialin/ui/dd_messaging.py =================================================================== diff -u -r84e4345fc09b9796d6430c49f11cc2b0a1e33522 -re38b6be81cddc03b21837ab51fdd3baa4ae14bfd --- leahi_dialin/ui/dd_messaging.py (.../dd_messaging.py) (revision 84e4345fc09b9796d6430c49f11cc2b0a1e33522) +++ leahi_dialin/ui/dd_messaging.py (.../dd_messaging.py) (revision e38b6be81cddc03b21837ab51fdd3baa4ae14bfd) @@ -24,7 +24,7 @@ def info(a1, a2): pass - self.can_interface = CAN.DenaliCanMessenger(can_interface=self.can_Channel, logger=fakeLogger() ) + self.can_interface = CAN.CanMessenger(can_interface=self.can_Channel, logger=fakeLogger() ) self.can_interface.start() if self.can_interface is not None: @@ -52,8 +52,8 @@ payload += conversions.float_to_bytearray(D43 ) payload += conversions.float_to_bytearray(D74 ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.dd_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.dd_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_DD_CONDUCTIVITY_DATA.value, payload=payload) @@ -80,8 +80,8 @@ payload += conversions.unsigned_integer_to_bytearray(is_dial_good ) payload += conversions.float_to_bytearray (currentQd ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.dd_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.dd_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_DD_GEN_DIALYSATE_MODE_DATA.value, payload=payload) @@ -117,8 +117,8 @@ payload += conversions.unsigned_byte_to_bytearray (fpga_lab ) payload += conversions.unsigned_integer_to_bytearray(compatibility_rev) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.dd_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.dd_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_DD_VERSION_RESPONSE.value, payload=payload) @@ -134,48 +134,45 @@ # TODO: replace with proper payload and message ID once message is defined payload = bytes(serial, 'ascii') + b'\x00' - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.dd_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.dd_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_DD_SERIAL_RESPONSE.value, payload=payload) 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.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.dd_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.dd_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_DD_LEVEL_DATA.value, payload=payload) 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,43 +191,44 @@ 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.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.dd_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.dd_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_DD_PRESSURES_DATA.value, payload=payload) 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,24 +248,32 @@ 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.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.dd_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.dd_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_DD_TEMPERATURE_DATA.value, payload=payload) @@ -329,8 +335,8 @@ payload += conversions.float_to_bytearray (dbg8 ) payload += conversions.float_to_bytearray (dbg9 ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.dd_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.dd_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_DD_HEATERS_DATA.value, payload=payload) @@ -416,8 +422,8 @@ payload += conversions.unsigned_integer_to_bytearray(d76PumpState ) payload += conversions.float_to_bytearray (d76PumpPulseUS ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.dd_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.dd_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_DD_CONCENTRATE_PUMP_DATA.value, payload=payload) @@ -489,23 +495,41 @@ payload += conversions.unsigned_integer_to_bytearray(d12PumpMeasuredDir ) payload += conversions.unsigned_integer_to_bytearray(d48PumpMeasuredDir ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.dd_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.dd_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_DIALYSATE_PUMPS_DATA.value, payload=payload) self.can_interface.send(message, 0) - def dd_blood_leak(self, blood_leak: int): + def dd_blood_leak(self, BloodLeakStatus : int , + BloodLeakState : int , + BloodLeakPersistentCounter : int , + BloodLeakSerialCommState : int , + BloodLeakIntensity : int , + BloodLeakDetect : int , + BloodLeakIntensityMovingAvg : float , + BloodLeakTimeSinceZeroMS : int , + DriftInRangeStatus : int , + DriftUpperRangeStatus : int ): """ Broadcasts the current DD Level Sensor data (Msg ID: 0x60, 96) Args: blood_leak (int ): Blood Leak status """ - payload = conversions.unsigned_integer_to_bytearray(blood_leak ) + payload = conversions.unsigned_integer_to_bytearray(BloodLeakStatus ) + payload += conversions.unsigned_integer_to_bytearray(BloodLeakState ) + payload += conversions.unsigned_integer_to_bytearray(BloodLeakPersistentCounter ) + payload += conversions.unsigned_integer_to_bytearray(BloodLeakSerialCommState ) + payload += conversions.unsigned_integer_to_bytearray(BloodLeakIntensity ) + payload += conversions.unsigned_integer_to_bytearray(BloodLeakDetect ) + payload += conversions.float_to_bytearray (BloodLeakIntensityMovingAvg ) + payload += conversions.unsigned_integer_to_bytearray(BloodLeakTimeSinceZeroMS ) + payload += conversions.unsigned_integer_to_bytearray(DriftInRangeStatus ) + payload += conversions.unsigned_integer_to_bytearray(DriftUpperRangeStatus ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.dd_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.dd_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_DD_BLOOD_LEAK_DATA.value, payload=payload) @@ -521,8 +545,8 @@ payload = conversions.integer_to_bytearray(1 if vRejectionReason == 0 else 0) payload += conversions.integer_to_bytearray(vRejectionReason) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.dd_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.dd_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_DD_DATE_AND_TIME_RESPONSE.value, payload=payload) self.can_interface.send(message, 0) @@ -665,8 +689,8 @@ for i in range(len(valvesensedState)): payload += conversions.unsigned_byte_to_bytearray(valvesensedState[i]) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.dd_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.dd_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_DD_VALVES_STATES_DATA.value, payload=payload)