Skip to content

Commit

Permalink
Check for old Marlin files mixed in (MarlinFirmware#21574)
Browse files Browse the repository at this point in the history
  • Loading branch information
ellensp authored Apr 9, 2021
1 parent 7124326 commit 19320a1
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions buildroot/share/PlatformIO/scripts/preflight-checks.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,3 +73,15 @@ def check_envs(build_env, board_envs, 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)

0 comments on commit 19320a1

Please sign in to comment.