Index: leahi_dialin/ui/fp_messaging.py =================================================================== diff -u -re8a6ae1277d26e72f7e9f7b39d15bac75a860d01 -r11e7bd014a4b44e94c055a15881b1e01b35f5749 --- leahi_dialin/ui/fp_messaging.py (.../fp_messaging.py) (revision e8a6ae1277d26e72f7e9f7b39d15bac75a860d01) +++ leahi_dialin/ui/fp_messaging.py (.../fp_messaging.py) (revision 11e7bd014a4b44e94c055a15881b1e01b35f5749) @@ -108,16 +108,16 @@ self.can_interface.send(message, 0) def fp_valves(self, M4_VALV : bool, - P39_VALV : bool, - P6_VALV : bool, - P11_VALV : bool, - P33_VALV : bool, - P34_VALV : bool, - P37_VALV : bool, - M7_VALV : bool, - P20_VALV : bool, - P43_VALV : bool, - valvesensedState: list): + P39_VALV : bool, + P6_VALV : bool, + P11_VALV : bool, + P33_VALV : bool, + P34_VALV : bool, + P37_VALV : bool, + M7_VALV : bool, + P20_VALV : bool, + M12_VALV : bool, + valvesensedState: list): """ Broadcasts the current FP Valve data (Msg ID: 0x31, 49) Args: @@ -130,27 +130,27 @@ P37_VALV (bool ): Valves (P37) M7_VALV (bool ): Valves (M7) P20_VALV (bool ): Valves (P20) - P43_VALV (bool ): Valves (P43) + M12_VALV (bool ): Valves (P43) valvesensedState[10] (list[int] ): Sense state of valves @return: None """ # final 6 bits are unused and left as 0 - hydraulic_valves = (M4_VALV << 0 )|\ - (P39_VALV << 1 )|\ - (P6_VALV << 2 )|\ - (P11_VALV << 3 )|\ - (P33_VALV << 4 )|\ - (P34_VALV << 5 )|\ - (P37_VALV << 6 )|\ - (M7_VALV << 7 )|\ - (P20_VALV << 8 )|\ - (P43_VALV << 9 )|\ - (0 << 10)|\ - (0 << 11)|\ - (0 << 12)|\ - (0 << 13)|\ - (0 << 14)|\ - (0 << 15) + hydraulic_valves = (M4_VALV << 0 ) | \ + (P39_VALV << 1 ) | \ + (P6_VALV << 2 ) | \ + (P11_VALV << 3 ) | \ + (P33_VALV << 4 ) | \ + (P34_VALV << 5 ) | \ + (P37_VALV << 6 ) | \ + (M7_VALV << 7 ) | \ + (P20_VALV << 8 ) | \ + (M12_VALV << 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)):