Index: leahi_dialin/common/dd_defs.py =================================================================== diff -u -r71d214924418dcf474c484a8e465f421d2aa9951 -r3d4c97a6c91e32ac6416a5174d8678c704e40474 --- leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 71d214924418dcf474c484a8e465f421d2aa9951) +++ leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 3d4c97a6c91e32ac6416a5174d8678c704e40474) @@ -439,16 +439,16 @@ @unique class DDLevelSensorNames(DialinEnum): D6_LEVEL = 0 # floater switch low, medium and high status - D63_LEVEL = 1 # bicarb level low or high status - D46_LEVEL = 2 # Spent dialysate air separation chamber level low or high status - D98_LEVEL = 3 # D98 Conductivity Level Sensor + D46_LEVEL = 1 # Spent dialysate air separation conductivity level sensor low or high status + D63_LEVEL = 2 # bicarb lower level conductivity level sensor low or high status + D98_LEVEL = 3 # bicarb upper level conductivity Level sensor low or high status NUM_OF_LEVELS = 4 # Number of Level Sensors DDLevelSensorNames._str_list = { # Official Name : Accepted strings 'D6_LEVEL': ['d6'], - 'D63_LEVEL': ['d63'], 'D46_LEVEL': ['d46'], + 'D63_LEVEL': ['d63'], 'D98_LEVEL': ['d98'], 'NUM_OF_LEVELS': [], } Index: leahi_dialin/common/msg_ids.py =================================================================== diff -u -rc93ef62631552b2ba3ffb77006d29f902e7a1128 -r3d4c97a6c91e32ac6416a5174d8678c704e40474 --- leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision c93ef62631552b2ba3ffb77006d29f902e7a1128) +++ leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 3d4c97a6c91e32ac6416a5174d8678c704e40474) @@ -184,6 +184,9 @@ MSG_ID_UI_WATER_SAMPLE_RESULT_REQUEST = 0XA3 MSG_ID_UI_PRESSURE_LIMIT_WIDEN_REQUEST = 0xA4 MSG_ID_TD_PRESSURE_LIMIT_WIDEN_RESPONSE = 0xA5 + MSG_ID_UI_RECIRCULATE_REQUEST = 0xA6 + MSG_ID_TD_RECIRCULATE_RESPONSE = 0xA7 + MSG_ID_TD_RECIRCULATE_DATA = 0xA8 MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0 @@ -351,6 +354,7 @@ 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 = 0xA05C MSG_ID_DD_SET_CONDUCTIVITY_MODEL_REQUEST = 0xA100 MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST = 0xA101 @@ -375,7 +379,7 @@ MSG_ID_FP_PRESSURE_SENSOR_FILTER_TEMPERATURE_OVERRIDE_REQUEST = 0xB00D MSG_ID_FP_PRESSURE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB00E MSG_ID_FP_LEVEL_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB00F - MSG_ID_FP_LEVEL_OVERRIDE_REQUEST = 0xB010 + MSG_ID_FP_FLOATER_LEVEL_OVERRIDE_REQUEST = 0xB010 MSG_ID_FP_FLOWS_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB011 MSG_ID_FP_FLOW_RATE_OVERRIDE_REQUEST = 0xB012 MSG_ID_FP_FLOW_TEMP_OVERRIDE_REQUEST = 0xB013