Index: dialin/common/msg_ids.py =================================================================== diff -u -r74da0b9125ce91e76ce824e4f8e520eb32ee8d84 -re27520166a6ec9b88423c6a0deeb75ea2ba0d61d --- dialin/common/msg_ids.py (.../msg_ids.py) (revision 74da0b9125ce91e76ce824e4f8e520eb32ee8d84) +++ dialin/common/msg_ids.py (.../msg_ids.py) (revision e27520166a6ec9b88423c6a0deeb75ea2ba0d61d) @@ -388,7 +388,7 @@ MSG_ID_DG_ACCEL_SEND_INTERVAL_OVERRIDE = 0xA019 MSG_ID_DG_MONITORED_VOLTAGES_SEND_INTERVAL_OVERRIDE = 0xA01A MSG_ID_DG_MONITORED_VOLTAGES_OVERRIDE = 0xA01B - MSG_ID_DRAIN_PUMP_TARGET_OUTLET_PRESSURE = 0xA01C + MSG_ID_DRAIN_PUMP_TARGET_OUTLET_FLOW = 0xA01C MSG_ID_DG_SWITCHES_STATUS_OVERRIDE = 0xA01D MSG_ID_DG_SWITCHES_PUBLISH_INTERVAL_OVERRIDE = 0xA01E MSG_ID_DG_OP_MODE_PUBLISH_INTERVAL_OVERRIDE = 0xA01F @@ -456,6 +456,7 @@ 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_DG_HEATERS_DUTY_CYCLE_OVERRIDE = 0xA061 MSG_ID_HD_DEBUG_EVENT = 0xFFF1 MSG_ID_DG_DEBUG_EVENT = 0xFFF2 Index: dialin/dg/drain_pump.py =================================================================== diff -u -rb380516aac6b6b68f3d1532cba02b54facb23020 -re27520166a6ec9b88423c6a0deeb75ea2ba0d61d --- dialin/dg/drain_pump.py (.../drain_pump.py) (revision b380516aac6b6b68f3d1532cba02b54facb23020) +++ dialin/dg/drain_pump.py (.../drain_pump.py) (revision e27520166a6ec9b88423c6a0deeb75ea2ba0d61d) @@ -118,32 +118,32 @@ self.drain_pump_direction = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0] - def cmd_drain_pump_set_outlet_target_pressure(self, pressure: float) -> int: + def cmd_drain_pump_set_outlet_target_flow_lpm(self, flow: float) -> int: """ - Constructs and sends the drain pump target outlet pressure command + Constructs and sends the drain pump target outlet flow in L/min Constraints: Must be logged into DG. - @param pressure: (float) target outlet pressure + @param flow: (float) target outlet flow in L/min @return: 1 if successful, zero otherwise """ - prssr = float_to_bytearray(pressure) - payload = prssr + flw = float_to_bytearray(flow) + payload = flw message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_DRAIN_PUMP_TARGET_OUTLET_PRESSURE.value, + message_id=MsgIds.MSG_ID_DRAIN_PUMP_TARGET_OUTLET_FLOW.value, payload=payload) - self.logger.debug("Setting drain pump target pressure") + self.logger.debug("Setting drain pump target flow") # Send message received_message = self.can_interface.send(message) # If there is no content... if received_message is not None: - self.logger.debug("Drain pump outlet pressure set to " + str(pressure) + " psi" + + self.logger.debug("Drain pump outlet flow set to " + str(flow) + " L/min" + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] Index: tests/dg_tests.py =================================================================== diff -u -r74da0b9125ce91e76ce824e4f8e520eb32ee8d84 -re27520166a6ec9b88423c6a0deeb75ea2ba0d61d --- tests/dg_tests.py (.../dg_tests.py) (revision 74da0b9125ce91e76ce824e4f8e520eb32ee8d84) +++ tests/dg_tests.py (.../dg_tests.py) (revision e27520166a6ec9b88423c6a0deeb75ea2ba0d61d) @@ -701,19 +701,19 @@ hd.cmd_log_in_to_hd() sleep(1) - #run_heat_disinfect() + run_heat_disinfect() #run_flush_mode() #run_chemical_disinfect() - run_chem_disinfect_flush_mode() + #run_chem_disinfect_flush_mode() #run_dg() # cmd_set_disinfect_ui_screen() - collect_treatment_data() + #collect_treatment_data() #collect_hd_treatment()