Index: firmware/App/Controllers/Valves.h
===================================================================
diff -u -r19f13e67288117e7f81c1245a75cc6b5f8aaf899 -r4d635c390c184a405bdc96e56ce35505fe3868c5
--- firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision 19f13e67288117e7f81c1245a75cc6b5f8aaf899)
+++ firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision 4d635c390c184a405bdc96e56ce35505fe3868c5)
@@ -53,6 +53,11 @@
     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
@@ -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 );