andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

[LPC176x] Update PIO extrascript (#12878)

pull/1/head
Chris Pepper 6 years ago
committed by Scott Lahteine
parent
19fea772e5
commit
2919f3045d
2 changed files with 76 additions and 83 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 155
      Marlin/src/HAL/HAL_LPC1768/upload_extra_script.py
  2. 4
      platformio.ini

155
Marlin/src/HAL/HAL_LPC1768/upload_extra_script.py
View File

@ -10,18 +10,16 @@ target_drive = "REARM"
import os import os
import platform import platform
current_OS = platform.system() current_OS = platform.system()
Import("env")
#env_vars = subprocess.check_output('platformio run -t envdump') def detect_error(e):
#env_vars = env_vars.split('\n') print '\nUnable to find destination disk (' + e + ')\n' \
#for env in env_vars: 'Please select it in platformio.ini using the upload_port keyword ' \
# print env '(https://docs.platformio.org/en/latest/projectconf/section_env_upload.html)\n' \
#exit(0) 'or copy the firmware (.pioenvs/' + env.get('PIOENV') + '/firmware.bin) manually to the appropriate disk\n'
build_type = os.environ.get("BUILD_TYPE", 'Not Set')
if build_type == 'upload' or build_type == 'traceback' or build_type == 'Not Set' :
try:
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:'
# Windows - doesn't care about the disk's name, only cares about the drive letter # Windows - doesn't care about the disk's name, only cares about the drive letter
@ -30,119 +28,114 @@ if build_type == 'upload' or build_type == 'traceback' or build_type == 'Not Set
# #
# get all drives on this computer # get all drives on this computer
# #
import subprocess import subprocess
# typical result (string): 'Drives: C:\ D:\ E:\ F:\ G:\ H:\ I:\ J:\ K:\ L:\ M:\ Y:\ Z:\'
driveStr = subprocess.check_output("fsutil fsinfo drives") # typical result (string): 'Drives: C:\ D:\ E:\ F:\ G:\ H:\ I:\ J:\ K:\ L:\ M:\ Y:\ Z:\' driveStr = subprocess.check_output("fsutil fsinfo drives")
driveStr = driveStr.strip().lstrip('Drives: ') # typical result (string): 'C:\ D:\ E:\ F:\ G:\ H:\ I:\ J:\ K:\ L:\ M:\ Y:\ Z:\' # typical result (string): 'C:\ D:\ E:\ F:\ G:\ H:\ I:\ J:\ K:\ L:\ M:\ Y:\ Z:\'
drives = driveStr.split() # typical result (array of stings): ['C:\\', 'D:\\', 'E:\\', 'F:\\', 'G:\\', 'H:\\', 'I:\\', 'J:\\', 'K:\\', 'L:\\', 'M:\\', 'Y:\\', 'Z:\\'] driveStr = driveStr.strip().lstrip('Drives: ')
# typical result (array of stings): ['C:\\', 'D:\\', 'E:\\', 'F:\\',
# 'G:\\', 'H:\\', 'I:\\', 'J:\\', 'K:\\', 'L:\\', 'M:\\', 'Y:\\', 'Z:\\']
drives = driveStr.split()
upload_disk = 'Disk not found' upload_disk = 'Disk not found'
target_file_found = False target_file_found = False
target_drive_found = False target_drive_found = False
for drive in drives: for drive in drives:
final_drive_name = drive.strip().rstrip('\\') # typical result (string): 'C:' final_drive_name = drive.strip().rstrip('\\') # typical result (string): 'C:'
try: try:
volume_info = subprocess.check_output('cmd /C dir ' + final_drive_name, stderr=subprocess.STDOUT) volume_info = subprocess.check_output('cmd /C dir ' + final_drive_name, stderr=subprocess.STDOUT)
except Exception as e: except Exception as e:
continue continue
else: else:
if target_drive in volume_info and target_file_found == False: # set upload if not found target file yet if target_drive in volume_info and target_file_found == False: # set upload if not found target file yet
target_drive_found = True target_drive_found = True
upload_disk = final_drive_name upload_disk = final_drive_name
if target_filename in volume_info: if target_filename in volume_info:
if target_file_found == False: if target_file_found == False:
upload_disk = final_drive_name upload_disk = final_drive_name
target_file_found = True target_file_found = True
# #
# set upload_port to drive if found # set upload_port to drive if found
# #
if target_file_found == True or target_drive_found == True: if target_file_found == True or target_drive_found == True:
Import("env") env.Replace(
env.Replace( UPLOAD_PORT=upload_disk
UPLOAD_PORT = upload_disk )
) print 'upload disk: ', upload_disk
print 'upload disk: ' , upload_disk
else: else:
print '\nUnable to find destination disk. File must be copied manually. \n' detect_error('Autodetect Error')
if current_OS == 'Linux':
elif 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'
# #
upload_disk = 'Disk not found' upload_disk = 'Disk not found'
target_file_found = False target_file_found = False
target_drive_found = False target_drive_found = False
medias = os.listdir('/media') # medias = os.listdir('/media') #
for media in medias: for media in medias:
drives = os.listdir('/media/' + media) # drives = os.listdir('/media/' + media) #
if target_drive in drives and target_file_found == False: # set upload if not found target file yet if target_drive in drives and target_file_found == False: # set upload if not found target file yet
target_drive_found = True target_drive_found = True
upload_disk = '/media/' + media + '/' + target_drive + '/' upload_disk = '/media/' + media + '/' + target_drive + '/'
for drive in drives: for drive in drives:
try: try:
files = os.listdir('/media/' + media + '/' + drive ) files = os.listdir('/media/' + media + '/' + drive)
except: except:
continue continue
else: else:
if target_filename in files: if target_filename in files:
if target_file_found == False: if target_file_found == False:
upload_disk = '/media/' + media + '/' + drive + '/' upload_disk = '/media/' + media + '/' + drive + '/'
target_file_found = True target_file_found = True
# #
# set upload_port to drive if found # set upload_port to drive if found
# #
if target_file_found == True or target_drive_found == True: if target_file_found == True or target_drive_found == True:
Import("env") env.Replace(
env.Replace( UPLOAD_FLAGS="-P$UPLOAD_PORT",
UPLOAD_FLAGS = "-P$UPLOAD_PORT", UPLOAD_PORT=upload_disk
UPLOAD_PORT = upload_disk )
) print 'upload disk: ', upload_disk
print 'upload disk: ' , upload_disk
else: else:
print '\nUnable to find destination disk. File must be copied manually. \n' detect_error('Autodetect Error')
if current_OS == 'Darwin': # MAC
elif 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'
# #
import os
upload_disk = 'Disk not found' upload_disk = 'Disk not found'
drives = os.listdir('/Volumes') # human readable names drives = os.listdir('/Volumes') # human readable names
target_file_found = False target_file_found = False
target_drive_found = False target_drive_found = False
if target_drive in drives and target_file_found == False: # set upload if not found target file yet if target_drive in drives and target_file_found == False: # set upload if not found target file yet
target_drive_found = True target_drive_found = True
upload_disk = '/Volumes/' + target_drive + '/' upload_disk = '/Volumes/' + target_drive + '/'
for drive in drives: for drive in drives:
try: try:
filenames = os.listdir('/Volumes/' + drive + '/') # will get an error if the drive is protected filenames = os.listdir('/Volumes/' + drive + '/') # will get an error if the drive is protected
except: except:
continue continue
else: else:
if target_filename in filenames: if target_filename in filenames:
if target_file_found == False: if target_file_found == False:
upload_disk = '/Volumes/' + drive + '/' upload_disk = '/Volumes/' + drive + '/'
target_file_found = True target_file_found = True
# #
# set upload_port to drive if found # set upload_port to drive if found
# #
if target_file_found == True or target_drive_found == True: if target_file_found == True or target_drive_found == True:
Import("env") env.Replace(
env.Replace( UPLOAD_PORT=upload_disk
UPLOAD_PORT = upload_disk )
) print '\nupload disk: ', upload_disk, '\n'
print '\nupload disk: ' , upload_disk, '\n'
else: else:
print '\nUnable to find destination disk. File must be copied manually. \n' detect_error('Autodetect Error')
except Exception as e:
detect_error(str(e))

4
platformio.ini
View File

@ -161,7 +161,7 @@ src_filter = ${common.default_src_filter} +<src/HAL/HAL_LPC1768>
monitor_speed = 250000 monitor_speed = 250000
lib_deps = Servo lib_deps = Servo
LiquidCrystal LiquidCrystal
https://github.com/MarlinFirmware/U8glib-HAL/archive/dev.zip U8glib-HAL=https://github.com/MarlinFirmware/U8glib-HAL/archive/dev.zip
TMCStepper@<1.0.0 TMCStepper@<1.0.0
[env:LPC1769] [env:LPC1769]
@ -179,7 +179,7 @@ src_filter = ${common.default_src_filter} +<src/HAL/HAL_LPC1768>
monitor_speed = 250000 monitor_speed = 250000
lib_deps = Servo lib_deps = Servo
LiquidCrystal LiquidCrystal
https://github.com/MarlinFirmware/U8glib-HAL/archive/dev.zip U8glib-HAL=https://github.com/MarlinFirmware/U8glib-HAL/archive/dev.zip
TMCStepper@<1.0.0 TMCStepper@<1.0.0
# #

Write Preview
Loading…
Cancel
Save