Index: firmware/App/Controllers/Valves.h
===================================================================
diff -u -r4a5f3c9dfe803562a40aeea3bbc9fc3be0d1e26d -rcb9bcb7376f09096f833ce59cfb9a71f43263315
--- firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision 4a5f3c9dfe803562a40aeea3bbc9fc3be0d1e26d)
+++ firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision cb9bcb7376f09096f833ce59cfb9a71f43263315)
@@ -10,38 +10,57 @@
 
 #include "Common.h"
 
+/**
+ *  @defgroup Valves Valves
+ *  @brief Valves module
+ *  Driver that runs the valves in HD.
+ *
+ *  @addtogroup Valves
+ *  @{
+ */
+
+// ********** public definitions **********
+
 typedef enum valveStatesNames
 {
-    VALVE_STATE_POS_A_INSERT_EJECT = 0,
-    VALVE_STATE_POS_B_OPEN,
-    VALVE_STATE_POS_C_CLOSE,
-    NUM_OF_VALVE_STATES,
-} VALVE_STATE_NAMES_T;
+    VALVE_POSITION_NOT_IN_POSITION = 0,
+    VALVE_POSITION_A_INSERT_EJECT,
+    VALVE_POSITION_B_OPEN,
+    VALVE_POSITION_C_CLOSE,
+    NUM_OF_VALVE_POSITIONS,
+} VALVE_POSITION_T;
 
 typedef enum valveNames
 {
     VDI = 0,
     VDO,
     VBA,
     VBV,
-    VAT,
     NUM_OF_VALVES
-} VALVES_T;
+} VALVE_T;
 
+
+// ********** public function prototypes *********
+
 void initValves( void );
 
 SELF_TEST_STATUS_T execValvesSelfTest( void );
 
 void execValves( void );
 
-BOOL homeDialyzerInletValve( void );
+BOOL homeValve( VALVE_T valve, VALVE_POSITION_T position );
 
-BOOL homeDialyzerOutletValve( void );
+BOOL enableValvePIDController( VALVE_T valve );
 
-BOOL homeBloodArterialValve( void );
+BOOL enableValveBypassController( VALVE_T valve );
 
-BOOL homeBloodVenousValve( void );
+BOOL setValvePosition( VALVE_T valve, VALVE_POSITION_T position );
 
-BOOL homeBloodTrapValve( void );
+S16 getValvePosition( VALVE_T valve );
 
+BOOL energizeBloodTrapValve( void );
+BOOL denergizeBloodTrapValve( void );
+
+/**@}*/
+
 #endif