thomas
/
marlin
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Balance mega tests, shorten some env names

Scott Lahteine 4 years ago
parent
870a1f753a
commit
736521a3f1
15 changed files with 206 additions and 208 deletions
Split View Show Diff Stats
  1. 8
    8
      .github/workflows/test-builds.yml
  2. 113
    113
      Marlin/src/pins/pins.h
  3. 1
    1
      Marlin/src/pins/rambo/pins_MINIRAMBO.h
  4. 3
    3
      buildroot/share/git/mftest
  5. 0
    0
      buildroot/share/tests/STM32F103RC_btt-tests
  6. 0
    0
      buildroot/share/tests/STM32F103RC_btt_USB-tests
  7. 0
    0
      buildroot/share/tests/STM32F103RE_btt-tests
  8. 0
    0
      buildroot/share/tests/STM32F103RE_btt_USB-tests
  9. 60
    0
      buildroot/share/tests/mega1280-tests
  10. 0
    35
      buildroot/share/tests/mega2560-tests
  11. 0
    27
      buildroot/share/tests/megaatmega1280-tests
  12. 0
    0
      buildroot/share/tests/sanguino1284p-tests
  13. 0
    0
      buildroot/share/tests/sanguino644p-tests
  14. 4
    4
      buildroot/share/vscode/auto_build.py
  15. 17
    17
      platformio.ini

+ 8
- 8
.github/workflows/test-builds.yml View File 

@@ -29,7 +29,7 @@ jobs:
29 29 
         - DUE
30 30 
         - esp32
31 31 
         - linux_native
32 
-        - megaatmega2560
32 
+        - mega2560
33 33 
         - teensy31
34 34 
         - teensy35
35 35 
         - SAMD51_grandcentral_m4
 
@@ -37,17 +37,17 @@ jobs:
37 37 
         # Extended AVR Environments
38 38
39 39 
         - FYSETC_F6_13
40 
-        - megaatmega1280
40 
+        - mega1280
41 41 
         - rambo
42 
-        - sanguino_atmega1284p
43 
-        - sanguino_atmega644p
42 
+        - sanguino1284p
43 
+        - sanguino644p
44 44
45 45 
         # Extended STM32 Environments
46 46
47 
-        - STM32F103RC_bigtree
48 
-        - STM32F103RC_bigtree_USB
49 
-        - STM32F103RE_bigtree
50 
-        - STM32F103RE_bigtree_USB
47 
+        - STM32F103RC_btt
48 
+        - STM32F103RC_btt_USB
49 
+        - STM32F103RE_btt
50 
+        - STM32F103RE_btt_USB
51 51 
         - STM32F103RC_fysetc
52 52 
         - jgaurora_a5s_a1
53 53 
         - STM32F103VE_longer

+ 113
- 113
Marlin/src/pins/pins.h View File 

@@ -56,138 +56,138 @@
56 56 
 //
57 57
58 58 
 #if MB(RAMPS_OLD)
59 
-  #include "ramps/pins_RAMPS_OLD.h"             // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
59 
+  #include "ramps/pins_RAMPS_OLD.h"             // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
60 60 
 #elif MB(RAMPS_13_EFB)
61 
-  #include "ramps/pins_RAMPS_13.h"              // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
61 
+  #include "ramps/pins_RAMPS_13.h"              // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
62 62 
 #elif MB(RAMPS_13_EEB)
63 
-  #include "ramps/pins_RAMPS_13.h"              // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
63 
+  #include "ramps/pins_RAMPS_13.h"              // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
64 64 
 #elif MB(RAMPS_13_EFF)
65 
-  #include "ramps/pins_RAMPS_13.h"              // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
65 
+  #include "ramps/pins_RAMPS_13.h"              // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
66 66 
 #elif MB(RAMPS_13_EEF)
67 
-  #include "ramps/pins_RAMPS_13.h"              // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
67 
+  #include "ramps/pins_RAMPS_13.h"              // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
68 68 
 #elif MB(RAMPS_13_SF)
69 
-  #include "ramps/pins_RAMPS_13.h"              // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
69 
+  #include "ramps/pins_RAMPS_13.h"              // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
70 70 
 #elif MB(RAMPS_14_EFB)
71 
-  #include "ramps/pins_RAMPS.h"                 // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
71 
+  #include "ramps/pins_RAMPS.h"                 // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
72 72 
 #elif MB(RAMPS_14_EEB)
73 
-  #include "ramps/pins_RAMPS.h"                 // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
73 
+  #include "ramps/pins_RAMPS.h"                 // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
74 74 
 #elif MB(RAMPS_14_EFF)
75 
-  #include "ramps/pins_RAMPS.h"                 // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
75 
+  #include "ramps/pins_RAMPS.h"                 // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
76 76 
 #elif MB(RAMPS_14_EEF)
77 
-  #include "ramps/pins_RAMPS.h"                 // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
77 
+  #include "ramps/pins_RAMPS.h"                 // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
78 78 
 #elif MB(RAMPS_14_SF)
79 
-  #include "ramps/pins_RAMPS.h"                 // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
79 
+  #include "ramps/pins_RAMPS.h"                 // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
80 80 
 #elif MB(RAMPS_PLUS_EFB)
81 
-  #include "ramps/pins_RAMPS_PLUS.h"            // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
81 
+  #include "ramps/pins_RAMPS_PLUS.h"            // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
82 82 
 #elif MB(RAMPS_PLUS_EEB)
83 
-  #include "ramps/pins_RAMPS_PLUS.h"            // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
83 
+  #include "ramps/pins_RAMPS_PLUS.h"            // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
84 84 
 #elif MB(RAMPS_PLUS_EFF)
85 
-  #include "ramps/pins_RAMPS_PLUS.h"            // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
85 
+  #include "ramps/pins_RAMPS_PLUS.h"            // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
86 86 
 #elif MB(RAMPS_PLUS_EEF)
87 
-  #include "ramps/pins_RAMPS_PLUS.h"            // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
87 
+  #include "ramps/pins_RAMPS_PLUS.h"            // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
88 88 
 #elif MB(RAMPS_PLUS_SF)
89 
-  #include "ramps/pins_RAMPS_PLUS.h"            // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
89 
+  #include "ramps/pins_RAMPS_PLUS.h"            // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
90 90
91 91 
 //
92 92 
 // RAMPS Derivatives - ATmega1280, ATmega2560
93 93 
 //
94 94
95 95 
 #elif MB(3DRAG)
96 
-  #include "ramps/pins_3DRAG.h"                 // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
96 
+  #include "ramps/pins_3DRAG.h"                 // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
97 97 
 #elif MB(K8200)
98 
-  #include "ramps/pins_K8200.h"                 // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560 (3DRAG)
98 
+  #include "ramps/pins_K8200.h"                 // ATmega1280, ATmega2560                 env:mega1280 env:mega2560 (3DRAG)
99 99 
 #elif MB(K8400)
100 
-  #include "ramps/pins_K8400.h"                 // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560 (3DRAG)
100 
+  #include "ramps/pins_K8400.h"                 // ATmega1280, ATmega2560                 env:mega1280 env:mega2560 (3DRAG)
101 101 
 #elif MB(K8800)
102 
-  #include "ramps/pins_K8800.h"                 // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560 (3DRAG)
102 
+  #include "ramps/pins_K8800.h"                 // ATmega1280, ATmega2560                 env:mega1280 env:mega2560 (3DRAG)
103 103 
 #elif MB(BAM_DICE)
104 
-  #include "ramps/pins_RAMPS.h"                 // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
104 
+  #include "ramps/pins_RAMPS.h"                 // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
105 105 
 #elif MB(BAM_DICE_DUE)
106 
-  #include "ramps/pins_BAM_DICE_DUE.h"          // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
106 
+  #include "ramps/pins_BAM_DICE_DUE.h"          // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
107 107 
 #elif MB(MKS_BASE)
108 
-  #include "ramps/pins_MKS_BASE_10.h"           // ATmega2560                             env:megaatmega2560
108 
+  #include "ramps/pins_MKS_BASE_10.h"           // ATmega2560                             env:mega2560
109 109 
 #elif MB(MKS_BASE_14)
110 
-  #include "ramps/pins_MKS_BASE_14.h"           // ATmega2560                             env:megaatmega2560
110 
+  #include "ramps/pins_MKS_BASE_14.h"           // ATmega2560                             env:mega2560
111 111 
 #elif MB(MKS_BASE_15)
112 
-  #include "ramps/pins_MKS_BASE_15.h"           // ATmega2560                             env:megaatmega2560
112 
+  #include "ramps/pins_MKS_BASE_15.h"           // ATmega2560                             env:mega2560
113 113 
 #elif MB(MKS_BASE_16)
114 
-  #include "ramps/pins_MKS_BASE_16.h"           // ATmega2560                             env:megaatmega2560
114 
+  #include "ramps/pins_MKS_BASE_16.h"           // ATmega2560                             env:mega2560
115 115 
 #elif MB(MKS_BASE_HEROIC)
116 
-  #include "ramps/pins_MKS_BASE_HEROIC.h"       // ATmega2560                             env:megaatmega2560
116 
+  #include "ramps/pins_MKS_BASE_HEROIC.h"       // ATmega2560                             env:mega2560
117 117 
 #elif MB(MKS_GEN_13)
118 
-  #include "ramps/pins_MKS_GEN_13.h"            // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
118 
+  #include "ramps/pins_MKS_GEN_13.h"            // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
119 119 
 #elif MB(MKS_GEN_L)
120 
-  #include "ramps/pins_MKS_GEN_L.h"             // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
120 
+  #include "ramps/pins_MKS_GEN_L.h"             // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
121 121 
 #elif MB(KFB_2)
122 
-  #include "ramps/pins_BIQU_KFB_2.h"            // ATmega2560                             env:megaatmega2560
122 
+  #include "ramps/pins_BIQU_KFB_2.h"            // ATmega2560                             env:mega2560
123 123 
 #elif MB(ZRIB_V20)
124 
-  #include "ramps/pins_ZRIB_V20.h"              // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560 (MKS_GEN_13)
124 
+  #include "ramps/pins_ZRIB_V20.h"              // ATmega1280, ATmega2560                 env:mega1280 env:mega2560 (MKS_GEN_13)
125 125 
 #elif MB(FELIX2)
126 
-  #include "ramps/pins_FELIX2.h"                // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
126 
+  #include "ramps/pins_FELIX2.h"                // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
127 127 
 #elif MB(RIGIDBOARD)
128 
-  #include "ramps/pins_RIGIDBOARD.h"            // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
128 
+  #include "ramps/pins_RIGIDBOARD.h"            // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
129 129 
 #elif MB(RIGIDBOARD_V2)
130 
-  #include "ramps/pins_RIGIDBOARD_V2.h"         // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
130 
+  #include "ramps/pins_RIGIDBOARD_V2.h"         // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
131 131 
 #elif MB(SAINSMART_2IN1)
132 
-  #include "ramps/pins_SAINSMART_2IN1.h"        // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
132 
+  #include "ramps/pins_SAINSMART_2IN1.h"        // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
133 133 
 #elif MB(ULTIMAKER)
134 
-  #include "ramps/pins_ULTIMAKER.h"             // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
134 
+  #include "ramps/pins_ULTIMAKER.h"             // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
135 135 
 #elif MB(ULTIMAKER_OLD)
136 
-  #include "ramps/pins_ULTIMAKER_OLD.h"         // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
136 
+  #include "ramps/pins_ULTIMAKER_OLD.h"         // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
137 137 
 #elif MB(AZTEEG_X3)
138 
-  #include "ramps/pins_AZTEEG_X3.h"             // ATmega2560                             env:megaatmega2560
138 
+  #include "ramps/pins_AZTEEG_X3.h"             // ATmega2560                             env:mega2560
139 139 
 #elif MB(AZTEEG_X3_PRO)
140 
-  #include "ramps/pins_AZTEEG_X3_PRO.h"         // ATmega2560                             env:megaatmega2560
140 
+  #include "ramps/pins_AZTEEG_X3_PRO.h"         // ATmega2560                             env:mega2560
141 141 
 #elif MB(ULTIMAIN_2)
142 
-  #include "ramps/pins_ULTIMAIN_2.h"            // ATmega2560                             env:megaatmega2560
142 
+  #include "ramps/pins_ULTIMAIN_2.h"            // ATmega2560                             env:mega2560
143 143 
 #elif MB(FORMBOT_RAPTOR)
144 
-  #include "ramps/pins_FORMBOT_RAPTOR.h"        // ATmega2560                             env:megaatmega2560
144 
+  #include "ramps/pins_FORMBOT_RAPTOR.h"        // ATmega2560                             env:mega2560
145 145 
 #elif MB(FORMBOT_RAPTOR2)
146 
-  #include "ramps/pins_FORMBOT_RAPTOR2.h"       // ATmega2560                             env:megaatmega2560
146 
+  #include "ramps/pins_FORMBOT_RAPTOR2.h"       // ATmega2560                             env:mega2560
147 147 
 #elif MB(FORMBOT_TREX2PLUS)
148 
-  #include "ramps/pins_FORMBOT_TREX2PLUS.h"     // ATmega2560                             env:megaatmega2560
148 
+  #include "ramps/pins_FORMBOT_TREX2PLUS.h"     // ATmega2560                             env:mega2560
149 149 
 #elif MB(FORMBOT_TREX3)
150 
-  #include "ramps/pins_FORMBOT_TREX3.h"         // ATmega2560                             env:megaatmega2560
150 
+  #include "ramps/pins_FORMBOT_TREX3.h"         // ATmega2560                             env:mega2560
151 151 
 #elif MB(RUMBA)
152 
-  #include "ramps/pins_RUMBA.h"                 // ATmega2560                             env:megaatmega2560
152 
+  #include "ramps/pins_RUMBA.h"                 // ATmega2560                             env:mega2560
153 153 
 #elif MB(RUMBA_RAISE3D)
154 
-  #include "ramps/pins_RUMBA_RAISE3D.h"         // ATmega2560                             env:megaatmega2560
154 
+  #include "ramps/pins_RUMBA_RAISE3D.h"         // ATmega2560                             env:mega2560
155 155 
 #elif MB(RL200)
156 
-  #include "ramps/pins_RL200.h"                 // ATmega2560                             env:megaatmega2560
156 
+  #include "ramps/pins_RL200.h"                 // ATmega2560                             env:mega2560
157 157 
 #elif MB(BQ_ZUM_MEGA_3D)
158 
-  #include "ramps/pins_BQ_ZUM_MEGA_3D.h"        // ATmega2560                             env:megaatmega2560
158 
+  #include "ramps/pins_BQ_ZUM_MEGA_3D.h"        // ATmega2560                             env:mega2560
159 159 
 #elif MB(MAKEBOARD_MINI)
160 
-  #include "ramps/pins_MAKEBOARD_MINI.h"        // ATmega2560                             env:megaatmega2560
160 
+  #include "ramps/pins_MAKEBOARD_MINI.h"        // ATmega2560                             env:mega2560
161 161 
 #elif MB(TRIGORILLA_13)
162 
-  #include "ramps/pins_TRIGORILLA_13.h"         // ATmega2560                             env:megaatmega2560
162 
+  #include "ramps/pins_TRIGORILLA_13.h"         // ATmega2560                             env:mega2560
163 163 
 #elif MB(TRIGORILLA_14)
164 
-  #include "ramps/pins_TRIGORILLA_14.h"         // ATmega2560                             env:megaatmega2560
164 
+  #include "ramps/pins_TRIGORILLA_14.h"         // ATmega2560                             env:mega2560
165 165 
 #elif MB(TRIGORILLA_14_11)
166 
-  #include "ramps/pins_TRIGORILLA_14.h"         // ATmega2560                             env:megaatmega2560
166 
+  #include "ramps/pins_TRIGORILLA_14.h"         // ATmega2560                             env:mega2560
167 167 
 #elif MB(RAMPS_ENDER_4)
168 
-  #include "ramps/pins_RAMPS_ENDER_4.h"         // ATmega2560                             env:megaatmega2560
168 
+  #include "ramps/pins_RAMPS_ENDER_4.h"         // ATmega2560                             env:mega2560
169 169 
 #elif MB(RAMPS_CREALITY)
170 
-  #include "ramps/pins_RAMPS_CREALITY.h"        // ATmega2560                             env:megaatmega2560
170 
+  #include "ramps/pins_RAMPS_CREALITY.h"        // ATmega2560                             env:mega2560
171 171 
 #elif MB(RAMPS_DAGOMA)
172 
-  #include "ramps/pins_RAMPS_DAGOMA.h"          // ATmega2560                             env:megaatmega2560
172 
+  #include "ramps/pins_RAMPS_DAGOMA.h"          // ATmega2560                             env:mega2560
173 173 
 #elif MB(FYSETC_F6_13)
174 174 
   #include "ramps/pins_FYSETC_F6_13.h"          // ATmega2560                             env:FYSETC_F6_13
175 175 
 #elif MB(FYSETC_F6_14)
176 176 
   #include "ramps/pins_FYSETC_F6_14.h"          // ATmega2560                             env:FYSETC_F6_14
177 177 
 #elif MB(DUPLICATOR_I3_PLUS)
178 
-  #include "ramps/pins_DUPLICATOR_I3_PLUS.h"    // ATmega2560                             env:megaatmega2560
178 
+  #include "ramps/pins_DUPLICATOR_I3_PLUS.h"    // ATmega2560                             env:mega2560
179 179 
 #elif MB(VORON)
180 
-  #include "ramps/pins_VORON.h"                 // ATmega2560                             env:megaatmega2560
180 
+  #include "ramps/pins_VORON.h"                 // ATmega2560                             env:mega2560
181 181 
 #elif MB(TRONXY_V3_1_0)
182 
-  #include "ramps/pins_TRONXY_V3_1_0.h"         // ATmega2560                             env:megaatmega2560
182 
+  #include "ramps/pins_TRONXY_V3_1_0.h"         // ATmega2560                             env:mega2560
183 183 
 #elif MB(Z_BOLT_X_SERIES)
184 
-  #include "ramps/pins_Z_BOLT_X_SERIES.h"       // ATmega2560                             env:megaatmega2560
184 
+  #include "ramps/pins_Z_BOLT_X_SERIES.h"       // ATmega2560                             env:mega2560
185 185 
 #elif MB(TT_OSCAR)
186 
-  #include "ramps/pins_TT_OSCAR.h"              // ATmega2560                             env:megaatmega2560
186 
+  #include "ramps/pins_TT_OSCAR.h"              // ATmega2560                             env:mega2560
187 187 
 #elif MB(TANGO)
188 
-  #include "ramps/pins_TANGO.h"                 // ATmega2560                             env:megaatmega2560
188 
+  #include "ramps/pins_TANGO.h"                 // ATmega2560                             env:mega2560
189 189 
 #elif MB(MKS_GEN_L_V2)
190 
-  #include "ramps/pins_MKS_GEN_L_V2.h"          // ATmega2560                             env:megaatmega2560
190 
+  #include "ramps/pins_MKS_GEN_L_V2.h"          // ATmega2560                             env:mega2560
191 191
192 192 
 //
193 193 
 // RAMBo and derivatives
 
@@ -209,114 +209,114 @@
209 209 
 //
210 210
211 211 
 #elif MB(CNCONTROLS_11)
212 
-  #include "mega/pins_CNCONTROLS_11.h"          // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
212 
+  #include "mega/pins_CNCONTROLS_11.h"          // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
213 213 
 #elif MB(CNCONTROLS_12)
214 
-  #include "mega/pins_CNCONTROLS_12.h"          // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
214 
+  #include "mega/pins_CNCONTROLS_12.h"          // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
215 215 
 #elif MB(CNCONTROLS_15)
216 
-  #include "mega/pins_CNCONTROLS_15.h"          // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
216 
+  #include "mega/pins_CNCONTROLS_15.h"          // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
217 217 
 #elif MB(MIGHTYBOARD_REVE)
218 
-  #include "mega/pins_MIGHTYBOARD_REVE.h"       // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
218 
+  #include "mega/pins_MIGHTYBOARD_REVE.h"       // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
219 219 
 #elif MB(CHEAPTRONIC)
220 
-  #include "mega/pins_CHEAPTRONIC.h"            // ATmega2560                             env:megaatmega2560
220 
+  #include "mega/pins_CHEAPTRONIC.h"            // ATmega2560                             env:mega2560
221 221 
 #elif MB(CHEAPTRONIC_V2)
222 
-  #include "mega/pins_CHEAPTRONICv2.h"          // ATmega2560                             env:megaatmega2560
222 
+  #include "mega/pins_CHEAPTRONICv2.h"          // ATmega2560                             env:mega2560
223 223 
 #elif MB(MEGATRONICS)
224 
-  #include "mega/pins_MEGATRONICS.h"            // ATmega2560                             env:megaatmega2560
224 
+  #include "mega/pins_MEGATRONICS.h"            // ATmega2560                             env:mega2560
225 225 
 #elif MB(MEGATRONICS_2)
226 
-  #include "mega/pins_MEGATRONICS_2.h"          // ATmega2560                             env:megaatmega2560
226 
+  #include "mega/pins_MEGATRONICS_2.h"          // ATmega2560                             env:mega2560
227 227 
 #elif MB(MEGATRONICS_3, MEGATRONICS_31, MEGATRONICS_32)
228 
-  #include "mega/pins_MEGATRONICS_3.h"          // ATmega2560                             env:megaatmega2560
228 
+  #include "mega/pins_MEGATRONICS_3.h"          // ATmega2560                             env:mega2560
229 229 
 #elif MB(ELEFU_3)
230 
-  #include "mega/pins_ELEFU_3.h"                // ATmega2560                             env:megaatmega2560
230 
+  #include "mega/pins_ELEFU_3.h"                // ATmega2560                             env:mega2560
231 231 
 #elif MB(LEAPFROG)
232 
-  #include "mega/pins_LEAPFROG.h"               // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
232 
+  #include "mega/pins_LEAPFROG.h"               // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
233 233 
 #elif MB(MEGACONTROLLER)
234 
-  #include "mega/pins_MEGACONTROLLER.h"         // ATmega2560                             env:megaatmega2560
234 
+  #include "mega/pins_MEGACONTROLLER.h"         // ATmega2560                             env:mega2560
235 235 
 #elif MB(GT2560_REV_A)
236 
-  #include "mega/pins_GT2560_REV_A.h"           // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
236 
+  #include "mega/pins_GT2560_REV_A.h"           // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
237 237 
 #elif MB(GT2560_REV_A_PLUS)
238 
-  #include "mega/pins_GT2560_REV_A_PLUS.h"      // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
238 
+  #include "mega/pins_GT2560_REV_A_PLUS.h"      // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
239 239 
 #elif MB(GT2560_V3)
240 
-  #include "mega/pins_GT2560_V3.h"              // ATmega2560                             env:megaatmega2560
240 
+  #include "mega/pins_GT2560_V3.h"              // ATmega2560                             env:mega2560
241 241 
 #elif MB(GT2560_V3_MC2)
242 
-  #include "mega/pins_GT2560_V3_MC2.h"          // ATmega2560                             env:megaatmega2560
242 
+  #include "mega/pins_GT2560_V3_MC2.h"          // ATmega2560                             env:mega2560
243 243 
 #elif MB(GT2560_V3_A20)
244 
-  #include "mega/pins_GT2560_V3_A20.h"          // ATmega2560                             env:megaatmega2560
244 
+  #include "mega/pins_GT2560_V3_A20.h"          // ATmega2560                             env:mega2560
245 245 
 #elif MB(EINSTART_S)
246 
-  #include "mega/pins_EINSTART-S.h"             // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
246 
+  #include "mega/pins_EINSTART-S.h"             // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
247 247 
 #elif MB(WANHAO_ONEPLUS)
248 
-  #include "mega/pins_WANHAO_ONEPLUS.h"         // ATmega2560                             env:megaatmega2560
248 
+  #include "mega/pins_WANHAO_ONEPLUS.h"         // ATmega2560                             env:mega2560
249 249 
 #elif MB(OVERLORD)
250 
-  #include "mega/pins_OVERLORD.h"               // ATmega2560                             env:megaatmega2560
250 
+  #include "mega/pins_OVERLORD.h"               // ATmega2560                             env:mega2560
251 251 
 #elif MB(HJC2560C_REV2)
252 
-  #include "mega/pins_HJC2560C_REV2.h"          // ATmega2560                             env:megaatmega2560
252 
+  #include "mega/pins_HJC2560C_REV2.h"          // ATmega2560                             env:mega2560
253 253 
 #elif MB(LEAPFROG_XEED2015)
254 
-  #include "mega/pins_LEAPFROG_XEED2015.h"      // ATmega2560                             env:megaatmega2560
254 
+  #include "mega/pins_LEAPFROG_XEED2015.h"      // ATmega2560                             env:mega2560
255 255 
 #elif MB(PICA)
256 
-  #include "mega/pins_PICA.h"                   // ATmega2560                             env:megaatmega2560
256 
+  #include "mega/pins_PICA.h"                   // ATmega2560                             env:mega2560
257 257 
 #elif MB(PICA_REVB)
258 
-  #include "mega/pins_PICAOLD.h"                // ATmega2560                             env:megaatmega2560
258 
+  #include "mega/pins_PICAOLD.h"                // ATmega2560                             env:mega2560
259 259
260 260 
 //
261 261 
 // ATmega1281, ATmega2561
262 262 
 //
263 263
264 264 
 #elif MB(MINITRONICS)
265 
-  #include "mega/pins_MINITRONICS.h"            // ATmega1281                             env:megaatmega1280
265 
+  #include "mega/pins_MINITRONICS.h"            // ATmega1281                             env:mega1280
266 266 
 #elif MB(SILVER_GATE)
267 
-  #include "mega/pins_SILVER_GATE.h"            // ATmega2561                             env:megaatmega2560
267 
+  #include "mega/pins_SILVER_GATE.h"            // ATmega2561                             env:mega2560
268 268
269 269 
 //
270 270 
 // Sanguinololu and Derivatives - ATmega644P, ATmega1284P
271 271 
 //
272 272
273 273 
 #elif MB(SANGUINOLOLU_11)
274 
-  #include "sanguino/pins_SANGUINOLOLU_11.h"    // ATmega644P, ATmega1284P                env:sanguino_atmega644p env:sanguino_atmega1284p
274 
+  #include "sanguino/pins_SANGUINOLOLU_11.h"    // ATmega644P, ATmega1284P                env:sanguino644p env:sanguino1284p
275 275 
 #elif MB(SANGUINOLOLU_12)
276 
-  #include "sanguino/pins_SANGUINOLOLU_12.h"    // ATmega644P, ATmega1284P                env:sanguino_atmega644p env:sanguino_atmega1284p
276 
+  #include "sanguino/pins_SANGUINOLOLU_12.h"    // ATmega644P, ATmega1284P                env:sanguino644p env:sanguino1284p
277 277 
 #elif MB(MELZI)
278 
-  #include "sanguino/pins_MELZI.h"              // ATmega644P, ATmega1284P                env:sanguino_atmega644p env:sanguino_atmega1284p
278 
+  #include "sanguino/pins_MELZI.h"              // ATmega644P, ATmega1284P                env:sanguino644p env:sanguino1284p
279 279 
 #elif MB(MELZI_MAKR3D)
280 
-  #include "sanguino/pins_MELZI_MAKR3D.h"       // ATmega644P, ATmega1284P                env:sanguino_atmega644p env:sanguino_atmega1284p
280 
+  #include "sanguino/pins_MELZI_MAKR3D.h"       // ATmega644P, ATmega1284P                env:sanguino644p env:sanguino1284p
281 281 
 #elif MB(MELZI_CREALITY)
282 
-  #include "sanguino/pins_MELZI_CREALITY.h"     // ATmega644P, ATmega1284P                env:sanguino_atmega644p env:sanguino_atmega1284p
282 
+  #include "sanguino/pins_MELZI_CREALITY.h"     // ATmega644P, ATmega1284P                env:sanguino644p env:sanguino1284p
283 283 
 #elif MB(MELZI_MALYAN)
284 
-  #include "sanguino/pins_MELZI_MALYAN.h"       // ATmega644P, ATmega1284P                env:sanguino_atmega644p env:sanguino_atmega1284p
284 
+  #include "sanguino/pins_MELZI_MALYAN.h"       // ATmega644P, ATmega1284P                env:sanguino644p env:sanguino1284p
285 285 
 #elif MB(MELZI_TRONXY)
286 
-  #include "sanguino/pins_MELZI_TRONXY.h"       // ATmega644P, ATmega1284P                env:sanguino_atmega644p env:sanguino_atmega1284p
286 
+  #include "sanguino/pins_MELZI_TRONXY.h"       // ATmega644P, ATmega1284P                env:sanguino644p env:sanguino1284p
287 287 
 #elif MB(STB_11)
288 
-  #include "sanguino/pins_STB_11.h"             // ATmega644P, ATmega1284P                env:sanguino_atmega644p env:sanguino_atmega1284p
288 
+  #include "sanguino/pins_STB_11.h"             // ATmega644P, ATmega1284P                env:sanguino644p env:sanguino1284p
289 289 
 #elif MB(AZTEEG_X1)
290 
-  #include "sanguino/pins_AZTEEG_X1.h"          // ATmega644P, ATmega1284P                env:sanguino_atmega644p env:sanguino_atmega1284p
290 
+  #include "sanguino/pins_AZTEEG_X1.h"          // ATmega644P, ATmega1284P                env:sanguino644p env:sanguino1284p
291 291
292 292 
 //
293 293 
 // Other ATmega644P, ATmega644, ATmega1284P
294 294 
 //
295 295
296 296 
 #elif MB(GEN3_MONOLITHIC)
297 
-  #include "sanguino/pins_GEN3_MONOLITHIC.h"    // ATmega644P                             env:sanguino_atmega644p
297 
+  #include "sanguino/pins_GEN3_MONOLITHIC.h"    // ATmega644P                             env:sanguino644p
298 298 
 #elif MB(GEN3_PLUS)
299 
-  #include "sanguino/pins_GEN3_PLUS.h"          // ATmega644P, ATmega1284P                env:sanguino_atmega644p env:sanguino_atmega1284p
299 
+  #include "sanguino/pins_GEN3_PLUS.h"          // ATmega644P, ATmega1284P                env:sanguino644p env:sanguino1284p
300 300 
 #elif MB(GEN6)
301 
-  #include "sanguino/pins_GEN6.h"               // ATmega644P, ATmega1284P                env:sanguino_atmega644p env:sanguino_atmega1284p
301 
+  #include "sanguino/pins_GEN6.h"               // ATmega644P, ATmega1284P                env:sanguino644p env:sanguino1284p
302 302 
 #elif MB(GEN6_DELUXE)
303 
-  #include "sanguino/pins_GEN6_DELUXE.h"        // ATmega644P, ATmega1284P                env:sanguino_atmega644p env:sanguino_atmega1284p
303 
+  #include "sanguino/pins_GEN6_DELUXE.h"        // ATmega644P, ATmega1284P                env:sanguino644p env:sanguino1284p
304 304 
 #elif MB(GEN7_CUSTOM)
305 
-  #include "sanguino/pins_GEN7_CUSTOM.h"        // ATmega644P, ATmega644, ATmega1284P     env:sanguino_atmega644p env:sanguino_atmega1284p
305 
+  #include "sanguino/pins_GEN7_CUSTOM.h"        // ATmega644P, ATmega644, ATmega1284P     env:sanguino644p env:sanguino1284p
306 306 
 #elif MB(GEN7_12)
307 
-  #include "sanguino/pins_GEN7_12.h"            // ATmega644P, ATmega644, ATmega1284P     env:sanguino_atmega644p env:sanguino_atmega1284p
307 
+  #include "sanguino/pins_GEN7_12.h"            // ATmega644P, ATmega644, ATmega1284P     env:sanguino644p env:sanguino1284p
308 308 
 #elif MB(GEN7_13)
309 
-  #include "sanguino/pins_GEN7_13.h"            // ATmega644P, ATmega644, ATmega1284P     env:sanguino_atmega644p env:sanguino_atmega1284p
309 
+  #include "sanguino/pins_GEN7_13.h"            // ATmega644P, ATmega644, ATmega1284P     env:sanguino644p env:sanguino1284p
310 310 
 #elif MB(GEN7_14)
311 
-  #include "sanguino/pins_GEN7_14.h"            // ATmega644P, ATmega644, ATmega1284P     env:sanguino_atmega644p env:sanguino_atmega1284p
311 
+  #include "sanguino/pins_GEN7_14.h"            // ATmega644P, ATmega644, ATmega1284P     env:sanguino644p env:sanguino1284p
312 312 
 #elif MB(OMCA_A)
313 
-  #include "sanguino/pins_OMCA_A.h"             // ATmega644                              env:sanguino_atmega644p
313 
+  #include "sanguino/pins_OMCA_A.h"             // ATmega644                              env:sanguino644p
314 314 
 #elif MB(OMCA)
315 
-  #include "sanguino/pins_OMCA.h"               // ATmega644P, ATmega644                  env:sanguino_atmega644p
315 
+  #include "sanguino/pins_OMCA.h"               // ATmega644P, ATmega644                  env:sanguino644p
316 316 
 #elif MB(ANET_10)
317 
-  #include "sanguino/pins_ANET_10.h"            // ATmega1284P                            env:sanguino_atmega1284p
317 
+  #include "sanguino/pins_ANET_10.h"            // ATmega1284P                            env:sanguino1284p
318 318 
 #elif MB(SETHI)
319 
-  #include "sanguino/pins_SETHI.h"              // ATmega644P, ATmega644, ATmega1284P     env:sanguino_atmega644p env:sanguino_atmega1284p
319 
+  #include "sanguino/pins_SETHI.h"              // ATmega644P, ATmega644, ATmega1284P     env:sanguino644p env:sanguino1284p
320 320
321 321 
 //
322 322 
 // Teensyduino - AT90USB1286, AT90USB1286P
 
@@ -491,13 +491,13 @@
491 491 
 #elif MB(MKS_ROBIN_LITE)
492 492 
   #include "stm32/pins_MKS_ROBIN_LITE.h"        // STM32F1                                env:mks_robin_lite
493 493 
 #elif MB(BTT_SKR_MINI_V1_1)
494 
-  #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
494 
+  #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
495 495 
 #elif MB(BTT_SKR_MINI_E3_V1_0)
496 
-  #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
496 
+  #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
497 497 
 #elif MB(BTT_SKR_MINI_E3_V1_2)
498 
-  #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
498 
+  #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
499 499 
 #elif MB(BTT_SKR_E3_DIP)
500 
-  #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
500 
+  #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
501 501 
 #elif MB(JGAURORA_A5S_A1)
502 502 
   #include "stm32/pins_JGAURORA_A5S_A1.h"       // STM32F1                                env:jgaurora_a5s_a1
503 503 
 #elif MB(FYSETC_AIO_II)

+ 1
- 1
Marlin/src/pins/rambo/pins_MINIRAMBO.h View File 

@@ -26,7 +26,7 @@
26 26 
  */
27 27
28 28 
 #ifndef __AVR_ATmega2560__
29 
-  #error "Oops! Select 'RAMBo' in 'Tools > Board.'"
29 
+  #error "Oops! Select 'RAMBo' in 'Tools > Board' or the Mega2560 environment in PlatformIO."
30 30 
 #endif
31 31
32 32 
 #if MB(MINIRAMBO_10A)

+ 3
- 3
buildroot/share/git/mftest View File 

@@ -34,9 +34,9 @@ case $TESTENV in
34 34 
     lin*) TESTENV='linux_native' ;;
35 35 
  lpc?(8)) TESTENV='LPC1768' ;;
36 36 
     lpc9) TESTENV='LPC1769' ;;
37 
-    m128) TESTENV='megaatmega1280' ;;
38 
-    m256) TESTENV='megaatmega2560' ;;
39 
-    mega) TESTENV='megaatmega2560' ;;
37 
+    m128) TESTENV='mega1280' ;;
38 
+    m256) TESTENV='mega2560' ;;
39 
+    mega) TESTENV='mega2560' ;;
40 40 
      stm) TESTENV='STM32F103RE' ;;
41 41 
       f1) TESTENV='STM32F103RE' ;;
42 42 
       f4) TESTENV='STM32F4' ;;

buildroot/share/tests/STM32F103RC_bigtree-tests → buildroot/share/tests/STM32F103RC_btt-tests View File


buildroot/share/tests/STM32F103RC_bigtree_USB-tests → buildroot/share/tests/STM32F103RC_btt_USB-tests View File


buildroot/share/tests/STM32F103RE_bigtree-tests → buildroot/share/tests/STM32F103RE_btt-tests View File


buildroot/share/tests/STM32F103RE_bigtree_USB-tests → buildroot/share/tests/STM32F103RE_btt_USB-tests View File


+ 60
- 0
buildroot/share/tests/mega1280-tests View File 

@@ -0,0 +1,60 @@
1 
+#!/usr/bin/env bash
2 
+#
3 
+# Build tests for AVR ATmega1280
4 
+#
5 
+
6 
+# exit on first failure
7 
+set -e
8 
+
9 
+#
10 
+# Build with the default configurations
11 
+#
12 
+#restore_configs
13 
+#exec_test $1 $2 "Default Configuration"
14 
+
15 
+#
16 
+# Test MESH_BED_LEVELING feature, with LCD
17 
+#
18 
+restore_configs
19 
+opt_set LCD_LANGUAGE an
20 
+opt_enable SPINDLE_FEATURE ULTIMAKERCONTROLLER LCD_BED_LEVELING \
21 
+           MESH_BED_LEVELING ENABLE_LEVELING_FADE_HEIGHT MESH_G28_REST_ORIGIN \
22 
+           G26_MESH_VALIDATION MESH_EDIT_MENU GCODE_QUOTED_STRINGS
23 
+exec_test $1 $2 "Spindle, MESH_BED_LEVELING, and LCD"
24 
+
25 
+#
26 
+# Test DUAL_X_CARRIAGE
27 
+#
28 
+restore_configs
29 
+opt_set MOTHERBOARD BOARD_TT_OSCAR
30 
+opt_set LCD_LANGUAGE pt
31 
+opt_set EXTRUDERS 2
32 
+opt_set TEMP_SENSOR_1 1
33 
+opt_enable USE_XMAX_PLUG DUAL_X_CARRIAGE REPRAPWORLD_KEYPAD
34 
+opt_set REPRAPWORLD_KEYPAD_MOVE_STEP 10.0
35 
+exec_test $1 $2 "TT Oscar | DUAL_X_CARRIAGE"
36 
+
37 
+#
38 
+# Delta Config (generic) + Probeless
39 
+#
40 
+use_example_configs delta/generic
41 
+opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER DELTA_AUTO_CALIBRATION DELTA_CALIBRATION_MENU
42 
+exec_test $1 $2 "RAMPS | DELTA | RRD LCD | DELTA_AUTO_CALIBRATION | DELTA_CALIBRATION_MENU"
43 
+
44 
+#
45 
+# Delta Config (generic) + ABL bilinear + BLTOUCH
46 
+use_example_configs delta/generic
47 
+opt_set LCD_LANGUAGE cz
48 
+opt_set X_DRIVER_TYPE L6470
49 
+opt_set Y_DRIVER_TYPE L6470
50 
+opt_set Z_DRIVER_TYPE L6470
51 
+opt_add L6470_CHAIN_SCK_PIN  53
52 
+opt_add L6470_CHAIN_MISO_PIN 49
53 
+opt_add L6470_CHAIN_MOSI_PIN 40
54 
+opt_add L6470_CHAIN_SS_PIN   42
55 
+opt_add "ENABLE_RESET_L64XX_CHIPS(V) NOOP"
56 
+opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER DELTA_CALIBRATION_MENU AUTO_BED_LEVELING_BILINEAR BLTOUCH
57 
+exec_test $1 $2 "DELTA | L6470 | RRD LCD | ABL Bilinear | BLTOUCH"
58 
+
59 
+# clean up
60 
+restore_configs

buildroot/share/tests/megaatmega2560-tests → buildroot/share/tests/mega2560-tests View File 

@@ -143,19 +143,6 @@ opt_set LCD_LANGUAGE ru
143 143 
 exec_test $1 $2 "Azteeg X3 | Mixing Extruder (x5) | Gradient Mix | Cyrillic"
144 144
145 145 
 #
146 
-# Test DUAL_X_CARRIAGE
147 
-#
148 
-restore_configs
149 
-opt_set MOTHERBOARD BOARD_TT_OSCAR
150 
-opt_set LCD_LANGUAGE pt
151 
-opt_set EXTRUDERS 2
152 
-opt_set TEMP_SENSOR_1 1
153 
-opt_enable USE_XMAX_PLUG DUAL_X_CARRIAGE
154 
-opt_enable REPRAPWORLD_KEYPAD
155 
-opt_set REPRAPWORLD_KEYPAD_MOVE_STEP 10.0
156 
-exec_test $1 $2 "TT Oscar | DUAL_X_CARRIAGE"
157 
-
158 
-#
159 146 
 # Test SPEAKER with BOARD_BQ_ZUM_MEGA_3D and BQ_LCD_SMART_CONTROLLER
160 147 
 #
161 148 
 #restore_configs
 
@@ -299,21 +286,6 @@ exec_test $1 $2 "Full-featured CR-10S config"
299 286 
 #exec_test $1 $2 "Stuff"
300 287
301 288 
 #
302 
-# Delta Config (generic) + ABL bilinear + BLTOUCH
303 
-use_example_configs delta/generic
304 
-opt_set LCD_LANGUAGE cz
305 
-opt_set X_DRIVER_TYPE L6470
306 
-opt_set Y_DRIVER_TYPE L6470
307 
-opt_set Z_DRIVER_TYPE L6470
308 
-opt_add L6470_CHAIN_SCK_PIN  53
309 
-opt_add L6470_CHAIN_MISO_PIN 49
310 
-opt_add L6470_CHAIN_MOSI_PIN 40
311 
-opt_add L6470_CHAIN_SS_PIN   42
312 
-opt_add "ENABLE_RESET_L64XX_CHIPS(V) NOOP"
313 
-opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER DELTA_CALIBRATION_MENU AUTO_BED_LEVELING_BILINEAR BLTOUCH
314 
-exec_test $1 $2 "DELTA | L6470 | RRD LCD | ABL Bilinear | BLTOUCH"
315 
-
316 
-#
317 289 
 # Delta Config (generic) + UBL + ALLEN_KEY + OLED_PANEL_TINYBOY2 + EEPROM_SETTINGS
318 290 
 #
319 291 
 use_example_configs delta/generic
 
@@ -323,13 +295,6 @@ opt_enable AUTO_BED_LEVELING_UBL RESTORE_LEVELING_AFTER_G28 Z_PROBE_ALLEN_KEY EE
323 295 
 exec_test $1 $2 "RAMPS | DELTA | OLED_PANEL_TINYBOY2 | UBL | Allen Key | EEPROM"
324 296
325 297 
 #
326 
-# Delta Config (generic) + Probeless
327 
-#
328 
-use_example_configs delta/generic
329 
-opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER DELTA_AUTO_CALIBRATION DELTA_CALIBRATION_MENU
330 
-exec_test $1 $2 "RAMPS | DELTA | RRD LCD | DELTA_AUTO_CALIBRATION | DELTA_CALIBRATION_MENU"
331 
-
332 
-#
333 298 
 # Delta Config (FLSUN AC because it's complex)
334 299 
 #
335 300 
 use_example_configs delta/FLSUN/auto_calibrate

+ 0
- 27
buildroot/share/tests/megaatmega1280-tests View File 

@@ -1,27 +0,0 @@
1 
-#!/usr/bin/env bash
2 
-#
3 
-# Build tests for AVR ATmega1280
4 
-#
5 
-
6 
-# exit on first failure
7 
-set -e
8 
-
9 
-#
10 
-# Build with the default configurations
11 
-#
12 
-#restore_configs
13 
-#exec_test $1 $2 "Default Configuration"
14 
-
15 
-#
16 
-# Test MESH_BED_LEVELING feature, with LCD
17 
-#
18 
-restore_configs
19 
-opt_set LCD_LANGUAGE an
20 
-opt_enable SPINDLE_FEATURE ULTIMAKERCONTROLLER LCD_BED_LEVELING \
21 
-           MESH_BED_LEVELING ENABLE_LEVELING_FADE_HEIGHT MESH_G28_REST_ORIGIN \
22 
-           G26_MESH_VALIDATION MESH_EDIT_MENU GCODE_QUOTED_STRINGS
23 
-exec_test $1 $2 "Spindle, MESH_BED_LEVELING, and LCD"
24 
-
25 
-
26 
-# clean up
27 
-restore_configs

buildroot/share/tests/sanguino_atmega1284p-tests → buildroot/share/tests/sanguino1284p-tests View File


buildroot/share/tests/sanguino_atmega644p-tests → buildroot/share/tests/sanguino644p-tests View File


+ 4
- 4
buildroot/share/vscode/auto_build.py View File 

@@ -600,13 +600,13 @@ def get_env(board_name, ver_Marlin):
600 600 
           target_env = 'DUE_USB'
601 601 
         else:
602 602 
           target_env = 'DUE'
603 
-    elif env_A == 'STM32F103RC_bigtree' or env_A == 'STM32F103RE_bigtree':
604 
-      if env_A == 'STM32F103RE_bigtree':
603 
+    elif env_A == 'STM32F103RC_btt' or env_A == 'STM32F103RE_btt':
604 
+      if env_A == 'STM32F103RE_btt':
605 605 
         get_answer(board_name, 'MCU Type?', 'STM32F103RC', 'STM32F103RE')
606 606 
         if 1 == get_answer_val:
607 
-          env_A = 'STM32F103RC_bigtree'
607 
+          env_A = 'STM32F103RC_btt'
608 608 
       target_env = env_A
609 
-      if env_A == 'STM32F103RC_bigtree':
609 
+      if env_A == 'STM32F103RC_btt':
610 610 
         get_answer(board_name, 'RCT6 Flash Size?', '512K', '256K')
611 611 
         if 1 == get_answer_val:
612 612 
           target_env += '_512K'

+ 17
- 17
platformio.ini View File 

@@ -18,7 +18,7 @@
18 18 
 [platformio]
19 19 
 src_dir      = Marlin
20 20 
 boards_dir   = buildroot/share/PlatformIO/boards
21 
-default_envs = megaatmega2560
21 
+default_envs = mega2560
22 22
23 23 
 [common]
24 24 
 default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
 
@@ -57,7 +57,7 @@ monitor_speed = 250000
57 57 
 #
58 58 
 # ATmega2560
59 59 
 #
60 
-[env:megaatmega2560]
60 
+[env:mega2560]
61 61 
 platform          = atmelavr
62 62 
 board             = megaatmega2560
63 63 
 board_build.f_cpu = 16000000L
 
@@ -68,7 +68,7 @@ src_filter        = ${common.default_src_filter} +<src/HAL/HAL_AVR>
68 68 
 #
69 69 
 # ATmega1280
70 70 
 #
71 
-[env:megaatmega1280]
71 
+[env:mega1280]
72 72 
 platform          = atmelavr
73 73 
 board             = megaatmega1280
74 74 
 board_build.f_cpu = 16000000L
 
@@ -112,7 +112,7 @@ src_filter        = ${common.default_src_filter} +<src/HAL/HAL_AVR>
112 112 
 #
113 113 
 # Sanguinololu (ATmega644p)
114 114 
 #
115 
-[env:sanguino_atmega644p]
115 
+[env:sanguino644p]
116 116 
 platform      = atmelavr
117 117 
 board         = sanguino_atmega644p
118 118 
 lib_deps      = ${common.lib_deps}
 
@@ -122,7 +122,7 @@ src_filter    = ${common.default_src_filter} +<src/HAL/HAL_AVR>
122 122 
 #
123 123 
 # Sanguinololu (ATmega1284p)
124 124 
 #
125 
-[env:sanguino_atmega1284p]
125 
+[env:sanguino1284p]
126 126 
 platform      = atmelavr
127 127 
 board         = sanguino_atmega1284p
128 128 
 lib_deps      = ${common.lib_deps}
 
@@ -284,13 +284,13 @@ upload_protocol   = serial
284 284 
 #
285 285 
 # BigTree SKR Mini V1.1 / SKR mini E3 / SKR E3 DIP (STM32F103RCT6 ARM Cortex-M3)
286 286 
 #
287 
-#   STM32F103RC_bigtree ............. RCT6 with 256K
288 
-#   STM32F103RC_bigtree_USB ......... RCT6 with 256K (USB mass storage)
289 
-#   STM32F103RC_bigtree_512K ........ RCT6 with 512K
290 
-#   STM32F103RC_bigtree_512K_USB .... RCT6 with 512K (USB mass storage)
287 
+#   STM32F103RC_btt ............. RCT6 with 256K
288 
+#   STM32F103RC_btt_USB ......... RCT6 with 256K (USB mass storage)
289 
+#   STM32F103RC_btt_512K ........ RCT6 with 512K
290 
+#   STM32F103RC_btt_512K_USB .... RCT6 with 512K (USB mass storage)
291 291 
 #
292 292
293 
-[env:STM32F103RC_bigtree]
293 
+[env:STM32F103RC_btt]
294 294 
 platform          = ststm32
295 295 
 board             = genericSTM32F103RC
296 296 
 platform_packages = tool-stm32duino
 
@@ -304,7 +304,7 @@ lib_deps          = ${common.lib_deps}
304 304 
 lib_ignore        = Adafruit NeoPixel, SPI
305 305 
 monitor_speed     = 115200
306 306
307 
-[env:STM32F103RC_bigtree_USB]
307 
+[env:STM32F103RC_btt_USB]
308 308 
 platform          = ststm32
309 309 
 board             = genericSTM32F103RC
310 310 
 platform_packages = tool-stm32duino
 
@@ -318,7 +318,7 @@ lib_deps          = ${common.lib_deps}
318 318 
 lib_ignore        = Adafruit NeoPixel, SPI
319 319 
 monitor_speed     = 115200
320 320
321 
-[env:STM32F103RC_bigtree_512K]
321 
+[env:STM32F103RC_btt_512K]
322 322 
 platform          = ststm32
323 323 
 board             = genericSTM32F103RC
324 324 
 board_upload.maximum_size=524288
 
@@ -333,7 +333,7 @@ lib_deps          = ${common.lib_deps}
333 333 
 lib_ignore        = Adafruit NeoPixel, SPI
334 334 
 monitor_speed     = 115200
335 335
336 
-[env:STM32F103RC_bigtree_512K_USB]
336 
+[env:STM32F103RC_btt_512K_USB]
337 337 
 platform          = ststm32
338 338 
 board             = genericSTM32F103RC
339 339 
 board_upload.maximum_size=524288
 
@@ -365,10 +365,10 @@ lib_ignore        = Adafruit NeoPixel, SPI
365 365 
 monitor_speed     = 115200
366 366
367 367 
 #
368 
-#   STM32F103RE_bigtree ............. RET6
369 
-#   STM32F103RE_bigtree_USB ......... RET6 (USB mass storage)
368 
+#   STM32F103RE_btt ............. RET6
369 
+#   STM32F103RE_btt_USB ......... RET6 (USB mass storage)
370 370 
 #
371 
-[env:STM32F103RE_bigtree]
371 
+[env:STM32F103RE_btt]
372 372 
 platform          = ststm32
373 373 
 board             = genericSTM32F103RE
374 374 
 platform_packages = tool-stm32duino
 
@@ -384,7 +384,7 @@ debug_tool        = stlink
384 384 
 upload_protocol   = stlink
385 385 
 monitor_speed     = 115200
386 386
387 
-[env:STM32F103RE_bigtree_USB]
387 
+[env:STM32F103RE_btt_USB]
388 388 
 platform          = ststm32
389 389 
 board             = genericSTM32F103RE
390 390 
 platform_packages = tool-stm32duino

Write Preview
Loading…
Cancel
Save