Index: leahi_dialin/dd/modules/heaters.py =================================================================== diff -u -r951bd79131f9c5dd0e62d40a2101815100cdb787 -r829d25cb941953c353279777e82a083d204f99ff --- leahi_dialin/dd/modules/heaters.py (.../heaters.py) (revision 951bd79131f9c5dd0e62d40a2101815100cdb787) +++ leahi_dialin/dd/modules/heaters.py (.../heaters.py) (revision 829d25cb941953c353279777e82a083d204f99ff) @@ -71,8 +71,10 @@ 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.d5_duty_cycle_count = 0.0 + self.d5_pwm_period = 0.0 + self.d5_adjusted_target_temp = 0.0 + self.d5_target_temp_td = 0.0 self.dd_heaters_timestamp = 0.0 #Temp Heater Debugging published fields @@ -84,6 +86,7 @@ self.dbg6 = 0.0 self.dbg7 = 0.0 self.dbg8 = 0.0 + self.dbg9 = 0.0 if self.can_interface is not None: @@ -95,7 +98,8 @@ "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"]) + "d5_duty_cycle_count","d5_pwm_period", + "d5_adjusted_target_temp","d5_target_temp_td"]) def _handler_heaters_sync(self, message, timestamp=0.0): """ Handles published DD heaters message @@ -115,29 +119,34 @@ message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] self.d45_heat_state = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0] - self.d5_heat_control_counter = struct.unpack('i', bytearray( + self.d5_duty_cycle_count = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0] - self.d45_heat_control_counter = struct.unpack('i', bytearray( + self.d5_pwm_period = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0] + self.d5_adjusted_target_temp = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0] + self.d5_target_temp_td = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10]))[0] self.dbg1 = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0] + message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11]))[0] self.dbg2 = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10]))[0] + message['message'][MsgFieldPositions.START_POS_FIELD_12:MsgFieldPositions.END_POS_FIELD_12]))[0] self.dbg3 = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11]))[0] + message['message'][MsgFieldPositions.START_POS_FIELD_13:MsgFieldPositions.END_POS_FIELD_13]))[0] self.dbg4 = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_12:MsgFieldPositions.END_POS_FIELD_12]))[0] + message['message'][MsgFieldPositions.START_POS_FIELD_14:MsgFieldPositions.END_POS_FIELD_14]))[0] self.dbg5 = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_13:MsgFieldPositions.END_POS_FIELD_13]))[0] + message['message'][MsgFieldPositions.START_POS_FIELD_15:MsgFieldPositions.END_POS_FIELD_15]))[0] self.dbg6 = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_14:MsgFieldPositions.END_POS_FIELD_14]))[0] + message['message'][MsgFieldPositions.START_POS_FIELD_16:MsgFieldPositions.END_POS_FIELD_16]))[0] self.dbg7 = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_15:MsgFieldPositions.END_POS_FIELD_15]))[0] + message['message'][MsgFieldPositions.START_POS_FIELD_17:MsgFieldPositions.END_POS_FIELD_17]))[0] self.dbg8 = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_16:MsgFieldPositions.END_POS_FIELD_16]))[0] + message['message'][MsgFieldPositions.START_POS_FIELD_18:MsgFieldPositions.END_POS_FIELD_18]))[0] + self.dbg9 = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_19:MsgFieldPositions.END_POS_FIELD_19]))[0] - self.dg_heaters_timestamp = timestamp def cmd_heaters_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: