Index: Compatible.h
===================================================================
diff -u -r217368753a49e87a84f7098a3dd5e608576c849c -re37fda69662dfc63ba0209529d322b3d78403b0d
--- Compatible.h	(.../Compatible.h)	(revision 217368753a49e87a84f7098a3dd5e608576c849c)
+++ Compatible.h	(.../Compatible.h)	(revision e37fda69662dfc63ba0209529d322b3d78403b0d)
@@ -26,9 +26,9 @@
  */
 
 #define SW_COMPATIBILITY_REV        0                       ///< Compatibility revision for all system software stacks (TD, DD, RO and UI).
-#define TD_FPGA_COMPATIBILITY_REV   1                       ///< Compatibility revision for TD firmware with TD FPGA.
+#define TD_FPGA_COMPATIBILITY_REV   0                       ///< Compatibility revision for TD firmware with TD FPGA.
 #define DD_FPGA_COMPATIBILITY_REV   0                       ///< Compatibility revision for DD firmware with DD FPGA.
-#define RO_FPGA_COMPATIBILITY_REV   1                       ///< Compatibility revision for RO firmware with RO FPGA.
+#define RO_FPGA_COMPATIBILITY_REV   0                       ///< Compatibility revision for RO firmware with RO FPGA.
 
 /**@}*/
 
Index: MsgDefs.h
===================================================================
diff -u -r217368753a49e87a84f7098a3dd5e608576c849c -re37fda69662dfc63ba0209529d322b3d78403b0d
--- MsgDefs.h	(.../MsgDefs.h)	(revision 217368753a49e87a84f7098a3dd5e608576c849c)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision e37fda69662dfc63ba0209529d322b3d78403b0d)
@@ -88,7 +88,9 @@
     MSG_ID_DD_RO_START_STOP_CMD_REQUEST = 0x38,                                     ///< DD requests RO to start/stop delivering the purified water.
     MSG_ID_RO_TEMPERATURE_DATA = 0x39,                                              ///< RO temperatures data broadcast
     MSG_ID_RO_HEATER_DATA = 0x3A,                                                   ///< RO heater data broadcast
-
+#ifdef __PUMPTEST__
+    MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0x3B,                                      ///< DD piston pump data
+#endif
     // service/test CAN messages
     MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000,                                        ///< First TD test message ID
     MSG_ID_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_TD_TESTER_MESSAGE,                   ///< TD tester log-in
@@ -192,6 +194,11 @@
     MSG_ID_DD_DIAL_DELIVERY_GOOD_TO_DELIVER_OVERRIDE_REQUEST = 0xA034,              ///< DD dialysate delivery good to deliver override request
     MSG_ID_DD_HEATERS_TARGET_TEMPERATURE_OVERRIDE_REQUEST = 0xA035,                 ///< DD heaters target temperature override request
     MSG_ID_DD_BC_VALVE_STATES_OVERRIDE_REQUEST = 0xA036,                            ///< DD balancing chamber valve states override request
+#ifdef __PUMPTEST__
+    MSG_ID_DD_PISTON_PUMP_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA037,                   ///< DD piston pump data publish interval override request
+    MSG_ID_DD_PISTON_PUMP_START_STOP_OVERRIDE_REQUEST = 0xA038,                     ///< DD piston pump start/stop override request
+#endif
+    MSG_ID_DD_BC_SWITCH_ONLY_START_STOP_OVERRIDE_REQUEST = 0xA039,                  ///< DD balancing chamber switch only start/stop override request
 
     MSG_ID_FIRST_RO_TESTER_MESSAGE = 0xB000,                                        ///< First RO test message ID
     MSG_ID_RO_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_RO_TESTER_MESSAGE,                ///< RO tester log-in