Index: dialin/common/dg_defs.py =================================================================== diff -u -re3ad27490f27a84efa4d2a79ce730165ccdfd2e2 -rd155e227e226d875054c35dd83eb612158c8fd7e --- dialin/common/dg_defs.py (.../dg_defs.py) (revision e3ad27490f27a84efa4d2a79ce730165ccdfd2e2) +++ dialin/common/dg_defs.py (.../dg_defs.py) (revision d155e227e226d875054c35dd83eb612158c8fd7e) @@ -35,6 +35,32 @@ @unique +class DGInitStates(DialinEnum): + DG_POST_STATE_START = 0 + DG_POST_STATE_FW_COMPATIBILITY = 1 + DG_POST_STATE_FW_INTEGRITY = 2 + DG_POST_STATE_FPGA = 3 + DG_POST_STATE_RTC = 4 + DG_POST_STATE_NVDATAMGMT = 5 + DG_POST_STATE_TEMPERATURE_SENSORS = 6 + DG_POST_STATE_ACCELEROMETER = 7 + DG_POST_STATE_PRESSURES = 8 + DG_POST_STATE_RO_PUMP = 9 + DG_POST_STATE_DRAIN_PUMP = 10 + DG_POST_STATE_CONCENTRATE_PUMPS = 11 + DG_POST_STATE_CONDUCTIVITY_SENSORS = 12 + DG_POST_STATE_RESERVOIRS = 13 + DG_POST_STATE_UV_REACTORS = 14 + DG_POST_STATE_THERMISTORS = 15 + DG_POST_STATE_FANS = 16 + DG_POST_STATE_WATCHDOG = 17 + DG_POST_STATE_SAFETY_SHUTDOWN = 18 + DG_POST_STATE_LOAD_CELL = 19 + DG_POST_STATE_COMPLETED = 20 + DG_POST_STATE_FAILED = 21 + + +@unique class DGFaultStates(DialinEnum): DG_FAULT_STATE_START = 0 NUM_OF_DG_FAULT_STATES = 1 Index: dialin/dg/events.py =================================================================== diff -u -rd430e49fa1d7a0f4ff1dfe24733fecded6d5ee70 -rd155e227e226d875054c35dd83eb612158c8fd7e --- dialin/dg/events.py (.../events.py) (revision d430e49fa1d7a0f4ff1dfe24733fecded6d5ee70) +++ dialin/dg/events.py (.../events.py) (revision d155e227e226d875054c35dd83eb612158c8fd7e) @@ -33,14 +33,15 @@ self._dg_event_data_type = dict() # Dictionary of the the mode as key and the sub mode states enum class as the value - self._dg_op_mode_2_sub_mode = {DGOpModes.DG_MODE_STAN.name: DGStandByModeStates, + self._dg_op_mode_2_sub_mode = {DGOpModes.DG_MODE_FAUL.name: DGFaultStates, + DGOpModes.DG_MODE_INIT.name: DGInitStates, + DGOpModes.DG_MODE_STAN.name: DGStandByModeStates, DGOpModes.DG_MODE_CIRC.name: DGRecircModeStates, DGOpModes.DG_MODE_FILL.name: DGFillModeStates, DGOpModes.DG_MODE_DRAI.name: DGDrainModeStates, DGOpModes.DG_MODE_FLUS.name: DGFlushStates, DGOpModes.DG_MODE_HEAT.name: DGHeatDisinfectStates, - DGOpModes.DG_MODE_CHEM.name: DGChemicalDisinfectStates, - DGOpModes.DG_MODE_FAUL.name: DGFaultStates} + DGOpModes.DG_MODE_CHEM.name: DGChemicalDisinfectStates} # Loop through the list of the DG events enums and initial the event dictionary. Each event is a key in the # dictionary and the value is a list.