Fix Windows linker error by shortening the environment names

2020-09-10 16:56:55 +02:00
parent d969459aa0
commit 777f9fd9a7
4 changed files with 110 additions and 110 deletions
--- a/.github/workflows/build-all.yml
+++ b/.github/workflows/build-all.yml
@@ -30,42 +30,42 @@ jobs:
         platform:
         # Knutwurst Base Environments

-         - i3_MEGA_1stgen
-         - i3_MEGA_1stgen_TMC
-         #- i3_MEGA_1stgen_BLTOUCH_10
-         #- i3_MEGA_1stgen_BLTOUCH_11
-         #- i3_MEGA_1stgen_TMC_BLTOUCH_10
-         #- i3_MEGA_1stgen_TMC_BLTOUCH_11
-         - i3_MEGA
-         - i3_MEGA_TMC
-         - i3_MEGA_BLTOUCH_10
-         - i3_MEGA_BLTOUCH_11
-         - i3_MEGA_TMC_BLTOUCH_10
-         - i3_MEGA_TMC_BLTOUCH_11
-         - i3_MEGA_S
-         - i3_MEGA_S_TMC
-         - i3_MEGA_S_BLTOUCH_10
-         - i3_MEGA_S_BLTOUCH_11
-         - i3_MEGA_S_TMC_BLTOUCH_10
-         - i3_MEGA_S_TMC_BLTOUCH_11
-         - i3_MEGA_S_DGUS
-         - i3_MEGA_S_DGUS_TMC
-         - i3_MEGA_S_DGUS_BLTOUCH_10
-         - i3_MEGA_S_DGUS_BLTOUCH_11
-         - i3_MEGA_S_DGUS_TMC_BLTOUCH_10
-         - i3_MEGA_S_DGUS_TMC_BLTOUCH_11
-         - i3_MEGA_X
-         - i3_MEGA_X_TMC
-         - i3_MEGA_X_BLTOUCH_10
-         - i3_MEGA_X_BLTOUCH_11
-         - i3_MEGA_X_TMC_BLTOUCH_10
-         - i3_MEGA_X_TMC_BLTOUCH_11
-         #- i3_MEGA_P
-         #- i3_MEGA_P_TMC
-         #- i3_MEGA_P_BLTOUCH_10
-         #- i3_MEGA_P_BLTOUCH_11
-         #- i3_MEGA_P_TMC_BLTOUCH_10
-         #- i3_MEGA_P_TMC_BLTOUCH_11
+        - MEGA_1G
+        - MEGA_1G_TMC
+        - MEGA_1G_BLT_10
+        - MEGA_1G_BLT_11
+        - MEGA_1G_TMC_BLT_10
+        - MEGA_1G_TMC_BLT_11
+        - MEGA
+        - MEGA_TMC
+        - MEGA_BLT_10
+        - MEGA_BLT_11
+        - MEGA_TMC_BLT_10
+        - MEGA_TMC_BLT_11
+        - MEGA_S
+        - MEGA_S_TMC
+        - MEGA_S_BLT_10
+        - MEGA_S_BLT_11
+        - MEGA_S_TMC_BLT_10
+        - MEGA_S_TMC_BLT_11
+        - MEGA_S_DGUS
+        - MEGA_S_DGUS_TMC
+        - MEGA_S_DGUS_BLT_10
+        - MEGA_S_DGUS_BLT_11
+        - MEGA_S_DGUS_TMC_BLT_10
+        - MEGA_S_DGUS_TMC_BLT_11
+        - MEGA_X
+        - MEGA_X_TMC
+        - MEGA_X_BLT_10
+        - MEGA_X_BLT_11
+        - MEGA_X_TMC_BLT_10
+        - MEGA_X_TMC_BLT_11
+        - MEGA_P
+        - MEGA_P_TMC
+        - MEGA_P_BLT_10
+        - MEGA_P_BLT_11
+        - MEGA_P_TMC_BLT_10
+        - MEGA_P_TMC_BLT_11

    steps:

--- a/README.md
+++ b/README.md
@@ -84,7 +84,7 @@ Um es übersichtlich zu gestalten, beinhalten die Dateinamen die einzelnen Featu

 `_DGUS` steht für das "neue" blau/gelbe DGUS II Display, welches sonst kein Special-Menü anzeigen kann.

-`_BLTOUCH` steht für die BL-Touch Version mit Autoleveling-Sensor. Das manuelle Mesh-Leveling ist hier deaktiviert.
+`_BLT` steht für die BL-Touch Version mit Autoleveling-Sensor. Das manuelle Mesh-Leveling ist hier deaktiviert.

 `_10` steht für das Trigorilla_14 v1.0 Mainboard, welches normalerweise der Standard sein sollte.

@@ -152,7 +152,7 @@ In order to make it clear, the file names contain the individual features.

 `_DGUS` stands for the "new" blue / yellow DGUS II display, which otherwise cannot show a special menu.

-`_BLTOUCH` stands for the BL-Touch version with auto-leveling sensor. Manual mesh leveling is deactivated here.
+`_BLT` stands for the BL-Touch version with auto-leveling sensor. Manual mesh leveling is deactivated here.

 `_10` stands for the Trigorilla_14 v1.0 mainboard, which should normally be the standard.

--- a/i3_mega_envs.ini
+++ b/i3_mega_envs.ini
@@ -2,7 +2,7 @@
 #  i3 Mega (First generation with only one endstop)
 #

-[env:i3_MEGA_1stgen]
+[env:MEGA_1G]
 platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L
@@ -12,7 +12,7 @@ src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA -DKNUTWURST_ONE_Z_ENDSTOP
 build_unflags     = -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_MEGA_P -DKNUTWURST_DGUS2_TFT -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH

-[env:i3_MEGA_1stgen_TMC]
+[env:MEGA_1G_TMC]
 platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L
@@ -22,7 +22,7 @@ src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA -DKNUTWURST_TMC -DKNUTWURST_ONE_Z_ENDSTOP
 build_unflags     = -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_MEGA_P -DKNUTWURST_DGUS2_TFT -DKNUTWURST_BLTOUCH

-[env:i3_MEGA_1stgen_BLTOUCH_10]
+[env:MEGA_1G_BLT_10]
 platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L
@@ -32,7 +32,7 @@ src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA -DKNUTWURST_BLTOUCH -DKNUTWURST_ONE_Z_ENDSTOP
 build_unflags     = -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_MEGA_P -DKNUTWURST_DGUS2_TFT -DKNUTWURST_TMC

-[env:i3_MEGA_1stgen_BLTOUCH_11]
+[env:MEGA_1G_BLT_11]
 platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L
@@ -42,7 +42,7 @@ src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14_11 -DKNUTWURST_MEGA -DKNUTWURST_BLTOUCH -DKNUTWURST_ONE_Z_ENDSTOP
 build_unflags     = -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_MEGA_P -DKNUTWURST_DGUS2_TFT -DKNUTWURST_TMC

-[env:i3_MEGA_1stgen_TMC_BLTOUCH_10]
+[env:MEGA_1G_TMC_BLT_10]
 platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L
@@ -52,7 +52,7 @@ src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH -DKNUTWURST_ONE_Z_ENDSTOP
 build_unflags     = -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_MEGA_P -DKNUTWURST_DGUS2_TFT

-[env:i3_MEGA_1stgen_TMC_BLTOUCH_11]
+[env:MEGA_1G_TMC_BLT_11]
 platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L
@@ -67,7 +67,7 @@ build_unflags     = -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_MEGA_P -DK
 #  i3 Mega (normal Version)
 #

-[env:i3_MEGA]
+[env:MEGA]
 platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L
@@ -77,7 +77,7 @@ src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA
 build_unflags     = -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_MEGA_P -DKNUTWURST_DGUS2_TFT -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH

-[env:i3_MEGA_TMC]
+[env:MEGA_TMC]
 platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L
@@ -87,7 +87,7 @@ src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA -DKNUTWURST_TMC
 build_unflags     = -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_MEGA_P -DKNUTWURST_DGUS2_TFT -DKNUTWURST_BLTOUCH

-[env:i3_MEGA_BLTOUCH_10]
+[env:MEGA_BLT_10]
 platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L
@@ -97,7 +97,7 @@ src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA -DKNUTWURST_BLTOUCH
 build_unflags     = -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_MEGA_P -DKNUTWURST_DGUS2_TFT -DKNUTWURST_TMC

-[env:i3_MEGA_BLTOUCH_11]
+[env:MEGA_BLT_11]
 platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L
@@ -107,7 +107,7 @@ src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14_11 -DKNUTWURST_MEGA -DKNUTWURST_BLTOUCH
 build_unflags     = -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_MEGA_P -DKNUTWURST_DGUS2_TFT -DKNUTWURST_TMC

-[env:i3_MEGA_TMC_BLTOUCH_10]
+[env:MEGA_TMC_BLT_10]
 platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L
@@ -117,7 +117,7 @@ src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH
 build_unflags     = -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_MEGA_P -DKNUTWURST_DGUS2_TFT

-[env:i3_MEGA_TMC_BLTOUCH_11]
+[env:MEGA_TMC_BLT_11]
 platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L
@@ -132,7 +132,7 @@ build_unflags     = -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_MEGA_P -DK
 #
 #  i3 Mega S
 #
-[env:i3_MEGA_S]
+[env:MEGA_S]
 platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L
@@ -142,7 +142,7 @@ src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_S
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_X -DKNUTWURST_MEGA_P -DKNUTWURST_DGUS2_TFT -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH

-[env:i3_MEGA_S_TMC]
+[env:MEGA_S_TMC]
 platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L
@@ -152,7 +152,7 @@ src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_S -DKNUTWURST_TMC
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_X -DKNUTWURST_MEGA_P -DKNUTWURST_DGUS2_TFT -DKNUTWURST_BLTOUCH

-[env:i3_MEGA_S_BLTOUCH_10]
+[env:MEGA_S_BLT_10]
 platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L
@@ -162,7 +162,7 @@ src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_S -DKNUTWURST_BLTOUCH
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_X -DKNUTWURST_MEGA_P -DKNUTWURST_DGUS2_TFT -DKNUTWURST_TMC

-[env:i3_MEGA_S_BLTOUCH_11]
+[env:MEGA_S_BLT_11]
 platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L
@@ -172,7 +172,7 @@ src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14_11 -DKNUTWURST_MEGA_S -DKNUTWURST_BLTOUCH
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_X -DKNUTWURST_MEGA_P -DKNUTWURST_DGUS2_TFT -DKNUTWURST_TMC

-[env:i3_MEGA_S_TMC_BLTOUCH_10]
+[env:MEGA_S_TMC_BLT_10]
 platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L
@@ -182,7 +182,7 @@ src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_S -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_X -DKNUTWURST_MEGA_P -DKNUTWURST_DGUS2_TFT

-[env:i3_MEGA_S_TMC_BLTOUCH_11]
+[env:MEGA_S_TMC_BLT_11]
 platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L
@@ -197,7 +197,7 @@ build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_X -DKNUTWURST_MEGA_P -DKNU
 #
 #  i3 Mega S (new TFT)
 #
-[env:i3_MEGA_S_DGUS]
+[env:MEGA_S_DGUS]
 platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L
@@ -207,7 +207,7 @@ src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_S -DKNUTWURST_DGUS2_TFT
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_X -DKNUTWURST_MEGA_P -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH

-[env:i3_MEGA_S_DGUS_TMC]
+[env:MEGA_S_DGUS_TMC]
 platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L
@@ -217,7 +217,7 @@ src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_S -DKNUTWURST_DGUS2_TFT -DKNUTWURST_TMC
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_X -DKNUTWURST_MEGA_P -DKNUTWURST_BLTOUCH

-[env:i3_MEGA_S_DGUS_BLTOUCH_10]
+[env:MEGA_S_DGUS_BLT_10]
 platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L
@@ -227,7 +227,7 @@ src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_S -DKNUTWURST_DGUS2_TFT -DKNUTWURST_BLTOUCH
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_X -DKNUTWURST_MEGA_P -DKNUTWURST_TMC

-[env:i3_MEGA_S_DGUS_BLTOUCH_11]
+[env:MEGA_S_DGUS_BLT_11]
 platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L
@@ -237,7 +237,7 @@ src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14_11 -DKNUTWURST_MEGA_S -DKNUTWURST_DGUS2_TFT -DKNUTWURST_BLTOUCH
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_X -DKNUTWURST_MEGA_P -DKNUTWURST_TMC

-[env:i3_MEGA_S_DGUS_TMC_BLTOUCH_10]
+[env:MEGA_S_DGUS_TMC_BLT_10]
 platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L
@@ -247,7 +247,7 @@ src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_S -DKNUTWURST_DGUS2_TFT -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_X -DKNUTWURST_MEGA_P

-[env:i3_MEGA_S_DGUS_TMC_BLTOUCH_11]
+[env:MEGA_S_DGUS_TMC_BLT_11]
 platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L
@@ -262,7 +262,7 @@ build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_X -DKNUTWURST_MEGA_P
 #
 #  i3 Mega X
 #
-[env:i3_MEGA_X]
+[env:MEGA_X]
 platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L
@@ -272,7 +272,7 @@ src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_X
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_P -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH -DKNUTWURST_DGUS2_TFT

-[env:i3_MEGA_X_TMC]
+[env:MEGA_X_TMC]
 platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L
@@ -282,7 +282,7 @@ src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_X -DKNUTWURST_TMC
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_P -DKNUTWURST_BLTOUCH -DKNUTWURST_DGUS2_TFT

-[env:i3_MEGA_X_BLTOUCH_10]
+[env:MEGA_X_BLT_10]
 platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L
@@ -292,7 +292,7 @@ src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_X -DKNUTWURST_BLTOUCH
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_P -DKNUTWURST_TMC -DKNUTWURST_DGUS2_TFT

-[env:i3_MEGA_X_BLTOUCH_11]
+[env:MEGA_X_BLT_11]
 platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L
@@ -302,7 +302,7 @@ src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14_11 -DKNUTWURST_MEGA_X -DKNUTWURST_BLTOUCH
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_P -DKNUTWURST_TMC -DKNUTWURST_DGUS2_TFT

-[env:i3_MEGA_X_TMC_BLTOUCH_10]
+[env:MEGA_X_TMC_BLT_10]
 platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L
@@ -312,7 +312,7 @@ src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_X -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_P -DKNUTWURST_DGUS2_TFT

-[env:i3_MEGA_X_TMC_BLTOUCH_11]
+[env:MEGA_X_TMC_BLT_11]
 platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L
@@ -327,7 +327,7 @@ build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_P -DKNU
 #
 #  i3 Mega P
 #
-[env:i3_MEGA_P]
+[env:MEGA_P]
 platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L
@@ -337,7 +337,7 @@ src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_P -DKNUTWURST_BMG -DKNUTWURST_DGUS2_TFT
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH

-[env:i3_MEGA_P_TMC]
+[env:MEGA_P_TMC]
 platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L
@@ -347,7 +347,7 @@ src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_P -DKNUTWURST_TMC -DKNUTWURST_BMG -DKNUTWURST_DGUS2_TFT
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_BLTOUCH

-[env:i3_MEGA_P_BLTOUCH_10]
+[env:MEGA_P_BLT_10]
 platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L
@@ -357,7 +357,7 @@ src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_P -DKNUTWURST_BMG -DKNUTWURST_BLTOUCH -DKNUTWURST_DGUS2_TFT
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_TMC 

-[env:i3_MEGA_P_BLTOUCH_11]
+[env:MEGA_P_BLT_11]
 platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L
@@ -367,7 +367,7 @@ src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14_11 -DKNUTWURST_MEGA_P -DKNUTWURST_BMG -DKNUTWURST_BLTOUCH -DKNUTWURST_DGUS2_TFT
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_TMC 

-[env:i3_MEGA_P_TMC_BLTOUCH_10]
+[env:MEGA_P_TMC_BLT_10]
 platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L
@@ -377,7 +377,7 @@ src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_P -DKNUTWURST_BMG -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH -DKNUTWURST_DGUS2_TFT
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X

-[env:i3_MEGA_P_TMC_BLTOUCH_11]
+[env:MEGA_P_TMC_BLT_11]
 platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L
--- a/platformio.ini
+++ b/platformio.ini
@@ -32,42 +32,42 @@ boards_dir   = buildroot/share/PlatformIO/boards
 #default_envs = mega2560
 extra_configs = i3_mega_envs.ini
 default_envs =
-  i3_MEGA_1stgen
-  i3_MEGA_1stgen_TMC
-#  i3_MEGA_1stgen_BLTOUCH_10
-#  i3_MEGA_1stgen_BLTOUCH_11
-#  i3_MEGA_1stgen_TMC_BLTOUCH_10
-#  i3_MEGA_1stgen_TMC_BLTOUCH_11
-  i3_MEGA
-  i3_MEGA_TMC
-  i3_MEGA_BLTOUCH_10
-  i3_MEGA_BLTOUCH_11
-  i3_MEGA_TMC_BLTOUCH_10
-  i3_MEGA_TMC_BLTOUCH_11
-  i3_MEGA_S
-  i3_MEGA_S_TMC
-  i3_MEGA_S_BLTOUCH_10
-  i3_MEGA_S_BLTOUCH_11
-  i3_MEGA_S_TMC_BLTOUCH_10
-  i3_MEGA_S_TMC_BLTOUCH_11
-  i3_MEGA_S_DGUS
-  i3_MEGA_S_DGUS_TMC
-  i3_MEGA_S_DGUS_BLTOUCH_10
-  i3_MEGA_S_DGUS_BLTOUCH_11
-  i3_MEGA_S_DGUS_TMC_BLTOUCH_10
-  i3_MEGA_S_DGUS_TMC_BLTOUCH_11
-  i3_MEGA_X
-  i3_MEGA_X_TMC
-  i3_MEGA_X_BLTOUCH_10
-  i3_MEGA_X_BLTOUCH_11
-  i3_MEGA_X_TMC_BLTOUCH_10
-  i3_MEGA_X_TMC_BLTOUCH_11
-#  i3_MEGA_P
-#  i3_MEGA_P_TMC
-#  i3_MEGA_P_BLTOUCH_10
-#  i3_MEGA_P_BLTOUCH_11
-#  i3_MEGA_P_TMC_BLTOUCH_10
-#  i3_MEGA_P_TMC_BLTOUCH_11
+  MEGA_1G
+  MEGA_1G_TMC
+#  MEGA_1G_BLT_10
+#  MEGA_1G_BLT_11
+#  MEGA_1G_TMC_BLT_10
+#  MEGA_1G_TMC_BLT_11
+  MEGA
+  MEGA_TMC
+  MEGA_BLT_10
+  MEGA_BLT_11
+  MEGA_TMC_BLT_10
+  MEGA_TMC_BLT_11
+  MEGA_S
+  MEGA_S_TMC
+  MEGA_S_BLT_10
+  MEGA_S_BLT_11
+  MEGA_S_TMC_BLT_10
+  MEGA_S_TMC_BLT_11
+  MEGA_S_DGUS
+  MEGA_S_DGUS_TMC
+  MEGA_S_DGUS_BLT_10
+  MEGA_S_DGUS_BLT_11
+  MEGA_S_DGUS_TMC_BLT_10
+  MEGA_S_DGUS_TMC_BLT_11
+  MEGA_X
+  MEGA_X_TMC
+  MEGA_X_BLT_10
+  MEGA_X_BLT_11
+  MEGA_X_TMC_BLT_10
+  MEGA_X_TMC_BLT_11
+#  MEGA_P
+#  MEGA_P_TMC
+#  MEGA_P_BLT_10
+#  MEGA_P_BLT_11
+#  MEGA_P_TMC_BLT_10
+#  MEGA_P_TMC_BLT_11

 # *******************************************************************************************
 # **                                                                                       **