Index: leahi_dialin/ui/fp_messaging.py =================================================================== diff -u -re4ddc3ed6d05ef9f2a69e8130dfdcc4377b00262 -r49b711a972d5843dd6d5bd7850f3db5c8f8bb1bc --- leahi_dialin/ui/fp_messaging.py (.../fp_messaging.py) (revision e4ddc3ed6d05ef9f2a69e8130dfdcc4377b00262) +++ leahi_dialin/ui/fp_messaging.py (.../fp_messaging.py) (revision 49b711a972d5843dd6d5bd7850f3db5c8f8bb1bc) @@ -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: @@ -60,22 +60,18 @@ 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.fp_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.fp_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_FP_VERSION_RESPONSE.value, payload=payload) self.can_interface.send(message, 0) - def fp_pressure(self, m1Pressure : float, - m3Pressure : float, + def fp_pressure(self, m3Pressure : float, p8Pressure : float, p13Pressure : float, p17Pressure : float, - x1Pressure : float, - x2Pressure : float, - x3Pressure : float, - x4Pressure : float): + p46Pressure : float): """ Broadcasts the current FP Level Sensor data (Msg ID: 0x34, 52) Args: @@ -90,18 +86,14 @@ x4Pressure (float): Pressure drain drop @return: None """ - payload = conversions.float_to_bytearray(m1Pressure ) - payload += conversions.float_to_bytearray(m3Pressure ) - payload += conversions.float_to_bytearray(p8Pressure ) - payload += conversions.float_to_bytearray(p13Pressure ) - payload += conversions.float_to_bytearray(p17Pressure ) - payload += conversions.float_to_bytearray(x1Pressure ) - payload += conversions.float_to_bytearray(x2Pressure ) - payload += conversions.float_to_bytearray(x3Pressure ) - payload += conversions.float_to_bytearray(x4Pressure ) + payload = conversions.float_to_bytearray(m3Pressure ) + payload += conversions.float_to_bytearray(p8Pressure ) + payload += conversions.float_to_bytearray(p13Pressure) + payload += conversions.float_to_bytearray(p17Pressure) + payload += conversions.float_to_bytearray(p46Pressure) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.fp_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.fp_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_FP_PRESSURES_DATA.value, payload=payload) @@ -140,8 +132,8 @@ payload += conversions.float_to_bytearray (p12PumpDutyCyclePct ) payload += conversions.float_to_bytearray (p12PumpFBDutyCyclePct ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.fp_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.fp_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_FP_RO_PUMP_DATA.value, payload=payload) @@ -156,17 +148,15 @@ """ payload = conversions.unsigned_integer_to_bytearray(p25Level ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.fp_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.fp_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_FP_LEVEL_DATA.value, payload=payload) self.can_interface.send(message, 0) def fp_flow_sensors(self, p7Flow : float, - p16Flow : float, - p7Temp : float, - p16Temp : float): + p16Flow : float): """ Broadcasts the current FP flow data (Msg ID: 0x36, 54) Args: @@ -178,11 +168,9 @@ """ payload = conversions.float_to_bytearray(p7Flow ) payload += conversions.float_to_bytearray(p16Flow ) - payload += conversions.float_to_bytearray(p7Temp ) - payload += conversions.float_to_bytearray(p16Temp ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.fp_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.fp_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_FP_FLOW_DATA.value, payload=payload) @@ -200,26 +188,24 @@ payload = conversions.float_to_bytearray(p9Conductivity ) payload += conversions.float_to_bytearray(p18Conductivity ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.fp_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.fp_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_FP_CONDUCTIVITY_DATA.value, payload=payload) self.can_interface.send(message, 0) - def fp_temperature(self, p10Temp : float, - p19Temp : float, - m1Temp : float, - m3Temp : float, - p8Temp : float, - p13Temp : float, - p17Temp : float, - x1Temp : float, - x2Temp : float, - x3Temp : float, - x4Temp : float, - p7Temp : float, - p16Temp : float): + def fp_temperature(self, m3Temp : float, + p8Temp : float, + p13Temp : float, + p17Temp : float, + p46Temp : float, + p10Temp : float, + p19Temp : float, + p7Temp : float, + p16Temp : float, + p7InternalTemp : float, + p16InternalTemp : float): """ Broadcasts the current FP temperature data (Msg ID: 0x39, 57) Args: @@ -238,22 +224,20 @@ p16Temp (float): Temperature RO outlet @return: None """ - payload = conversions.float_to_bytearray(p10Temp ) - payload += conversions.float_to_bytearray(p19Temp ) - payload += conversions.float_to_bytearray(m1Temp ) - payload += conversions.float_to_bytearray(m3Temp ) - payload += conversions.float_to_bytearray(p8Temp ) - payload += conversions.float_to_bytearray(p13Temp ) - payload += conversions.float_to_bytearray(p17Temp ) - payload += conversions.float_to_bytearray(x1Temp ) - payload += conversions.float_to_bytearray(x2Temp ) - payload += conversions.float_to_bytearray(x3Temp ) - payload += conversions.float_to_bytearray(x4Temp ) - payload += conversions.float_to_bytearray(p7Temp ) - payload += conversions.float_to_bytearray(p16Temp ) + payload = conversions.float_to_bytearray(m3Temp ) + payload += conversions.float_to_bytearray(p8Temp ) + payload += conversions.float_to_bytearray(p13Temp ) + payload += conversions.float_to_bytearray(p17Temp ) + payload += conversions.float_to_bytearray(p46Temp ) + payload += conversions.float_to_bytearray(p10Temp ) + payload += conversions.float_to_bytearray(p19Temp ) + payload += conversions.float_to_bytearray(p7Temp ) + payload += conversions.float_to_bytearray(p16Temp ) + payload += conversions.float_to_bytearray(p7InternalTemp ) + payload += conversions.float_to_bytearray(p16InternalTemp ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.fp_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.fp_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_FP_TEMPERATURE_DATA.value, payload=payload) @@ -292,8 +276,8 @@ payload += conversions.float_to_bytearray (p40PumpDutyCyclePct ) payload += conversions.float_to_bytearray (p40PumpFBDutyCyclePct ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.fp_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.fp_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_FP_BOOST_PUMP_DATA.value, payload=payload) @@ -323,7 +307,7 @@ payload += conversions.unsigned_integer_to_bytearray(genPermeateState ) message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.fp_sync_broadcast_ch_id, + channel_id=CAN.CanChannels.fp_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_FP_RO_REJECTION_RATIO_DATA.value, payload=payload)