SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #10860 from Bob-the-Kuhn/upload-extra-script-fix

Browse source 
[2.0.x] LPC1768 upload_extra_script.py fix (wrong type of exit method)
This commit is contained in:
Bob Kuhn 2018-05-26 09:40:55 -05:00 committed by GitHub
commit 498a328148
Signed by: GitHub
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 114 additions and 116 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Marlin/src/HAL/HAL_LPC1768/upload_extra_script.py
View file

@ -18,11 +18,9 @@ current_OS = platform.system()
#exit(0) #exit(0)
build_type = os.environ.get("BUILD_TYPE", 'Not Set') build_type = os.environ.get("BUILD_TYPE", 'Not Set')
if not(build_type == 'upload' or build_type == 'traceback' or build_type == 'Not Set') : if build_type == 'upload' or build_type == 'traceback' or build_type == 'Not Set' :
exit(0)
if current_OS == 'Windows':
if current_OS == 'Windows':
# #
# platformio.ini will accept this for a Windows upload port designation: 'upload_port = L:' # platformio.ini will accept this for a Windows upload port designation: 'upload_port = L:'
@ -71,7 +69,7 @@ if current_OS == 'Windows':
print '\nUnable to find destination disk. File must be copied manually. \n' print '\nUnable to find destination disk. File must be copied manually. \n'
if current_OS == 'Linux': if current_OS == 'Linux':
# #
# platformio.ini will accept this for a Linux upload port designation: 'upload_port = /media/media_name/drive' # platformio.ini will accept this for a Linux upload port designation: 'upload_port = /media/media_name/drive'
@ -112,7 +110,7 @@ if current_OS == 'Linux':
print '\nUnable to find destination disk. File must be copied manually. \n' print '\nUnable to find destination disk. File must be copied manually. \n'
if current_OS == 'Darwin': # MAC if current_OS == 'Darwin': # MAC
# #
# platformio.ini will accept this for a OSX upload port designation: 'upload_port = /media/media_name/drive' # platformio.ini will accept this for a OSX upload port designation: 'upload_port = /media/media_name/drive'