Index: firmware/App/Controllers/Valves.h
===================================================================
diff -u -r4d635c390c184a405bdc96e56ce35505fe3868c5 -r47704a7ed8a9e9f5546923e64b1408896b730674
--- firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision 4d635c390c184a405bdc96e56ce35505fe3868c5)
+++ firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision 47704a7ed8a9e9f5546923e64b1408896b730674)
@@ -33,6 +33,11 @@
 
 // ********** public definitions **********
 
+#define VALVE_NO_FORCE_HOME             FALSE       ///< Do not re-home valve if already homed - just go to position A instead
+#define VALVE_FORCE_HOME                TRUE        ///< Force valve to home even if already homed
+#define VALVE_NO_CARTRIDGE_PRESENT      FALSE       ///< No cartridge should be present, so insist homed positions to be near where expected
+#define VALVE_CARTRIDGE_MAY_BE_PRESENT  TRUE        ///< A cartridge may be present, so allow for homed positions to be further away from where expected
+
 /// Valves positions
 typedef enum valveStatesNames
 {
@@ -53,11 +58,6 @@
     NUM_OF_VALVES                       ///< Number of valves
 } VALVE_T;
 
-#define VALVE_NO_FORCE_HOME             FALSE       ///< Do not re-home valve if already homed - just go to position A instead
-#define VALVE_FORCE_HOME                TRUE        ///< Force valve to home even if already homed
-#define VALVE_NO_CARTRIDGE_PRESENT      FALSE       ///< No cartridge should be present, so insist homed positions to be near where expected
-#define VALVE_CARTRIDGE_MAY_BE_PRESENT  TRUE        ///< A cartridge may be present, so allow for homed positions to be further away from where expected
-
 #pragma pack(push, 1)
 /// HD valves broadcast data
 typedef struct
Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r6da7e2f207bd98e7f519784d9cd84928691a5ca2 -r47704a7ed8a9e9f5546923e64b1408896b730674
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 6da7e2f207bd98e7f519784d9cd84928691a5ca2)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 47704a7ed8a9e9f5546923e64b1408896b730674)
@@ -1308,6 +1308,7 @@
         data.audioCurrLG = getAlarmAudioPrimaryLowGainCurrent();
         data.backupAudioCurr = getAlarmAudioBackupCurrent();
         data.safetyShutdown = isSafetyShutdownActivated();
+        data.acPowerLost = getCPLDACPowerLossDetected();
         data.uiAlarmButtonBlocks[ ALARM_BUTTON_TABLE_BLOCK_RESUME ]         = (U08)alarmButtonBlockers[ ALARM_BUTTON_TABLE_BLOCK_RESUME ];
         data.uiAlarmButtonBlocks[ ALARM_BUTTON_TABLE_BLOCK_RINSEBACK ]      = (U08)alarmButtonBlockers[ ALARM_BUTTON_TABLE_BLOCK_RINSEBACK ];
         data.uiAlarmButtonBlocks[ ALARM_BUTTON_TABLE_BLOCK_END_TREATMENT ]  = (U08)alarmButtonBlockers[ ALARM_BUTTON_TABLE_BLOCK_END_TREATMENT ];
Index: firmware/App/Services/AlarmMgmt.h
===================================================================
diff -u -r6da7e2f207bd98e7f519784d9cd84928691a5ca2 -r47704a7ed8a9e9f5546923e64b1408896b730674
--- firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 6da7e2f207bd98e7f519784d9cd84928691a5ca2)
+++ firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 47704a7ed8a9e9f5546923e64b1408896b730674)
@@ -156,6 +156,7 @@
     F32 audioCurrLG;                                            ///< Primary alarm audio current - low gain (mA)
     F32 backupAudioCurr;                                        ///< Backup alarm audio current (mA)
     BOOL safetyShutdown;                                        ///< Safety shutdown activated? (T/F)
+    BOOL acPowerLost;                                           ///< Has A/C power been lost? (T/F)
     U08 uiAlarmButtonBlocks[ NUM_OF_ALARM_BUTTON_BLOCKERS ];    ///< Flags indicating UI alarm buttons blocked by alarm table or state
 } ALARM_INFO_PAYLOAD_T;