Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r3f2b9de757500da37e0ed8881e4e906d94f3076c -r58f8416a9ff9c68ee34361ac23a46dcf56cfa79e
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 3f2b9de757500da37e0ed8881e4e906d94f3076c)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 58f8416a9ff9c68ee34361ac23a46dcf56cfa79e)
@@ -327,14 +327,6 @@
                     {
                         canTransmit( canREG1, lastCANPacketSentChannel, lastCANPacketSent );
                     }
-#ifdef DEBUG_ENABLED
-                    {
-                        char debugStr[100];
-                        sprintf( debugStr, "SystemComm-HD resend Last Frame. %2d\n", lastCANPacketSentChannel );
-                        sendDebugData( (U08*)debugStr, strlen(debugStr) );
-                        sendDebugDataToUI( (U08*)debugStr );
-                    }
-#endif
                 }
                 // We must be only node on CAN bus - nobody is ACKing our transmitted frames
                 else
@@ -343,13 +335,6 @@
                     canXmitRetryCtr = MAX_XMIT_RETRIES;
                     signalCANXmitsCompleted();          // Clear pending xmit flag
                     clearCANXmitBuffers();              // Clear xmit buffers - nothing is going out right now
-#ifdef DEBUG_ENABLED
-                    {
-                        char debugStr[100];
-                        sprintf( debugStr, "SystemComm-HD is only node.\n" );
-                        sendDebugData( (U08*)debugStr, strlen(debugStr) );
-                    }
-#endif
                 }
             }
         }
@@ -968,13 +953,6 @@
         SET_ALARM_WITH_1_U32_DATA( ALARM_ID_COMM_TOO_MANY_BAD_CRCS, (U32)ALARM_SOURCE_HD );
 #endif
     }
-#ifdef DEBUG_ENABLED
-    {
-        char debugStr[100];
-        sprintf( debugStr, "SystemComm-HD-Bad Msg CRC.\n" );
-        sendDebugDataToUI( (U08*)debugStr );
-    }
-#endif
 }
 
 /*********************************************************************//**
@@ -1557,6 +1535,14 @@
                 handleTestDialOutPumpHomeRequest( message );
                 break;
 
+            case MSG_ID_SUPER_CLEAR_ALARMS_CMD:
+                handleTestSuperClearAlarmsRequest( message );
+                break;
+
+            case MSG_ID_HD_SET_OP_MODE_REQUEST:
+                handleTestSetOpModeRequest( message );
+                break;
+
             case MSG_ID_HD_FLUID_LEAK_SEND_INTERVAL_OVERRIDE:
                 handleSetFluidLeakBroadcastIntervalOverrideRequest( message );
                 break;
@@ -1589,6 +1575,10 @@
                 handleBubbleSelfTestRequest( message );
                 break;
 
+            case MSG_ID_HD_BLOOD_PRIME_VOLUME_OVERRIDE:
+                handleBloodPrimeVolumeOverrideRequest( message );
+                break;
+
             case MSG_ID_HD_SWITCHES_STATUS_OVERRIDE:
                 handleSetSwitchesStatusOverrideRequest( message );
                 break;
@@ -1597,18 +1587,14 @@
                 handleTestSwitchesPublishIntervalOverrideRequest( message );
                 break;
 
+            case MSG_ID_HD_BLOOD_PRIME_SAFETY_VOLUME_OVERRIDE:
+                handleBloodPrimeSafetyVolumeOverrideRequest( message );
+                break;
+
             case MSG_ID_HD_BATTERY_REMAINING_PERCENT_OVERRIDE:
                 handleBatteryRemainingPercentOverrideRequest( message );
                 break;
 
-            case MSG_ID_HD_SET_OP_MODE_REQUEST:
-                handleTestSetOpModeRequest( message );
-                break;
-
-            case MSG_ID_SUPER_CLEAR_ALARMS_CMD:
-                handleTestSuperClearAlarmsRequest( message );
-                break;
-
             case MSG_ID_HD_SYRINGE_PUMP_SEND_INTERVAL_OVERRIDE:
                 handleTestSyringePumpDataBroadcastIntervalOverrideRequest( message );
                 break;
@@ -1645,6 +1631,10 @@
                 handleTestValvesCurrentOverrideRequest( message );
                 break;
 
+            case MSG_ID_HD_VALVES_POSITION_COUNT_OVERRIDE:
+                handleTestValvesPositionCountOverrideRequest( message );
+                break;
+
             case MSG_ID_HD_MONITORED_VOLTAGES_SEND_INTERVAL_OVERRIDE:
                 handleTestMonitoredVoltagesSendIntervalOverrideRequest( message );
                 break;