Index: firmware/App/Controllers/Valves.h
===================================================================
diff -u -r876a1cdab00a28265349cec424f77709a101db5c -rcd5be724d5a3ba7457e761191d82f278654d7f5c
--- firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision 876a1cdab00a28265349cec424f77709a101db5c)
+++ 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)      18-Jan-2023
+* @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
 {
@@ -90,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 );