Index: leahi_dialin/common/fp_defs.py =================================================================== diff -u -rdefe59974cd16b0f1c825bfc61aae7c3862f812e -r5c4a3b41a159d0e882fd41286d63e479a5aba08c --- leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision defe59974cd16b0f1c825bfc61aae7c3862f812e) +++ leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision 5c4a3b41a159d0e882fd41286d63e479a5aba08c) @@ -14,7 +14,7 @@ # ############################################################################ -from enum import unique, auto +from enum import unique from .dd_defs import dd_enum_repository from ..utils.base import DialinEnum @@ -29,16 +29,16 @@ # ================================================== Enum Creators: Operations ================================================== @unique class FPOpModes(DialinEnum): - MODE_FAUL = auto() # Fault mode - MODE_SERV = auto() # Service mode - MODE_INIT = auto() # Initialization & POST mode - MODE_STAN = auto() # Standby mode - MODE_PRE_GENP = auto() # Pre Generate Permeate mode - MODE_GENP = auto() # Generate Permeate mode - MODE_DPGP = auto() # Defeatured Pre-Generate Permeate mode - MODE_DEGP = auto() # Defeatured Generate Permeate mode - MODE_NLEG = auto() # Not legal - an illegal mode transition occurred - NUM_OF_FP_MODES = auto() # Number of TD operation modes + MODE_FAUL = 0 # Fault mode + MODE_SERV = 1 # Service mode + MODE_INIT = 2 # Initialization & POST mode + MODE_STAN = 3 # Standby mode + MODE_PRE_GENP = 4 # Pre Generate Permeate mode + MODE_GENP = 5 # Generate Permeate mode + MODE_DPGP = 6 # Defeatured Pre-Generate Permeate mode + MODE_DEGP = 7 # Defeatured Generate Permeate mode + MODE_NLEG = 8 # Not legal - an illegal mode transition occurred + NUM_OF_FP_MODES = 9 # Number of TD operation modes FPOpModes._str_list = { # Official Name : Accepted strings @@ -57,10 +57,10 @@ @unique class FPFaultStates(DialinEnum): - FP_FAULT_STATE_START = auto() # FP Fault Start State - FP_FAULT_DEENERGIZED_STATE = auto() # FP Fault De-energized State - FP_FAULT_ENERGIZED_STATE = auto() # FP Fault Energized State - NUM_OF_FP_FAULT_STATES = auto() # Number of Fault Mode State + FP_FAULT_STATE_START = 0 # FP Fault Start State + FP_FAULT_DEENERGIZED_STATE = 1 # FP Fault De-energized State + FP_FAULT_ENERGIZED_STATE = 2 # FP Fault Energized State + NUM_OF_FP_FAULT_STATES = 3 # Number of Fault Mode State FPFaultStates._str_list = { # Official Name : Accepted strings @@ -73,7 +73,7 @@ @unique class FPServiceStates(DialinEnum): - NUM_OF_FP_SERV_STATES = auto() # Number of FP service states + NUM_OF_FP_SERV_STATES = 0 # Number of FP service states FPServiceStates._str_list = { # Official Name : Accepted strings @@ -83,17 +83,17 @@ @unique class FPPostStates(DialinEnum): - FP_POST_STATE_START = auto() # Start initialize & POST mode state - FP_POST_STATE_FW_INTEGRITY = auto() # Run firmware integrity test state - FP_POST_STATE_NVDATAMGMT = auto() # Run NV Data Mgmt. test state - FP_POST_STATE_WATCHDOG = auto() # Run watchdog test state - FP_POST_STATE_SAFETY_SHUTDOWN = auto() # Run safety shutdown test state - FP_POST_STATE_TEMPERATURES = auto() # Run temperatures POST state - FP_POST_STATE_FW_COMPATIBILITY = auto() # Run firmware compatibility test state - FP_POST_STATE_FPGA = auto() # Run FPGA test state - FP_POST_STATE_COMPLETED = auto() # POST self-tests completed state - FP_POST_STATE_FAILED = auto() # POST self-tests failed state - NUM_OF_FP_POST_STATES = auto() # Number of initialize & POST mode states + FP_POST_STATE_START = 0 # Start initialize & POST mode state + FP_POST_STATE_FW_INTEGRITY = 1 # Run firmware integrity test state + FP_POST_STATE_NVDATAMGMT = 2 # Run NV Data Mgmt. test state + FP_POST_STATE_WATCHDOG = 3 # Run watchdog test state + FP_POST_STATE_SAFETY_SHUTDOWN = 4 # Run safety shutdown test state + FP_POST_STATE_TEMPERATURES = 5 # Run temperatures POST state + FP_POST_STATE_FW_COMPATIBILITY = 6 # Run firmware compatibility test state + FP_POST_STATE_FPGA = 7 # Run FPGA test state + FP_POST_STATE_COMPLETED = 8 # POST self-tests completed state + FP_POST_STATE_FAILED = 9 # POST self-tests failed state + NUM_OF_FP_POST_STATES = 10 # Number of initialize & POST mode states FPPostStates._str_list = { # Official Name : Accepted strings @@ -113,8 +113,8 @@ @unique class FPStandbyStates(DialinEnum): - FP_STANDBY_MODE_STATE_IDLE = auto() # Idle standby mode state - NUM_OF_FP_STANDBY_MODE_STATES = auto() # Number of standby mode states + FP_STANDBY_MODE_STATE_IDLE = 0 # Idle standby mode state + NUM_OF_FP_STANDBY_MODE_STATES = 1 # Number of standby mode states FPStandbyStates._str_list = { # Official Name : Accepted strings @@ -125,13 +125,13 @@ @unique class FPPreGenPermeateStates(DialinEnum): - FP_PRE_GENP_INLET_PRES_CHECK = auto() # FP Pre Gen Permeate Inlet Pressure Check State - FP_PRE_GENP_FILTER_FLUSH = auto() # FP Pre Gen Permeate Filter Flush State - FP_PRE_GENP_PERMEATE_FLUSH = auto() # FP Pre Gen Permeate Permeate Flush State - FP_PRE_GENP_CONCENTRATE_FLUSH = auto() # FP Pre Gen Permeate Concentrate Flush State - FP_PRE_GENP_VERIFY_WATER = auto() # FP Pre Gen Permeate Verify Water State - FP_PRE_GENP_PAUSED = auto() # FP Pre Gen Permeate Paused State - NUM_OF_FP_PRE_GENP_MODE_STATES = auto() # Number of Pre-Gen Permeate mode states + FP_PRE_GENP_INLET_PRES_CHECK = 0 # FP Pre Gen Permeate Inlet Pressure Check State + FP_PRE_GENP_FILTER_FLUSH = 1 # FP Pre Gen Permeate Filter Flush State + FP_PRE_GENP_PERMEATE_FLUSH = 2 # FP Pre Gen Permeate Permeate Flush State + FP_PRE_GENP_CONCENTRATE_FLUSH = 3 # FP Pre Gen Permeate Concentrate Flush State + FP_PRE_GENP_VERIFY_WATER = 4 # FP Pre Gen Permeate Verify Water State + FP_PRE_GENP_PAUSED = 5 # FP Pre Gen Permeate Paused State + NUM_OF_FP_PRE_GENP_MODE_STATES = 7 # Number of Pre-Gen Permeate mode states FPPreGenPermeateStates._str_list = { # Official Name : Accepted strings @@ -147,10 +147,10 @@ @unique class FPPreGenPDefStates(DialinEnum): - FP_PRE_GENP_DEF_FLUSH = auto() # Pre Gen Permeate Defeatured Flush state - FP_PRE_GENP_DEF_INLET_WATER_CHECK = auto() # Pre Gen Permeate Defeatured Inlet Water Check state - FP_PRE_GENP_DEF_PAUSED = auto() # Defeatured Pre Gen Permeate Paused state - NUM_OF_FP_PRE_GENP_DEF_MODE_STATES = auto() # Number of Defeatured Pre Gen Permeate states + FP_PRE_GENP_DEF_FLUSH = 0 # Pre Gen Permeate Defeatured Flush state + FP_PRE_GENP_DEF_INLET_WATER_CHECK = 1 # Pre Gen Permeate Defeatured Inlet Water Check state + FP_PRE_GENP_DEF_PAUSED = 2 # Defeatured Pre Gen Permeate Paused state + NUM_OF_FP_PRE_GENP_DEF_MODE_STATES = 3 # Number of Defeatured Pre Gen Permeate states FPPreGenPDefStates._str_list = { # Official Name : Accepted strings @@ -163,9 +163,9 @@ @unique class FPGenPermeateStates(DialinEnum): - FP_GENP_TANK_FILL_STATE = auto() # Gen Permeate Tank Fill low state - FP_GENP_TANK_FULL_STATE = auto() # Gen Permeate Tank Full state - NUM_OF_FP_GENP_MODE_STATES = auto() # Number of Gen permeate states + FP_GENP_TANK_FILL_STATE = 0 # Gen Permeate Tank Fill low state + FP_GENP_TANK_FULL_STATE = 1 # Gen Permeate Tank Full state + NUM_OF_FP_GENP_MODE_STATES = 2 # Number of Gen permeate states FPGenPermeateStates._str_list = { # Official Name : Accepted strings @@ -177,9 +177,9 @@ @unique class FPGenPermeateDefStates(DialinEnum): - FP_GENP_DEF_SUPPLY_WATER = auto() # Gen Permeate Defeatured Supply Water statee - FP_GENP_DEF_PAUSED = auto() # Gen Permeate Defeatured Paused state - NUM_OF_FP_GENP_DEF_MODE_STATES = auto() # Number of Defeatured Gen permeate states + FP_GENP_DEF_SUPPLY_WATER = 0 # Gen Permeate Defeatured Supply Water statee + FP_GENP_DEF_PAUSED = 1 # Gen Permeate Defeatured Paused state + NUM_OF_FP_GENP_DEF_MODE_STATES = 2 # Number of Defeatured Gen permeate states FPGenPermeateDefStates._str_list = { # Official Name : Accepted strings @@ -191,7 +191,7 @@ @unique class FPNotLegalStates(DialinEnum): - NUM_OF_NOT_LEGAL_STATES = auto() # Number of Not Legal states + NUM_OF_NOT_LEGAL_STATES = 0 # Number of Not Legal states FPNotLegalStates._str_list = { # Official Name : Accepted strings @@ -200,20 +200,20 @@ -# ================================================== Enum Creators: Operations ================================================== +# ================================================== Enum Creators: Events ================================================== @unique class FPEventList(DialinEnum): - FP_EVENT_STARTUP = auto() # FP startup event - FP_EVENT_OP_MODE_CHANGE = auto() # FP Op mode change event - FP_EVENT_SUB_MODE_CHANGE = auto() # FP Op sub-mode change event - FP_EVENT_PRE_GEN_RO_SET_PWM = auto() # FP gen permeate ro set pwm event - FP_EVENT_GENP_BOOST_SET_PWM = auto() # FP gen permeate boost set pwm event - FP_EVENT_GENP_CHANGE = auto() # FP gen permeate state change - FP_EVENT_PRE_GEN_CHANGE = auto() # FP pre gen state change - FP_EVENT_PRE_GEN_DEF_CHANGE = auto() # FP defeatured pre gen state change - FP_EVENT_GENP_DEF_CHANGE = auto() # FP defeatured gen permeate state change - FP_EVENT_FAULT_ALARM_TRIGGER = auto() # FP event for alarms that would trigger - NUM_OF_FP_EVENT_IDS = auto() # Number of FP events + 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 + NUM_OF_FP_EVENT_IDS = 10 # Number of FP events FPEventList._str_list = { # Official Name : Accepted strings @@ -233,12 +233,12 @@ @unique class FPEventDataTypes(DialinEnum): - EVENT_DATA_TYPE_NONE = auto() # No Event Data Type - EVENT_DATA_TYPE_U32 = auto() # Unsigned 32bit Event Data Type - EVENT_DATA_TYPE_S32 = auto() # Signed 32bit Event Data Type - EVENT_DATA_TYPE_F32 = auto() # Float 32bit Event Data Type - EVENT_DATA_TYPE_BOOL = auto() # Boolean Event Data Type - NUM_OF_EVENT_DATA_TYPES = auto() # Number of Event Data Types + EVENT_DATA_TYPE_NONE = 0 # No Event Data Type + EVENT_DATA_TYPE_U32 = 1 # Unsigned 32bit Event Data Type + EVENT_DATA_TYPE_S32 = 2 # Signed 32bit Event Data Type + EVENT_DATA_TYPE_F32 = 3 # Float 32bit Event Data Type + EVENT_DATA_TYPE_BOOL = 4 # Boolean Event Data Type + NUM_OF_EVENT_DATA_TYPES = 5 # Number of Event Data Types FPEventDataTypes._str_list = { # Official Name : Accepted strings @@ -255,8 +255,8 @@ # ================================================== Enum Creators: Names ================================================== @unique class FPBoostPumpNames(DialinEnum): - P40_PUMP = auto() # FP Boost Pump - NUM_OF_BOOST_PUMPS = auto() # Number of FP Boost Pumps + P40_PUMP = 0 # FP Boost Pump + NUM_OF_BOOST_PUMPS = 1 # Number of FP Boost Pumps FPBoostPumpNames._str_list = { # Official Name : Accepted strings @@ -267,9 +267,9 @@ @unique class FPConductivitySensorNames(DialinEnum): - P9_COND = auto() # CPi (P9) conductivity sensor value - P18_COND = auto() # CPo (P18) conductivity sensor value - NUM_OF_FP_CONDUCTIVITY_SENSRORS = auto() # Number of Conductivity sensors + P9_COND = 0 # CPi (P9) conductivity sensor value + P18_COND = 1 # CPo (P18) conductivity sensor value + NUM_OF_FP_CONDUCTIVITY_SENSRORS = 2 # Number of Conductivity sensors FPConductivitySensorNames._str_list = { # Official Name : Accepted strings @@ -281,12 +281,12 @@ @unique class FPRORejectionRatioNames(DialinEnum): - RAW_RO_REJECTION_RATIO = auto() # Raw RO Rejection Ratio value - RAW_RO_REJECTION_RATIO_TANK_FILL = auto() # Raw RO Rejection Ratio Tank Fill value - AVG_RO_REJECTION_RATIO = auto() # Average RO Rejection Ratio value - AVG_RO_REJECTION_RATIO_TANK_FILL = auto() # Average RO Rejection Ratio Tank Fill value - GEN_PERMEATE_STATE = auto() # Generate Permeate State value - NUM_OF_FP_RO_REJECTION_RATIO = auto() # Number of RO Rejection Ratio items + RAW_RO_REJECTION_RATIO = 0 # Raw RO Rejection Ratio value + RAW_RO_REJECTION_RATIO_TANK_FILL = 1 # Raw RO Rejection Ratio Tank Fill value + AVG_RO_REJECTION_RATIO = 2 # Average RO Rejection Ratio value + AVG_RO_REJECTION_RATIO_TANK_FILL = 3 # Average RO Rejection Ratio Tank Fill value + GEN_PERMEATE_STATE = 4 # Generate Permeate State value + NUM_OF_FP_RO_REJECTION_RATIO = 5 # Number of RO Rejection Ratio items FPRORejectionRatioNames._str_list = { # Official Name : Accepted strings @@ -301,9 +301,9 @@ @unique class FPFlowSensorNames(DialinEnum): - P7_FLOW = auto() # Water inlet flow sensor (FMS P7) - P16_FLOW = auto() # RO outlet flow sensor (FMP P16) - NUM_OF_FP_FLOW_SENSORS = auto() # Number of FP Flow Sensors + P7_FLOW = 0 # Water inlet flow sensor (FMS P7) + P16_FLOW = 1 # RO outlet flow sensor (FMP P16) + NUM_OF_FP_FLOW_SENSORS = 2 # Number of FP Flow Sensors FPFlowSensorNames._str_list = { # Official Name : Accepted strings @@ -315,8 +315,8 @@ @unique class FPFloaterLevelSensorNames(DialinEnum): - P25_LEVEL = auto() # P25 Level sensor - NUM_OF_FP_LEVEL_SENSORS = auto() # Number of Level Sensors + P25_LEVEL = 0 # P25 Level sensor + NUM_OF_FP_LEVEL_SENSORS = 1 # Number of Level Sensors FPFloaterLevelSensorNames._str_list = { # Official Name : Accepted strings @@ -327,12 +327,12 @@ @unique class FPPressureSensorNames(DialinEnum): - M3_PRES = auto() # Water inlet pressure before regulator - P8_PRES = auto() # Water inlet pressure after regulator - P13_PRES = auto() # Water inlet pressure before the conductivity sensor - P17_PRES = auto() # Pressure before the RO filter - P46_PRES = auto() # Pressure after the RO filter - NUM_OF_FP_PRES_SENSORS = auto() # Number of Pressure Sensors + M3_PRES = 0 # Water inlet pressure before regulator + P8_PRES = 1 # Water inlet pressure after regulator + P13_PRES = 2 # Water inlet pressure before the conductivity sensor + P17_PRES = 3 # Pressure before the RO filter + P46_PRES = 4 # Pressure after the RO filter + NUM_OF_FP_PRES_SENSORS = 5 # Number of Pressure Sensors FPPressureSensorNames._str_list = { # Official Name : Accepted strings @@ -347,8 +347,8 @@ @unique class FPROPumpNames(DialinEnum): - P12_PUMP = auto() # P12 RO Pump - NUM_OF_RO_PUMPS = auto() # Number of RO Pumps + P12_PUMP = 0 # P12 RO Pump + NUM_OF_RO_PUMPS = 1 # Number of RO Pumps FPROPumpNames._str_list = { # Official Name : Accepted strings @@ -358,18 +358,18 @@ class FPTemperatureSensorNames(DialinEnum): - M3_TEMP = auto() # Temperature after pressure regulator (M3) - P8_TEMP = auto() # Temperature before inlet conductivity sensor (P8) - P13_TEMP = auto() # Temperature before RO filter (P13) - P17_TEMP = auto() # Temperature after RO filter (P17) - P46_TEMP = auto() # Temperature after sediment filter (P46) - P10_TEMP = auto() # P10 temperature from inlet conductivity sensor. - P19_TEMP = auto() # P19 temperature from outlet conductivity sensor. - P7_TEMP = auto() # Temperature at p7 flow meter - P16_TEMP = auto() # Temperature at p16 flow meter - P7_INTERNAL_TEMP = auto() # Interal Temperature at p7 flow meter - P16_INTERNAL_TEMP = auto() # Interal Temperature at p16 flow meter - NUM_OF_TEMPERATURE_SENSORS = auto() # Number of Temperature Sensors + M3_TEMP = 0 # Temperature after pressure regulator (M3) + P8_TEMP = 1 # Temperature before inlet conductivity sensor (P8) + P13_TEMP = 2 # Temperature before RO filter (P13) + P17_TEMP = 3 # Temperature after RO filter (P17) + P46_TEMP = 4 # Temperature after sediment filter (P46) + P10_TEMP = 5 # P10 temperature from inlet conductivity sensor. + P19_TEMP = 6 # P19 temperature from outlet conductivity sensor. + P7_TEMP = 7 # Temperature at p7 flow meter + P16_TEMP = 8 # Temperature at p16 flow meter + P7_INTERNAL_TEMP = 9 # Interal Temperature at p7 flow meter + P16_INTERNAL_TEMP = 10 # Interal Temperature at p16 flow meter + NUM_OF_TEMPERATURE_SENSORS = 11 # Number of Temperature Sensors # Aliases FIRST_PRESSURE_SENSOR = M3_TEMP @@ -398,15 +398,15 @@ @unique class FPValveNames(DialinEnum): - M4_VALV = auto() # Valve (M4 VWi) - M12_VALV = auto() # Valve (M12) - P11_VALV = auto() # Valve (P11 VPi) - P33_VALV = auto() # Valve (P33 VCr) - P34_VALV = auto() # Valve (P34 VCb) - P37_VALV = auto() # Valve (P37 VCd) - P39_VALV = auto() # Valve (P39 VROd) - P6_VALV = auto() # Valve (P6 VFF) - NUM_OF_FP_VALVES = auto() # Number of valves + M4_VALV = 0 # Valve (M4 VWi) + M12_VALV = 1 # Valve (M12) + P11_VALV = 2 # Valve (P11 VPi) + P33_VALV = 3 # Valve (P33 VCr) + P34_VALV = 4 # Valve (P34 VCb) + P37_VALV = 5 # Valve (P37 VCd) + P39_VALV = 6 # Valve (P39 VROd) + P6_VALV = 7 # Valve (P6 VFF) + NUM_OF_FP_VALVES = 8 # Number of valves FPValveNames._str_list = { # Official Name : Accepted strings @@ -424,9 +424,9 @@ @unique class FPAllPumpNames(DialinEnum): - P12_PUMP_RO = auto() # P12 RO Pump - P40_PUMP_BOOSTER = auto() # P40 Boost Pump - NUM_OF_PUMPS = auto() # Number of pumps + P12_PUMP_RO = 0 # P12 RO Pump + P40_PUMP_BOOSTER = 1 # P40 Boost Pump + NUM_OF_PUMPS = 2 # Number of pumps FPAllPumpNames._str_list = { # Official Name : Accepted strings @@ -440,12 +440,12 @@ # ================================================== Enum Creators: Support ================================================== @unique class FPFloaterLevels(DialinEnum): - LEVEL_STATE_EMPTY = auto() # Empty level for the FP Floater Level Sensors - LEVEL_STATE_LOW = auto() # Low level for the FP Floater Level Sensors - LEVEL_STATE_MEDIUM = auto() # Medium level for the FP Floater Level Sensors - LEVEL_STATE_HIGH = auto() # High level for the FP Floater Level Sensors - LEVEL_STATE_ILLEGAL = auto() # Illegal level for FP Floater Level Sensor (indicates investigation) - NUM_OF_LEVEL_STATES = auto() # Number of Level States + 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 FPFloaterLevels._str_list = { # Official Name : Accepted strings @@ -460,16 +460,16 @@ @unique class FPPumpAttributes(DialinEnum): - STATE = auto() # State to command attribute for Pumps - DUTY_CYCLE = auto() # Duty Cycle attribute for Pumps - FB_DUTY_CYCLE = auto() # Feedback Duty Cycle attribute for Pumps - SPEED = auto() # Current Speed attribute for pumps - TARGET_PRES = auto() # Target Pressure attribute for pumps - TARGET_FLOW = auto() # Target Flow attribute for pumps - TARGET_DUTY_CYCLE = auto() # Target Duty Cycle attribute for pumps - DUTY_CYCLE_PCT = auto() # Duty Cycle Percentage attribute for pumps - FB_DUTY_CYCLE_PCT = auto() # Feedback Duty Cycle Percentage attribute for pumps - NUM_OF_RO_PUMP_ATTRIBUTES = auto() # Number of pump attributes + STATE = 0 # State to command attribute for Pumps + DUTY_CYCLE = 1 # Duty Cycle attribute for Pumps + FB_DUTY_CYCLE = 2 # Feedback Duty Cycle attribute for Pumps + SPEED = 3 # Current Speed attribute for pumps + TARGET_PRES = 4 # Target Pressure attribute for pumps + TARGET_FLOW = 5 # Target Flow attribute for pumps + TARGET_DUTY_CYCLE = 6 # Target Duty Cycle attribute for pumps + DUTY_CYCLE_PCT = 7 # Duty Cycle Percentage attribute for pumps + FB_DUTY_CYCLE_PCT = 8 # Feedback Duty Cycle Percentage attribute for pumps + NUM_OF_RO_PUMP_ATTRIBUTES = 9 # Number of pump attributes FPPumpAttributes._str_list = { # Official Name : Accepted strings @@ -488,15 +488,15 @@ @unique class FPValveStates(DialinEnum): - VALVE_STATE_CLOSED = auto() # Valve Closed State - VALVE_STATE_OPEN = auto() # Valve Open State - NUM_OF_VALVE_STATES = auto() # Valve Open State + VALVE_STATE_CLOSED = 0 # Valve Closed State + VALVE_STATE_OPEN = 1 # Valve Open State + NUM_OF_VALVE_STATES = 2 # Valve Open State FPValveStates._str_list = { # Official Name : Accepted strings 'VALVE_STATE_CLOSED': ['closed'], - 'VALVE_STATE_OPEN': ['open'], - 'NUM_OF_VALVE_STATES': [], + 'VALVE_STATE_OPEN': ['open'], + 'NUM_OF_VALVE_STATES': [], }