Index: leahi_dialin/common/fp_defs.py =================================================================== diff -u -re7d16bd6881619e5fc2a0bc1a7fd578a9978498e -r956757fac807b52aec078e84127089db5dff069f --- leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision e7d16bd6881619e5fc2a0bc1a7fd578a9978498e) +++ leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision 956757fac807b52aec078e84127089db5dff069f) @@ -47,76 +47,82 @@ FP_EVENT_OP_MODE_CHANGE = 1 # FP Op mode change event FP_EVENT_SUB_MODE_CHANGE = 2 # FP Op sub-mode change event NUM_OF_FP_EVENT_IDS = 3 # Total number of FP events + @unique class FPEventDataType(DialinEnum): - EVENT_DATA_TYPE_NONE = 0 - EVENT_DATA_TYPE_U32 = 1 - EVENT_DATA_TYPE_S32 = 2 - EVENT_DATA_TYPE_F32 = 3 - EVENT_DATA_TYPE_BOOL = 4 - NUM_OF_EVENT_DATA_TYPES = 5 + 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 @unique +class BoostPumpNames(DialinEnum): + P40_PUMP = 0 # FP Boost Pump + NUM_OF_BOOST_PUMPS = 1 # Number of FP Boost Pumps + +@unique class FPConductivitySensorsEnum(DialinEnum): - P9_COND = 0 # CPi (P9) conductivity sensor value - P18_COND = 1 # CPo (P18) conductivity sensor value - NUM_OF_FP_CONDUCTIVITY = 2 + P9_COND = 0 # CPi (P9) conductivity sensor value + P18_COND = 1 # CPo (P18) conductivity sensor value + NUM_OF_FP_CONDUCTIVITY = 2 # Number of Conductivity sensors @unique class FPFlowSensorNames(DialinEnum): - P7_FLOW = 0 # Water inlet flow sensor (FMS P7) - P16_FLOW = 1 # RO outlet flow sensor (FMP P16) - NUM_OF_FP_FLOW_SENSORS = 2 + 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 @unique class FPFlowSensorAttributesEnum(DialinEnum): - FLOW = 0 - TEMP = 1 - NUM_OF_FP_FLOW_ATTRIBUTES = 2 + FLOW = 0 # Flow attribute for FP Flow Sensors + TEMP = 1 # Temperature attribute for FP Flow Sensors + NUM_OF_FP_FLOW_ATTRIBUTES = 2 # Number of FP Flow Sensor attributes @unique class FPFloaterLevels(DialinEnum): - LEVEL_STATE_LOW = 0 - LEVEL_STATE_MEDIUM = 1 - LEVEL_STATE_HIGH = 2 - LEVEL_STATE_ILLEGAL = 3 - NUM_OF_LEVEL_STATES = 4 + LEVEL_STATE_LOW = 0 # Low level for the FP Floater Level Sensors + LEVEL_STATE_MEDIUM = 1 # Medium level for the FP Floater Level Sensors + LEVEL_STATE_HIGH = 2 # High level for the FP Floater Level Sensors + LEVEL_STATE_ILLEGAL = 3 # Illegal level for FP Floater Level Sensor (indicates investigation) + NUM_OF_LEVEL_STATES = 4 # Number of Level States @unique class FPFloaterLevelSensorNames(DialinEnum): - P25_LEVEL = 0 - NUM_OF_FP_LEVEL_SENSORS = 1 + P25_LEVEL = 0 # P25 Level sensor + NUM_OF_FP_LEVEL_SENSORS = 1 # Number of FP Level Sensors @unique class FPPressureSensorNames(DialinEnum): - M1_PRES = 0 - M3_PRES = 1 - P8_PRES = 2 - P13_PRES = 3 - P17_PRES = 4 - X1_PRES = 5 - X2_PRES = 6 - X3_PRES = 7 - X4_PRES = 8 - NUM_OF_FP_PRES_SENSORS = 9 + M1_PRES = 0 # Water inlet pressure before regulator + M3_PRES = 1 # Water inlet pressure after regulator + P8_PRES = 2 # Water inlet pressure before the conductivity sensor + P13_PRES = 3 # Pressure before the RO filter + P17_PRES = 4 # Pressure after the RO filter + X1_PRES = 5 # Pressure before RO pump + X2_PRES = 6 # Pressure of RO Concentrate + X3_PRES = 7 # Pressure after P32, concentrate drop + X4_PRES = 8 # Pressure Drain Drop + NUM_OF_FP_PRES_SENSORS = 9 # Number of Pressure Sensors @unique class ROPumpNames(DialinEnum): - P12_PUMP = 0 - NUM_OF_RO_PUMPS = 1 + P12_PUMP = 0 # P12 RO Pump + NUM_OF_RO_PUMPS = 1 # Number of RO Pumps @unique -class ROPumpAttributes(DialinEnum): - STATE = 0 - DUTY_CYCLE = 1 - FB_DUTY_CYCLE = 2 - SPEED = 3 - TARGET_PRES = 4 - TARGET_FLOW = 5 - TARGET_DUTY_CYCLE = 6 - DUTY_CYCLE_PCT = 7 - FB_DUTY_CYCLE_PCT = 8 - NUM_OF_RO_PUMP_ATTRIBUTES = 9 +class FPPumpAttributes(DialinEnum): + 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 @unique class FPTemperaturesNames(DialinEnum): @@ -137,24 +143,24 @@ @unique class FPValveStates(DialinEnum): - VALVE_STATE_CLOSED = 0 - VALVE_STATE_OPEN = 1 + VALVE_STATE_CLOSED = 0 # Valve Closed State + VALVE_STATE_OPEN = 1 # Valve Open State @unique class FPValveNames(DialinEnum): - M4_VALV = 0 # Valve (M4 VWi) - P39_VALV = 1 # Valve (P39 VROd) - P6_VALV = 2 # Valve (P6 VFF) - P11_VALV = 3 # Valve (P11 VPi) - P33_VALV = 4 # Valve (P33 VCr) - P34_VALV = 5 # Valve (P34 VCb) - P37_VALV = 6 # Valve (P37 VCd) - M7_VALV = 7 # Valve (M7) - P20_VALV = 8 # Valve (P20) - P43_VALV = 9 # Valve (P43) - NUM_OF_VALVES = 10 # Number of valves + M4_VALV = 0 # Valve (M4 VWi) + P39_VALV = 1 # Valve (P39 VROd) + P6_VALV = 2 # Valve (P6 VFF) + P11_VALV = 3 # Valve (P11 VPi) + P33_VALV = 4 # Valve (P33 VCr) + P34_VALV = 5 # Valve (P34 VCb) + P37_VALV = 6 # Valve (P37 VCd) + M7_VALV = 7 # Valve (M7) + P20_VALV = 8 # Valve (P20) + P43_VALV = 9 # Valve (P43) + NUM_OF_VALVES = 10 # Number of valves @unique class FPPumpNames(DialinEnum): - P12_PUMP_RO = 0 - P40_PUMP_BOOSTER = 1 \ No newline at end of file + P12_PUMP_RO = 0 # RO Pump + P40_PUMP_BOOSTER = 1 # Booster Pump \ No newline at end of file