Index: firmware/App/Controllers/Valves.h
===================================================================
diff -u -r78f072a9cb6acc3a007171562f6e63efb8b9ae23 -rcd5be724d5a3ba7457e761191d82f278654d7f5c
--- firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision 78f072a9cb6acc3a007171562f6e63efb8b9ae23)
+++ firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision cd5be724d5a3ba7457e761191d82f278654d7f5c)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2020-2023 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2020-2024 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    Valves.h
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      07-May-2021
+* @author  (last)      Sean Nash
+* @date    (last)      04-May-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  07-Aug-2020
@@ -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
 {
@@ -68,7 +73,6 @@
     S16 posB;                          ///< Calculated Position B
     U32 pwm;                           ///< Valve PWM in the bypass mode
     U32 airTrapValve;                  ///< Air trap valve status
-
 } HD_VALVE_DATA_T;
 #pragma pack(pop)
 
@@ -91,7 +95,7 @@
 
 void execValves( void );
 
-BOOL homeValve( VALVE_T valve );
+BOOL homeValve( VALVE_T valve, BOOL force, BOOL cartridge );
 
 BOOL setValvePosition( VALVE_T valve, VALVE_POSITION_T position );
 
@@ -104,23 +108,18 @@
 OPN_CLS_STATE_T getValveAirTrapStatus( void );
 
 BOOL testSetValvesDataPublishInterval( U32 value );
-
 BOOL testResetValvesDataPublishInterval( void );
 
 BOOL testSetValvesPositionOverride( U32 valve, U32 position );
-
 BOOL testResetValvesPositionOverride( U32 valve );
 
 BOOL testSetValvePWMOverride( U32 valve, U32 pwm, U32 direction );
-
 BOOL testResetValvePWMOverride( U32 valve );
 
 BOOL testSetValvesCurrentOverride( U32 valve, F32 current );
-
 BOOL testResetValvesCurrentOverride( U32 valve );
 
 BOOL testSetValvesPositionCountOverride( U32 valve, U32 count );
-
 BOOL testResetValvesPositionCountOverride( U32 valve );
 
 /**@}*/