Index: leahi_dialin/common/dd_defs.py =================================================================== diff -u -r78ca8321ca7429b492dcbaa373262094ceadd901 -r7a7b289d28b91a8cf9ddbd6d5db542abaee9721f --- leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 78ca8321ca7429b492dcbaa373262094ceadd901) +++ leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 7a7b289d28b91a8cf9ddbd6d5db542abaee9721f) @@ -996,7 +996,18 @@ 'CANCELLATION_MODE_WATER': ['water'], 'NUM_OF_CANCELLATION_MODES': [], } +@unique +class DDConductivityResistanceAttributes(DialinEnum): + RAW_RESISTANCE = 0 # Raw Conductivity resistance Attribute + RTD_RESISTANCE = 1 # raw RTD resistance Attribute + NUM_OF_RESISTANCE_ATTRIBUTES = 2 # Number of conductivity sensor Attributes +DDConductivityResistanceAttributes._str_list = { + # Official Name : Accepted strings + 'RAW_RESISTANCE': ['cond resistance,'], + 'RTD_RESISTANCE': ['rtd resistance'], + 'NUM_OF_RESISTANCE_ATTRIBUTES': [], +} @unique class DDSubstitutionPumpAttributes(DialinEnum): TARGET_SPEED = 0 # Target RPM Substitution Pump Attribute Index: leahi_dialin/common/dd_defs_proxy.py =================================================================== diff -u -r5f8fef12f850bb73e1f8e7d7372a404e9db07fa4 -r7a7b289d28b91a8cf9ddbd6d5db542abaee9721f --- leahi_dialin/common/dd_defs_proxy.py (.../dd_defs_proxy.py) (revision 5f8fef12f850bb73e1f8e7d7372a404e9db07fa4) +++ leahi_dialin/common/dd_defs_proxy.py (.../dd_defs_proxy.py) (revision 7a7b289d28b91a8cf9ddbd6d5db542abaee9721f) @@ -57,23 +57,24 @@ DDSubstitutionPumpNames = dd_defs.DDSubstitutionPumpNames # Sensor Attributes - DDBalancingChamberStates = dd_defs.DDBalancingChamberStates - DDBalancingChamberSwitchStates = dd_defs.DDBalancingChamberSwitchStates - DDBicartChFFillExecStates = dd_defs.DDBicartChFFillExecStates - DDBloodLeakStates = dd_defs.DDBloodLeakStates - DDConcentratePumpAttributes = dd_defs.DDConcentratePumpAttributes - DDConcentratePumpStates = dd_defs.DDConcentratePumpStates - DDDialysatePumpAttributes = dd_defs.DDDialysatePumpAttributes - DDDialysatePumpsStates = dd_defs.DDDialysatePumpsStates - DDDryBicartDrainExecStates = dd_defs.DDDryBicartDrainExecStates - DDDryBicartFillExecStates = dd_defs.DDDryBicartFillExecStates - DDHeaterStartStop = dd_defs.DDHeaterStartStop - DDHeaterAttributes = dd_defs.DDHeaterAttributes - DDHeaterExecState = dd_defs.DDHeaterExecState - DDPistonPumpAttributes = dd_defs.DDPistonPumpAttributes - DDSpentChFillExecState = dd_defs.DDSpentChFillExecState - DDValveStates = dd_defs.DDValveStates - DDCancelModes = dd_defs.DDCancelModes + DDBalancingChamberStates = dd_defs.DDBalancingChamberStates + DDBalancingChamberSwitchStates = dd_defs.DDBalancingChamberSwitchStates + DDBicartChFFillExecStates = dd_defs.DDBicartChFFillExecStates + DDBloodLeakStates = dd_defs.DDBloodLeakStates + DDConcentratePumpAttributes = dd_defs.DDConcentratePumpAttributes + DDConcentratePumpStates = dd_defs.DDConcentratePumpStates + DDDialysatePumpAttributes = dd_defs.DDDialysatePumpAttributes + DDDialysatePumpsStates = dd_defs.DDDialysatePumpsStates + DDDryBicartDrainExecStates = dd_defs.DDDryBicartDrainExecStates + DDDryBicartFillExecStates = dd_defs.DDDryBicartFillExecStates + DDHeaterStartStop = dd_defs.DDHeaterStartStop + DDHeaterAttributes = dd_defs.DDHeaterAttributes + DDHeaterExecState = dd_defs.DDHeaterExecState + DDPistonPumpAttributes = dd_defs.DDPistonPumpAttributes + DDSpentChFillExecState = dd_defs.DDSpentChFillExecState + DDValveStates = dd_defs.DDValveStates + DDCancelModes = dd_defs.DDCancelModes + DDConductivityResistanceAttributes = dd_defs.DDConductivityResistanceAttributes DDSubstitutionPumpAttributes = dd_defs.DDSubstitutionPumpAttributes dd_enum_repository = DD_Defs() Index: leahi_dialin/common/msg_ids.py =================================================================== diff -u -r9c2fab5b413da62b218e6a9a12a5752e974071a0 -r7a7b289d28b91a8cf9ddbd6d5db542abaee9721f --- leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 9c2fab5b413da62b218e6a9a12a5752e974071a0) +++ leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 7a7b289d28b91a8cf9ddbd6d5db542abaee9721f) @@ -197,7 +197,9 @@ MSG_ID_UI_TUBE_SET_AUTHENTICATION_ACK_RESPONSE = 0xAF MSG_ID_TD_SYRINGE_PUMP_DATA = 0xB1 MSG_ID_TD_HEPARIN_PAUSE_RESUME_RESPONSE= 0xB2 - MSG_ID_DD_SUBSTITUTION_PUMP_DATA = 0xA9 + MSG_ID_FFU_SIGNAL_TD_UPDATE_AVAILABLE = 0xB3 + MSG_ID_FFU_SIGNAL_DD_UPDATE_AVAILABLE = 0xB4 + MSG_ID_DD_SUBSTITUTION_PUMP_DATA = 0xB5 MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_DATA = 0xB6 MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0 @@ -397,6 +399,7 @@ MSG_ID_DD_FLOATER_LEVEL_OVERRIDE_REQUEST = 0xA06C MSG_ID_DD_SUBSTITUTION_PUMP_START_STOP_OVERRIDE_REQUEST = 0xA06D MSG_ID_DD_SUBSTITUTION_PUMP_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA06E + MSG_ID_DD_SUBSTITUTION_PUMP_TARGET_SPEED_OVERRIDE_REQUEST = 0xA06F # Placeholder messages MSG_ID_DD_ALARM_STATE_OVERRIDE_REQUEST = 0xAF03