Index: leahi_dialin/ui/fp_messaging.py
===================================================================
diff -u -r11e7bd014a4b44e94c055a15881b1e01b35f5749 -rcb3b4b4cffc07204d74bb502bc25205780ec4f57
--- leahi_dialin/ui/fp_messaging.py	(.../fp_messaging.py)	(revision 11e7bd014a4b44e94c055a15881b1e01b35f5749)
+++ leahi_dialin/ui/fp_messaging.py	(.../fp_messaging.py)	(revision cb3b4b4cffc07204d74bb502bc25205780ec4f57)
@@ -108,43 +108,40 @@
         self.can_interface.send(message, 0)
 
     def fp_valves(self, M4_VALV         : bool,
-                  P39_VALV        : bool,
-                  P6_VALV         : bool,
+                  M12_VALV        : bool,
                   P11_VALV        : bool,
                   P33_VALV        : bool,
                   P34_VALV        : bool,
                   P37_VALV        : bool,
-                  M7_VALV         : bool,
-                  P20_VALV        : bool,
-                  M12_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)
-            P39_VALV                  (bool       ): Valves (P39)
-            P6_VALV                   (bool       ): Valves (P6)
+            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)
-            M7_VALV                   (bool       ): Valves (M7)
-            P20_VALV                  (bool       ): Valves (P20)
-            M12_VALV                  (bool       ): Valves (P43)
+            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 ) | \
-                           (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) | \
+                           (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) | \