Index: leahi_dialin/ui/fp_messaging.py =================================================================== diff -u -rcb3b4b4cffc07204d74bb502bc25205780ec4f57 -r372d9868eab437585688e307e166881c42d2fc9b --- leahi_dialin/ui/fp_messaging.py (.../fp_messaging.py) (revision cb3b4b4cffc07204d74bb502bc25205780ec4f57) +++ leahi_dialin/ui/fp_messaging.py (.../fp_messaging.py) (revision 372d9868eab437585688e307e166881c42d2fc9b) @@ -107,59 +107,6 @@ self.can_interface.send(message, 0) - def fp_valves(self, M4_VALV : bool, - M12_VALV : bool, - P11_VALV : bool, - P33_VALV : bool, - P34_VALV : bool, - P37_VALV : bool, - P39_VALV : bool, - P6_VALV : bool, - valvesensedState: list): - """ - Broadcasts the current FP Valve data (Msg ID: 0x31, 49) - Args: - M4_VALV (bool ): Valves (M4) - M12_VALV (bool ): Valves (M12) - P11_VALV (bool ): Valves (P11) - P33_VALV (bool ): Valves (P33) - P34_VALV (bool ): Valves (P34) - P37_VALV (bool ): Valves (P37) - P39_VALV (bool ): Valves (P39) - P6_VALV (bool ): Valves (P6) - - valvesensedState[10] (list[int] ): Sense state of valves - @return: None - """ - # final 6 bits are unused and left as 0 - hydraulic_valves = (M4_VALV << 0 ) | \ - (M12_VALV << 1) | \ - (P11_VALV << 2 ) | \ - (P33_VALV << 3 ) | \ - (P34_VALV << 4 ) | \ - (P37_VALV << 5 ) | \ - (P39_VALV << 6) | \ - (P6_VALV << 7) | \ - (0 << 8) | \ - (0 << 9) | \ - (0 << 10) | \ - (0 << 11) | \ - (0 << 12) | \ - (0 << 13) | \ - (0 << 14) | \ - (0 << 15) - - payload = conversions.unsigned_short_to_bytearray(hydraulic_valves ) - for i in range(len(valvesensedState)): - payload += conversions.unsigned_byte_to_bytearray(valvesensedState[i]) - - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.fp_sync_broadcast_ch_id, - message_id=msg_ids.MsgIds.MSG_ID_FP_VALVES_STATES_DATA.value, - payload=payload) - - self.can_interface.send(message, 0) - def fp_ro_pump(self, p12PumpState : int , p12PumpDutyCycle : int , p12PumpFBDutyCycle : int ,