Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -rc0d1d149e3b669b0bf424206c725b5c1bfaff797 -r848865316d989b1e541b234aefcb99891c92a481
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision c0d1d149e3b669b0bf424206c725b5c1bfaff797)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 848865316d989b1e541b234aefcb99891c92a481)
@@ -16,6 +16,8 @@
  *
  **************************************************************************/
 
+#include "mibspi.h"
+
 #include "AlarmLamp.h"
 #include "OperationModes.h"
 #include "SystemCommMessages.h"
@@ -44,7 +46,7 @@
 {
     ALARM_PRIORITY_T    alarmPriority;              ///< priority of alarm
     U32                 alarmEscalatesAfter;        ///< time (s) after start when alarm will escalate if not cleared (zero indicates no escalation)
-    ALARM_ID_T          alarmEscalatesTo;           ///< ID of alarm that this alarm will escalate to (ALARM_ID_NO_ALARM indicates no esclation)
+    ALARM_ID_T          alarmEscalatesTo;           ///< ID of alarm that this alarm will escalate to (ALARM_ID_NO_ALARM indicates no escalation)
     BOOL                alarmIsFault;               ///< alarm is a system fault?
     BOOL                alarmStops;                 ///< alarm activation should cause a controlled stop
     BOOL                alarmNoClear;               ///< alarm cannot be cleared (unrecoverable)?
@@ -66,15 +68,15 @@
     { ALARM_PRIORITY_HIGH,   0,              ALARM_ID_NO_ALARM,                            TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_WATCHDOG_POST_TEST_FAILED
     { ALARM_PRIORITY_HIGH,   0,              ALARM_ID_NO_ALARM,                            TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_UI_COMM_POST_FAILED
     { ALARM_PRIORITY_MEDIUM, ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK
-    { ALARM_PRIORITY_MEDIUM, ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_BLOOD_PUMP_MC_SPEED_CHECK
+    { ALARM_PRIORITY_MEDIUM, ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_BLOOD_PUMP_OFF_CHECK
     { ALARM_PRIORITY_MEDIUM, ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_BLOOD_PUMP_MC_DIRECTION_CHECK
     { ALARM_PRIORITY_HIGH,   ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_CHECK
     { ALARM_PRIORITY_MEDIUM, ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_DIAL_IN_PUMP_MC_CURRENT_CHECK
-    { ALARM_PRIORITY_MEDIUM, ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_DIAL_IN_PUMP_MC_SPEED_CHECK
+    { ALARM_PRIORITY_MEDIUM, ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_DIAL_IN_PUMP_OFF_CHECK
     { ALARM_PRIORITY_MEDIUM, ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_DIAL_IN_PUMP_MC_DIRECTION_CHECK
     { ALARM_PRIORITY_HIGH,   ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_DIAL_IN_PUMP_ROTOR_SPEED_CHECK
     { ALARM_PRIORITY_MEDIUM, ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_DIAL_OUT_PUMP_MC_CURRENT_CHECK
-    { ALARM_PRIORITY_MEDIUM, ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_DIAL_OUT_PUMP_MC_SPEED_CHECK
+    { ALARM_PRIORITY_MEDIUM, ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_DIAL_OUT_PUMP_OFF_CHECK
     { ALARM_PRIORITY_MEDIUM, ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_DIAL_OUT_PUMP_MC_DIRECTION_CHECK
     { ALARM_PRIORITY_HIGH,   ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_DIAL_OUT_PUMP_ROTOR_SPEED_CHECK
     { ALARM_PRIORITY_HIGH,   0,              ALARM_ID_NO_ALARM,                            TRUE,  TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_WATCHDOG_EXPIRED
@@ -110,11 +112,25 @@
     { ALARM_PRIORITY_HIGH,   0,              ALARM_ID_NO_ALARM,                            TRUE,  TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  FALSE }, // ALARM_ID_TEMPERATURE_SENSORS_OUT_OF_RANGE
     { ALARM_PRIORITY_HIGH,   0,              ALARM_ID_NO_ALARM,                            TRUE,  TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  FALSE }, // ALARM_ID_TEMPERATURE_SENSORS_INCONSISTENT
     { ALARM_PRIORITY_HIGH,   0,              ALARM_ID_NO_ALARM,                            FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_HD_COMM_TIMEOUT
+    { ALARM_PRIORITY_HIGH,   0,              ALARM_ID_NO_ALARM,                            TRUE,  TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  FALSE }, // ALARM_ID_VALVE_CONTROL_FAILURE
+    { ALARM_PRIORITY_HIGH,   ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_BLOOD_PUMP_FLOW_VS_MOTOR_SPEED_CHECK
+    { ALARM_PRIORITY_HIGH,   ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_DIAL_IN_PUMP_FLOW_VS_MOTOR_SPEED_CHECK
+    { ALARM_PRIORITY_HIGH,   ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_DIAL_OUT_PUMP_FLOW_VS_MOTOR_SPEED_CHECK
+    { ALARM_PRIORITY_HIGH,   ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_BLOOD_PUMP_MOTOR_SPEED_CHECK
+    { ALARM_PRIORITY_HIGH,   ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_DIAL_IN_PUMP_MOTOR_SPEED_CHECK
+    { ALARM_PRIORITY_HIGH,   ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_DIAL_OUT_PUMP_MOTOR_SPEED_CHECK
+    { ALARM_PRIORITY_HIGH,   ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_TOO_HIGH
 };
 
 /// A blank alarm data record for alarms that do not include alarm data when triggered.
 const ALARM_DATA_T blankAlarmData = { ALARM_DATA_TYPE_NONE, 0 };
 
+// pin assignment for backup alarm audio enable
+#define BACKUP_AUDIO_ENABLE_SPI3_PORT_MASK    0x00000001  // (SPI3-CS0 - re-purposed as output GPIO)
+// backup alarm audio enable/disable macros
+#define SET_BACKUP_AUDIO_ENABLE()             {mibspiREG3->PC3 |= BACKUP_AUDIO_ENABLE_SPI3_PORT_MASK;}
+#define CLR_BACKUP_AUDIO_ENABLE()             {mibspiREG3->PC3 &= ~BACKUP_AUDIO_ENABLE_SPI3_PORT_MASK;}
+
 // ********** private data **********
 
 /// interval (in ms) at which to publish alarm status to CAN bus
@@ -159,6 +175,9 @@
     ALARM_PRIORITY_T p;
     ALARM_ID_T a;
 
+    // disable backup audio
+    CLR_BACKUP_AUDIO_ENABLE();
+
     // initialize alarm states and start time stamps
     for ( a = ALARM_ID_NO_ALARM; a < NUM_OF_ALARM_IDS; a++ )
     {
@@ -245,14 +264,6 @@
             // activate alarm
             alarmIsActive[ alarm ] = TRUE;
             alarmStartedAt[ alarm ].data = getMSTimerCount();
-#ifdef DEBUG_ENABLED
-            {
-                // TODO - temporary debug code - remove later
-                char debugStr[ 256 ];
-                sprintf( debugStr, "ALARM triggered:%5d \n", alarm );
-                sendDebugData( (U08*)debugStr, strlen(debugStr) );
-            }
-#endif
         }
     }
     else
@@ -281,6 +292,16 @@
         broadcastAlarmTriggered( (U16)alarm, blankAlarmData, blankAlarmData );
     }
     activateAlarm( alarm );
+#ifdef DEBUG_ENABLED
+#ifdef ALARMS_DEBUG
+            {
+                // TODO - temporary debug code - remove later
+                char debugStr[ 256 ];
+                sprintf( debugStr, "ALARM triggered:%5d \n", alarm );
+                sendDebugData( (U08*)debugStr, strlen(debugStr) );
+            }
+#endif
+#endif
 }
 
 /*************************************************************************
@@ -303,6 +324,16 @@
         broadcastAlarmTriggered( (U16)alarm, alarmData, blankAlarmData );
     }
     activateAlarm( alarm );
+#ifdef DEBUG_ENABLED
+#ifdef ALARMS_DEBUG
+            {
+                // TODO - temporary debug code - remove later
+                char debugStr[ 256 ];
+                sprintf( debugStr, "ALARM triggered:%5d %8X \n", alarm, alarmData.data.uInt.data );
+                sendDebugData( (U08*)debugStr, strlen(debugStr) );
+            }
+#endif
+#endif
 }
 
 /*************************************************************************
@@ -326,6 +357,16 @@
         broadcastAlarmTriggered( (U16)alarm, alarmData1, alarmData2 );
     }
     activateAlarm( alarm );
+#ifdef DEBUG_ENABLED
+#ifdef ALARMS_DEBUG
+            {
+                // TODO - temporary debug code - remove later
+                char debugStr[ 256 ];
+                sprintf( debugStr, "ALARM triggered:%5d %8X %8X \n", (S32)alarm, alarmData1.data.uInt.data, alarmData2.data.uInt.data );
+                sendDebugData( (U08*)debugStr, strlen(debugStr) );
+            }
+#endif
+#endif
 }
 
 /*************************************************************************
@@ -357,6 +398,16 @@
                 {
                     resetAlarmPriorityFIFO( alarmTable[ alarm ].alarmPriority );
                 }
+#ifdef DEBUG_ENABLED
+#ifdef ALARMS_DEBUG
+                {
+                    // TODO - temporary debug code - remove later
+                    char debugStr[ 256 ];
+                    sprintf( debugStr, "ALARM cleared:%5d \n", alarm );
+                    sendDebugData( (U08*)debugStr, strlen(debugStr) );
+                }
+#endif
+#endif
             }
         }
     }