From 736521a3f1124a84a023e5ba1f030e09a95f16dc Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 1 Mar 2020 17:39:46 -0600
Subject: [PATCH] Balance mega tests, shorten some env names
---
.github/workflows/test-builds.yml | 16 +-
Marlin/src/pins/pins.h | 226 +++++++++---------
Marlin/src/pins/rambo/pins_MINIRAMBO.h | 2 +-
buildroot/share/git/mftest | 6 +-
...RC_bigtree-tests => STM32F103RC_btt-tests} | 0
...ee_USB-tests => STM32F103RC_btt_USB-tests} | 0
...RE_bigtree-tests => STM32F103RE_btt-tests} | 0
...ee_USB-tests => STM32F103RE_btt_USB-tests} | 0
buildroot/share/tests/mega1280-tests | 60 +++++
.../{megaatmega2560-tests => mega2560-tests} | 35 ---
buildroot/share/tests/megaatmega1280-tests | 27 ---
..._atmega1284p-tests => sanguino1284p-tests} | 0
...no_atmega644p-tests => sanguino644p-tests} | 0
buildroot/share/vscode/auto_build.py | 8 +-
platformio.ini | 34 +--
15 files changed, 206 insertions(+), 208 deletions(-)
rename buildroot/share/tests/{STM32F103RC_bigtree-tests => STM32F103RC_btt-tests} (100%)
rename buildroot/share/tests/{STM32F103RC_bigtree_USB-tests => STM32F103RC_btt_USB-tests} (100%)
rename buildroot/share/tests/{STM32F103RE_bigtree-tests => STM32F103RE_btt-tests} (100%)
rename buildroot/share/tests/{STM32F103RE_bigtree_USB-tests => STM32F103RE_btt_USB-tests} (100%)
create mode 100644 buildroot/share/tests/mega1280-tests
rename buildroot/share/tests/{megaatmega2560-tests => mega2560-tests} (92%)
delete mode 100644 buildroot/share/tests/megaatmega1280-tests
rename buildroot/share/tests/{sanguino_atmega1284p-tests => sanguino1284p-tests} (100%)
rename buildroot/share/tests/{sanguino_atmega644p-tests => sanguino644p-tests} (100%)
diff --git a/.github/workflows/test-builds.yml b/.github/workflows/test-builds.yml
index be38685736..b92b015287 100644
--- a/.github/workflows/test-builds.yml
+++ b/.github/workflows/test-builds.yml
@@ -29,7 +29,7 @@ jobs:
- DUE
- esp32
- linux_native
- - megaatmega2560
+ - mega2560
- teensy31
- teensy35
- SAMD51_grandcentral_m4
@@ -37,17 +37,17 @@ jobs:
# Extended AVR Environments
- FYSETC_F6_13
- - megaatmega1280
+ - mega1280
- rambo
- - sanguino_atmega1284p
- - sanguino_atmega644p
+ - sanguino1284p
+ - sanguino644p
# Extended STM32 Environments
- - STM32F103RC_bigtree
- - STM32F103RC_bigtree_USB
- - STM32F103RE_bigtree
- - STM32F103RE_bigtree_USB
+ - STM32F103RC_btt
+ - STM32F103RC_btt_USB
+ - STM32F103RE_btt
+ - STM32F103RE_btt_USB
- STM32F103RC_fysetc
- jgaurora_a5s_a1
- STM32F103VE_longer
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 920c124a5c..4f1483d55f 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -56,138 +56,138 @@
//
#if MB(RAMPS_OLD)
- #include "ramps/pins_RAMPS_OLD.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_RAMPS_OLD.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(RAMPS_13_EFB)
- #include "ramps/pins_RAMPS_13.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_RAMPS_13.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(RAMPS_13_EEB)
- #include "ramps/pins_RAMPS_13.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_RAMPS_13.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(RAMPS_13_EFF)
- #include "ramps/pins_RAMPS_13.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_RAMPS_13.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(RAMPS_13_EEF)
- #include "ramps/pins_RAMPS_13.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_RAMPS_13.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(RAMPS_13_SF)
- #include "ramps/pins_RAMPS_13.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_RAMPS_13.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(RAMPS_14_EFB)
- #include "ramps/pins_RAMPS.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_RAMPS.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(RAMPS_14_EEB)
- #include "ramps/pins_RAMPS.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_RAMPS.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(RAMPS_14_EFF)
- #include "ramps/pins_RAMPS.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_RAMPS.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(RAMPS_14_EEF)
- #include "ramps/pins_RAMPS.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_RAMPS.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(RAMPS_14_SF)
- #include "ramps/pins_RAMPS.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_RAMPS.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(RAMPS_PLUS_EFB)
- #include "ramps/pins_RAMPS_PLUS.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_RAMPS_PLUS.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(RAMPS_PLUS_EEB)
- #include "ramps/pins_RAMPS_PLUS.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_RAMPS_PLUS.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(RAMPS_PLUS_EFF)
- #include "ramps/pins_RAMPS_PLUS.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_RAMPS_PLUS.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(RAMPS_PLUS_EEF)
- #include "ramps/pins_RAMPS_PLUS.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_RAMPS_PLUS.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(RAMPS_PLUS_SF)
- #include "ramps/pins_RAMPS_PLUS.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_RAMPS_PLUS.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
//
// RAMPS Derivatives - ATmega1280, ATmega2560
//
#elif MB(3DRAG)
- #include "ramps/pins_3DRAG.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_3DRAG.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(K8200)
- #include "ramps/pins_K8200.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560 (3DRAG)
+ #include "ramps/pins_K8200.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560 (3DRAG)
#elif MB(K8400)
- #include "ramps/pins_K8400.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560 (3DRAG)
+ #include "ramps/pins_K8400.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560 (3DRAG)
#elif MB(K8800)
- #include "ramps/pins_K8800.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560 (3DRAG)
+ #include "ramps/pins_K8800.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560 (3DRAG)
#elif MB(BAM_DICE)
- #include "ramps/pins_RAMPS.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_RAMPS.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(BAM_DICE_DUE)
- #include "ramps/pins_BAM_DICE_DUE.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_BAM_DICE_DUE.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(MKS_BASE)
- #include "ramps/pins_MKS_BASE_10.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_MKS_BASE_10.h" // ATmega2560 env:mega2560
#elif MB(MKS_BASE_14)
- #include "ramps/pins_MKS_BASE_14.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_MKS_BASE_14.h" // ATmega2560 env:mega2560
#elif MB(MKS_BASE_15)
- #include "ramps/pins_MKS_BASE_15.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_MKS_BASE_15.h" // ATmega2560 env:mega2560
#elif MB(MKS_BASE_16)
- #include "ramps/pins_MKS_BASE_16.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_MKS_BASE_16.h" // ATmega2560 env:mega2560
#elif MB(MKS_BASE_HEROIC)
- #include "ramps/pins_MKS_BASE_HEROIC.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_MKS_BASE_HEROIC.h" // ATmega2560 env:mega2560
#elif MB(MKS_GEN_13)
- #include "ramps/pins_MKS_GEN_13.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_MKS_GEN_13.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(MKS_GEN_L)
- #include "ramps/pins_MKS_GEN_L.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_MKS_GEN_L.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(KFB_2)
- #include "ramps/pins_BIQU_KFB_2.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_BIQU_KFB_2.h" // ATmega2560 env:mega2560
#elif MB(ZRIB_V20)
- #include "ramps/pins_ZRIB_V20.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560 (MKS_GEN_13)
+ #include "ramps/pins_ZRIB_V20.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560 (MKS_GEN_13)
#elif MB(FELIX2)
- #include "ramps/pins_FELIX2.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_FELIX2.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(RIGIDBOARD)
- #include "ramps/pins_RIGIDBOARD.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_RIGIDBOARD.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(RIGIDBOARD_V2)
- #include "ramps/pins_RIGIDBOARD_V2.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_RIGIDBOARD_V2.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(SAINSMART_2IN1)
- #include "ramps/pins_SAINSMART_2IN1.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_SAINSMART_2IN1.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(ULTIMAKER)
- #include "ramps/pins_ULTIMAKER.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_ULTIMAKER.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(ULTIMAKER_OLD)
- #include "ramps/pins_ULTIMAKER_OLD.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_ULTIMAKER_OLD.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(AZTEEG_X3)
- #include "ramps/pins_AZTEEG_X3.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_AZTEEG_X3.h" // ATmega2560 env:mega2560
#elif MB(AZTEEG_X3_PRO)
- #include "ramps/pins_AZTEEG_X3_PRO.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_AZTEEG_X3_PRO.h" // ATmega2560 env:mega2560
#elif MB(ULTIMAIN_2)
- #include "ramps/pins_ULTIMAIN_2.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_ULTIMAIN_2.h" // ATmega2560 env:mega2560
#elif MB(FORMBOT_RAPTOR)
- #include "ramps/pins_FORMBOT_RAPTOR.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_FORMBOT_RAPTOR.h" // ATmega2560 env:mega2560
#elif MB(FORMBOT_RAPTOR2)
- #include "ramps/pins_FORMBOT_RAPTOR2.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_FORMBOT_RAPTOR2.h" // ATmega2560 env:mega2560
#elif MB(FORMBOT_TREX2PLUS)
- #include "ramps/pins_FORMBOT_TREX2PLUS.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_FORMBOT_TREX2PLUS.h" // ATmega2560 env:mega2560
#elif MB(FORMBOT_TREX3)
- #include "ramps/pins_FORMBOT_TREX3.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_FORMBOT_TREX3.h" // ATmega2560 env:mega2560
#elif MB(RUMBA)
- #include "ramps/pins_RUMBA.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_RUMBA.h" // ATmega2560 env:mega2560
#elif MB(RUMBA_RAISE3D)
- #include "ramps/pins_RUMBA_RAISE3D.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_RUMBA_RAISE3D.h" // ATmega2560 env:mega2560
#elif MB(RL200)
- #include "ramps/pins_RL200.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_RL200.h" // ATmega2560 env:mega2560
#elif MB(BQ_ZUM_MEGA_3D)
- #include "ramps/pins_BQ_ZUM_MEGA_3D.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_BQ_ZUM_MEGA_3D.h" // ATmega2560 env:mega2560
#elif MB(MAKEBOARD_MINI)
- #include "ramps/pins_MAKEBOARD_MINI.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_MAKEBOARD_MINI.h" // ATmega2560 env:mega2560
#elif MB(TRIGORILLA_13)
- #include "ramps/pins_TRIGORILLA_13.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_TRIGORILLA_13.h" // ATmega2560 env:mega2560
#elif MB(TRIGORILLA_14)
- #include "ramps/pins_TRIGORILLA_14.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_TRIGORILLA_14.h" // ATmega2560 env:mega2560
#elif MB(TRIGORILLA_14_11)
- #include "ramps/pins_TRIGORILLA_14.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_TRIGORILLA_14.h" // ATmega2560 env:mega2560
#elif MB(RAMPS_ENDER_4)
- #include "ramps/pins_RAMPS_ENDER_4.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_RAMPS_ENDER_4.h" // ATmega2560 env:mega2560
#elif MB(RAMPS_CREALITY)
- #include "ramps/pins_RAMPS_CREALITY.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_RAMPS_CREALITY.h" // ATmega2560 env:mega2560
#elif MB(RAMPS_DAGOMA)
- #include "ramps/pins_RAMPS_DAGOMA.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_RAMPS_DAGOMA.h" // ATmega2560 env:mega2560
#elif MB(FYSETC_F6_13)
#include "ramps/pins_FYSETC_F6_13.h" // ATmega2560 env:FYSETC_F6_13
#elif MB(FYSETC_F6_14)
#include "ramps/pins_FYSETC_F6_14.h" // ATmega2560 env:FYSETC_F6_14
#elif MB(DUPLICATOR_I3_PLUS)
- #include "ramps/pins_DUPLICATOR_I3_PLUS.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_DUPLICATOR_I3_PLUS.h" // ATmega2560 env:mega2560
#elif MB(VORON)
- #include "ramps/pins_VORON.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_VORON.h" // ATmega2560 env:mega2560
#elif MB(TRONXY_V3_1_0)
- #include "ramps/pins_TRONXY_V3_1_0.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_TRONXY_V3_1_0.h" // ATmega2560 env:mega2560
#elif MB(Z_BOLT_X_SERIES)
- #include "ramps/pins_Z_BOLT_X_SERIES.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_Z_BOLT_X_SERIES.h" // ATmega2560 env:mega2560
#elif MB(TT_OSCAR)
- #include "ramps/pins_TT_OSCAR.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_TT_OSCAR.h" // ATmega2560 env:mega2560
#elif MB(TANGO)
- #include "ramps/pins_TANGO.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_TANGO.h" // ATmega2560 env:mega2560
#elif MB(MKS_GEN_L_V2)
- #include "ramps/pins_MKS_GEN_L_V2.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_MKS_GEN_L_V2.h" // ATmega2560 env:mega2560
//
// RAMBo and derivatives
@@ -209,114 +209,114 @@
//
#elif MB(CNCONTROLS_11)
- #include "mega/pins_CNCONTROLS_11.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "mega/pins_CNCONTROLS_11.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(CNCONTROLS_12)
- #include "mega/pins_CNCONTROLS_12.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "mega/pins_CNCONTROLS_12.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(CNCONTROLS_15)
- #include "mega/pins_CNCONTROLS_15.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "mega/pins_CNCONTROLS_15.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(MIGHTYBOARD_REVE)
- #include "mega/pins_MIGHTYBOARD_REVE.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "mega/pins_MIGHTYBOARD_REVE.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(CHEAPTRONIC)
- #include "mega/pins_CHEAPTRONIC.h" // ATmega2560 env:megaatmega2560
+ #include "mega/pins_CHEAPTRONIC.h" // ATmega2560 env:mega2560
#elif MB(CHEAPTRONIC_V2)
- #include "mega/pins_CHEAPTRONICv2.h" // ATmega2560 env:megaatmega2560
+ #include "mega/pins_CHEAPTRONICv2.h" // ATmega2560 env:mega2560
#elif MB(MEGATRONICS)
- #include "mega/pins_MEGATRONICS.h" // ATmega2560 env:megaatmega2560
+ #include "mega/pins_MEGATRONICS.h" // ATmega2560 env:mega2560
#elif MB(MEGATRONICS_2)
- #include "mega/pins_MEGATRONICS_2.h" // ATmega2560 env:megaatmega2560
+ #include "mega/pins_MEGATRONICS_2.h" // ATmega2560 env:mega2560
#elif MB(MEGATRONICS_3, MEGATRONICS_31, MEGATRONICS_32)
- #include "mega/pins_MEGATRONICS_3.h" // ATmega2560 env:megaatmega2560
+ #include "mega/pins_MEGATRONICS_3.h" // ATmega2560 env:mega2560
#elif MB(ELEFU_3)
- #include "mega/pins_ELEFU_3.h" // ATmega2560 env:megaatmega2560
+ #include "mega/pins_ELEFU_3.h" // ATmega2560 env:mega2560
#elif MB(LEAPFROG)
- #include "mega/pins_LEAPFROG.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "mega/pins_LEAPFROG.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(MEGACONTROLLER)
- #include "mega/pins_MEGACONTROLLER.h" // ATmega2560 env:megaatmega2560
+ #include "mega/pins_MEGACONTROLLER.h" // ATmega2560 env:mega2560
#elif MB(GT2560_REV_A)
- #include "mega/pins_GT2560_REV_A.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "mega/pins_GT2560_REV_A.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(GT2560_REV_A_PLUS)
- #include "mega/pins_GT2560_REV_A_PLUS.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "mega/pins_GT2560_REV_A_PLUS.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(GT2560_V3)
- #include "mega/pins_GT2560_V3.h" // ATmega2560 env:megaatmega2560
+ #include "mega/pins_GT2560_V3.h" // ATmega2560 env:mega2560
#elif MB(GT2560_V3_MC2)
- #include "mega/pins_GT2560_V3_MC2.h" // ATmega2560 env:megaatmega2560
+ #include "mega/pins_GT2560_V3_MC2.h" // ATmega2560 env:mega2560
#elif MB(GT2560_V3_A20)
- #include "mega/pins_GT2560_V3_A20.h" // ATmega2560 env:megaatmega2560
+ #include "mega/pins_GT2560_V3_A20.h" // ATmega2560 env:mega2560
#elif MB(EINSTART_S)
- #include "mega/pins_EINSTART-S.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "mega/pins_EINSTART-S.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(WANHAO_ONEPLUS)
- #include "mega/pins_WANHAO_ONEPLUS.h" // ATmega2560 env:megaatmega2560
+ #include "mega/pins_WANHAO_ONEPLUS.h" // ATmega2560 env:mega2560
#elif MB(OVERLORD)
- #include "mega/pins_OVERLORD.h" // ATmega2560 env:megaatmega2560
+ #include "mega/pins_OVERLORD.h" // ATmega2560 env:mega2560
#elif MB(HJC2560C_REV2)
- #include "mega/pins_HJC2560C_REV2.h" // ATmega2560 env:megaatmega2560
+ #include "mega/pins_HJC2560C_REV2.h" // ATmega2560 env:mega2560
#elif MB(LEAPFROG_XEED2015)
- #include "mega/pins_LEAPFROG_XEED2015.h" // ATmega2560 env:megaatmega2560
+ #include "mega/pins_LEAPFROG_XEED2015.h" // ATmega2560 env:mega2560
#elif MB(PICA)
- #include "mega/pins_PICA.h" // ATmega2560 env:megaatmega2560
+ #include "mega/pins_PICA.h" // ATmega2560 env:mega2560
#elif MB(PICA_REVB)
- #include "mega/pins_PICAOLD.h" // ATmega2560 env:megaatmega2560
+ #include "mega/pins_PICAOLD.h" // ATmega2560 env:mega2560
//
// ATmega1281, ATmega2561
//
#elif MB(MINITRONICS)
- #include "mega/pins_MINITRONICS.h" // ATmega1281 env:megaatmega1280
+ #include "mega/pins_MINITRONICS.h" // ATmega1281 env:mega1280
#elif MB(SILVER_GATE)
- #include "mega/pins_SILVER_GATE.h" // ATmega2561 env:megaatmega2560
+ #include "mega/pins_SILVER_GATE.h" // ATmega2561 env:mega2560
//
// Sanguinololu and Derivatives - ATmega644P, ATmega1284P
//
#elif MB(SANGUINOLOLU_11)
- #include "sanguino/pins_SANGUINOLOLU_11.h" // ATmega644P, ATmega1284P env:sanguino_atmega644p env:sanguino_atmega1284p
+ #include "sanguino/pins_SANGUINOLOLU_11.h" // ATmega644P, ATmega1284P env:sanguino644p env:sanguino1284p
#elif MB(SANGUINOLOLU_12)
- #include "sanguino/pins_SANGUINOLOLU_12.h" // ATmega644P, ATmega1284P env:sanguino_atmega644p env:sanguino_atmega1284p
+ #include "sanguino/pins_SANGUINOLOLU_12.h" // ATmega644P, ATmega1284P env:sanguino644p env:sanguino1284p
#elif MB(MELZI)
- #include "sanguino/pins_MELZI.h" // ATmega644P, ATmega1284P env:sanguino_atmega644p env:sanguino_atmega1284p
+ #include "sanguino/pins_MELZI.h" // ATmega644P, ATmega1284P env:sanguino644p env:sanguino1284p
#elif MB(MELZI_MAKR3D)
- #include "sanguino/pins_MELZI_MAKR3D.h" // ATmega644P, ATmega1284P env:sanguino_atmega644p env:sanguino_atmega1284p
+ #include "sanguino/pins_MELZI_MAKR3D.h" // ATmega644P, ATmega1284P env:sanguino644p env:sanguino1284p
#elif MB(MELZI_CREALITY)
- #include "sanguino/pins_MELZI_CREALITY.h" // ATmega644P, ATmega1284P env:sanguino_atmega644p env:sanguino_atmega1284p
+ #include "sanguino/pins_MELZI_CREALITY.h" // ATmega644P, ATmega1284P env:sanguino644p env:sanguino1284p
#elif MB(MELZI_MALYAN)
- #include "sanguino/pins_MELZI_MALYAN.h" // ATmega644P, ATmega1284P env:sanguino_atmega644p env:sanguino_atmega1284p
+ #include "sanguino/pins_MELZI_MALYAN.h" // ATmega644P, ATmega1284P env:sanguino644p env:sanguino1284p
#elif MB(MELZI_TRONXY)
- #include "sanguino/pins_MELZI_TRONXY.h" // ATmega644P, ATmega1284P env:sanguino_atmega644p env:sanguino_atmega1284p
+ #include "sanguino/pins_MELZI_TRONXY.h" // ATmega644P, ATmega1284P env:sanguino644p env:sanguino1284p
#elif MB(STB_11)
- #include "sanguino/pins_STB_11.h" // ATmega644P, ATmega1284P env:sanguino_atmega644p env:sanguino_atmega1284p
+ #include "sanguino/pins_STB_11.h" // ATmega644P, ATmega1284P env:sanguino644p env:sanguino1284p
#elif MB(AZTEEG_X1)
- #include "sanguino/pins_AZTEEG_X1.h" // ATmega644P, ATmega1284P env:sanguino_atmega644p env:sanguino_atmega1284p
+ #include "sanguino/pins_AZTEEG_X1.h" // ATmega644P, ATmega1284P env:sanguino644p env:sanguino1284p
//
// Other ATmega644P, ATmega644, ATmega1284P
//
#elif MB(GEN3_MONOLITHIC)
- #include "sanguino/pins_GEN3_MONOLITHIC.h" // ATmega644P env:sanguino_atmega644p
+ #include "sanguino/pins_GEN3_MONOLITHIC.h" // ATmega644P env:sanguino644p
#elif MB(GEN3_PLUS)
- #include "sanguino/pins_GEN3_PLUS.h" // ATmega644P, ATmega1284P env:sanguino_atmega644p env:sanguino_atmega1284p
+ #include "sanguino/pins_GEN3_PLUS.h" // ATmega644P, ATmega1284P env:sanguino644p env:sanguino1284p
#elif MB(GEN6)
- #include "sanguino/pins_GEN6.h" // ATmega644P, ATmega1284P env:sanguino_atmega644p env:sanguino_atmega1284p
+ #include "sanguino/pins_GEN6.h" // ATmega644P, ATmega1284P env:sanguino644p env:sanguino1284p
#elif MB(GEN6_DELUXE)
- #include "sanguino/pins_GEN6_DELUXE.h" // ATmega644P, ATmega1284P env:sanguino_atmega644p env:sanguino_atmega1284p
+ #include "sanguino/pins_GEN6_DELUXE.h" // ATmega644P, ATmega1284P env:sanguino644p env:sanguino1284p
#elif MB(GEN7_CUSTOM)
- #include "sanguino/pins_GEN7_CUSTOM.h" // ATmega644P, ATmega644, ATmega1284P env:sanguino_atmega644p env:sanguino_atmega1284p
+ #include "sanguino/pins_GEN7_CUSTOM.h" // ATmega644P, ATmega644, ATmega1284P env:sanguino644p env:sanguino1284p
#elif MB(GEN7_12)
- #include "sanguino/pins_GEN7_12.h" // ATmega644P, ATmega644, ATmega1284P env:sanguino_atmega644p env:sanguino_atmega1284p
+ #include "sanguino/pins_GEN7_12.h" // ATmega644P, ATmega644, ATmega1284P env:sanguino644p env:sanguino1284p
#elif MB(GEN7_13)
- #include "sanguino/pins_GEN7_13.h" // ATmega644P, ATmega644, ATmega1284P env:sanguino_atmega644p env:sanguino_atmega1284p
+ #include "sanguino/pins_GEN7_13.h" // ATmega644P, ATmega644, ATmega1284P env:sanguino644p env:sanguino1284p
#elif MB(GEN7_14)
- #include "sanguino/pins_GEN7_14.h" // ATmega644P, ATmega644, ATmega1284P env:sanguino_atmega644p env:sanguino_atmega1284p
+ #include "sanguino/pins_GEN7_14.h" // ATmega644P, ATmega644, ATmega1284P env:sanguino644p env:sanguino1284p
#elif MB(OMCA_A)
- #include "sanguino/pins_OMCA_A.h" // ATmega644 env:sanguino_atmega644p
+ #include "sanguino/pins_OMCA_A.h" // ATmega644 env:sanguino644p
#elif MB(OMCA)
- #include "sanguino/pins_OMCA.h" // ATmega644P, ATmega644 env:sanguino_atmega644p
+ #include "sanguino/pins_OMCA.h" // ATmega644P, ATmega644 env:sanguino644p
#elif MB(ANET_10)
- #include "sanguino/pins_ANET_10.h" // ATmega1284P env:sanguino_atmega1284p
+ #include "sanguino/pins_ANET_10.h" // ATmega1284P env:sanguino1284p
#elif MB(SETHI)
- #include "sanguino/pins_SETHI.h" // ATmega644P, ATmega644, ATmega1284P env:sanguino_atmega644p env:sanguino_atmega1284p
+ #include "sanguino/pins_SETHI.h" // ATmega644P, ATmega644, ATmega1284P env:sanguino644p env:sanguino1284p
//
// Teensyduino - AT90USB1286, AT90USB1286P
@@ -491,13 +491,13 @@
#elif MB(MKS_ROBIN_LITE)
#include "stm32/pins_MKS_ROBIN_LITE.h" // STM32F1 env:mks_robin_lite
#elif MB(BTT_SKR_MINI_V1_1)
- #include "stm32/pins_BTT_SKR_MINI_V1_1.h" // STM32F1 env:STM32F103RC_bigtree env:STM32F103RC_bigtree_512K env:STM32F103RC_bigtree_USB env:STM32F103RC_bigtree_512K_USB
+ #include "stm32/pins_BTT_SKR_MINI_V1_1.h" // STM32F1 env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_USB env:STM32F103RC_btt_512K_USB
#elif MB(BTT_SKR_MINI_E3_V1_0)
- #include "stm32/pins_BTT_SKR_MINI_E3_V1_0.h" // STM32F1 env:STM32F103RC_bigtree env:STM32F103RC_bigtree_512K env:STM32F103RC_bigtree_USB env:STM32F103RC_bigtree_512K_USB
+ #include "stm32/pins_BTT_SKR_MINI_E3_V1_0.h" // STM32F1 env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_USB env:STM32F103RC_btt_512K_USB
#elif MB(BTT_SKR_MINI_E3_V1_2)
- #include "stm32/pins_BTT_SKR_MINI_E3_V1_2.h" // STM32F1 env:STM32F103RC_bigtree env:STM32F103RC_bigtree_512K env:STM32F103RC_bigtree_USB env:STM32F103RC_bigtree_512K_USB
+ #include "stm32/pins_BTT_SKR_MINI_E3_V1_2.h" // STM32F1 env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_USB env:STM32F103RC_btt_512K_USB
#elif MB(BTT_SKR_E3_DIP)
- #include "stm32/pins_BTT_SKR_E3_DIP.h" // STM32F1 env:STM32F103RE_bigtree env:STM32F103RE_bigtree_USB env:STM32F103RC_bigtree env:STM32F103RC_bigtree_512K env:STM32F103RC_bigtree_USB env:STM32F103RC_bigtree_512K_USB
+ #include "stm32/pins_BTT_SKR_E3_DIP.h" // STM32F1 env:STM32F103RE_btt env:STM32F103RE_btt_USB env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_USB env:STM32F103RC_btt_512K_USB
#elif MB(JGAURORA_A5S_A1)
#include "stm32/pins_JGAURORA_A5S_A1.h" // STM32F1 env:jgaurora_a5s_a1
#elif MB(FYSETC_AIO_II)
diff --git a/Marlin/src/pins/rambo/pins_MINIRAMBO.h b/Marlin/src/pins/rambo/pins_MINIRAMBO.h
index 6aabf594ac..50aec546a6 100644
--- a/Marlin/src/pins/rambo/pins_MINIRAMBO.h
+++ b/Marlin/src/pins/rambo/pins_MINIRAMBO.h
@@ -26,7 +26,7 @@
*/
#ifndef __AVR_ATmega2560__
- #error "Oops! Select 'RAMBo' in 'Tools > Board.'"
+ #error "Oops! Select 'RAMBo' in 'Tools > Board' or the Mega2560 environment in PlatformIO."
#endif
#if MB(MINIRAMBO_10A)
diff --git a/buildroot/share/git/mftest b/buildroot/share/git/mftest
index 0b2d9ef78f..b2d7cddfe5 100755
--- a/buildroot/share/git/mftest
+++ b/buildroot/share/git/mftest
@@ -34,9 +34,9 @@ case $TESTENV in
lin*) TESTENV='linux_native' ;;
lpc?(8)) TESTENV='LPC1768' ;;
lpc9) TESTENV='LPC1769' ;;
- m128) TESTENV='megaatmega1280' ;;
- m256) TESTENV='megaatmega2560' ;;
- mega) TESTENV='megaatmega2560' ;;
+ m128) TESTENV='mega1280' ;;
+ m256) TESTENV='mega2560' ;;
+ mega) TESTENV='mega2560' ;;
stm) TESTENV='STM32F103RE' ;;
f1) TESTENV='STM32F103RE' ;;
f4) TESTENV='STM32F4' ;;
diff --git a/buildroot/share/tests/STM32F103RC_bigtree-tests b/buildroot/share/tests/STM32F103RC_btt-tests
similarity index 100%
rename from buildroot/share/tests/STM32F103RC_bigtree-tests
rename to buildroot/share/tests/STM32F103RC_btt-tests
diff --git a/buildroot/share/tests/STM32F103RC_bigtree_USB-tests b/buildroot/share/tests/STM32F103RC_btt_USB-tests
similarity index 100%
rename from buildroot/share/tests/STM32F103RC_bigtree_USB-tests
rename to buildroot/share/tests/STM32F103RC_btt_USB-tests
diff --git a/buildroot/share/tests/STM32F103RE_bigtree-tests b/buildroot/share/tests/STM32F103RE_btt-tests
similarity index 100%
rename from buildroot/share/tests/STM32F103RE_bigtree-tests
rename to buildroot/share/tests/STM32F103RE_btt-tests
diff --git a/buildroot/share/tests/STM32F103RE_bigtree_USB-tests b/buildroot/share/tests/STM32F103RE_btt_USB-tests
similarity index 100%
rename from buildroot/share/tests/STM32F103RE_bigtree_USB-tests
rename to buildroot/share/tests/STM32F103RE_btt_USB-tests
diff --git a/buildroot/share/tests/mega1280-tests b/buildroot/share/tests/mega1280-tests
new file mode 100644
index 0000000000..c2d55a92e5
--- /dev/null
+++ b/buildroot/share/tests/mega1280-tests
@@ -0,0 +1,60 @@
+#!/usr/bin/env bash
+#
+# Build tests for AVR ATmega1280
+#
+
+# exit on first failure
+set -e
+
+#
+# Build with the default configurations
+#
+#restore_configs
+#exec_test $1 $2 "Default Configuration"
+
+#
+# Test MESH_BED_LEVELING feature, with LCD
+#
+restore_configs
+opt_set LCD_LANGUAGE an
+opt_enable SPINDLE_FEATURE ULTIMAKERCONTROLLER LCD_BED_LEVELING \
+ MESH_BED_LEVELING ENABLE_LEVELING_FADE_HEIGHT MESH_G28_REST_ORIGIN \
+ G26_MESH_VALIDATION MESH_EDIT_MENU GCODE_QUOTED_STRINGS
+exec_test $1 $2 "Spindle, MESH_BED_LEVELING, and LCD"
+
+#
+# Test DUAL_X_CARRIAGE
+#
+restore_configs
+opt_set MOTHERBOARD BOARD_TT_OSCAR
+opt_set LCD_LANGUAGE pt
+opt_set EXTRUDERS 2
+opt_set TEMP_SENSOR_1 1
+opt_enable USE_XMAX_PLUG DUAL_X_CARRIAGE REPRAPWORLD_KEYPAD
+opt_set REPRAPWORLD_KEYPAD_MOVE_STEP 10.0
+exec_test $1 $2 "TT Oscar | DUAL_X_CARRIAGE"
+
+#
+# Delta Config (generic) + Probeless
+#
+use_example_configs delta/generic
+opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER DELTA_AUTO_CALIBRATION DELTA_CALIBRATION_MENU
+exec_test $1 $2 "RAMPS | DELTA | RRD LCD | DELTA_AUTO_CALIBRATION | DELTA_CALIBRATION_MENU"
+
+#
+# Delta Config (generic) + ABL bilinear + BLTOUCH
+use_example_configs delta/generic
+opt_set LCD_LANGUAGE cz
+opt_set X_DRIVER_TYPE L6470
+opt_set Y_DRIVER_TYPE L6470
+opt_set Z_DRIVER_TYPE L6470
+opt_add L6470_CHAIN_SCK_PIN 53
+opt_add L6470_CHAIN_MISO_PIN 49
+opt_add L6470_CHAIN_MOSI_PIN 40
+opt_add L6470_CHAIN_SS_PIN 42
+opt_add "ENABLE_RESET_L64XX_CHIPS(V) NOOP"
+opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER DELTA_CALIBRATION_MENU AUTO_BED_LEVELING_BILINEAR BLTOUCH
+exec_test $1 $2 "DELTA | L6470 | RRD LCD | ABL Bilinear | BLTOUCH"
+
+# clean up
+restore_configs
diff --git a/buildroot/share/tests/megaatmega2560-tests b/buildroot/share/tests/mega2560-tests
similarity index 92%
rename from buildroot/share/tests/megaatmega2560-tests
rename to buildroot/share/tests/mega2560-tests
index 463261ee7f..a896c38733 100755
--- a/buildroot/share/tests/megaatmega2560-tests
+++ b/buildroot/share/tests/mega2560-tests
@@ -142,19 +142,6 @@ opt_set MIXING_STEPPERS 5
opt_set LCD_LANGUAGE ru
exec_test $1 $2 "Azteeg X3 | Mixing Extruder (x5) | Gradient Mix | Cyrillic"
-#
-# Test DUAL_X_CARRIAGE
-#
-restore_configs
-opt_set MOTHERBOARD BOARD_TT_OSCAR
-opt_set LCD_LANGUAGE pt
-opt_set EXTRUDERS 2
-opt_set TEMP_SENSOR_1 1
-opt_enable USE_XMAX_PLUG DUAL_X_CARRIAGE
-opt_enable REPRAPWORLD_KEYPAD
-opt_set REPRAPWORLD_KEYPAD_MOVE_STEP 10.0
-exec_test $1 $2 "TT Oscar | DUAL_X_CARRIAGE"
-
#
# Test SPEAKER with BOARD_BQ_ZUM_MEGA_3D and BQ_LCD_SMART_CONTROLLER
#
@@ -298,21 +285,6 @@ exec_test $1 $2 "Full-featured CR-10S config"
#use_example_configs Hephestos_2
#exec_test $1 $2 "Stuff"
-#
-# Delta Config (generic) + ABL bilinear + BLTOUCH
-use_example_configs delta/generic
-opt_set LCD_LANGUAGE cz
-opt_set X_DRIVER_TYPE L6470
-opt_set Y_DRIVER_TYPE L6470
-opt_set Z_DRIVER_TYPE L6470
-opt_add L6470_CHAIN_SCK_PIN 53
-opt_add L6470_CHAIN_MISO_PIN 49
-opt_add L6470_CHAIN_MOSI_PIN 40
-opt_add L6470_CHAIN_SS_PIN 42
-opt_add "ENABLE_RESET_L64XX_CHIPS(V) NOOP"
-opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER DELTA_CALIBRATION_MENU AUTO_BED_LEVELING_BILINEAR BLTOUCH
-exec_test $1 $2 "DELTA | L6470 | RRD LCD | ABL Bilinear | BLTOUCH"
-
#
# Delta Config (generic) + UBL + ALLEN_KEY + OLED_PANEL_TINYBOY2 + EEPROM_SETTINGS
#
@@ -322,13 +294,6 @@ opt_enable AUTO_BED_LEVELING_UBL RESTORE_LEVELING_AFTER_G28 Z_PROBE_ALLEN_KEY EE
OLED_PANEL_TINYBOY2 MESH_EDIT_GFX_OVERLAY
exec_test $1 $2 "RAMPS | DELTA | OLED_PANEL_TINYBOY2 | UBL | Allen Key | EEPROM"
-#
-# Delta Config (generic) + Probeless
-#
-use_example_configs delta/generic
-opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER DELTA_AUTO_CALIBRATION DELTA_CALIBRATION_MENU
-exec_test $1 $2 "RAMPS | DELTA | RRD LCD | DELTA_AUTO_CALIBRATION | DELTA_CALIBRATION_MENU"
-
#
# Delta Config (FLSUN AC because it's complex)
#
diff --git a/buildroot/share/tests/megaatmega1280-tests b/buildroot/share/tests/megaatmega1280-tests
deleted file mode 100644
index 4e5ad25355..0000000000
--- a/buildroot/share/tests/megaatmega1280-tests
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env bash
-#
-# Build tests for AVR ATmega1280
-#
-
-# exit on first failure
-set -e
-
-#
-# Build with the default configurations
-#
-#restore_configs
-#exec_test $1 $2 "Default Configuration"
-
-#
-# Test MESH_BED_LEVELING feature, with LCD
-#
-restore_configs
-opt_set LCD_LANGUAGE an
-opt_enable SPINDLE_FEATURE ULTIMAKERCONTROLLER LCD_BED_LEVELING \
- MESH_BED_LEVELING ENABLE_LEVELING_FADE_HEIGHT MESH_G28_REST_ORIGIN \
- G26_MESH_VALIDATION MESH_EDIT_MENU GCODE_QUOTED_STRINGS
-exec_test $1 $2 "Spindle, MESH_BED_LEVELING, and LCD"
-
-
-# clean up
-restore_configs
diff --git a/buildroot/share/tests/sanguino_atmega1284p-tests b/buildroot/share/tests/sanguino1284p-tests
similarity index 100%
rename from buildroot/share/tests/sanguino_atmega1284p-tests
rename to buildroot/share/tests/sanguino1284p-tests
diff --git a/buildroot/share/tests/sanguino_atmega644p-tests b/buildroot/share/tests/sanguino644p-tests
similarity index 100%
rename from buildroot/share/tests/sanguino_atmega644p-tests
rename to buildroot/share/tests/sanguino644p-tests
diff --git a/buildroot/share/vscode/auto_build.py b/buildroot/share/vscode/auto_build.py
index f9258846a5..1d4ea12c7b 100644
--- a/buildroot/share/vscode/auto_build.py
+++ b/buildroot/share/vscode/auto_build.py
@@ -600,13 +600,13 @@ def get_env(board_name, ver_Marlin):
target_env = 'DUE_USB'
else:
target_env = 'DUE'
- elif env_A == 'STM32F103RC_bigtree' or env_A == 'STM32F103RE_bigtree':
- if env_A == 'STM32F103RE_bigtree':
+ elif env_A == 'STM32F103RC_btt' or env_A == 'STM32F103RE_btt':
+ if env_A == 'STM32F103RE_btt':
get_answer(board_name, 'MCU Type?', 'STM32F103RC', 'STM32F103RE')
if 1 == get_answer_val:
- env_A = 'STM32F103RC_bigtree'
+ env_A = 'STM32F103RC_btt'
target_env = env_A
- if env_A == 'STM32F103RC_bigtree':
+ if env_A == 'STM32F103RC_btt':
get_answer(board_name, 'RCT6 Flash Size?', '512K', '256K')
if 1 == get_answer_val:
target_env += '_512K'
diff --git a/platformio.ini b/platformio.ini
index f69842cafe..89afb91235 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -18,7 +18,7 @@
[platformio]
src_dir = Marlin
boards_dir = buildroot/share/PlatformIO/boards
-default_envs = megaatmega2560
+default_envs = mega2560
[common]
default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
@@ -57,7 +57,7 @@ monitor_speed = 250000
#
# ATmega2560
#
-[env:megaatmega2560]
+[env:mega2560]
platform = atmelavr
board = megaatmega2560
board_build.f_cpu = 16000000L
@@ -68,7 +68,7 @@ src_filter = ${common.default_src_filter} +<src/HAL/HAL_AVR>
#
# ATmega1280
#
-[env:megaatmega1280]
+[env:mega1280]
platform = atmelavr
board = megaatmega1280
board_build.f_cpu = 16000000L
@@ -112,7 +112,7 @@ src_filter = ${common.default_src_filter} +<src/HAL/HAL_AVR>
#
# Sanguinololu (ATmega644p)
#
-[env:sanguino_atmega644p]
+[env:sanguino644p]
platform = atmelavr
board = sanguino_atmega644p
lib_deps = ${common.lib_deps}
@@ -122,7 +122,7 @@ src_filter = ${common.default_src_filter} +<src/HAL/HAL_AVR>
#
# Sanguinololu (ATmega1284p)
#
-[env:sanguino_atmega1284p]
+[env:sanguino1284p]
platform = atmelavr
board = sanguino_atmega1284p
lib_deps = ${common.lib_deps}
@@ -284,13 +284,13 @@ upload_protocol = serial
#
# BigTree SKR Mini V1.1 / SKR mini E3 / SKR E3 DIP (STM32F103RCT6 ARM Cortex-M3)
#
-# STM32F103RC_bigtree ............. RCT6 with 256K
-# STM32F103RC_bigtree_USB ......... RCT6 with 256K (USB mass storage)
-# STM32F103RC_bigtree_512K ........ RCT6 with 512K
-# STM32F103RC_bigtree_512K_USB .... RCT6 with 512K (USB mass storage)
+# STM32F103RC_btt ............. RCT6 with 256K
+# STM32F103RC_btt_USB ......... RCT6 with 256K (USB mass storage)
+# STM32F103RC_btt_512K ........ RCT6 with 512K
+# STM32F103RC_btt_512K_USB .... RCT6 with 512K (USB mass storage)
#
-[env:STM32F103RC_bigtree]
+[env:STM32F103RC_btt]
platform = ststm32
board = genericSTM32F103RC
platform_packages = tool-stm32duino
@@ -304,7 +304,7 @@ lib_deps = ${common.lib_deps}
lib_ignore = Adafruit NeoPixel, SPI
monitor_speed = 115200
-[env:STM32F103RC_bigtree_USB]
+[env:STM32F103RC_btt_USB]
platform = ststm32
board = genericSTM32F103RC
platform_packages = tool-stm32duino
@@ -318,7 +318,7 @@ lib_deps = ${common.lib_deps}
lib_ignore = Adafruit NeoPixel, SPI
monitor_speed = 115200
-[env:STM32F103RC_bigtree_512K]
+[env:STM32F103RC_btt_512K]
platform = ststm32
board = genericSTM32F103RC
board_upload.maximum_size=524288
@@ -333,7 +333,7 @@ lib_deps = ${common.lib_deps}
lib_ignore = Adafruit NeoPixel, SPI
monitor_speed = 115200
-[env:STM32F103RC_bigtree_512K_USB]
+[env:STM32F103RC_btt_512K_USB]
platform = ststm32
board = genericSTM32F103RC
board_upload.maximum_size=524288
@@ -365,10 +365,10 @@ lib_ignore = Adafruit NeoPixel, SPI
monitor_speed = 115200
#
-# STM32F103RE_bigtree ............. RET6
-# STM32F103RE_bigtree_USB ......... RET6 (USB mass storage)
+# STM32F103RE_btt ............. RET6
+# STM32F103RE_btt_USB ......... RET6 (USB mass storage)
#
-[env:STM32F103RE_bigtree]
+[env:STM32F103RE_btt]
platform = ststm32
board = genericSTM32F103RE
platform_packages = tool-stm32duino
@@ -384,7 +384,7 @@ debug_tool = stlink
upload_protocol = stlink
monitor_speed = 115200
-[env:STM32F103RE_bigtree_USB]
+[env:STM32F103RE_btt_USB]
platform = ststm32
board = genericSTM32F103RE
platform_packages = tool-stm32duino
--
GitLab