Merge upstream changes from Marlin 2.1.2.5

buildroot/share/vscode/auto_build.py

@@ -72,7 +72,7 @@
 from __future__ import print_function
 from __future__ import division
 
-import sys,os,re
+import sys, os, re
 
 pwd = os.getcwd()  # make sure we're executing from the correct directory level
 pwd = pwd.replace('\\', '/')
@@ -103,7 +103,7 @@ current_OS = platform.system()
 target_env = ''
 board_name = ''
 
-from datetime import datetime, date, time
+from datetime import datetime
 
 #########
 #  Python 2 error messages:
@@ -151,8 +151,6 @@ def get_answer(board_name, question_txt, options, default_value=1):
   root_get_answer.protocol("WM_DELETE_WINDOW", disable_event)
   root_get_answer.resizable(False, False)
 
-  root_get_answer.radio_state = default_value  # declare variables used by TK and enable
-
   global get_answer_val
   get_answer_val = default_value  # return get_answer_val, set default to match radio_state default
 
@@ -880,7 +878,6 @@ def run_PIO(dummy):
   print('build_type:  ', build_type)
 
   import subprocess
-  import sys
 
   print('starting platformio')
 
@@ -965,7 +962,6 @@ def run_PIO(dummy):
 
 ########################################################################
 
-import time
 import threading
 if python_ver == 2:
   import Tkinter as tk
@@ -978,7 +974,6 @@ else:
   import tkinter as tk
   import queue as queue
   from tkinter import ttk, Tk, Frame, Text, Menu
-import subprocess
 import sys
 que = queue.Queue()
 #IO_queue = queue.Queue()

buildroot/share/vscode/avrdude.conf

@@ -184,7 +184,7 @@
 # section avr061.zip which accompanies the application note
 # AVR061 available from:
 #
-#      http://www.atmel.com/atmel/acrobat/doc2525.pdf
+#      https://www.microchip.com/en-us/application-notes/an2525
 #
 
 #define ATTINY10    0x10  /* the _old_ one that never existed! */

buildroot/share/vscode/avrdude_linux.conf

@@ -184,7 +184,7 @@
 # section avr061.zip which accompanies the application note
 # AVR061 available from:
 #
-#      http://www.atmel.com/atmel/acrobat/doc2525.pdf
+#      https://www.microchip.com/en-us/application-notes/an2525
 #
 
 #define ATTINY10    0x10  /* the _old_ one that never existed! */

buildroot/share/vscode/avrdude_macOS.conf

@@ -184,7 +184,7 @@
 # section avr061.zip which accompanies the application note
 # AVR061 available from:
 #
-#      http://www.atmel.com/atmel/acrobat/doc2525.pdf
+#      https://www.microchip.com/en-us/application-notes/an2525
 #
 
 #define ATTINY10    0x10  /* the _old_ one that never existed! */

buildroot/share/vscode/create_custom_upload_command_CDC.py

@@ -13,7 +13,7 @@
 from __future__ import print_function
 from __future__ import division
 
-import subprocess,os,platform
+import subprocess, os, platform
 from SCons.Script import DefaultEnvironment
 
 current_OS = platform.system()

buildroot/share/vscode/create_custom_upload_command_DFU.py

@@ -9,9 +9,9 @@
 #  Will continue on if a COM port isn't found so that the compilation can be done.
 #
 
-import os
+import os, platform
 from SCons.Script import DefaultEnvironment
-import platform
+
 current_OS = platform.system()
 
 env = DefaultEnvironment()