Index: firmware/App/Tasks/TaskGeneral.c
===================================================================
diff -u -r4022a06181f6f6d58ccfd465159d95f0df1b0393 -r285b5d82539c96524c93703d52a66fff76fb64fc
--- firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 4022a06181f6f6d58ccfd465159d95f0df1b0393)
+++ firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 285b5d82539c96524c93703d52a66fff76fb64fc)
@@ -130,22 +130,22 @@
         if ( tmpCtr == ( 5 * 20 ) )
         {
             setAirPumpMotorPower( 255 );
-            set3WayValveState( H13_VALV, STATE_OPEN );
+            set3WayValveState( H13_VALV, VALVE_3WAY_COMMON_TO_OPEN_STATE );
         }
         else if ( tmpCtr == ( 10 * 20 ) )
         {
             setAirPumpMotorPower( 0 );
-            set3WayValveState( H13_VALV, STATE_CLOSED );
+            set3WayValveState( H13_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
         }
         else if ( tmpCtr == ( 15 * 20 ) )
         {
             setAirPumpMotorPower( 255 );
-            set3WayValveState( H20_VALV, STATE_OPEN );
+            set3WayValveState( H20_VALV, VALVE_3WAY_COMMON_TO_OPEN_STATE );
         }
         else if ( tmpCtr >= ( 20 * 20 ) )
         {
             setAirPumpMotorPower( 0 );
-            set3WayValveState( H20_VALV, STATE_CLOSED );
+            set3WayValveState( H20_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
             tmpCtr = 0;
         }
     }
@@ -169,23 +169,23 @@
     }
 
     // Get level sensor data
-    readLevelSensors();
+    readAirTrapLevelSensors();
     // Control blood pump
     execBloodFlowController();
     execAirPumpController();
 
     switch ( sta )
     {
     case 0:
-        set3WayValveState( H13_VALV, STATE_CLOSED );
-        set3WayValveState( H20_VALV, STATE_CLOSED );
+        set3WayValveState( H13_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
+        set3WayValveState( H20_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
         setAirPumpState( AIR_PUMP_STATE_ON, AIR_PUMP_MOTOR_OFF );
 
         if ( TRUE == start )
         {
             sta = 1;
             // lower the level
-            set3WayValveState( H13_VALV, STATE_OPEN );
+            set3WayValveState( H13_VALV, VALVE_3WAY_COMMON_TO_OPEN_STATE );
             setAirPumpState( AIR_PUMP_STATE_ON, 255 );
         }
         break;
@@ -194,7 +194,7 @@
         if ( AIR_TRAP_LEVEL_AIR == getRawLevelSensorState( H16_LEVL ) )
         {
             // stop lowering level
-            set3WayValveState( H13_VALV, STATE_CLOSED );
+            set3WayValveState( H13_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
             setAirPumpState( AIR_PUMP_STATE_OFF, AIR_PUMP_MOTOR_OFF );
             ctr = 0;
             sta = 2;
@@ -205,7 +205,7 @@
         if ( ++ctr > ( 5 * 20 ) )
         {
             // raise the level
-            set3WayValveState( H20_VALV, STATE_OPEN );
+            set3WayValveState( H20_VALV, VALVE_3WAY_COMMON_TO_OPEN_STATE );
             setAirPumpState( AIR_PUMP_STATE_ON, 255 );
             sta = 3;
         }
@@ -215,7 +215,7 @@
         if ( AIR_TRAP_LEVEL_FLUID == getRawLevelSensorState( H16_LEVL ) )
         {
             // stop raising level
-            set3WayValveState( H20_VALV, STATE_CLOSED );
+            set3WayValveState( H20_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
             setAirPumpState( AIR_PUMP_STATE_OFF, AIR_PUMP_MOTOR_OFF );
             ctr = 0;
             sta = 4;
@@ -226,7 +226,7 @@
         if ( ++ctr > ( 5 * 20 ) )
         {
             // lower the level
-            set3WayValveState( H13_VALV, STATE_OPEN );
+            set3WayValveState( H13_VALV, VALVE_3WAY_COMMON_TO_OPEN_STATE );
             setAirPumpState( AIR_PUMP_STATE_ON, 255 );
             sta = 1;
         }