Index: dialin/dg/dialysate_generator.py
===================================================================
diff -u -r2b8e96a45047b35b4d10e26da47a45e8d7a24c67 -rc09a7455b841c5aa99f00edf9659d22343d2cabe
--- dialin/dg/dialysate_generator.py	(.../dialysate_generator.py)	(revision 2b8e96a45047b35b4d10e26da47a45e8d7a24c67)
+++ dialin/dg/dialysate_generator.py	(.../dialysate_generator.py)	(revision c09a7455b841c5aa99f00edf9659d22343d2cabe)
@@ -42,12 +42,29 @@
 from .voltages import DGVoltages
 from ..utils.conversions import integer_to_bytearray
 from ..protocols.CAN import (DenaliCanMessenger, DenaliMessage, DenaliChannels)
-from ..utils.base import _AbstractSubSystem, _publish, _LogManager
+from ..utils.base import _AbstractSubSystem, _publish, _LogManager, DialinEnum
 from ..common.msg_defs import MsgIds, MsgFieldPositions
 from .flush import FlushMode
 from .chemical_disinfect import ChemicalDisinfect
+from enum import unique
 
+@unique
+class DGOperationModes(DialinEnum):
 
+    # DG operation modes
+    DG_OP_MODE_FAULT = 0
+    DG_OP_MODE_SERVICE = 1
+    DG_OP_MODE_INIT_POST = 2
+    DG_OP_MODE_STANDBY = 3
+    DG_OP_MODE_STANDBY_SOLO = 4
+    DG_OP_MODE_RECIRCULATE = 5
+    DG_OP_MODE_FILL = 6
+    DG_OP_MODE_DRAIN = 7
+    DG_OP_MODE_FLUSH = 8
+    DG_OP_MODE_DISINFECT = 9
+    DG_OP_MODE_CHEMICAL_DISINFECT = 10
+
+
 class DG(_AbstractSubSystem):
     """
     Dialysate Generator (DG) Dialin object API.  It provides the basic interface to communicate with
@@ -77,19 +94,6 @@
     START_POS_FPGA_LAB = END_POS_FPGA_MINOR
     END_POS_FPGA_LAB = START_POS_FPGA_LAB + 1
 
-    # DG operation modes
-    DG_OP_MODE_FAULT = 0
-    DG_OP_MODE_SERVICE = 1
-    DG_OP_MODE_INIT_POST = 2
-    DG_OP_MODE_STANDBY = 3
-    DG_OP_MODE_STANDBY_SOLO = 4
-    DG_OP_MODE_RECIRCULATE = 5
-    DG_OP_MODE_FILL = 6
-    DG_OP_MODE_DRAIN = 7
-    DG_OP_MODE_FLUSH = 8
-    DG_OP_MODE_DISINFECT = 9
-    DG_OP_MODE_CHEMICAL_DISINFECT = 10
-
     # DG sub_modes
     DG_POST_STATE_START = 0               # Start initialize & POST mode state
     DG_POST_STATE_FPGA = 1                # FPGA POST test state
@@ -138,7 +142,7 @@
         self.dg_version = None
         self.fpga_version = None
         # create properties
-        self.dg_operation_mode = self.DG_OP_MODE_INIT_POST
+        self.dg_operation_mode = 0 #self.DG_OP_MODE_INIT_POST
         self.dg_operation_sub_mode = 0
 
         # Create command groups
Index: dialin/hd/valves.py
===================================================================
diff -u -r2b8e96a45047b35b4d10e26da47a45e8d7a24c67 -rc09a7455b841c5aa99f00edf9659d22343d2cabe
--- dialin/hd/valves.py	(.../valves.py)	(revision 2b8e96a45047b35b4d10e26da47a45e8d7a24c67)
+++ dialin/hd/valves.py	(.../valves.py)	(revision c09a7455b841c5aa99f00edf9659d22343d2cabe)
@@ -343,7 +343,7 @@
         @returns 1 if successful, zero otherwise
         """
 
-        if valve_state == AirTrapState.STATE_OPEN:
+        if valve_state == AirTrapState.STATE_OPEN.value:
             payload = integer_to_bytearray(1)
         else:
             payload = integer_to_bytearray(0)
@@ -404,4 +404,4 @@
                                             'PosA': pos_a, 'PosB': pos_b, 'PosC': pos_c, 'PWM': pwm}
 
         if AirTrapState.has_value(air_trap):
-            self.hd_air_trap_status = AirTrapState(air_trap).name
+            self.hd_air_trap_status = AirTrapState(air_trap).value