Index: leahi_dialin/common/msg_ids.py =================================================================== diff -u -raa3a9ed97cc7e8be16632645e902ad4484ce298d -rf3bd21abd8100e88edb8f10f9b6443469236763d --- leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision aa3a9ed97cc7e8be16632645e902ad4484ce298d) +++ leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision f3bd21abd8100e88edb8f10f9b6443469236763d) @@ -285,6 +285,7 @@ MSG_ID_DD_DRY_BICART_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA054 MSG_ID_DD_DRY_BICART_MAX_FILL_CYCLE_COUNT_OVERRIDE_REQUEST = 0xA055 MSG_ID_DD_DRY_BICART_START_STOP_OVERRIDE_REQUEST = 0xA056 + MSG_ID_DD_BICARB_CHAMBER_FILL_REQUEST_OVERRIDE_REQUEST = 0xA057 # Placeholder messages MSG_ID_DD_ALARM_STATE_OVERRIDE_REQUEST = 0xAF03 Index: leahi_dialin/dd/dialysate_delivery.py =================================================================== diff -u -r8e3ce4e082f70e12b48d796c518994662f7668b3 -rf3bd21abd8100e88edb8f10f9b6443469236763d --- leahi_dialin/dd/dialysate_delivery.py (.../dialysate_delivery.py) (revision 8e3ce4e082f70e12b48d796c518994662f7668b3) +++ leahi_dialin/dd/dialysate_delivery.py (.../dialysate_delivery.py) (revision f3bd21abd8100e88edb8f10f9b6443469236763d) @@ -30,6 +30,7 @@ from .modules.pre_gen_dialysate import DDPreGenDialysate from .modules.rinse_pump import DDRinsePump from .modules.spent_chamber_fill import DDSpentChamberFill +from .modules.drybicart import DDDryBicart from .modules.temperature_sensors import DDTemperatureSensors from .modules.dd_test_configs import DDTestConfig from .modules.ultrafiltration import DDUltrafiltration @@ -129,6 +130,7 @@ self.pre_gen_dialysate = DDPreGenDialysate(self.can_interface, self.logger) self.rinse_pump = DDRinsePump(self.can_interface, self.logger) self.spent_chamber_fill = DDSpentChamberFill(self.can_interface, self.logger) + self.drybicart = DDDryBicart(self.can_interface, self.logger) self.temperature_sensors = DDTemperatureSensors(self.can_interface, self.logger) self.test_configs = DDTestConfig(self.can_interface, self.logger) self.ultrafiltration = DDUltrafiltration(self.can_interface, self.logger) Index: leahi_dialin/dd/modules/drybicart.py =================================================================== diff -u -r4b25823d00adbe6ef7cab733184f78dc3fc7f515 -rf3bd21abd8100e88edb8f10f9b6443469236763d --- leahi_dialin/dd/modules/drybicart.py (.../drybicart.py) (revision 4b25823d00adbe6ef7cab733184f78dc3fc7f515) +++ leahi_dialin/dd/modules/drybicart.py (.../drybicart.py) (revision f3bd21abd8100e88edb8f10f9b6443469236763d) @@ -47,18 +47,21 @@ self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_dry_bicart_data, self._handler_dry_bicart_sync) - self.execution_state = 0 - self.dry_bicart_fill_cycle_counter = 0 - self.dry_bicart_max_fill_cycle_count = 0 - self.dry_bicart_fill_request = 0 - self.dry_bicart_last_fill_time = 0 - self.dry_bicart_current_fill_time = 0 + self.dd_dry_bicart_fill_execution_state = 0 + self.dd_bicarb_chamber_fill_execution_state = 0 + self.dd_dry_bicart_fill_cycle_counter = 0 + self.dd_dry_bicart_max_fill_cycle_count = 0 + self.dd_dry_bicart_fill_request = 0 + self.dd_bicarb_chamber_fill_request = 0 + self.dd_dry_bicart_last_fill_time = 0 + self.dd_dry_bicart_current_fill_time = 0 self.dd_dry_bicart_timestamp = 0 - @publish(["msg_id_dd_dry_bicart_data", - "execution_state", "dry_bicart_fill_cycle_counter", "dry_bicart_max_fill_cycle_count", - "dry_bicart_fill_request", "dry_bicart_last_fill_time", "dry_bicart_current_fill_time", + "dd_dry_bicart_fill_execution_state", "dd_bicarb_chamber_fill_execution_state", + "dd_dry_bicart_fill_cycle_counter", "dd_dry_bicart_max_fill_cycle_count", + "dd_dry_bicart_fill_request", "dry_bicarb_chamber_fill_request", "dd_dry_bicart_last_fill_time", + "dd_dry_bicart_current_fill_time", "dd_dry_bicart_timestamp"]) def _handler_dry_bicart_sync(self, message, timestamp=0.0): """ @@ -68,21 +71,23 @@ @return: None """ - self.execution_state = struct.unpack('I', bytearray( + self.dd_dry_bicart_fill_execution_state = struct.unpack('I', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] - self.dry_bicart_fill_cycle_counter = struct.unpack('I', bytearray( + self.dd_bicarb_chamber_fill_execution_state = struct.unpack('I', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] - self.dry_bicart_max_fill_cycle_count = struct.unpack('f', bytearray( + self.dd_dry_bicart_fill_cycle_counter = struct.unpack('I', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] - self.dry_bicart_fill_request = struct.unpack('I', bytearray( + self.dd_dry_bicart_max_fill_cycle_count = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] - self.dry_bicart_last_fill_time = struct.unpack('I', bytearray( + self.ddd_dry_bicart_fill_request = struct.unpack('I', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] - self.dry_bicart_current_fill_time = struct.unpack('I', bytearray( + self.dd_bicarb_chamber_fill_request = struct.unpack('I', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0] + self.dd_dry_bicart_last_fill_time = struct.unpack('I', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0] + self.dd_dry_bicart_current_fill_time = struct.unpack('I', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0] - - self.dd_dry_bicart_timestamp = timestamp def cmd_dry_bicart_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: @@ -186,3 +191,32 @@ else: self.logger.error("Timeout!!!!") return False + def cmd_dry_bicart_bicarb_chamber_fill_request_override(self, start_stop: int, reset: int = NO_RESET) -> int: + """ + Constructs and sends the dry bicart bicarbonate chamber F fill request override command + Constraints: + Must be logged into DD. + + @param start_stop: int - value to start or stop dry bicart fill ( start = 1, stop = 0 + @return: 1 if successful, zero otherwise + + """ + + request = integer_to_bytearray(start_stop) + reset_byte_array = integer_to_bytearray(reset) + payload = reset_byte_array + request + + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, + message_id=MsgIds.MSG_ID_DD_BICARB_CHAMBER_FILL_REQUEST_OVERRIDE_REQUEST.value, + payload=payload) + + # Send message + received_message = self.can_interface.send(message) + + # If there is content... + if received_message is not None: + # response payload is OK or not OK + return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] + else: + self.logger.error("Timeout!!!!") + return False