Index: scripts/update_package_script/utilities.py =================================================================== diff -u -r5b6f3d91478d1da65e094cdb802d6c19ab4385d8 -ra99d0580e0f14cdf80321e963a7121a2225d2c4f --- scripts/update_package_script/utilities.py (.../utilities.py) (revision 5b6f3d91478d1da65e094cdb802d6c19ab4385d8) +++ scripts/update_package_script/utilities.py (.../utilities.py) (revision a99d0580e0f14cdf80321e963a7121a2225d2c4f) @@ -20,9 +20,10 @@ CAN_COMM_IN_PROGRESS = 1 CAN_COMM_SUCCESSFUL = 2 CAN_COMM_TIME_OUT = 3 - NUM_OF_CAN_COMM_STATES = 4 + CAN_COMM_READY = 4 + NUM_OF_CAN_COMM_STATES = 5 -class Utilities(Base): +class Utilities: _CRC32_TABLE = ( 0x00000000, 0x1EDC6F41, 0x3DB8DE82, 0x2364B1C3, 0x7B71BD04, 0x65ADD245, 0x46C96386, 0x58150CC7, @@ -74,7 +75,6 @@ def __init__(self): - super().__init__() self._can_bus = SocketcanBus(channel=self._CAN_INTERFACE) self._msg_id_count = 0 self._msg_sw_update_index = 0 @@ -105,12 +105,13 @@ self._send_can_message(self._SEND_CMD_MAIL_BOX, can_msg_bytes, self.SEND_MSG_ACK_STATUS_KEY_NAME, wait_for_resp_s=self._MIN_CAN_WAIT_FOR_RESP_S) - # TODO remove + # TODO remove for testing only sleep(0.7) self._msg_ack_nack_status[self.SEND_MSG_ACK_STATUS_KEY_NAME] = CanCommStatus.CAN_COMM_SUCCESSFUL.value + self._msg_ack_nack_status[self.UPDATE_MSG_ACK_STATUS_KEY_NAME] = CanCommStatus.CAN_COMM_READY.value # TODO remove - def send_software_update_msg(self, target: int, data: list, update_payload_len: int, signature_msg: bool = False): + def send_software_update_msg(self, target: int, data: bytes, update_payload_len: int, signature_msg: bool = False): mail_box = self._update_mail_boxes[target][0] time_out_s = self._update_mail_boxes[target][1] @@ -120,7 +121,7 @@ temp = bytes() can_msg_bytes = self._convert_data_to_bytes('