Better checking of program size before uploading // Issue #689

platformio/builder/scripts/atmelavr.py

@@ -142,7 +142,7 @@ AlwaysBuild(target_size)
 #
 
 upload = env.Alias(["upload", "uploadlazy"], target_firm,
-                   [BeforeUpload, "$UPLOADHEXCMD"])
+                   [env.CheckUploadSize, BeforeUpload, "$UPLOADHEXCMD"])
 AlwaysBuild(upload)
 
 #
@@ -159,7 +159,8 @@ AlwaysBuild(uploadeep)
 # Target: Upload firmware using external programmer
 #
 
-program = env.Alias("program", target_firm, [BeforeUpload, "$PROGRAMHEXCMD"])
+program = env.Alias("program", target_firm,
+                    [env.CheckUploadSize, BeforeUpload, "$PROGRAMHEXCMD"])
 AlwaysBuild(program)
 
 #

platformio/builder/scripts/atmelsam.py

@@ -174,10 +174,11 @@ AlwaysBuild(target_size)
 #
 
 if env.subst("$BOARD") == "zero":
-    upload = env.Alias(["upload", "uploadlazy"], target_firm, "$UPLOADCMD")
+    upload = env.Alias(["upload", "uploadlazy"], target_firm,
+                       [env.CheckUploadSize, "$UPLOADCMD"])
 else:
     upload = env.Alias(["upload", "uploadlazy"], target_firm,
-                       [BeforeUpload, "$UPLOADCMD"])
+                       [env.CheckUploadSize, BeforeUpload, "$UPLOADCMD"])
 
 AlwaysBuild(upload)