|
@@ -73,3 +73,15 @@ for p in [ env['PROJECT_DIR'], os.path.join(env['PROJECT_DIR'], "config") ]:
|
73
|
73
|
if os.path.isfile(os.path.join(p, f)):
|
74
|
74
|
err = "ERROR: Config files found in directory %s. Please move them into the Marlin subfolder." % p
|
75
|
75
|
raise SystemExit(err)
|
|
76
|
+
|
|
77
|
+#
|
|
78
|
+# Check for old files indicating an entangled Marlin (mixing old and new code)
|
|
79
|
+#
|
|
80
|
+mixedin = []
|
|
81
|
+for p in [ os.path.join(env['PROJECT_DIR'], "Marlin/src/lcd/dogm") ]:
|
|
82
|
+ for f in [ "ultralcd_DOGM.cpp", "ultralcd_DOGM.h" ]:
|
|
83
|
+ if os.path.isfile(os.path.join(p, f)):
|
|
84
|
+ mixedin += [ f ]
|
|
85
|
+if mixedin:
|
|
86
|
+ err = "ERROR: Old files fell into your Marlin folder. Remove %s and try again" % ", ".join(mixedin)
|
|
87
|
+ raise SystemExit(err)
|