Skip to content

Commit

Permalink
🔨 Clean up upload.py (#23679)
Browse files Browse the repository at this point in the history
  • Loading branch information
GHGiampy authored Feb 5, 2022
1 parent 57cee04 commit 6af5cb2
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions buildroot/share/scripts/upload.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ def _RemoveFirmwareFile(FirmwareFile):
upload_port = _GetUploadPort(env) # Serial port to use

# Set local upload params
upload_firmware_target_name = os.path.basename(upload_firmware_source_name) # WARNING! Need rework on "binary_stream" to allow filename > 8.3
upload_firmware_target_name = os.path.basename(upload_firmware_source_name)
# Target firmware filename
upload_timeout = 1000 # Communication timout, lossy/slow connections need higher values
upload_blocksize = 512 # Transfer block size. 512 = Autodetect
Expand All @@ -154,11 +154,11 @@ def _RemoveFirmwareFile(FirmwareFile):
# Set local upload params based on board type to change script behavior
# "upload_delete_old_bins": delete all *.bin files in the root of SD Card
upload_delete_old_bins = marlin_motherboard in ['BOARD_CREALITY_V4', 'BOARD_CREALITY_V4210', 'BOARD_CREALITY_V422', 'BOARD_CREALITY_V423',
'BOARD_CREALITY_V427', 'BOARD_CREALITY_V431', 'BOARD_CREALITY_V452', 'BOARD_CREALITY_V453',
'BOARD_CREALITY_V427', 'BOARD_CREALITY_V431', 'BOARD_CREALITY_V452', 'BOARD_CREALITY_V453',
'BOARD_CREALITY_V24S1']
# "upload_random_name": generate a random 8.3 firmware filename to upload
upload_random_filename = marlin_motherboard in ['BOARD_CREALITY_V4', 'BOARD_CREALITY_V4210', 'BOARD_CREALITY_V422', 'BOARD_CREALITY_V423',
'BOARD_CREALITY_V427', 'BOARD_CREALITY_V431', 'BOARD_CREALITY_V452', 'BOARD_CREALITY_V453',
'BOARD_CREALITY_V427', 'BOARD_CREALITY_V431', 'BOARD_CREALITY_V452', 'BOARD_CREALITY_V453',
'BOARD_CREALITY_V24S1'] and not marlin_long_filename_host_support

try:
Expand Down Expand Up @@ -258,7 +258,7 @@ def _RemoveFirmwareFile(FirmwareFile):
print('Trigger firmware update...')
protocol.send_ascii('M997', True)

protocol: protocol.shutdown()
protocol.shutdown()
print('Firmware update completed')

except KeyboardInterrupt:
Expand Down

0 comments on commit 6af5cb2

Please sign in to comment.