From 979204fc896c7129e21a57f733c657ea8d44fe24 Mon Sep 17 00:00:00 2001 From: Christopher Pepper Date: Thu, 8 Aug 2019 12:27:06 +0100 Subject: [PATCH] Use PlatformIO 4 default dir structure --- Marlin/src/HAL/HAL_LPC1768/upload_extra_script.py | 2 +- buildroot/bin/env_clean | 1 + buildroot/share/atom/auto_build.py | 8 ++++---- buildroot/share/atom/create_custom_upload_command_CDC.py | 6 +++--- platformio.ini | 3 --- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Marlin/src/HAL/HAL_LPC1768/upload_extra_script.py b/Marlin/src/HAL/HAL_LPC1768/upload_extra_script.py index 36242c96059d..44e0f09ad01a 100644 --- a/Marlin/src/HAL/HAL_LPC1768/upload_extra_script.py +++ b/Marlin/src/HAL/HAL_LPC1768/upload_extra_script.py @@ -17,7 +17,7 @@ def print_error(e): print('\nUnable to find destination disk (' + e + ')\n' \ 'Please select it in platformio.ini using the upload_port keyword ' \ '(https://docs.platformio.org/en/latest/projectconf/section_env_upload.html) ' \ - 'or copy the firmware (.pioenvs/' + env.get('PIOENV') + '/firmware.bin) manually to the appropriate disk\n') + 'or copy the firmware (.pio/build/' + env.get('PIOENV') + '/firmware.bin) manually to the appropriate disk\n') try: if current_OS == 'Windows': diff --git a/buildroot/bin/env_clean b/buildroot/bin/env_clean index c352b01b2afd..721aa762df57 100755 --- a/buildroot/bin/env_clean +++ b/buildroot/bin/env_clean @@ -3,6 +3,7 @@ rm -rf .pioenvs rm -rf .piolibdeps rm -rf .piolib +rm -rf .pio if [[ $1 = "--deep" ]]; then rm -rf ~/.platformio/packages/* diff --git a/buildroot/share/atom/auto_build.py b/buildroot/share/atom/auto_build.py index 13a7e84aa58b..0faa8ca0c445 100644 --- a/buildroot/share/atom/auto_build.py +++ b/buildroot/share/atom/auto_build.py @@ -421,17 +421,17 @@ def find_editor_mac(name, search_obj): def get_build_last(): env_last = '' DIR_PWD = os.listdir('.') - if '.pioenvs' in DIR_PWD: + if '.pio' in DIR_PWD: date_last = 0.0 - DIR__pioenvs = os.listdir('.pioenvs') + DIR__pioenvs = os.listdir('.pio') for name in DIR__pioenvs: if 0 <= name.find('.') or 0 <= name.find('-'): # skip files in listing continue - DIR_temp = os.listdir('.pioenvs/' + name) + DIR_temp = os.listdir('.pio/build/' + name) for names_temp in DIR_temp: if 0 == names_temp.find('firmware.'): - date_temp = os.path.getmtime('.pioenvs/' + name + '/' + names_temp) + date_temp = os.path.getmtime('.pio/build/' + name + '/' + names_temp) if date_temp > date_last: date_last = date_temp env_last = name diff --git a/buildroot/share/atom/create_custom_upload_command_CDC.py b/buildroot/share/atom/create_custom_upload_command_CDC.py index c2ed04e60a36..4d6fdf558526 100644 --- a/buildroot/share/atom/create_custom_upload_command_CDC.py +++ b/buildroot/share/atom/create_custom_upload_command_CDC.py @@ -97,7 +97,7 @@ def get_com_port(com_search_text, descr_search_text, start): avrdude_exe_path = 'buildroot\\share\\atom\\avrdude_5.10.exe' # source_path = env.get("PROJECTBUILD_DIR") + '\\' + env.get("PIOENV") + '\\firmware.hex' - source_path = '.pioenvs\\' + env.get("PIOENV") + '\\firmware.hex' + source_path = '.pio\\build\\' + env.get("PIOENV") + '\\firmware.hex' upload_string = avrdude_exe_path + ' -p usb1286 -c avr109 -P ' + com_CDC + ' -U flash:w:' + source_path + ':i' @@ -113,7 +113,7 @@ def get_com_port(com_search_text, descr_search_text, start): avrdude_exe_path = 'buildroot/share/atom/avrdude_5.10_macOS' # source_path = env.get("PROJECTBUILD_DIR") + '/' + env.get("PIOENV") + '/firmware.hex' - source_path = '.pioenvs/' + env.get("PIOENV") + '/firmware.hex' + source_path = '.pio/build/' + env.get("PIOENV") + '/firmware.hex' # upload_string = 'avrdude -p usb1286 -c avr109 -P ' + com_CDC + ' -U flash:w:' + source_path + ':i' @@ -132,7 +132,7 @@ def get_com_port(com_search_text, descr_search_text, start): avrdude_exe_path = 'buildroot/share/atom/avrdude_5.10_linux' # source_path = env.get("PROJECTBUILD_DIR") + '/' + env.get("PIOENV") + '/firmware.hex' - source_path = '.pioenvs/' + env.get("PIOENV") + '/firmware.hex' + source_path = '.pio/build/' + env.get("PIOENV") + '/firmware.hex' # upload_string = 'avrdude -p usb1286 -c avr109 -P ' + com_CDC + ' -U flash:w:' + source_path + ':i' upload_string = avrdude_exe_path + ' -p usb1286 -c avr109 -P ' + com_CDC + ' -C ' + avrdude_conf_path + ' -U flash:w:' + source_path + ':i' diff --git a/platformio.ini b/platformio.ini index 32803da11679..c98b0f4d32fc 100644 --- a/platformio.ini +++ b/platformio.ini @@ -17,9 +17,6 @@ [platformio] src_dir = Marlin -build_dir = .pioenvs -lib_dir = .piolib -libdeps_dir = .piolibdeps boards_dir = buildroot/share/PlatformIO/boards default_envs = megaatmega2560