Index: leahi_dialin/common/fp_defs.py =================================================================== diff -u -rfd6f015b1ff68a2ee15187722ec21b8898fce10c -rc6b28ca8a6aae3f70458f05b5bf445069e2fe457 --- leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision fd6f015b1ff68a2ee15187722ec21b8898fce10c) +++ leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision c6b28ca8a6aae3f70458f05b5bf445069e2fe457) @@ -26,7 +26,7 @@ BETA_IOFP_PRES_SENSOR_OFFSET = DDPressureSensorNames.NUM_OF_PRESSURE_SENSORS.value # Offset to translate Dialin FPTemperaturesNames to DD firmware DD Pressure Sensors enum BETA_IOFP_VALVE_OFFSET = DDValveNames.NUM_OF_DD_VALVES.value # Offset to translate Dialin FPValveNames to DD firmware DD_Valves -# ================================================== Enum Creators: Operations ================================================== +# ================================================== Enum Creators: Operations Lvl 1 ================================================== @unique class FPOpModes(DialinEnum): MODE_FAUL = 0 # Fault mode @@ -55,6 +55,8 @@ } +# ================================================== Enum Creators: Operations Lvl 2 ================================================== +# FPOpModes.MODE_FAUL sub states @unique class FPFaultStates(DialinEnum): FP_FAULT_STATE_START = 0 # FP Fault Start State @@ -71,6 +73,7 @@ } +# FPOpModes.MODE_SERV sub states @unique class FPServiceStates(DialinEnum): NUM_OF_FP_SERV_STATES = 0 # Number of FP service states @@ -81,6 +84,7 @@ } +# FPOpModes.MODE_INIT sub states @unique class FPPostStates(DialinEnum): FP_POST_STATE_START = 0 # Start initialize & POST mode state @@ -111,6 +115,7 @@ } +# FPOpModes.MODE_STAN sub states @unique class FPStandbyStates(DialinEnum): FP_STANDBY_MODE_STATE_IDLE = 0 # Idle standby mode state @@ -123,6 +128,7 @@ } +# FPOpModes.MODE_PRE_GENP sub states @unique class FPPreGenPermeateStates(DialinEnum): FP_PRE_GENP_INLET_PRES_CHECK = 0 # FP Pre Gen Permeate Inlet Pressure Check State @@ -145,6 +151,7 @@ } +# FPOpModes.MODE_DPGP sub states @unique class FPPreGenPDefStates(DialinEnum): FP_PRE_GENP_DEF_FLUSH = 0 # Pre Gen Permeate Defeatured Flush state @@ -161,6 +168,7 @@ } +# FPOpModes.MODE_GENP sub states @unique class FPGenPermeateStates(DialinEnum): FP_GENP_TANK_FILL_STATE = 0 # Gen Permeate Tank Fill low state @@ -175,6 +183,7 @@ } +# FPOpModes.MODE_DEGP sub states @unique class FPGenPermeateDefStates(DialinEnum): FP_GENP_DEF_SUPPLY_WATER = 0 # Gen Permeate Defeatured Supply Water statee @@ -189,6 +198,7 @@ } +# FPOpModes.MODE_NLEG sub states @unique class FPNotLegalStates(DialinEnum): NUM_OF_NOT_LEGAL_STATES = 0 # Number of Not Legal states @@ -199,7 +209,102 @@ } +# ================================================== Enum Creators: Operations Lvl 3 ================================================== +# FPFaultStates. sub states +@unique +class FPFaultNVDataStates(DialinEnum): + FP_NVDATA_STATE_START = 0 # FP Non-Volatile Data Management start state + FP_NVDATA_STATE_RUN_NV_POSTS = 1 # FP Non-Volatile Data Management run RTC and NV data management posts + FP_NVDATA_STATE_COMPLETE = 2 # FP Non-Volatile Data Management Complete + NUM_OF_FP_NVDATA_STATES = 3 # Number of fault mode NV Data management states +FPFaultNVDataStates._str_list = { + # Official Name : Accepted strings + 'FP_NVDATA_STATE_START': ['start'], + 'FP_NVDATA_STATE_RUN_NV_POSTS': ['running', 'run nv posts'], + 'FP_NVDATA_STATE_COMPLETE': ['complete', 'done'], + 'NUM_OF_FP_INIT_NVDATA_STATES': [], +} + + +# FPPreGenPermeateStates.FP_PRE_GENP_INLET_PRES_CHECK sub states +@unique +class FPInletPresCheckStates(DialinEnum): + INLET_PRES_CHECK_IN_PROGRESS = 0 # Inlet Pressure Check in progress state + INLET_PRES_CHECK_PAUSED = 1 # Inlet Pressure Check paused state + NUM_OF_INLET_PRES_CHECK_STATES = 2 # Number of Inlet Pressure Check states + +FPInletPresCheckStates._str_list = { + # Official Name : Accepted strings + 'INLET_PRES_CHECK_IN_PROGRESS': ['start', 'in progress', 'running'], + 'INLET_PRES_CHECK_PAUSED': ['paused'], + 'NUM_OF_INLET_PRES_CHECK_STATES': [], +} + + +# FPPreGenPermeateStates.FP_PRE_GENP_FILTER_FLUSH sub states +@unique +class FPFilterFlushStates(DialinEnum): + FILTER_FLUSH_IN_PROGRESS = 0 # Filter Flush in progress state + FILTER_FLUSH_PAUSED = 1 # Filter Flush paused state + NUM_OF_FILTER_FLUSH_STATES = 2 # Number of filter flush states + +FPFilterFlushStates._str_list = { + # Official Name : Accepted strings + 'FILTER_FLUSH_IN_PROGRESS': ['start', 'in progress', 'running'], + 'FILTER_FLUSH_PAUSED': ['paused'], + 'NUM_OF_FILTER_FLUSH_STATES': [], +} + + +# FPPreGenPermeateStates.FP_PRE_GENP_PERMEATE_FLUSH sub states +@unique +class FPPermeateFlushStates(DialinEnum): + PERM_FLUSH_IN_PROGRESS = 0 # Permeate Flush in progress state + PERM_FLUSH_PAUSED = 1 # Permeate Flush paused state + NUM_OF_PERM_FLUSH_STATES = 2 # Number of permeate flush states + +FPPermeateFlushStates._str_list = { + # Official Name : Accepted strings + 'PERM_FLUSH_IN_PROGRESS': ['start', 'in progress', 'running'], + 'PERM_FLUSH_PAUSED': ['paused'], + 'NUM_OF_PERM_FLUSH_STATES': [], +} + + +# FPPreGenPermeateStates.FP_PRE_GENP_CONCENTRATE_FLUSH sub states +@unique +class FPConcentrateFlushStates(DialinEnum): + CONC_FLUSH_IN_PROGRESS = 0 # Concentrate Flush in progress state + CONC_FLUSH_PAUSED = 1 # Concentrate Flush paused state + NUM_OF_CONC_FLUSH_STATES = 2 # Number of Concentrate flush states + +FPConcentrateFlushStates._str_list = { + # Official Name : Accepted strings + 'CONC_FLUSH_IN_PROGRESS': ['start', 'in progress', 'running'], + 'CONC_FLUSH_PAUSED': ['paused'], + 'NUM_OF_CONC_FLUSH_STATES': [], +} + + +# FPPreGenPDefStates.FP_PRE_GENP_DEF_FLUSH sub states +@unique +class FPDefFlushStates(DialinEnum): + FILTER_FLUSH_DEF_DYNAMIC_PRESSURE_CHECK = 0 # Filter Flush in dynamic pressure state + FILTER_FLUSH_DEF_STATIC_PRESSURE_CHECK = 1 # Filter flush in sttaic pressure check + FILTER_FLUSH_DEF_PAUSED = 2 # Filter Flush paused state + NUM_OF_FILTER_FLUSH_DEF_STATES = 3 # Number of filter flush states + +FPDefFlushStates._str_list = { + # Official Name : Accepted strings + 'FILTER_FLUSH_DEF_DYNAMIC_PRESSURE_CHECK': ['dynamic', 'dynamic pressure check'], + 'FILTER_FLUSH_DEF_STATIC_PRESSURE_CHECK': ['static', 'static pressure check'], + 'FILTER_FLUSH_DEF_PAUSED': ['paused'], + 'NUM_OF_PERM_FLUSH_STATES': [], +} + + + # ================================================== Enum Creators: Events ================================================== @unique class FPEventList(DialinEnum):