Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -rf5b02f03b6695c0c76fd8a4d902a13114e1a8aca -ra52e41cc2219362d433149ca034908c8763d8378
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision f5b02f03b6695c0c76fd8a4d902a13114e1a8aca)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision a52e41cc2219362d433149ca034908c8763d8378)
@@ -68,6 +68,8 @@
     // TODO - set initial actuator states
     setFPGAValveStates(0x014F);
     // VDr, VPo to drain
+    setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
+    setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
     // Conc. pumps on
 }
 
@@ -122,8 +124,7 @@
     // TODO - transition when temperature and mix is in range
     if ( 1 )
     {
-        // TODO - VPo to reservoir
-        setFPGAValveStates(0x015F);
+        setValveState( VPO, VALVE_STATE_FILL_C_TO_NC );
         result = DG_FILL_MODE_STATE_DELIVER_DIALYSATE;
     }
 
@@ -148,8 +149,7 @@
 
     if ( 0 )
     {
-        // TODO - VPo to drain
-        setFPGAValveStates(0x014F);
+        setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
         result = DG_FILL_MODE_STATE_DIALYSATE_PRODUCTION;
     }