Index: dialin/common/__init__.py
===================================================================
diff -u -rbe97d97e1ddd765351cdc51cb75aee9e7e63ba58 -r9fdaf53a622f2c87cc30080dde9b5e4c42dbef65
--- dialin/common/__init__.py	(.../__init__.py)	(revision be97d97e1ddd765351cdc51cb75aee9e7e63ba58)
+++ dialin/common/__init__.py	(.../__init__.py)	(revision 9fdaf53a622f2c87cc30080dde9b5e4c42dbef65)
@@ -3,4 +3,5 @@
 from .msg_defs import *
 from .prs_defs import *
 from .hd_defs import *
+from .dg_defs import *
 from .ui_defs import *
Index: dialin/common/dg_defs.py
===================================================================
diff -u
--- dialin/common/dg_defs.py	(revision 0)
+++ dialin/common/dg_defs.py	(revision 9fdaf53a622f2c87cc30080dde9b5e4c42dbef65)
@@ -0,0 +1,45 @@
+################################################################
+#
+# Copyright (c) 2021 Diality Inc. - All Rights Reserved.
+#
+# THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+# WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+#
+# @file dg_defs.py
+#
+# @author (last) Peter Lucia
+# @date (last) 22-Jun-2021
+# @author (original) Peter Lucia
+# @date (original) 22-Jun-2021
+#
+############################################################################
+from enum import unique
+from ..utils.base import DialinEnum
+
+
+@unique
+class DG_Heat_States(DialinEnum): # although it is a dg state and the file is hd_defs since we don't have dg_defs I put it here.
+    DG_HEAT_DISINFECT_STATE_START                       =  0 # Heat disinfect, start mode state
+    DG_HEAT_DISINFECT_STATE_DRAIN_R1                    =  1 # Heat disinfect, drain R1 state
+    DG_HEAT_DISINFECT_STATE_DRAIN_R2                    =  2 # Heat disinfect, drain R2 state
+    DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN                 =  3 # Heat disinfect, flush drain state
+    DG_HEAT_DISINFECT_STATE_FLUSH_CIRCULATION           =  4 # Heat disinfect, flush circulation state
+    DG_HEAT_DISINFECT_STATE_FLUSH_R1_AND_R2             =  5 # Heat disinfect, flush R1 and R2 state
+    DG_HEAT_DISINFECT_STATE_FLUSH_R2_AND_DRAIN_R1       =  6 # Heat disinfect, flush R2 and drain R1 state
+    DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN_R2              =  7 # Heat disinfect, flush drain R2 state
+    DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN_R1              =  8 # Heat disinfect, flush drain R1 state
+    DG_HEAT_DISINFECT_STATE_FILL_WITH_WATER             =  9 # Heat disinfect, fill with water state
+    DG_HEAT_DISINFECT_STATE_DISINFECT_R1_TO_R2          = 10 # Heat disinfect, disinfect R1 to R2 state
+    DG_HEAT_DISINFECT_STATE_FILL_R2_WITH_HOT_WATER      = 11 # Heat disinfect, fill R2 with hot water state
+    DG_HEAT_DISINFECT_STATE_DISINFECT_R2_TO_R1          = 12 # Heat disinfect, disinfect R2 to R1 state
+    DG_HEAT_DISINFECT_STATE_COOL_DOWN_HEATERS           = 13 # Heat disinfect, cool down heaters state
+    DG_HEAT_DISINFECT_STATE_COOL_DOWN_RO_FILTER         = 14 # Heat disinfect, cool down RO filter state
+    DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R1                = 15 # Heat disinfect, mix drain R1 state
+    DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R2                = 16 # Heat disinfect, mix drain R2 state
+    DG_HEAT_DISINFECT_STATE_RINSE_R1_TO_R2              = 17 # Heat disinfect, rinse R1 to R2 state
+    DG_HEAT_DISINFECT_STATE_RINSE_R2_TO_R1_AND_DRAIN_R1 = 18 # Heat disinfect, rinse R2 to R1 and drain R1 state
+    DG_HEAT_DISINFECT_STATE_RINSE_CIRCULATION           = 19 # Heat disinfect, rinse circulation state
+    DG_HEAT_DISINFECT_STATE_CANCEL_BASIC_PATH           = 20 # Heat disinfect, cancel mode basic path state
+    DG_HEAT_DISINFECT_STATE_CANCEL_WATER_PATH           = 21 # Heat disinfect, cancel mode water path state
+    DG_HEAT_DISINFECT_STATE_COMPLETE                    = 22 # Heat disinfect, complete state
+    NUM_OF_DG_HEAT_DISINFECT_STATES                     = 23 # Number of heat disinfect mode states
Index: dialin/common/hd_defs.py
===================================================================
diff -u -rb31694e714c45e0678632ab11efbcdcf6dbf6e96 -r9fdaf53a622f2c87cc30080dde9b5e4c42dbef65
--- dialin/common/hd_defs.py	(.../hd_defs.py)	(revision b31694e714c45e0678632ab11efbcdcf6dbf6e96)
+++ dialin/common/hd_defs.py	(.../hd_defs.py)	(revision 9fdaf53a622f2c87cc30080dde9b5e4c42dbef65)
@@ -271,31 +271,3 @@
     STANDBY_DG_HEAT_DISINFECT_IN_PROGRESS_STATE     = 4 # DG heat disinfection operation is in progress
     STANDBY_DG_CHEM_DISINFECT_IN_PROGRESS_STATE     = 5 # DG chemical disinfection operation is in progress
     NUM_OF_STANDBY_STATES                           = 6 # Number of standby states (sub-modes)
-
-
-@unique
-class DG_Heat_States(DialinEnum): # although it is a dg state and the file is hd_defs since we don't have dg_defs I put it here.
-    DG_HEAT_DISINFECT_STATE_START                       =  0 # Heat disinfect, start mode state
-    DG_HEAT_DISINFECT_STATE_DRAIN_R1                    =  1 # Heat disinfect, drain R1 state
-    DG_HEAT_DISINFECT_STATE_DRAIN_R2                    =  2 # Heat disinfect, drain R2 state
-    DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN                 =  3 # Heat disinfect, flush drain state
-    DG_HEAT_DISINFECT_STATE_FLUSH_CIRCULATION           =  4 # Heat disinfect, flush circulation state
-    DG_HEAT_DISINFECT_STATE_FLUSH_R1_AND_R2             =  5 # Heat disinfect, flush R1 and R2 state
-    DG_HEAT_DISINFECT_STATE_FLUSH_R2_AND_DRAIN_R1       =  6 # Heat disinfect, flush R2 and drain R1 state
-    DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN_R2              =  7 # Heat disinfect, flush drain R2 state
-    DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN_R1              =  8 # Heat disinfect, flush drain R1 state
-    DG_HEAT_DISINFECT_STATE_FILL_WITH_WATER             =  9 # Heat disinfect, fill with water state
-    DG_HEAT_DISINFECT_STATE_DISINFECT_R1_TO_R2          = 10 # Heat disinfect, disinfect R1 to R2 state
-    DG_HEAT_DISINFECT_STATE_FILL_R2_WITH_HOT_WATER      = 11 # Heat disinfect, fill R2 with hot water state
-    DG_HEAT_DISINFECT_STATE_DISINFECT_R2_TO_R1          = 12 # Heat disinfect, disinfect R2 to R1 state
-    DG_HEAT_DISINFECT_STATE_COOL_DOWN_HEATERS           = 13 # Heat disinfect, cool down heaters state
-    DG_HEAT_DISINFECT_STATE_COOL_DOWN_RO_FILTER         = 14 # Heat disinfect, cool down RO filter state
-    DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R1                = 15 # Heat disinfect, mix drain R1 state
-    DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R2                = 16 # Heat disinfect, mix drain R2 state
-    DG_HEAT_DISINFECT_STATE_RINSE_R1_TO_R2              = 17 # Heat disinfect, rinse R1 to R2 state
-    DG_HEAT_DISINFECT_STATE_RINSE_R2_TO_R1_AND_DRAIN_R1 = 18 # Heat disinfect, rinse R2 to R1 and drain R1 state
-    DG_HEAT_DISINFECT_STATE_RINSE_CIRCULATION           = 19 # Heat disinfect, rinse circulation state
-    DG_HEAT_DISINFECT_STATE_CANCEL_BASIC_PATH           = 20 # Heat disinfect, cancel mode basic path state
-    DG_HEAT_DISINFECT_STATE_CANCEL_WATER_PATH           = 21 # Heat disinfect, cancel mode water path state
-    DG_HEAT_DISINFECT_STATE_COMPLETE                    = 22 # Heat disinfect, complete state
-    NUM_OF_DG_HEAT_DISINFECT_STATES                     = 23 # Number of heat disinfect mode states
Index: dialin/dg/valves.py
===================================================================
diff -u -r8a13a85045edfcf69bf0e728d294f04b924d732c -r9fdaf53a622f2c87cc30080dde9b5e4c42dbef65
--- dialin/dg/valves.py	(.../valves.py)	(revision 8a13a85045edfcf69bf0e728d294f04b924d732c)
+++ dialin/dg/valves.py	(.../valves.py)	(revision 9fdaf53a622f2c87cc30080dde9b5e4c42dbef65)
@@ -312,7 +312,7 @@
         """
 
         rst = integer_to_bytearray(reset)
-        ste = integer_to_bytearray(state)
+        ste = integer_to_bytearray(int(state))
         vlv = integer_to_bytearray(valve)
         payload = rst + ste + vlv