From c508c2213ee5b0ed130238c058b7cc91beaea654 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 18 Apr 2021 14:07:30 -0500
Subject: [PATCH] Misc. pio cleanup

---
 ini/stm32f0.ini | 16 +++++++++++++---
 ini/stm32f1.ini | 16 +++++++++++++---
 ini/stm32f4.ini | 16 +++++++++++++---
 ini/stm32f7.ini | 16 +++++++++++++---
 platformio.ini  | 13 ++++++-------
 5 files changed, 58 insertions(+), 19 deletions(-)

diff --git a/ini/stm32f0.ini b/ini/stm32f0.ini
index fb6ce00dd0..10ac21fc89 100644
--- a/ini/stm32f0.ini
+++ b/ini/stm32f0.ini
@@ -4,9 +4,19 @@
 #
 
 #################################
-#                               #
-#     STM32F0 Architecture      #
-#                               #
+#
+# STM32F0 Architecture
+#
+# Naming Example: STM32F070CBT6
+#
+#   F : Foundation
+#   0 : Cortex M0 core
+#  70 : Line/Features
+#   C : 48 pins  (R:64 or 66, F:20)
+#   B : 128KB Flash-memory  (C:256KB, D:384KB, E:512KB, G:1024KB)
+#   T : LQFP package
+#   6 : -40...85°C   (7: ...105°C)
+#
 #################################
 
 #
diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index 2ba3d84862..81e9f1dcb8 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -4,9 +4,19 @@
 #
 
 #################################
-#                               #
-#     STM32F1 Architecture      #
-#                               #
+#
+# STM32F1 Architecture
+#
+# Naming Example: STM32F103RCT6
+#
+#   F : Foundation (sometimes High Performance F2/F4)
+#   1 : Cortex M1 core
+#  03 : Line/Features
+#   R : 64 or 66 pins  (V:100, Z:144, I:176)
+#   C : 256KB Flash-memory  (D:384KB, E:512KB, G:1024KB)
+#   T : LQFP package
+#   6 : -40...85°C   (7: ...105°C)
+#
 #################################
 
 #
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index 5e700f0e9f..0e8a8c6b05 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -4,9 +4,19 @@
 #
 
 #################################
-#                               #
-#     STM32F4 Architecture      #
-#                               #
+#
+# STM32F4 Architecture
+#
+# Naming Example: STM32F401RGT6
+#
+#   F : Foundation (sometimes High Performance F2/F4)
+#   4 : Cortex M4 core
+#  01 : Line/Features
+#   R : 64 or 66 pins  (V:100, Z:144, I:176)
+#   G : 1024KB Flash-memory  (C:256KB, D:384KB, E:512KB)
+#   T : LQFP package
+#   6 : -40...85°C   (7: ...105°C)
+#
 #################################
 
 #
diff --git a/ini/stm32f7.ini b/ini/stm32f7.ini
index d3fec7aebc..afcfc102d5 100644
--- a/ini/stm32f7.ini
+++ b/ini/stm32f7.ini
@@ -4,9 +4,19 @@
 #
 
 #################################
-#                               #
-#     STM32F7 Architecture      #
-#                               #
+#
+# STM32F7 Architecture
+#
+# Naming Example: STM32F767ZIT6
+#
+#   F : Foundation (sometimes High Performance F2/F4)
+#   7 : Cortex M7 core
+#  67 : Line/Features
+#   Z : 144 pins
+#   I : 4096KB Flash-memory
+#   T : LQFP package
+#   6 : -40...85°C   (7: ...105°C)
+#
 #################################
 
 #
diff --git a/platformio.ini b/platformio.ini
index 87b6e8a90b..77abb364e7 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -10,11 +10,6 @@
 # Automatic targets - enable auto-uploading
 #targets = upload
 
-#
-# By default platformio build will abort after 5 errors.
-# Remove '-fmax-errors=5' from build_flags below to see all.
-#
-
 [platformio]
 src_dir      = Marlin
 boards_dir   = buildroot/share/PlatformIO/boards
@@ -35,10 +30,14 @@ extra_configs =
     ini/teensy.ini
 
 #
-# The 'common' values are used for most Marlin builds
+# The 'common' section applies to most Marlin builds.
+#
+# By default platformio build will abort after 5 errors.
+# Remove '-fmax-errors=5' from build_flags below to see all.
 #
 [common]
-build_flags        = -fmax-errors=5 -g3 -D__MARLIN_FIRMWARE__ -fmerge-constants
+build_flags        = -g3 -D__MARLIN_FIRMWARE__ -fmerge-constants
+                     -fmax-errors=5
 extra_scripts      =
   pre:buildroot/share/PlatformIO/scripts/common-dependencies.py
   pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py