Index: dialin/dg/valves.py
===================================================================
diff -u -rc260906118f578a6d20e5579ed660466ee874fee -r7142f4d4e9c32cbc2aba71a5df56abed608eed4d
--- dialin/dg/valves.py	(.../valves.py)	(revision c260906118f578a6d20e5579ed660466ee874fee)
+++ dialin/dg/valves.py	(.../valves.py)	(revision 7142f4d4e9c32cbc2aba71a5df56abed608eed4d)
@@ -32,33 +32,9 @@
     MSG_ID_DG_VALVE_STATE_OVERRIDE = 0xA00E
     MSG_ID_DG_VALVES_STATES_PUBLISH_INTERVAL_OVERRIDE = 0xA00F
 
-    # Valve state publish message field positions
-    START_POS_VALVE_VRF = DenaliMessage.PAYLOAD_START_INDEX
-    END_POS_VALVE_VRF = START_POS_VALVE_VRF + 4
-    START_POS_VALVE_VRI = END_POS_VALVE_VRF + 4
-    END_POS_VALVE_VRI = START_POS_VALVE_VRI + 4
-    START_POS_VALVE_VRD = END_POS_VALVE_VRI + 4
-    END_POS_VALVE_VRD = START_POS_VALVE_VRD + 4
-    START_POS_VALVE_VRO = END_POS_VALVE_VRD + 4
-    END_POS_VALVE_VRO = START_POS_VALVE_VRO + 4
-    START_POS_VALVE_VPO = END_POS_VALVE_VRO + 4
-    END_POS_VALVE_VPO = START_POS_VALVE_VPO + 4
-    START_POS_VALVE_VBF = END_POS_VALVE_VPO + 4
-    END_POS_VALVE_VBF = START_POS_VALVE_VBF + 4
-    START_POS_VALVE_VRC = END_POS_VALVE_VBF + 4
-    END_POS_VALVE_VRC = START_POS_VALVE_VRC + 4
-    START_POS_VALVE_VDR = END_POS_VALVE_VRC + 4
-    END_POS_VALVE_VDR = START_POS_VALVE_VDR + 4
-    START_POS_VALVE_VPI = END_POS_VALVE_VDR + 4
-    END_POS_VALVE_VPI = START_POS_VALVE_VPI + 4
-    START_POS_VALVE_VSP = END_POS_VALVE_VPI + 4
-    END_POS_VALVE_VSP = START_POS_VALVE_VSP + 4
-    START_POS_VALVE_VR1 = END_POS_VALVE_VSP + 4
-    END_POS_VALVE_VR1 = START_POS_VALVE_VR1 + 4
-    START_POS_VALVE_VR2 = END_POS_VALVE_VR1 + 4
-    END_POS_VALVE_VR2 = START_POS_VALVE_VR2 + 4
-    START_POS_VALVE_VPD = END_POS_VALVE_VR2 + 4
-    END_POS_VALVE_VPD = START_POS_VALVE_VPD + 4
+    # Valves states publish message field positions
+    START_POS_VALVES_STATES = DenaliMessage.PAYLOAD_START_INDEX
+    END_POS_VALVES_STATES = START_POS_VALVES_STATES + 2          # Valves States come in as a U16 value (2 bytes)
 
     # Valve IDs
     VALVE_RESERVOIR_FILL = 0     # VRF