Balance mega tests, shorten some env names

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' ;;

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

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)
 #

buildroot/share/tests/megaatmega1280-tests

@@ -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

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'