Index: dialin/common/dg_defs.py =================================================================== diff -u -r26c7b6057f11680681e0a25399b5e5be9b92818d -r61fe0fcb4e609fd96382a7401d65c62de42007b3 --- dialin/common/dg_defs.py (.../dg_defs.py) (revision 26c7b6057f11680681e0a25399b5e5be9b92818d) +++ dialin/common/dg_defs.py (.../dg_defs.py) (revision 61fe0fcb4e609fd96382a7401d65c62de42007b3) @@ -32,7 +32,8 @@ DG_MODE_CHEM = 10 # Chemical Disinfect mode DG_MODE_CHFL = 11 # Chemical Disinfect Flush mode DG_MODE_HCOL = 12 # Heat Disinfect Active Cool mode - DG_MODE_NLEG = 13 # Not legal - an illegal mode transition occurred + DG_MODE_ROPS = 13 # RO Permeate Sample mode + DG_MODE_NLEG = 14 # Not legal - an illegal mode transition occurred NUM_OF_DG_MODES = 14 # Number of DG operation modes @@ -276,7 +277,7 @@ @unique -class DGROPermeateSampleSates(DialinEnum): +class DGROPermeateSampleStates(DialinEnum): DG_RO_PERM_SAMPLE_STATE_START = 0 DG_RO_PERM_SAMPLE_STATE_DRAIN_R1 = 1 DG_RO_PERM_SAMPLE_STATE_DRAIN_R2 = 2 Index: tests/dg_tests.py =================================================================== diff -u -r9ff38465c87974ff92d99ece044c413141f9d3b7 -r61fe0fcb4e609fd96382a7401d65c62de42007b3 --- tests/dg_tests.py (.../dg_tests.py) (revision 9ff38465c87974ff92d99ece044c413141f9d3b7) +++ tests/dg_tests.py (.../dg_tests.py) (revision 61fe0fcb4e609fd96382a7401d65c62de42007b3) @@ -48,7 +48,7 @@ from dialin.hd.valves import HDValves from dialin.hd.voltages import HDMonitoredVoltages from dialin.hd.pretreatment import PreTreatmentRsrvrState -from dialin.common.dg_defs import DGFlushStates, DGHeatDisinfectActiveCoolStates, DGROPermeateSampleSates +from dialin.common.dg_defs import DGFlushStates, DGHeatDisinfectActiveCoolStates, DGROPermeateSampleStates from dialin.dg.ro_permeate_sample import ROPermeateDispenseMsgStatus from dialin.common.test_config_defs import DGTestConfigOptions, HDTestConfigOptions from time import sleep @@ -130,7 +130,7 @@ def get_ro_permeate_sample_mode_info(): - state = DGROPermeateSampleSates(dg.ro_permeate_sample.ro_permeate_sample_state).name + state = DGROPermeateSampleStates(dg.ro_permeate_sample.ro_permeate_sample_state).name overall_elapsed_time = dg.ro_permeate_sample.overall_elapsed_time state_elapsed_time = dg.ro_permeate_sample.state_elapsed_time