Index: dialin/common/dg_defs.py =================================================================== diff -u -r00fe4fbb96d3993c4c8a95566e03090e8b30a5e4 -r0c7bff7d1c3407a564b0a2c8237f4aff4cfa9ae3 --- dialin/common/dg_defs.py (.../dg_defs.py) (revision 00fe4fbb96d3993c4c8a95566e03090e8b30a5e4) +++ dialin/common/dg_defs.py (.../dg_defs.py) (revision 0c7bff7d1c3407a564b0a2c8237f4aff4cfa9ae3) @@ -99,3 +99,59 @@ 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 + + +@unique +class HeatDisinfectUIStates(DialinEnum): + + HEAT_DISINFECT_UI_STATE_NOT_RUNNING = 0 + HEAT_DISINFECT_UI_STATE_FLUSH_BEFORE_DISINFECT = 1 + HEAT_DISINFECT_UI_STATE_HEAT_UP_WATER = 2 + HEAT_DISINFECT_UI_STATE_DISINFECT_RESERVOIR_1 = 3 + HEAT_DISINFECT_UI_STATE_TRANSITION_HOT_WATER = 4 + HEAT_DISINFECT_UI_STATE_DISINFECT_RESERVOIR_2 = 5 + HEAT_DISINFECT_UI_STATE_COOL_DOWN_DEVICE = 6 + HEAT_DISINFECT_UI_STATE_FLUSH_AFTER_DISINFECT = 7 + HEAT_DISINFECT_UI_STATE_CANCEL_DISINFECT = 8 + HEAT_DISINFECT_UI_STATE_COMPLETE = 9 + + +@unique +class ChemicalDisinfectStates(DialinEnum): + DG_CHEM_DISINFECT_STATE_START = 0 + DG_CHEM_DISINFECT_STATE_DRAIN_R1 = 1 + DG_CHEM_DISINFECT_STATE_DRAIN_R2 = 2 + DG_CHEM_DISINFECT_STATE_FLUSH_DRAIN = 3 + DG_CHEM_DISINFECT_STATE_FLUSH_CIRCULATION = 4 + DG_CHEM_DISINFECT_STATE_FLUSH_R1_AND_R2 = 5 + DG_CHEM_DISINFECT_STATE_FLUSH_R2_AND_DRAIN_R1 = 6 + DG_CHEM_DISINFECT_STATE_FLUSH_DRAIN_R2 = 7 + DG_CHEM_DISINFECT_STATE_FLUSH_DRAIN_R1 = 8 + DG_CHEM_DISINFECT_STATE_PRIME_ACID_LINE = 9 + DG_CHEM_DISINFECT_STATE_FILL_WITH_WATER_AND_DISINFECTANT = 10 + DG_CHEM_DISINFECT_STATE_REMOVE_ACID_BOTTLE_FROM_UI = 11 + DG_CHEM_DISINFECT_STATE_DISINFECT_R1_TO_R2 = 12 + DG_CHEM_DISINFECT_STATE_FILL_R2_WITH_DISINFECTANT = 13 + DG_CHEM_DISINFECT_STATE_DISINFECT_R2_TO_R1 = 14 + DG_CHEM_DISINFECT_STATE_COOL_DOWN_HEATERS = 15 + DG_CHEM_DISINFECT_STATE_DISINFECTANT_DRAIN_R1 = 16 + DG_CHEM_DISINFECT_STATE_DISINFECTANT_DRAIN_R2 = 17 + DG_CHEM_DISINFECT_STATE_RINSE_R1_TO_R2 = 18 + DG_CHEM_DISINFECT_STATE_RINSE_R2_TO_R1_AND_DRAIN_R1 = 19 + DG_CHEM_DISINFECT_STATE_RINSE_R1_TO_R2_AND_DRAIN_R2 = 20 + DG_CHEM_DISINFECT_STATE_RINSE_CIRCULATION = 21 + DG_CHEM_DISINFECT_STATE_CANCEL_BASIC_PATH = 22 + DG_CHEM_DISINFECT_STATE_CANCEL_WATER_PATH = 23 + DG_CHEM_DISINFECT_STATE_COMPLETE = 24 + + +@unique +class ChemDisinfectUIStates(DialinEnum): + CHEM_DISINFECT_UI_STATE_NOT_RUNNING = 0 + CHEM_DISINFECT_UI_STATE_FLUSH_BEFORE_DISINFECT = 1 + CHEM_DISINFECT_UI_STATE_MIX_WATER_AND_ACID = 2 + CHEM_DISINFECT_UI_STATE_REMOVE_ACID = 3 + CHEM_DISINFECT_UI_STATE_DISINFECT_DEVICE = 4 + CHEM_DISINFECT_UI_STATE_FLUSH_AFTER_DISINFECT = 5 + CHEM_DISINFECT_UI_STATE_CANCEL_DISINFECT = 6 + CHEM_DISINFECT_UI_STATE_COMPLETE = 7 \ No newline at end of file Index: dialin/dg/chemical_disinfect.py =================================================================== diff -u -rf9ade5206d6da9dc2ef510ef0d985ecc4bf44924 -r0c7bff7d1c3407a564b0a2c8237f4aff4cfa9ae3 --- dialin/dg/chemical_disinfect.py (.../chemical_disinfect.py) (revision f9ade5206d6da9dc2ef510ef0d985ecc4bf44924) +++ dialin/dg/chemical_disinfect.py (.../chemical_disinfect.py) (revision 0c7bff7d1c3407a564b0a2c8237f4aff4cfa9ae3) @@ -8,49 +8,6 @@ @unique -class ChemicalDisinfectStates(DialinEnum): - - DG_CHEM_DISINFECT_STATE_START = 0 - DG_CHEM_DISINFECT_STATE_DRAIN_R1 = 1 - DG_CHEM_DISINFECT_STATE_DRAIN_R2 = 2 - DG_CHEM_DISINFECT_STATE_FLUSH_DRAIN = 3 - DG_CHEM_DISINFECT_STATE_FLUSH_CIRCULATION = 4 - DG_CHEM_DISINFECT_STATE_FLUSH_R1_AND_R2 = 5 - DG_CHEM_DISINFECT_STATE_FLUSH_R2_AND_DRAIN_R1 = 6 - DG_CHEM_DISINFECT_STATE_FLUSH_DRAIN_R2 = 7 - DG_CHEM_DISINFECT_STATE_FLUSH_DRAIN_R1 = 8 - DG_CHEM_DISINFECT_STATE_PRIME_ACID_LINE = 9 - DG_CHEM_DISINFECT_STATE_FILL_WITH_WATER_AND_DISINFECTANT = 10 - DG_CHEM_DISINFECT_STATE_REMOVE_ACID_BOTTLE_FROM_UI = 11 - DG_CHEM_DISINFECT_STATE_DISINFECT_R1_TO_R2 = 12 - DG_CHEM_DISINFECT_STATE_FILL_R2_WITH_DISINFECTANT = 13 - DG_CHEM_DISINFECT_STATE_DISINFECT_R2_TO_R1 = 14 - DG_CHEM_DISINFECT_STATE_COOL_DOWN_HEATERS = 15 - DG_CHEM_DISINFECT_STATE_DISINFECTANT_DRAIN_R1 = 16 - DG_CHEM_DISINFECT_STATE_DISINFECTANT_DRAIN_R2 = 17 - DG_CHEM_DISINFECT_STATE_RINSE_R1_TO_R2 = 18 - DG_CHEM_DISINFECT_STATE_RINSE_R2_TO_R1_AND_DRAIN_R1 = 19 - DG_CHEM_DISINFECT_STATE_RINSE_R1_TO_R2_AND_DRAIN_R2 = 20 - DG_CHEM_DISINFECT_STATE_RINSE_CIRCULATION = 21 - DG_CHEM_DISINFECT_STATE_CANCEL_BASIC_PATH = 22 - DG_CHEM_DISINFECT_STATE_CANCEL_WATER_PATH = 23 - DG_CHEM_DISINFECT_STATE_COMPLETE = 24 - - -@unique -class ChemDisinfectUIStates(DialinEnum): - - CHEM_DISINFECT_UI_STATE_NOT_RUNNING = 0 - CHEM_DISINFECT_UI_STATE_FLUSH_BEFORE_DISINFECT = 1 - CHEM_DISINFECT_UI_STATE_MIX_WATER_AND_ACID = 2 - CHEM_DISINFECT_UI_STATE_REMOVE_ACID = 3 - CHEM_DISINFECT_UI_STATE_DISINFECT_DEVICE = 4 - CHEM_DISINFECT_UI_STATE_FLUSH_AFTER_DISINFECT = 5 - CHEM_DISINFECT_UI_STATE_CANCEL_DISINFECT = 6 - CHEM_DISINFECT_UI_STATE_COMPLETE = 7 - - -@unique class ChemCancellationModes(DialinEnum): CANCELLATION_MODE_NONE = 0 Index: dialin/dg/heat_disinfect.py =================================================================== diff -u -rf7927c4086e16a080e6ba1552e10f6d776c84e17 -r0c7bff7d1c3407a564b0a2c8237f4aff4cfa9ae3 --- dialin/dg/heat_disinfect.py (.../heat_disinfect.py) (revision f7927c4086e16a080e6ba1552e10f6d776c84e17) +++ dialin/dg/heat_disinfect.py (.../heat_disinfect.py) (revision 0c7bff7d1c3407a564b0a2c8237f4aff4cfa9ae3) @@ -8,49 +8,6 @@ @unique -class HeatDisinfectStates(DialinEnum): - - DG_HEAT_DISINFECT_STATE_START = 0 - DG_HEAT_DISINFECT_STATE_DRAIN_R1 = 1 - DG_HEAT_DISINFECT_STATE_DRAIN_R2 = 2 - DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN = 3 - DG_HEAT_DISINFECT_STATE_FLUSH_CIRCULATION = 4 - DG_HEAT_DISINFECT_STATE_FLUSH_R1_AND_R2 = 5 - DG_HEAT_DISINFECT_STATE_FLUSH_R2_AND_DRAIN_R1 = 6 - DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN_R2 = 7 - DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN_R1 = 8 - DG_HEAT_DISINFECT_STATE_FILL_WITH_WATER = 9 - DG_HEAT_DISINFECT_STATE_DISINFECT_R1_TO_R2 = 10 - DG_HEAT_DISINFECT_STATE_FILL_R2_WITH_HOT_WATER = 11 - DG_HEAT_DISINFECT_STATE_DISINFECT_R2_TO_R1 = 12 - DG_HEAT_DISINFECT_STATE_COOL_DOWN_HEATERS = 13 - DG_HEAT_DISINFECT_STATE_COOL_DOWN_RO_FILTER = 14 - DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R1 = 15 - DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R2 = 16 - DG_HEAT_DISINFECT_STATE_RINSE_R1_TO_R2 = 17 - DG_HEAT_DISINFECT_STATE_RINSE_R2_TO_R1_AND_DRAIN_R1 = 18 - DG_HEAT_DISINFECT_STATE_RINSE_CIRCULATION = 19 - DG_HEAT_DISINFECT_STATE_CANCEL_BASIC_PATH = 20 - DG_HEAT_DISINFECT_STATE_CANCEL_WATER_PATH = 21 - DG_HEAT_DISINFECT_STATE_COMPLETE = 22 - - -@unique -class HeatDisinfectUIStates(DialinEnum): - - HEAT_DISINFECT_UI_STATE_NOT_RUNNING = 0 - HEAT_DISINFECT_UI_STATE_FLUSH_BEFORE_DISINFECT = 1 - HEAT_DISINFECT_UI_STATE_HEAT_UP_WATER = 2 - HEAT_DISINFECT_UI_STATE_DISINFECT_RESERVOIR_1 = 3 - HEAT_DISINFECT_UI_STATE_TRANSITION_HOT_WATER = 4 - HEAT_DISINFECT_UI_STATE_DISINFECT_RESERVOIR_2 = 5 - HEAT_DISINFECT_UI_STATE_COOL_DOWN_DEVICE = 6 - HEAT_DISINFECT_UI_STATE_FLUSH_AFTER_DISINFECT = 7 - HEAT_DISINFECT_UI_STATE_CANCEL_DISINFECT = 8 - HEAT_DISINFECT_UI_STATE_COMPLETE = 9 - - -@unique class HeatCancellationModes(DialinEnum): CANCELLATION_MODE_NONE = 0