Index: leahi_dialin/common/msg_ids.py =================================================================== diff -u -r38e8dd31728056dbb7f9304c98ab16d7147b75a2 -r55a8c10a40d37ca346976b11dd5fdc0c8ee76c97 --- leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 38e8dd31728056dbb7f9304c98ab16d7147b75a2) +++ leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 55a8c10a40d37ca346976b11dd5fdc0c8ee76c97) @@ -161,6 +161,9 @@ MSG_ID_TD_HEPARIN_DATA = 0x8C MSG_ID_TD_END_TREATMENT_REQUEST = 0x8D MSG_ID_TD_END_TREATMENT_RESPONSE = 0x8E + MSG_ID_TD_RINSEBACK_PROGRESS = 0x8F + MSG_ID_UI_RINSEBACK_CMD_REQUEST = 0x90 + MSG_ID_TD_RINSEBACK_CMD_RESPONSE = 0x91 MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0 @@ -326,6 +329,7 @@ MSG_ID_DD_RINSE_PUMP_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA053 MSG_ID_DD_RINSE_PUMP_PWM_PERCENT_OVERRIDE_REQUEST = 0xA054 MSG_ID_DD_RINSE_PUMP_TURN_ON_OFF_REQUEST = 0xA055 + MSG_ID_DD_SET_CONDUCTIVITY_MODEL_REQUEST = 0xA056 # Placeholder messages MSG_ID_DD_ALARM_STATE_OVERRIDE_REQUEST = 0xAF03 Index: leahi_dialin/dd/modules/conductivity_sensors.py =================================================================== diff -u -r3715028b608b10e1d440a8a738c8a4f70d3d411b -r55a8c10a40d37ca346976b11dd5fdc0c8ee76c97 --- leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision 3715028b608b10e1d440a8a738c8a4f70d3d411b) +++ leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision 55a8c10a40d37ca346976b11dd5fdc0c8ee76c97) @@ -23,7 +23,7 @@ from leahi_dialin.common.global_vars import GlobalVariables from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override -from leahi_dialin.protocols.CAN import DenaliChannels +from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels from leahi_dialin.utils.base import AbstractSubSystem, publish from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray @@ -170,7 +170,6 @@ logger = self.logger, can_interface = self.can_interface) - def cmd_conductivity_sensor_error_counter_override(self, sensor_index: int, counter: int, reset: int = NO_RESET) -> int: """ Constructs and sends the conductivity error count override command @@ -195,3 +194,30 @@ override_text = str(counter), logger = self.logger, can_interface = self.can_interface) + + def cmd_set_conductivity_sensor_model(self, model_id: int) -> int: + """ + Constructs and sends the conductivity model set command. Default is Standard. + This only applies to Aly conductivity sensors that are connected to a Teensy Board. + This will also affect FP conductivity sensors. + Model IDs: + STANDARD, standard equation for conductivity + ALY_LINEAR, Aly's high range model for conductivity + UPDATED_STANDARD, Updated standard equation with a linear transformation. + + @param model_id: unsigned int - model ID. + @return: none + """ + model_byte_array = integer_to_bytearray(model_id) + payload = model_byte_array + + return cmd_generic_override( + payload = payload, + reset = 0, + channel_id = DenaliChannels.dialin_to_dd_ch_id, + msg_id = MsgIds.MSG_ID_DD_SET_CONDUCTIVITY_MODEL_REQUEST, + entity_name = f'DD set Conductivity Model ID', + override_text = str(model_id), + logger = self.logger, + can_interface = self.can_interface) + Index: leahi_dialin/dd/modules/gen_dialysate.py =================================================================== diff -u -r38e8dd31728056dbb7f9304c98ab16d7147b75a2 -r55a8c10a40d37ca346976b11dd5fdc0c8ee76c97 --- leahi_dialin/dd/modules/gen_dialysate.py (.../gen_dialysate.py) (revision 38e8dd31728056dbb7f9304c98ab16d7147b75a2) +++ leahi_dialin/dd/modules/gen_dialysate.py (.../gen_dialysate.py) (revision 55a8c10a40d37ca346976b11dd5fdc0c8ee76c97) @@ -57,10 +57,6 @@ @publish(["msg_id_dd_gen_dialysate_mode_data", "execution_state", "dialysate_delivery_in_progress", - "d6_level", - "d63_level", "d46_level", - "d9_pressure", - "d18_pressure", "d51_pressure", "dialysate_good_to_deliver", "targetQd", "isBalancingChamberSwitchingActive", Index: leahi_dialin/fp/filtration_purification.py =================================================================== diff -u -r3715028b608b10e1d440a8a738c8a4f70d3d411b -r55a8c10a40d37ca346976b11dd5fdc0c8ee76c97 --- leahi_dialin/fp/filtration_purification.py (.../filtration_purification.py) (revision 3715028b608b10e1d440a8a738c8a4f70d3d411b) +++ leahi_dialin/fp/filtration_purification.py (.../filtration_purification.py) (revision 55a8c10a40d37ca346976b11dd5fdc0c8ee76c97) @@ -95,6 +95,7 @@ self._handler_fp_defeatured_response) # create properties + self.fp_defeaturized = False self.fp_defeatured_timestamp = 0.0 self.fp_op_mode_timestamp = 0.0 self.fp_debug_events_timestamp = 0.0 @@ -124,7 +125,7 @@ self.temperatures = FPTemperatureSensors(self.can_interface, self.logger) self.test_configs = FPTestConfig(self.can_interface, self.logger) self.valves = FPValves(self.can_interface, self.logger) - self.dd_proxy = DDProxy(self.can_interface, self.logger) + self.dd_proxy = DDProxy(self.can_interface, self.logger, fp = self) @publish(["msg_id_fp_debug_event", "fp_debug_events_timestamp","fp_debug_events"])