Index: leahi_dialin/common/dd_defs.py
===================================================================
diff -u -ra407ca3aee42efe94cf8d2fe41ef2804175b992b -r611187f2d0918fb5fef0c8aa4e34768a2093b97c
--- leahi_dialin/common/dd_defs.py	(.../dd_defs.py)	(revision a407ca3aee42efe94cf8d2fe41ef2804175b992b)
+++ leahi_dialin/common/dd_defs.py	(.../dd_defs.py)	(revision 611187f2d0918fb5fef0c8aa4e34768a2093b97c)
@@ -350,7 +350,15 @@
     D20_VALV                            = 21    # Balancing chamber Valve 6 (D20)
     D26_VALV                            = 22    # Balancing chamber Valve 4 (D21)
     D22_VALV                            = 23    # Balancing chamber Valve 8 (D22)
-    NUM_OF_DD_VALVES                    = 24    # Number of Valves for the DD
+    D79_PMP_VALV                        = 24    # D79 pump mapped to spare valve 0
+    SPARE1_VALV                         = 25    # Spare Valve 1
+    SPARE2_VALV                         = 26    # Spare Valve 2
+    SPARE3_VALV                         = 27    # Spare Valve 3
+    SPARE4_VALV                         = 28    # Spare Valve 4
+    SPARE5_VALV                         = 29    # Spare Valve 5
+    SPARE6_VALV                         = 30    # Spare Valve 6
+    SPARE7_VALV                         = 31    # Spare Valve 7
+    NUM_OF_DD_VALVES                    = 32    # Number of Valves for the DD
 
 @unique
 class DDNotLegalStates(DialinEnum):
Index: leahi_dialin/common/msg_ids.py
===================================================================
diff -u -ra407ca3aee42efe94cf8d2fe41ef2804175b992b -r611187f2d0918fb5fef0c8aa4e34768a2093b97c
--- leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision a407ca3aee42efe94cf8d2fe41ef2804175b992b)
+++ leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision 611187f2d0918fb5fef0c8aa4e34768a2093b97c)
@@ -275,17 +275,12 @@
     MSG_ID_DD_BLOOD_LEAK_INTENSITY_MOVING_AVERAGE_OVERRIDE_REQUEST = 0xA04C
     MSG_ID_DD_BLOOD_LEAK_ZEROING_INTERVAL_IN_MS_OVERRIDE_REQUEST = 0xA04D
     MSG_ID_DD_BLOOD_LEAK_ZERO_REQUEST = 0xA04E
-    #MSG_ID_DD_FILTERED_COND_SENSOR_READINGS_OVERRIDE_REQUEST = 0xA04F
-    #MSG_ID_DD_FILTERED_COND_SENSOR_TEMPERATURE_OVERRIDE_REQUEST = 0xA050
-    MSG_ID_DD_RINSE_PUMP_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA04F
-    MSG_ID_DD_RINSE_PUMP_PWM_PERCENT_OVERRIDE_REQUEST = 0xA050
+    MSG_ID_DD_FILTERED_COND_SENSOR_READINGS_OVERRIDE_REQUEST = 0xA04F
+    MSG_ID_DD_FILTERED_COND_SENSOR_TEMPERATURE_OVERRIDE_REQUEST = 0xA050
     MSG_ID_DD_VOLTAGE_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA051
     MSG_ID_DD_MONITORED_VOLTAGE_OVERRIDE_REQUEST = 0xA052
+    MSG_ID_DD_RINSE_PUMP_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA053
 
-    # TODO: Placeholders for Beta conflict with above messages
-    MSG_ID_DD_FILTERED_COND_SENSOR_READINGS_OVERRIDE_REQUEST = 0xA060	# Original ID: 0xA04F
-    MSG_ID_DD_FILTERED_COND_SENSOR_TEMPERATURE_OVERRIDE_REQUEST = 0xA061	# Original ID: 0xA050
-
     MSG_ID_DD_PISTON_PUMP_DATA_PUBLISH_OVERRIDE_REQUEST = 0xAF00
     MSG_ID_DD_PISTON_PUMP_START_STOP_OVERRIDE_REQUEST = 0xAF01
     MSG_ID_DD_PISTON_PUMP_FILL_AFTER_DISPENSE_OVERRIDE_REQUEST = 0xAF02