Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove PlatformIO folder structure override #14879

Merged
merged 1 commit into from
Aug 8, 2019
Merged

Remove PlatformIO folder structure override #14879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Marlin/src/HAL/HAL_LPC1768/upload_extra_script.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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':
Expand Down
1 change: 1 addition & 0 deletions buildroot/bin/env_clean
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
rm -rf .pioenvs
rm -rf .piolibdeps
rm -rf .piolib
rm -rf .pio

if [[ $1 = "--deep" ]]; then
rm -rf ~/.platformio/packages/*
Expand Down
8 changes: 4 additions & 4 deletions buildroot/share/atom/auto_build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions buildroot/share/atom/create_custom_upload_command_CDC.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand All @@ -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'
Expand All @@ -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'
Expand Down
3 changes: 0 additions & 3 deletions platformio.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down