Index: leahi_dialin/common/fp_defs.py =================================================================== diff -u -r9c1ee405a484654486ee23393f0b8e6b33a17154 -rd0dedd8e720be5de357176ffb095484ec082c830 --- leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision 9c1ee405a484654486ee23393f0b8e6b33a17154) +++ leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision d0dedd8e720be5de357176ffb095484ec082c830) @@ -230,76 +230,76 @@ # 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 + IN_PROGRESS = 0 # Inlet Pressure Check in progress state + 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'], + 'IN_PROGRESS': ['start', 'in progress', 'running'], + '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 + IN_PROGRESS = 0 # Filter Flush in progress state + 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'], + 'IN_PROGRESS': ['start', 'in progress', 'running'], + '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 + IN_PROGRESS = 0 # Permeate Flush in progress state + 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'], + 'IN_PROGRESS': ['start', 'in progress', 'running'], + '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 + IN_PROGRESS = 0 # Concentrate Flush in progress state + 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'], + 'IN_PROGRESS': ['start', 'in progress', 'running'], + '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 + DYNAMIC_PRESSURE_CHECK = 0 # Filter Flush in dynamic pressure state + STATIC_PRESSURE_CHECK = 1 # Filter flush in sttaic pressure check + 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'], + 'DYNAMIC_PRESSURE_CHECK': ['dynamic', 'dynamic pressure check'], + 'STATIC_PRESSURE_CHECK': ['static', 'static pressure check'], + 'PAUSED': ['paused'], 'NUM_OF_PERM_FLUSH_STATES': [], } @@ -308,33 +308,34 @@ # ================================================== Enum Creators: Events ================================================== @unique class FPEventList(DialinEnum): - FP_EVENT_STARTUP = 0 # FP startup event - FP_EVENT_OP_MODE_CHANGE = 1 # FP Op mode change event - FP_EVENT_SUB_MODE_CHANGE = 2 # FP Op sub-mode change event - FP_EVENT_PRE_GEN_RO_SET_PWM = 3 # FP gen permeate ro set pwm event - FP_EVENT_GENP_BOOST_SET_PWM = 4 # FP gen permeate boost set pwm event - FP_EVENT_GENP_CHANGE = 5 # FP gen permeate state change - FP_EVENT_PRE_GEN_CHANGE = 6 # FP pre gen state change - FP_EVENT_PRE_GEN_DEF_CHANGE = 7 # FP defeatured pre gen state change - FP_EVENT_GENP_DEF_CHANGE = 8 # FP defeatured gen permeate state change - FP_EVENT_FAULT_ALARM_TRIGGER = 9 # FP event for alarms that would trigger - FP_EVENT_P25_LEVL_CHANGE = 10 # FP floater level change event - FP_EVENT_OPERATION_STATUS = 11 # FP operation status event - NUM_OF_FP_EVENT_IDS = 12 # Number of FP events + STARTUP = 0 # FP startup event + OP_MODE_CHANGE = 1 # FP Op mode change event + SUB_MODE_CHANGE = 2 # FP Op sub-mode change event + PRE_GEN_RO_SET_PWM = 3 # FP gen permeate ro set pwm event + GENP_BOOST_SET_PWM = 4 # FP gen permeate boost set pwm event + GENP_CHANGE = 5 # FP gen permeate state change + PRE_GEN_CHANGE = 6 # FP pre gen state change + PRE_GEN_DEF_CHANGE = 7 # FP defeatured pre gen state change + GENP_DEF_CHANGE = 8 # FP defeatured gen permeate state change + FAULT_ALARM_TRIGGER = 9 # FP event for alarms that would trigger + P25_LEVL_CHANGE = 10 # FP floater level change event + OPERATION_STATUS = 11 # FP operation status event + NUM_OF_FP_EVENT_IDS = 12 # Number of FP events FPEventList._str_list = { # Official Name : Accepted strings - 'FP_EVENT_STARTUP': ['startup'], - 'FP_EVENT_OP_MODE_CHANGE': ['op mode change'], - 'FP_EVENT_SUB_MODE_CHANGE': ['sub mode change'], - 'FP_EVENT_PRE_GEN_RO_SET_PWM': ['ro pump set pwm'], - 'FP_EVENT_GENP_BOOST_SET_PWM': ['boost pump set pwm'], - 'FP_EVENT_GENP_CHANGE': ['generate permeate change', 'genp change'], - 'FP_EVENT_PRE_GEN_CHANGE': ['pre-generate permeate change', 'pre-genp change'], - 'FP_EVENT_PRE_GEN_DEF_CHANGE': ['defeatured pre-generate permeate change', 'def pre-genp change'], - 'FP_EVENT_GENP_DEF_CHANGE': ['defeatured generate permeate change', 'def genp change'], - 'FP_EVENT_FAULT_ALARM_TRIGGER': ['alarm', 'alarm trigger', 'fault alarm trigger'], - 'FP_EVENT_OPERATION_STATUS': ['operation status', 'status', 'op status', 'operation status change', 'status change', 'op status change'], + 'STARTUP': ['startup'], + 'OP_MODE_CHANGE': ['op mode change'], + 'SUB_MODE_CHANGE': ['sub mode change'], + 'PRE_GEN_RO_SET_PWM': ['ro pump set pwm'], + 'GENP_BOOST_SET_PWM': ['boost pump set pwm'], + 'GENP_CHANGE': ['generate permeate change', 'genp change'], + 'PRE_GEN_CHANGE': ['pre-generate permeate change', 'pre-genp change'], + 'PRE_GEN_DEF_CHANGE': ['defeatured pre-generate permeate change', 'def pre-genp change'], + 'GENP_DEF_CHANGE': ['defeatured generate permeate change', 'def genp change'], + 'FAULT_ALARM_TRIGGER': ['alarm', 'alarm trigger', 'fault alarm trigger'], + 'P25_LEVL_CHANGE': ['p25', 'level change'], + 'OPERATION_STATUS': ['operation status', 'status', 'op status', 'operation status change', 'status change', 'op status change'], 'NUM_OF_FP_EVENT_IDS': [], } @@ -551,20 +552,20 @@ @unique class FPFloaterLevels(DialinEnum): - LEVEL_STATE_EMPTY = 0 # Empty level for the FP Floater Level Sensors - LEVEL_STATE_LOW = 1 # Low level for the FP Floater Level Sensors - LEVEL_STATE_MEDIUM = 2 # Medium level for the FP Floater Level Sensors - LEVEL_STATE_HIGH = 3 # High level for the FP Floater Level Sensors - LEVEL_STATE_ILLEGAL = 4 # Illegal level for FP Floater Level Sensor (indicates investigation) - NUM_OF_LEVEL_STATES = 5 # Number of Level States + EMPTY = 0 # Empty level for the FP Floater Level Sensors + LOW = 1 # Low level for the FP Floater Level Sensors + MEDIUM = 2 # Medium level for the FP Floater Level Sensors + HIGH = 3 # High level for the FP Floater Level Sensors + ILLEGAL = 4 # Illegal level for FP Floater Level Sensor (indicates investigation) + NUM_OF_LEVEL_STATES = 5 # Number of Level States FPFloaterLevels._str_list = { # Official Name : Accepted strings - 'LEVEL_STATE_EMPTY': ['empty'], - 'LEVEL_STATE_LOW': ['low'], - 'LEVEL_STATE_MEDIUM': ['medium'], - 'LEVEL_STATE_HIGH': ['high'], - 'LEVEL_STATE_ILLEGAL': ['illegal'], + 'EMPTY': ['empty'], + 'LOW': ['low'], + 'MEDIUM': ['medium'], + 'HIGH': ['high'], + 'ILLEGAL': ['illegal'], 'NUM_OF_LEVEL_STATES': [], } @@ -617,31 +618,31 @@ @unique class FPROPumpStates(DialinEnum): - PUMP_OFF_STATE = 0 # Pump Offline State - PUMP_CONTROL_TO_TARGET_FLOW_STATE = 1 # RO pump control to target flow state - PUMP_CONTROL_TO_TARGET_PRESSURE_STATE = 2 # RO pump control to max pressure state. - PUMP_OPEN_LOOP_STATE = 3 # RO pump open loop state. - NUM_OF_RO_PUMP_STATES = 4 # Number of RO pump states + OFF_STATE = 0 # Pump Offline State + CONTROL_TO_TARGET_FLOW_STATE = 1 # RO pump control to target flow state + CONTROL_TO_TARGET_PRESSURE_STATE = 2 # RO pump control to max pressure state. + OPEN_LOOP_STATE = 3 # RO pump open loop state. + NUM_OF_RO_PUMP_STATES = 4 # Number of RO pump states FPROPumpStates._str_list = { # Official Name : Accepted strings - 'PUMP_OFF_STATE': ['closed', 'off', 'inactive', 'offline'], - 'PUMP_CONTROL_TO_TARGET_FLOW_STATE': ['flow', 'target to flow', 'to flow'], - 'PUMP_CONTROL_TO_TARGET_PRESSURE_STATE': ['pressure', 'target to pressure', 'to pressure', 'pres'], - 'PUMP_OPEN_LOOP_STATE': ['open', 'open loop', 'on'], + 'OFF_STATE': ['closed', 'off', 'inactive', 'offline'], + 'CONTROL_TO_TARGET_FLOW_STATE': ['flow', 'target to flow', 'to flow'], + 'CONTROL_TO_TARGET_PRESSURE_STATE': ['pressure', 'target to pressure', 'to pressure', 'pres'], + 'OPEN_LOOP_STATE': ['open', 'open loop', 'on'], 'NUM_OF_RO_PUMP_STATES': [], } @unique class FPValveStates(DialinEnum): - VALVE_STATE_CLOSED = 0 # Valve Closed State - VALVE_STATE_OPEN = 1 # Valve Open State + CLOSED = 0 # Valve Closed State + OPEN = 1 # Valve Open State NUM_OF_VALVE_STATES = 2 # Number of valve states FPValveStates._str_list = { # Official Name : Accepted strings - 'VALVE_STATE_CLOSED': ['closed', 'off'], - 'VALVE_STATE_OPEN': ['open', 'on'], + 'CLOSED': ['closed', 'off'], + 'OPEN': ['open', 'on'], 'NUM_OF_VALVE_STATES': [], }