Merge branch 'bugfix-2.0.x' into CrealityDwin2.0_Bleeding

buildroot/share/PlatformIO/scripts/common-cxxflags.py

@@ -3,6 +3,12 @@
 # Convenience script to apply customizations to CPP flags
 #
 Import("env")
+
+# Detect that 'vscode init' is running
+from SCons.Script import COMMAND_LINE_TARGETS
+if "idedata" in COMMAND_LINE_TARGETS:
+    env.Exit(0)
+
 env.Append(CXXFLAGS=[
   "-Wno-register"
   #"-Wno-incompatible-pointer-types",

buildroot/share/PlatformIO/scripts/common-dependencies-post.py

@@ -2,8 +2,13 @@
 # common-dependencies-post.py
 # Convenience script to add build flags for Marlin Enabled Features
 #
-
 Import("env")
+
+# Detect that 'vscode init' is running
+from SCons.Script import COMMAND_LINE_TARGETS
+if "idedata" in COMMAND_LINE_TARGETS:
+    env.Exit(0)
+
 Import("projenv")
 
 def apply_board_build_flags():

buildroot/share/PlatformIO/scripts/common-dependencies.py

@@ -2,6 +2,15 @@
 # common-dependencies.py
 # Convenience script to check dependencies and add libs and sources for Marlin Enabled Features
 #
+Import("env")
+
+#print(env.Dump())
+
+# Detect that 'vscode init' is running
+from SCons.Script import COMMAND_LINE_TARGETS
+if "idedata" in COMMAND_LINE_TARGETS:
+    env.Exit(0)
+
 import subprocess,os,re
 
 PIO_VERSION_MIN = (5, 0, 3)
@@ -31,10 +40,6 @@ except:
 from platformio.package.meta import PackageSpec
 from platformio.project.config import ProjectConfig
 
-Import("env")
-
-#print(env.Dump())
-
 try:
 	verbose = int(env.GetProjectOption('custom_verbose'))
 except:

buildroot/share/PlatformIO/scripts/copy_marlin_variant_to_framework.py

@@ -1,6 +1,13 @@
 #
 # copy_marlin_variant_to_framework.py
 #
+Import("env")
+
+# Detect that 'vscode init' is running
+from SCons.Script import COMMAND_LINE_TARGETS
+if "idedata" in COMMAND_LINE_TARGETS:
+    env.Exit(0)
+
 import os,shutil
 from SCons.Script import DefaultEnvironment
 from platformio import util

buildroot/share/PlatformIO/scripts/preflight-checks.py

@@ -2,9 +2,15 @@
 # preflight-checks.py
 # Check for common issues prior to compiling
 #
-import os,re,sys
 Import("env")
 
+# Detect that 'vscode init' is running
+from SCons.Script import COMMAND_LINE_TARGETS
+if "idedata" in COMMAND_LINE_TARGETS:
+    env.Exit(0)
+
+import os,re,sys
+
 def get_envs_for_board(board):
 	with open(os.path.join("Marlin", "src", "pins", "pins.h"), "r") as file:
 
@@ -73,3 +79,15 @@ for p in [ env['PROJECT_DIR'], os.path.join(env['PROJECT_DIR'], "config") ]:
 		if os.path.isfile(os.path.join(p, f)):
 			err = "ERROR: Config files found in directory %s. Please move them into the Marlin subfolder." % p
 			raise SystemExit(err)
+
+#
+# Check for old files indicating an entangled Marlin (mixing old and new code)
+#
+mixedin = []
+for p in [ os.path.join(env['PROJECT_DIR'], "Marlin/src/lcd/dogm") ]:
+	for f in [ "ultralcd_DOGM.cpp", "ultralcd_DOGM.h" ]:
+		if os.path.isfile(os.path.join(p, f)):
+			mixedin += [ f ]
+if mixedin:
+	err = "ERROR: Old files fell into your Marlin folder. Remove %s and try again" % ", ".join(mixedin)
+	raise SystemExit(err)