Index: leahi_dialin/dd/modules/heaters.py =================================================================== diff -u -rc911f3b6e212249136baf0e45b614a2f5be2b190 -r951bd79131f9c5dd0e62d40a2101815100cdb787 --- leahi_dialin/dd/modules/heaters.py (.../heaters.py) (revision c911f3b6e212249136baf0e45b614a2f5be2b190) +++ leahi_dialin/dd/modules/heaters.py (.../heaters.py) (revision 951bd79131f9c5dd0e62d40a2101815100cdb787) @@ -35,18 +35,16 @@ @unique class HeatersState(DialinEnum): HEATER_EXEC_STATE_OFF = 0 - HEATER_EXEC_STATE_PRIMARY_RAMP_TO_TARGET = 1 - HEATER_EXEC_STATE_PRIMARY_CONTROL_TO_TARGET = 2 - HEATER_EXEC_STATE_CONTROL_TO_DISINFECT_TARGE = 3 - HEATER_EXEC_STATE_TRIMMER_RAMP_TO_TARGET = 4 - HEATER_EXEC_STATE_TRIMMER_CONTROL_TO_TARGET = 5 - NUM_OF_HEATERS_STATE = 6 + HEATER_EXEC_STATE_RAMP_TO_TARGET = 1 + HEATER_EXEC_STATE_CONTROL_TO_TARGET = 2 + HEATER_EXEC_STATE_CONTROL_TO_DISINFECT_TARGET = 3 + NUM_OF_HEATERS_STATE = 4 @unique class HeatersNames(DialinEnum): - DD_PRIMARY_HEATER = 0 - DD_TRIMMER_HEATER = 1 + D5_HEAT = 0 + D45_HEAT = 1 NUM_OF_DD_HEATERS = 2 @@ -67,58 +65,87 @@ self.can_interface = can_interface self.logger = logger - self.main_primary_heater_duty_cycle = 0.0 - self.trimmer_heater_duty_cycle = 0.0 - self.primary_heaters_target_temperature = 0.0 - self.trimmer_heater_target_temperature = 0.0 - self.primary_heater_state = 0 - self.trimmer_heater_state = 0 - self.primary_control_counter = 0 - self.trimmer_control_counter = 0 + self.d5_heat_duty_cycle = 0.0 + self.d45_heat_duty_cycle = 0.0 + self.d5_heat_target_temperature = 0.0 + self.d45_heat_target_temperature = 0.0 + self.d5_heat_state = 0 + self.d45_heat_state = 0 + self.d5_heat_control_counter = 0 + self.d45_heat_control_counter = 0 self.dd_heaters_timestamp = 0.0 + #Temp Heater Debugging published fields + self.dbg1 = 0.0 + self.dbg2 = 0.0 + self.dbg3 = 0.0 + self.dbg4 = 0.0 + self.dbg5 = 0.0 + self.dbg6 = 0.0 + self.dbg7 = 0.0 + self.dbg8 = 0.0 + + if self.can_interface is not None: channel_id = DenaliChannels.dd_sync_broadcast_ch_id msg_id = MsgIds.MSG_ID_DD_HEATERS_DATA.value self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_heaters_sync) @publish(["dd_heaters_timestamp", - "main_primary_heater_duty_cycle","trimmer_heater_duty_cycle", - "primary_heaters_target_temperature","trimmer_heater_target_temperature", - "primary_heater_state","trimmer_heater_state", - "primary_control_counter","trimmer_control_counter"]) + "d5_heat_duty_cycle","d45_heat_duty_cycle", + "d5_heat_target_temperature","d45_heat_target_temperature", + "d5_heat_state","d45_heat_state", + "d5_heat_control_counter","d45_heat_control_counter"]) def _handler_heaters_sync(self, message, timestamp=0.0): """ - Handles published heaters message + Handles published DD heaters message - @param message: published heaters data message + @param message: published DD heaters data message @returns none """ - self.main_primary_heater_duty_cycle = struct.unpack('f', bytearray( + self.d5_heat_duty_cycle = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] - self.trimmer_heater_duty_cycle = struct.unpack('f', bytearray( + self.d45_heat_duty_cycle = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] - self.primary_heaters_target_temperature = struct.unpack('f', bytearray( + self.d5_heat_target_temperature = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] - self.trimmer_heater_target_temperature = struct.unpack('f', bytearray( + self.d45_heat_target_temperature = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] - self.primary_heater_state = struct.unpack('i', bytearray( + self.d5_heat_state = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] - self.trimmer_heater_state = struct.unpack('i', bytearray( + self.d45_heat_state = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0] - self.primary_control_counter = struct.unpack('i', bytearray( + self.d5_heat_control_counter = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0] - self.trimmer_control_counter = struct.unpack('i', bytearray( + self.d45_heat_control_counter = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0] + self.dbg1 = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0] + self.dbg2 = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10]))[0] + self.dbg3 = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11]))[0] + self.dbg4 = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_12:MsgFieldPositions.END_POS_FIELD_12]))[0] + self.dbg5 = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_13:MsgFieldPositions.END_POS_FIELD_13]))[0] + self.dbg6 = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_14:MsgFieldPositions.END_POS_FIELD_14]))[0] + self.dbg7 = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_15:MsgFieldPositions.END_POS_FIELD_15]))[0] + self.dbg8 = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_16:MsgFieldPositions.END_POS_FIELD_16]))[0] + + self.dg_heaters_timestamp = timestamp def cmd_heaters_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends broadcast time interval. Constraints: - Must be logged into DG. - Given interval must be non-zero and a multiple of the DG general task interval (50 ms). + Must be logged into DD. + Given interval must be non-zero and a multiple of the DD general task interval (50 ms). @param ms: (int) Publish time interval in ms @param reset: (int) 1 to reset a previous override, 0 to override @@ -150,10 +177,9 @@ def cmd_heater_duty_cycle_override(self, heater: int, duty_cycle: float, reset: int = NO_RESET) -> int: """ Constructs and sends heater duty cycle override command - Must be logged into DG - There must be a minimum flow available for the heaters (FMP for primary and FMD for trimmer) + Must be logged into DD - @param heater the heater to override its value (primary, trimmer) (0-1.0 order) + @param heater the heater to override its value @param duty_cycle the duty cycle value to override in percent @param reset: (int) 1 to reset a previous override, 0 to override @returns 1 if successful, zero otherwise @@ -183,7 +209,7 @@ Constructs and sends heater start stop override - @param heater the heater to override its value (primary, trimmer) (0-1.0 order) + @param heater the heater to override its value @param command the heater to start or stop @param temperature: float - temp to set to @returns 1 if successful, zero otherwise @@ -235,4 +261,34 @@ return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: self.logger.debug("Timeout!!!!") + return False + + + def cmd_heater_pwm_period_override(self, heater: int, period: float, reset: int) -> int: + """ + Constructs and sends heater pwm period override + + @param heater the heater to override its value (primary, trimmer) (0-1.0 order) + @param period: float - period to set to + @param reset: (int) 1 to reset a previous override, 0 to override + @returns 1 if successful, zero otherwise + """ + htr = integer_to_bytearray(heater) + prd = float_to_bytearray(period) + rst = integer_to_bytearray(reset) + payload = rst + prd + htr + + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, + message_id=MsgIds.MSG_ID_DD_HEATERS_PWM_PERIOD_OVERRIDE_REQUEST.value, + payload=payload) + + # Send message + received_message = self.can_interface.send(message) + + # If there is content in message + if received_message is not None: + # Response payload is OK or not + return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] + else: + self.logger.debug("Timeout!!!!") return False \ No newline at end of file