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

buildroot/share/PlatformIO/scripts/pioutil.py

@@ -4,5 +4,10 @@
 
 # Make sure 'vscode init' is not the current command
 def is_pio_build():
-	from SCons.Script import COMMAND_LINE_TARGETS
-	return "idedata" not in COMMAND_LINE_TARGETS and "_idedata" not in COMMAND_LINE_TARGETS
+	from SCons.Script import DefaultEnvironment
+	env = DefaultEnvironment()
+	return not env.IsIntegrationDump()
+
+def get_pio_version():
+	from platformio import util
+	return util.pioversion_to_intstr()

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

@@ -52,6 +52,11 @@ if pioutil.is_pio_build():
 		if 'PIOENV' not in env:
 			raise SystemExit("Error: PIOENV is not defined. This script is intended to be used with PlatformIO")
 
+		# Require PlatformIO 6.1.1 or later
+		vers = pioutil.get_pio_version()
+		if vers < [6, 1, 1]:
+			raise SystemExit("Error: Marlin requires PlatformIO >= 6.1.1. Use 'pio upgrade' to get a newer version.")
+
 		if 'MARLIN_FEATURES' not in env:
 			raise SystemExit("Error: this script should be used after common Marlin scripts")
 
@@ -78,21 +83,27 @@ if pioutil.is_pio_build():
 					err = "ERROR: Config files found in directory %s. Please move them into the Marlin subfolder." % p
 					raise SystemExit(err)
 
+		#
+		# Find the name.cpp.o or name.o and remove it
+		#
+		def rm_ofile(subdir, name):
+			build_dir = os.path.join(env['PROJECT_BUILD_DIR'], build_env);
+			for outdir in [ build_dir, os.path.join(build_dir, "debug") ]:
+				for ext in [ ".cpp.o", ".o" ]:
+					fpath = os.path.join(outdir, "src", "src", subdir, name + ext)
+					if os.path.exists(fpath):
+						os.remove(fpath)
+
 		#
 		# Give warnings on every build
 		#
-		srcpath = os.path.join(env['PROJECT_BUILD_DIR'], build_env, "src", "src")
-		warnfile = os.path.join(srcpath, "inc", "Warnings.cpp.o")
-		if os.path.exists(warnfile):
-			os.remove(warnfile)
+		rm_ofile("inc", "Warnings")
 
 		#
 		# Rebuild 'settings.cpp' for EEPROM_INIT_NOW
 		#
 		if 'EEPROM_INIT_NOW' in env['MARLIN_FEATURES']:
-			setfile = os.path.join(srcpath, "module", "settings.cpp.o")
-			if os.path.exists(setfile):
-				os.remove(setfile)
+			rm_ofile("module", "settings")
 
 		#
 		# Check for old files indicating an entangled Marlin (mixing old and new code)

buildroot/share/PlatformIO/scripts/simulator.py

@@ -50,5 +50,3 @@ if pioutil.is_pio_build():
 
 			# Break out of the PIO build immediately
 			sys.exit(1)
-
-	env.AddCustomTarget("upload", "$BUILD_DIR/${PROGNAME}", "$BUILD_DIR/${PROGNAME}")