Index: scripts/update_package_script/update_package.py =================================================================== diff -u -r239e4187b87deffb844cf29a350a980252cba042 -r2c4faeb6256124837d794dc6c8df27a448ca3f13 --- scripts/update_package_script/update_package.py (.../update_package.py) (revision 239e4187b87deffb844cf29a350a980252cba042) +++ scripts/update_package_script/update_package.py (.../update_package.py) (revision 2c4faeb6256124837d794dc6c8df27a448ca3f13) @@ -11,7 +11,7 @@ The class runs the firmware and FPGA updates """ - _SW_UPDATE_PAYLOAD_BYTES = 256 + _SW_UPDATE_PAYLOAD_BYTES = 512 _BROADCAST_MESSAGE_INTERVAL_S = 0.2 _SW_UPDATE_STACK = 'stack_name' _SW_UPDATE_DEST = 'stack_target' @@ -93,7 +93,7 @@ @return none """ - progress_bar_scale = 10 + progress_bar_scale = 100 # TODo this was 10. This should automatically scale write_counter = self._sw_update_status[self._WRITE_COUNTER] binary_file_size_bytes = self._sw_update_status[self._BINARY_FILE_SIZE] target_stack = self._sw_update_status[self._SW_UPDATE_STACK] @@ -152,6 +152,7 @@ self._sw_update_status[self._SW_UPDATE_DEST]) break elif update_ack_status == CanCommStatus.CAN_COMM_TIME_OUT.value: + print() print("Timeout") # TODO send again? break @@ -160,7 +161,7 @@ f.close() def _handle_broadcast_message_thread(self, start_thread: bool): - + # TODO add doxygen if start_thread: self._thread_event = threading.Event() self._thread = threading.Thread(target=self._utilities.send_update_available_broadcast_message, @@ -189,7 +190,7 @@ # Start updating # TODO check if the update folder is empty then send the thread - self._handle_broadcast_message_thread(start_thread=True) + #self._handle_broadcast_message_thread(start_thread=True) for file in os.listdir(packages_dir): if not file.endswith(".bin") and not file.endswith(".hex"): continue @@ -199,4 +200,4 @@ self._process_binary_file(path) # Done with update binary files, stop sending the broadcast message - self._handle_broadcast_message_thread(start_thread=False) + #self._handle_broadcast_message_thread(start_thread=False) Index: scripts/update_package_script/utilities.py =================================================================== diff -u -r239e4187b87deffb844cf29a350a980252cba042 -r2c4faeb6256124837d794dc6c8df27a448ca3f13 --- scripts/update_package_script/utilities.py (.../utilities.py) (revision 239e4187b87deffb844cf29a350a980252cba042) +++ scripts/update_package_script/utilities.py (.../utilities.py) (revision 2c4faeb6256124837d794dc6c8df27a448ca3f13) @@ -98,7 +98,7 @@ _CAN_INTERFACE = 'can0' _SEND_CMD_MAIL_BOX = 0x601 _BROADCAST_UPDATE_MAIL_BOX = 0x606 - _CAN_MSG_WAIT_FOR_RESP_S = 3.0 + _CAN_MSG_WAIT_FOR_RESP_S = 60.0 _RESP_MSG_ACK = 1 _RESP_MSG_NACK = 0 _RESP_MSG_ID_INDEX = 0