Index: leahi_dialin/common/dd_defs.py =================================================================== diff -u -r78ca8321ca7429b492dcbaa373262094ceadd901 -re9a32dcd15e9112f38ad3de850db56e029aae861 --- leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 78ca8321ca7429b492dcbaa373262094ceadd901) +++ leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision e9a32dcd15e9112f38ad3de850db56e029aae861) @@ -997,6 +997,7 @@ 'NUM_OF_CANCELLATION_MODES': [], } + @unique class DDSubstitutionPumpAttributes(DialinEnum): TARGET_SPEED = 0 # Target RPM Substitution Pump Attribute @@ -1013,3 +1014,17 @@ 'MEASURED_SPEED': ['measured speed'], 'NUM_OF_DIALYSATE_PUMP_ATTRIBUTES': [], } + + +@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': [], +} \ No newline at end of file Index: leahi_dialin/common/dd_defs_proxy.py =================================================================== diff -u -r5f8fef12f850bb73e1f8e7d7372a404e9db07fa4 -re9a32dcd15e9112f38ad3de850db56e029aae861 --- 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 e9a32dcd15e9112f38ad3de850db56e029aae861) @@ -75,5 +75,6 @@ DDValveStates = dd_defs.DDValveStates DDCancelModes = dd_defs.DDCancelModes DDSubstitutionPumpAttributes = dd_defs.DDSubstitutionPumpAttributes + DDConductivityResistanceAttributes = dd_defs.DDConductivityResistanceAttributes dd_enum_repository = DD_Defs() Index: leahi_dialin/common/msg_ids.py =================================================================== diff -u -r8215cd965fdf2833cbfdf2306cd4e250b300f767 -re9a32dcd15e9112f38ad3de850db56e029aae861 --- leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 8215cd965fdf2833cbfdf2306cd4e250b300f767) +++ leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision e9a32dcd15e9112f38ad3de850db56e029aae861) @@ -197,6 +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_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 @@ -378,6 +381,10 @@ MSG_ID_DD_BICARB_CHAMBER_FILL_REQUEST_OVERRIDE_REQUEST = 0xA059 MSG_ID_DD_BICART_DRAIN_REQUEST_OVERRIDE_REQUEST = 0xA05A MSG_ID_DD_BICART_CARTRIDGE_SELECT_OVERRIDE_REQUEST = 0xA05B + MSG_ID_DD_FLOATER_LEVEL_OVERRIDE_REQUEST = 0xA06C + MSG_ID_DD_SUBSTITUTION_PUMP_START_STOP_OVERRIDE_REQUEST = 0xA06D + MSG_ID_DD_SUBSTITUTION_PUMP_BROADCAST_OVERRIDE_REQUEST = 0xA06E + MSG_ID_DD_SUBSTITUTION_PUMP_TARGET_SPEED_OVERRIDE_REQUEST = 0xA06F MSG_ID_DD_SET_CONDUCTIVITY_MODEL_REQUEST = 0xA100 MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST = 0xA101