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