Index: AlarmDefs.h
===================================================================
diff -u -r230b1b3ba4fef6de247dc9ffe01470ddb7ea7776 -r1e017e7e1063b7fdd10829a948773575cd258f7e
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision 230b1b3ba4fef6de247dc9ffe01470ddb7ea7776)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision 1e017e7e1063b7fdd10829a948773575cd258f7e)
@@ -29,17 +29,17 @@
     ALARM_ID_WATCHDOG_POST_TEST_FAILED = 4,                         ///< Watchdog POST failure.
     ALARM_ID_UI_COMM_POST_FAILED = 5,                               ///< UI communication POST failure.  UI failed to communicate within a reasonable time after power up.
     ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK = 6,                       ///< Blood pump failed motor controller current check.  Too high when pump should be off or out of range when pump should be running.
-    ALARM_ID_BLOOD_PUMP_MC_SPEED_CHECK = 7,                         ///< Blood pump failed motor controller speed check.
-    ALARM_ID_BLOOD_PUMP_MC_DIRECTION_CHECK = 8,                     ///< Blood pump failed motor controller direction check.
-    ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_CHECK = 9,                      ///< Blood pump failed rotor speed check.  Mismatch with motor and motor controller speeds.
+    ALARM_ID_BLOOD_PUMP_OFF_CHECK = 7,                              ///< Blood pump failed motor off check.  Measured speed while commanded off.
+    ALARM_ID_BLOOD_PUMP_MC_DIRECTION_CHECK = 8,                     ///< Blood pump failed motor direction check.  Measured vs. commanded.
+    ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_CHECK = 9,                      ///< Blood pump failed rotor speed check.  Mismatch with rotor and motor speeds.
     ALARM_ID_DIAL_IN_PUMP_MC_CURRENT_CHECK = 10,                    ///< Dialysis inlet pump failed motor controller current check.  Too high when pump should be off or out of range when pump should be running.
-    ALARM_ID_DIAL_IN_PUMP_MC_SPEED_CHECK = 11,                      ///< Dialysis inlet pump failed motor controller speed check.
-    ALARM_ID_DIAL_IN_PUMP_MC_DIRECTION_CHECK = 12,                  ///< Dialysis inlet pump failed motor controller direction check.
-    ALARM_ID_DIAL_IN_PUMP_ROTOR_SPEED_CHECK = 13,                   ///< Dialysis inlet pump failed rotor speed check.  Mismatch with motor and motor controller speeds.
+    ALARM_ID_DIAL_IN_PUMP_MC_SPEED_CHECK = 11,                      ///< Dialysis inlet pump failed motor off check.  Measured speed while commanded off.
+    ALARM_ID_DIAL_IN_PUMP_MC_DIRECTION_CHECK = 12,                  ///< Dialysis inlet pump failed motor direction check.  Measured vs. commanded.
+    ALARM_ID_DIAL_IN_PUMP_ROTOR_SPEED_CHECK = 13,                   ///< Dialysis inlet pump failed rotor speed check.  Mismatch with rotor and motor speeds.
     ALARM_ID_DIAL_OUT_PUMP_MC_CURRENT_CHECK = 14,                   ///< Dialysis outlet pump failed motor controller current check.  Too high when pump should be off or out of range when pump should be running.
-    ALARM_ID_DIAL_OUT_PUMP_MC_SPEED_CHECK = 15,                     ///< Dialysis outlet pump failed motor controller speed check.
-    ALARM_ID_DIAL_OUT_PUMP_MC_DIRECTION_CHECK = 16,                 ///< Dialysis outlet pump failed motor controller direction check.
-    ALARM_ID_DIAL_OUT_PUMP_ROTOR_SPEED_CHECK = 17,                  ///< Dialysis outlet pump failed rotor speed check.  Mismatch with motor and motor controller speeds.
+    ALARM_ID_DIAL_OUT_PUMP_MC_SPEED_CHECK = 15,                     ///< Dialysis outlet pump failed motor off check.  Measured speed while commanded off.
+    ALARM_ID_DIAL_OUT_PUMP_MC_DIRECTION_CHECK = 16,                 ///< Dialysis outlet pump failed motor direction check.  Measured vs. commanded.
+    ALARM_ID_DIAL_OUT_PUMP_ROTOR_SPEED_CHECK = 17,                  ///< Dialysis outlet pump failed rotor speed check.  Mismatch with rotor and motor speeds.
     ALARM_ID_WATCHDOG_EXPIRED = 18,                                 ///< Watchdog expired error.  Watchdog was not "pet" within the appropriate time.
     ALARM_ID_RTC_COMM_ERROR = 19,                                   ///< Real-time clock communication error.
     ALARM_ID_RTC_CONFIG_ERROR = 20,                                 ///< Real-time clock configuration error.
@@ -74,6 +74,12 @@
     ALARM_ID_TEMPERATURE_SENSORS_INCONSISTENT = 49,                 ///< DG temperature sensors values are inconsistent with respect to each other
     ALARM_ID_HD_COMM_TIMEOUT = 50,                                  ///< HD communication timeout.
     ALARM_ID_VALVE_CONTROL_FAILURE = 51,                            ///< FPGA not accepting commanded valve states.
+    ALARM_ID_BLOOD_PUMP_FLOW_VS_MOTOR_SPEED_CHECK = 52,             ///< Blood pump failed flow vs. motor speed check.  Mismatch with flow rate and rate implied by motor speed.
+    ALARM_ID_DIAL_IN_PUMP_FLOW_VS_MOTOR_SPEED_CHECK = 53,           ///< Dialysate inlet pump failed flow vs. motor speed check.  Mismatch with flow rate and rate implied by motor speed.
+    ALARM_ID_DIAL_OUT_PUMP_FLOW_VS_MOTOR_SPEED_CHECK = 54,          ///< Dialysate outlet pump failed flow vs. motor speed check.  Mismatch with flow rate and rate implied by motor speed.
+    ALARM_ID_BLOOD_PUMP_MOTOR_SPEED_CHECK = 55,                     ///< Blood pump failed motor speed check.  Measured vs. commanded.
+    ALARM_ID_DIAL_IN_PUMP_MOTOR_SPEED_CHECK = 56,                   ///< Dialysate inlet pump failed motor speed check.  Measured vs. commanded.
+    ALARM_ID_DIAL_OUT_PUMP_MOTOR_SPEED_CHECK = 57,                  ///< Dialysate outlet pump failed motor speed check.  Measured vs. commanded.
     NUM_OF_ALARM_IDS                                                ///< Total # of alarms.
 };
 /// Type for alarm list enumeration.