Index: firmware/App/Controllers/Valves.h
===================================================================
diff -u -r19f13e67288117e7f81c1245a75cc6b5f8aaf899 -r47704a7ed8a9e9f5546923e64b1408896b730674
--- firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision 19f13e67288117e7f81c1245a75cc6b5f8aaf899)
+++ 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
 {
@@ -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 );