wp/Marlin-Ai3M
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge upstream changes

Browse Source 
from https://github.com/MarlinFirmware/Marlin/tree/bugfix-1.1.x
This commit is contained in:
David Ramiro
2019-01-28 23:30:14 +01:00
parent b3af9708e9
commit f01ee75004
75 changed files with 420 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
buildroot/share/atom/auto_build.py
View File

@@ -1337,9 +1337,9 @@ class output_window(Text):
self.insert('end', 'Unable to move board definition file to destination. User must manually copy the file.\n\n', 'error')
self.insert('end', 'Please copy the following file and re-run the script:\n', 'normal')
self.insert('end', ' FROM:\n')
self.insert('end', ' ' + pwd + '/' + board_path + '/at90USB1286.json\n')
self.insert('end', ' ' + pwd + '/' + board_path + '/at90usb1286.json\n')
self.insert('end', ' TO:\n')
self.insert('end', ' ' + PIO_path + '/at90USB1286.json\n')
self.insert('end', ' ' + PIO_path + '/at90usb1286.json\n')
@@ -1405,7 +1405,7 @@ class output_window(Text):
except:
self.report_failure(PIO_path, board_path)
return False
if 'at90USB1286.json' in boards_dir:
if 'at90usb1286.json' in boards_dir:
return True # it's there so all is well
self.report_failure(PIO_path, board_path)
return False