Index: dialin/common/msg_ids.py =================================================================== diff -u -r683488dfe7660d2021b2887afe955f409f7de2aa -rcc9a40857c4fea20edf59440a7ce3aa27943a0ff --- dialin/common/msg_ids.py (.../msg_ids.py) (revision 683488dfe7660d2021b2887afe955f409f7de2aa) +++ dialin/common/msg_ids.py (.../msg_ids.py) (revision cc9a40857c4fea20edf59440a7ce3aa27943a0ff) @@ -437,6 +437,9 @@ MSG_ID_DG_RO_FEEDBACK_VOLTAGE_OVERRIDE = 0xA05B MSG_ID_DG_DIALYSATE_FILL_INTEGRATED_VOLUME_OVERRIDE = 0xA05C MSG_ID_DG_NV_RECORD_CRC_OVERRIDE = 0xA05D + MSG_ID_DG_CONC_PUMP_PARK_STATUS_OVERRIDE = 0xA05E + MSG_ID_DG_CONC_PUMP_PARK_FAULT_STATUS_OVERRIDE = 0xA05F + MSG_ID_DG_CONC_PUMP_PARK_COMMAND = 0xA060 MSG_ID_HD_DEBUG_EVENT = 0xFFF1 MSG_ID_DG_DEBUG_EVENT = 0xFFF2 Index: dialin/dg/concentrate_pumps.py =================================================================== diff -u -ra3008f2085dca1d8de69c242414b91429bc188e9 -rcc9a40857c4fea20edf59440a7ce3aa27943a0ff --- dialin/dg/concentrate_pumps.py (.../concentrate_pumps.py) (revision a3008f2085dca1d8de69c242414b91429bc188e9) +++ dialin/dg/concentrate_pumps.py (.../concentrate_pumps.py) (revision cc9a40857c4fea20edf59440a7ce3aa27943a0ff) @@ -69,6 +69,10 @@ self.concentrate_pump_cp2_current_state = 0.0 self.concentrate_pump_cp1_target_speed = 0.0 self.concentrate_pump_cp2_target_speed = 0.0 + self.concentrate_pump_cp1_parked = False + self.concentrate_pump_cp2_parked = False + self.concentrate_pump_cp1_park_fault = False + self.concentrate_pump_cp2_park_fault = False self.cp1_temp_pulse = 0.0 self.cp2_temp_pulse = 0.0 @@ -84,10 +88,23 @@ return [self.concentrate_pump_cp1_current_set_speed, self.concentrate_pump_cp1_measured_speed, self.concentrate_pump_cp2_current_set_speed, self.concentrate_pump_cp2_measured_speed] + def get_concentrate_pumps_parked(self): + """ + Gets the current concentrate pump park data + + @return: List containing concentrate pump park states: + [ concentrate_pump_cp1_parked, concentrate_pump_cp2_parked, + concentrate_pump_cp1_park_fault, concentrate_pump_cp2_park_fault ] + """ + return [self.concentrate_pump_cp1_parked, self.concentrate_pump_cp2_parked, + self.concentrate_pump_cp1_park_fault, self.concentrate_pump_cp2_park_fault] + @publish(["concentrate_pump_cp1_current_set_speed", "concentrate_pump_cp1_measured_speed", "concentrate_pump_cp2_current_set_speed", "concentrate_pump_cp2_measured_speed", "concentrate_pump_cp1_current_state", "concentrate_pump_cp2_current_state", - "concentrate_pump_cp1_target_speed", "concentrate_pump_cp2_target_speed"]) + "concentrate_pump_cp1_target_speed", "concentrate_pump_cp2_target_speed", + "concentrate_pump_cp1_parked", "concentrate_pump_cp2_parked", + "concentrate_pump_cp1_park_fault", "concentrate_pump_cp2_park_fault"]) def _handler_concentrate_pumps_sync(self, message): """ Handles published concentrate pumps' data messages. Concentrate pumps' speed data are captured @@ -120,6 +137,15 @@ self.concentrate_pump_cp2_target_speed = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10]))[0] + self.concentrate_pump_cp1_parked = True if struct.unpack('I', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11]))[0] == 1 else False + self.concentrate_pump_cp2_parked = True if struct.unpack('I', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_12:MsgFieldPositions.END_POS_FIELD_12]))[0] == 1 else False + self.concentrate_pump_cp1_park_fault = True if struct.unpack('I', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_13:MsgFieldPositions.END_POS_FIELD_13]))[0] == 1 else False + self.concentrate_pump_cp2_park_fault = True if struct.unpack('I', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_14:MsgFieldPositions.END_POS_FIELD_14]))[0] == 1 else False + def cmd_concentrate_pump_state_change_request(self, pump_id: int, on: bool = False) -> int: """ Constructs and sends the concentrate pump state change request command @@ -225,6 +251,114 @@ self.logger.error("Timeout!!!!") return False + def cmd_concentrate_pump_parked_status_override(self, pump_id: int, status: int, reset: int = NO_RESET) -> int: + """ + Constructs and sends the concentrate pump parked state override command + + @param pump_id: unsigned int - concentrate pump ID + @param status: unsigned int - 1 = parked, 0 = not parked + @param reset: integer - 1 to reset a previous override, 0 to override + @return: 1 if successful, zero otherwise + + Concentrate pump IDs: \n + 0 = CP1 \n + 1 = CP2 \n + """ + + reset_byte_array = integer_to_bytearray(reset) + status_byte_array = integer_to_bytearray(status) + pump_id_byte_array = integer_to_bytearray(pump_id) + payload = reset_byte_array + status_byte_array + pump_id_byte_array + + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, + message_id=MsgIds.MSG_ID_DG_CONC_PUMP_PARK_STATUS_OVERRIDE.value, + payload=payload) + + if reset == RESET: + self.logger.debug("reset parked status back to normal for pump: " + str(pump_id)) + else: + self.logger.debug("override parked status to: " + str(status) + " - for pump: " + str(pump_id)) + + # 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 + + def cmd_concentrate_pump_park_fault_state_override(self, pump_id: int, status: int, reset: int = NO_RESET) -> int: + """ + Constructs and sends the concentrate pump park fault state override command + + @param pump_id: unsigned int - concentrate pump ID + @param status: unsigned int - 1 = fault, 0 = no fault + @param reset: integer - 1 to reset a previous override, 0 to override + @return: 1 if successful, zero otherwise + + Concentrate pump IDs: \n + 0 = CP1 \n + 1 = CP2 \n + """ + + reset_byte_array = integer_to_bytearray(reset) + status_byte_array = integer_to_bytearray(status) + pump_id_byte_array = integer_to_bytearray(pump_id) + payload = reset_byte_array + status_byte_array + pump_id_byte_array + + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, + message_id=MsgIds.MSG_ID_DG_CONC_PUMP_PARK_FAULT_STATUS_OVERRIDE.value, + payload=payload) + + if reset == RESET: + self.logger.debug("reset park fault status back to normal for pump: " + str(pump_id)) + else: + self.logger.debug("override park fault status to: " + str(status) + " - for pump: " + str(pump_id)) + + # 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 + + def cmd_concentrate_pump_park_command(self, pump_id: int) -> int: + """ + Constructs and sends the concentrate pump park command + + @param pump_id: unsigned int - concentrate pump ID + @return: 1 if successful, zero otherwise + + Concentrate pump IDs: \n + 0 = CP1 \n + 1 = CP2 \n + """ + + payload = integer_to_bytearray(pump_id) + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, + message_id=MsgIds.MSG_ID_DG_CONC_PUMP_PARK_COMMAND.value, + payload=payload) + + self.logger.debug("park concentrate pump: " + str(pump_id)) + + # 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 + def cmd_concentrate_pump_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends the concentrate pump data broadcast interval override command