Index: leahi_dialin/common/dd_defs_proxy.py =================================================================== diff -u -r20c821bd230fc7689a0275a2918981669ff5cc19 -r99f9233b24e6115bb1384ec8f5a077aefc37ab4b --- leahi_dialin/common/dd_defs_proxy.py (.../dd_defs_proxy.py) (revision 20c821bd230fc7689a0275a2918981669ff5cc19) +++ leahi_dialin/common/dd_defs_proxy.py (.../dd_defs_proxy.py) (revision 99f9233b24e6115bb1384ec8f5a077aefc37ab4b) @@ -14,50 +14,50 @@ # ############################################################################ -from .dd_defs import * +from . import dd_defs class DD_Defs(): - DDOpModes = DDOpModes - DDFaultStates = DDFaultStates - DDFaultNVDataStates = DDFaultNVDataStates - DDServiceStates = DDServiceStates - DDInitStates = DDInitStates - DDStandbyStates = DDStandbyStates - DDPreGenDialysateStates = DDPreGenDialysateStates - DDGenDialysateModeStates = DDGenDialysateModeStates - DDPostGenDialysateStates = DDPostGenDialysateStates - DDHeatDisinfectStates = DDHeatDisinfectStates - DDHeaterCoolingStates = DDHeaterCoolingStates - DDROPermeateStates = DDROPermeateStates - DDNotLegalStates = DDNotLegalStates + DDOpModes = dd_defs.DDOpModes + DDFaultStates = dd_defs.DDFaultStates + DDFaultNVDataStates = dd_defs.DDFaultNVDataStates + DDServiceStates = dd_defs.DDServiceStates + DDInitStates = dd_defs.DDInitStates + DDStandbyStates = dd_defs.DDStandbyStates + DDPreGenDialysateStates = dd_defs.DDPreGenDialysateStates + DDGenDialysateModeStates = dd_defs.DDGenDialysateModeStates + DDPostGenDialysateStates = dd_defs.DDPostGenDialysateStates + DDHeatDisinfectStates = dd_defs.DDHeatDisinfectStates + DDHeaterCoolingStates = dd_defs.DDHeaterCoolingStates + DDROPermeateStates = dd_defs.DDROPermeateStates + DDNotLegalStates = dd_defs.DDNotLegalStates - DDEventList = DDEventList - DDEventDataTypes = DDEventDataTypes + DDEventList = dd_defs.DDEventList + DDEventDataTypes = dd_defs.DDEventDataTypes - DDConcentratePumpNames = DDConcentratePumpNames - DDConductivitySensorNames = DDConductivitySensorNames - DDDialysatePumpNames = DDDialysatePumpNames - DDHeaterNames = DDHeaterNames - DDLevelSensorNames = DDLevelSensorNames - DDPistonPumpNames = DDPistonPumpNames - DDPressureSensorNames = DDPressureSensorNames - DDTemperatureSensorNames = DDTemperatureSensorNames - DDValveNames = DDValveNames - DDMonitoredVoltages = DDMonitoredVoltages + DDConcentratePumpNames = dd_defs.DDConcentratePumpNames + DDConductivitySensorNames = dd_defs.DDConductivitySensorNames + DDDialysatePumpNames = dd_defs.DDDialysatePumpNames + DDHeaterNames = dd_defs.DDHeaterNames + DDLevelSensorNames = dd_defs.DDLevelSensorNames + DDPistonPumpNames = dd_defs.DDPistonPumpNames + DDPressureSensorNames = dd_defs.DDPressureSensorNames + DDTemperatureSensorNames = dd_defs.DDTemperatureSensorNames + DDValveNames = dd_defs.DDValveNames + DDMonitoredVoltages = dd_defs.DDMonitoredVoltages - DDBalancingChamberStates = DDBalancingChamberStates - DDBalancingChamberSwitchStates = DDBalancingChamberSwitchStates - DDBloodLeakStates = DDBloodLeakStates - DDConcentratePumpAttributes = DDConcentratePumpAttributes - DDConcentratePumpStates = DDConcentratePumpStates - DDDialysatePumpAttributes = DDDialysatePumpAttributes - DDDialysatePumpsStates =DDDialysatePumpsStates - DDHeaterStartStop = DDHeaterStartStop - DDHeaterAttributes = DDHeaterAttributes - DDHeaterExecState = DDHeaterExecState - DDPistonPumpAttributes = DDPistonPumpAttributes - DDValveStates = DDValveStates + DDBalancingChamberStates = dd_defs.DDBalancingChamberStates + DDBalancingChamberSwitchStates = dd_defs.DDBalancingChamberSwitchStates + DDBloodLeakStates = dd_defs.DDBloodLeakStates + DDConcentratePumpAttributes = dd_defs.DDConcentratePumpAttributes + DDConcentratePumpStates = dd_defs.DDConcentratePumpStates + DDDialysatePumpAttributes = dd_defs.DDDialysatePumpAttributes + DDDialysatePumpsStates = dd_defs.DDDialysatePumpsStates + DDHeaterStartStop = dd_defs.DDHeaterStartStop + DDHeaterAttributes = dd_defs.DDHeaterAttributes + DDHeaterExecState = dd_defs.DDHeaterExecState + DDPistonPumpAttributes = dd_defs.DDPistonPumpAttributes + DDValveStates = dd_defs.DDValveStates dd_enum_repository = DD_Defs() Index: leahi_dialin/common/fp_defs.py =================================================================== diff -u -r57aed15d5b38f236deaea49daba706ce352162d2 -r99f9233b24e6115bb1384ec8f5a077aefc37ab4b --- leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision 57aed15d5b38f236deaea49daba706ce352162d2) +++ leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision 99f9233b24e6115bb1384ec8f5a077aefc37ab4b) @@ -444,6 +444,24 @@ # ================================================== Enum Creators: Support ================================================== @unique +class FPBoostPumpStates(DialinEnum): + PUMP_OFF_STATE = 0, # Pump Offline State + PUMP_CONTROL_TO_TARGET_FLOW_STATE = 1, # Boost pump control to target flow state + PUMP_CONTROL_TO_TARGET_PRESSURE_STATE = 2, # Boost pump control to max pressure state. + PUMP_OPEN_LOOP_STATE = 3, # Boost pump open loop state. + NUM_OF_BOOST_PUMP_STATES = 4 # Number of Boost pump states + +FPBoostPumpStates._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'], + 'NUM_OF_BOOST_PUMP_STATES': [], +} + + +@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 @@ -492,16 +510,38 @@ @unique -class FPPumpStates(DialinEnum): - PUMP_OFF_STATE = 0 # Pump Offline State - PUMP_ON_STATE = 1 # Pump Online State - NUM_OF_PUMP_STATES = 2 # Number of pump states +class FPRecoveryOptions(DialinEnum): + NO_RECOVERY = 0 # NO recoverye + LOW_RECOVERY = 1 # LOW recovery + MEDIUM_RECOVERY = 2 # MEDIUM recovery + HIGH_RECOVERY = 3 # HIGH recovery + NUM_OF_VALVE_STATES = 4 # Number of recovery options -FPPumpStates._str_list = { +FPRecoveryOptions._str_list = { # Official Name : Accepted strings + 'NO_RECOVERY': ['no', 'no ro'], + 'LOW_RECOVERY': ['low', 'low ro'], + 'MEDIUM_RECOVERY': ['med', 'med ro', 'medium', 'medium ro'], + 'HIGH_RECOVERY': ['high', 'high ro'], + 'NUM_OF_VALVE_STATES': [], +} + + +@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_PUMP_STATES = 4 # Number of RO pump states + +FPROPumpStates._str_list = { + # Official Name : Accepted strings 'PUMP_OFF_STATE': ['closed', 'off', 'inactive', 'offline'], - 'PUMP_ON_STATE': ['open', 'on', 'active', 'online'], - 'NUM_OF_PUMP_STATES': [], + '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'], + 'NUM_OF_RO_PUMP_STATES': [], } Index: leahi_dialin/common/fp_defs_proxy.py =================================================================== diff -u -r9f947930678d5b13aa8f788f4e3d58cd1370a541 -r99f9233b24e6115bb1384ec8f5a077aefc37ab4b --- leahi_dialin/common/fp_defs_proxy.py (.../fp_defs_proxy.py) (revision 9f947930678d5b13aa8f788f4e3d58cd1370a541) +++ leahi_dialin/common/fp_defs_proxy.py (.../fp_defs_proxy.py) (revision 99f9233b24e6115bb1384ec8f5a077aefc37ab4b) @@ -14,39 +14,42 @@ # ############################################################################ -from .fp_defs import * +from . import fp_defs class FP_Defs(): - FPOpModes = FPOpModes - FPFaultStates = FPFaultStates - FPServiceStates = FPServiceStates - FPPostStates = FPPostStates - FPStandbyStates = FPStandbyStates - FPPreGenPermeateStates = FPPreGenPermeateStates - FPPreGenPDefStates = FPPreGenPDefStates - FPGenPermeateStates = FPGenPermeateStates - FPGenPermeateDefStates = FPGenPermeateDefStates - FPNotLegalStates = FPNotLegalStates + FPOpModes = fp_defs.FPOpModes + FPFaultStates = fp_defs.FPFaultStates + FPServiceStates = fp_defs.FPServiceStates + FPPostStates = fp_defs.FPPostStates + FPStandbyStates = fp_defs.FPStandbyStates + FPPreGenPermeateStates = fp_defs.FPPreGenPermeateStates + FPPreGenPDefStates = fp_defs.FPPreGenPDefStates + FPGenPermeateStates = fp_defs.FPGenPermeateStates + FPGenPermeateDefStates = fp_defs.FPGenPermeateDefStates + FPNotLegalStates = fp_defs.FPNotLegalStates - FPEventList= FPEventList - FPEventDataTypes= FPEventDataTypes + FPEventList = fp_defs.FPEventList + FPEventDataTypes = fp_defs.FPEventDataTypes - FPBoostPumpNames = FPBoostPumpNames - FPConductivitySensorNames = FPConductivitySensorNames - FPRORejectionRatioNames = FPRORejectionRatioNames - FPFlowSensorNames = FPFlowSensorNames - FPFloaterLevelSensorNames = FPFloaterLevelSensorNames - FPPressureSensorNames = FPPressureSensorNames - FPROPumpNames = FPROPumpNames - FPTemperatureSensorNames = FPTemperatureSensorNames - FPValveNames = FPValveNames - FPAllPumpNames = FPAllPumpNames - - FPFloaterLevels = FPFloaterLevels - FPPumpAttributes = FPPumpAttributes - FPPumpStates = FPPumpStates - FPValveStates = FPValveStates + FPBoostPumpNames = fp_defs.FPBoostPumpNames + FPConductivitySensorNames = fp_defs.FPConductivitySensorNames + FPRORejectionRatioNames = fp_defs.FPRORejectionRatioNames + FPFlowSensorNames = fp_defs.FPFlowSensorNames + FPFloaterLevelSensorNames = fp_defs.FPFloaterLevelSensorNames + FPPressureSensorNames = fp_defs.FPPressureSensorNames + FPROPumpNames = fp_defs.FPROPumpNames + FPTemperatureSensorNames = fp_defs.FPTemperatureSensorNames + FPValveNames = fp_defs.FPValveNames + FPAllPumpNames = fp_defs.FPAllPumpNames + FPBoostPumpStates = fp_defs.FPBoostPumpStates + FPFloaterLevels = fp_defs.FPFloaterLevels + FPPumpAttributes = fp_defs.FPPumpAttributes + FPROPumpStates = fp_defs.FPROPumpStates + FPROPumpStates = fp_defs.FPROPumpStates + FPRecoveryOptions = fp_defs.FPRecoveryOptions + FPValveStates = fp_defs.FPValveStates + fp_enum_repository = FP_Defs() Index: leahi_dialin/common/td_defs_proxy.py =================================================================== diff -u -r20c821bd230fc7689a0275a2918981669ff5cc19 -r99f9233b24e6115bb1384ec8f5a077aefc37ab4b --- leahi_dialin/common/td_defs_proxy.py (.../td_defs_proxy.py) (revision 20c821bd230fc7689a0275a2918981669ff5cc19) +++ leahi_dialin/common/td_defs_proxy.py (.../td_defs_proxy.py) (revision 99f9233b24e6115bb1384ec8f5a077aefc37ab4b) @@ -14,48 +14,48 @@ # ############################################################################ -from .td_defs import * +from . import td_defs class TD_Defs(): - TDOpModes = TDOpModes - TDFaultStates = TDFaultStates - TDServiceStates = TDServiceStates - TDInitStates = TDInitStates - TDStandbyStates = TDStandbyStates - TDTreatmentParamStates = TDTreatmentParamStates - TDPreTreatmentModesStates = TDPreTreatmentModesStates - TDTreatmentStates = TDTreatmentStates - TDPostTreatmentStates = TDPostTreatmentStates - TDNotLegalStates = TDNotLegalStates - TDPreTreatmentPrimeStates = TDPreTreatmentPrimeStates - TDDialysisStates = TDDialysisStates - TDTreatmentParameters = TDTreatmentParameters + TDOpModes = td_defs.TDOpModes + TDFaultStates = td_defs.TDFaultStates + TDServiceStates = td_defs.TDServiceStates + TDInitStates = td_defs.TDInitStates + TDStandbyStates = td_defs.TDStandbyStates + TDTreatmentParamStates = td_defs.TDTreatmentParamStates + TDPreTreatmentModesStates = td_defs.TDPreTreatmentModesStates + TDTreatmentStates = td_defs.TDTreatmentStates + TDPostTreatmentStates = td_defs.TDPostTreatmentStates + TDNotLegalStates = td_defs.TDNotLegalStates + TDPreTreatmentPrimeStates = td_defs.TDPreTreatmentPrimeStates + TDDialysisStates = td_defs.TDDialysisStates + TDTreatmentParameters = td_defs.TDTreatmentParameters - TDEventList = TDEventList - TDEventDataTypes = TDEventDataTypes + TDEventList = td_defs.TDEventList + TDEventDataTypes = td_defs.TDEventDataTypes - TDAirPumpNames = TDAirPumpNames - TDAirTrapValveNames = TDAirTrapValveNames - TDAirTrapLevelSensorNames = TDAirTrapLevelSensorNames - TDAirBubbleDetectorNames = TDAirBubbleDetectorNames - TDEjectorNames = TDEjectorNames - TDPressureSensorNames = TDPressureSensorNames - TDTemperatureSensorNames = TDTemperatureSensorNames - TDSwitchNames = TDSwitchNames - TDValveNames = TDValveNames - TDMonitoredVoltages = TDMonitoredVoltages + TDAirPumpNames = td_defs.TDAirPumpNames + TDAirTrapValveNames = td_defs.TDAirTrapValveNames + TDAirTrapLevelSensorNames = td_defs.TDAirTrapLevelSensorNames + TDAirBubbleDetectorNames = td_defs.TDAirBubbleDetectorNames + TDEjectorNames = td_defs.TDEjectorNames + TDPressureSensorNames = td_defs.TDPressureSensorNames + TDTemperatureSensorNames = td_defs.TDTemperatureSensorNames + TDSwitchNames = td_defs.TDSwitchNames + TDValveNames = td_defs.TDValveNames + TDMonitoredVoltages = td_defs.TDMonitoredVoltages - TDAirPumpAttributes = TDAirPumpAttributes - TDAirTrapLevelSensorAttributes = TDAirTrapLevelSensorAttributes - TDAirTrapState = TDAirTrapState - TDBloodFlowMotorAttributes = TDBloodFlowMotorAttributes - TDAirBubbleDetectorAttributes = TDAirBubbleDetectorAttributes - TDEjectorAttributes = TDEjectorAttributes - TDPressureSensorAttributes = TDPressureSensorAttributes - TDSwitchStatus = TDSwitchStatus - TDValvePositions = TDValvePositions - TDValveStates = TDValveStates + TDAirPumpAttributes = td_defs.TDAirPumpAttributes + TDAirTrapLevelSensorAttributes = td_defs.TDAirTrapLevelSensorAttributes + TDAirTrapState = td_defs.TDAirTrapState + TDBloodFlowMotorAttributes = td_defs.TDBloodFlowMotorAttributes + TDAirBubbleDetectorAttributes = td_defs.TDAirBubbleDetectorAttributes + TDEjectorAttributes = td_defs.TDEjectorAttributes + TDPressureSensorAttributes = td_defs.TDPressureSensorAttributes + TDSwitchStatus = td_defs.TDSwitchStatus + TDValvePositions = td_defs.TDValvePositions + TDValveStates = td_defs.TDValveStates td_enum_repository = TD_Defs() Index: leahi_dialin/fp/modules/boost_pump.py =================================================================== diff -u -r9f947930678d5b13aa8f788f4e3d58cd1370a541 -r99f9233b24e6115bb1384ec8f5a077aefc37ab4b --- leahi_dialin/fp/modules/boost_pump.py (.../boost_pump.py) (revision 9f947930678d5b13aa8f788f4e3d58cd1370a541) +++ leahi_dialin/fp/modules/boost_pump.py (.../boost_pump.py) (revision 99f9233b24e6115bb1384ec8f5a077aefc37ab4b) @@ -50,7 +50,7 @@ # The Boost Pump data in dictionary format self.boost_pump = { fp_enum_repository.FPBoostPumpNames.P40_PUMP.name: { - fp_enum_repository.FPPumpAttributes.STATE.name: fp_enum_repository.FPPumpStates.PUMP_OFF_STATE.value, + fp_enum_repository.FPPumpAttributes.STATE.name: fp_enum_repository.FPBoostPumpStates.PUMP_OFF_STATE.value, fp_enum_repository.FPPumpAttributes.DUTY_CYCLE.name: 0, fp_enum_repository.FPPumpAttributes.FB_DUTY_CYCLE.name: 0, fp_enum_repository.FPPumpAttributes.SPEED.name: 0.0, Index: leahi_dialin/fp/modules/ro_pump.py =================================================================== diff -u -r21a1d644c7d02e7588781b9025b422aa9d74c9ca -r99f9233b24e6115bb1384ec8f5a077aefc37ab4b --- leahi_dialin/fp/modules/ro_pump.py (.../ro_pump.py) (revision 21a1d644c7d02e7588781b9025b422aa9d74c9ca) +++ leahi_dialin/fp/modules/ro_pump.py (.../ro_pump.py) (revision 99f9233b24e6115bb1384ec8f5a077aefc37ab4b) @@ -50,7 +50,7 @@ # The RO Pump data in dictionary format self.ro_pump = { fp_enum_repository.FPROPumpNames.P12_PUMP.name: { - fp_enum_repository.FPPumpAttributes.STATE.name: fp_enum_repository.FPPumpStates.PUMP_OFF_STATE.value, + fp_enum_repository.FPPumpAttributes.STATE.name: fp_enum_repository.FPROPumpStates.PUMP_OFF_STATE.value, fp_enum_repository.FPPumpAttributes.DUTY_CYCLE.name: 0, fp_enum_repository.FPPumpAttributes.FB_DUTY_CYCLE.name: 0, fp_enum_repository.FPPumpAttributes.SPEED.name: 0.0,