Merge pull request #11692 from thinkyhead/bf2_teensy_and_servos

[2.0.x] Don't test servos for Teensy 3.5/3.6

.circleci/config.yml

@@ -53,11 +53,11 @@ jobs:
             # Generate custom version include
             generate_version_header_for_marlin ./Marlin/src/inc
             cat ./Marlin/src/inc/_Version.h
+
             #
-            # Backup pins_RAMPS.h
-            #
-            cp Marlin/src/pins/pins_RAMPS.h Marlin/src/pins/pins_RAMPS.h.backup
+            # Back up the environment
             #
+            env_backup
 
             #################################
             # Build all sample configurations
@@ -279,6 +279,10 @@ jobs:
             # Remove temp files from dependencies tree prior to caching
             rm -rf ~/Marlin/.piolibdeps/_tmp_*
 
+            #
+            # Restore the environment
+            #
+            env_restore
 
 
       - save_cache:

Marlin/src/inc/SanityCheck.h

@@ -607,14 +607,47 @@ static_assert(X_MAX_LENGTH >= X_BED_SIZE && Y_MAX_LENGTH >= Y_BED_SIZE,
     #error "SWITCHING_NOZZLE requires exactly 2 EXTRUDERS."
   #elif NUM_SERVOS < 1
     #error "SWITCHING_NOZZLE requires NUM_SERVOS >= 1."
+  #elif SWITCHING_NOZZLE_SERVO_NR == 0 && !PIN_EXISTS(SERVO0)
+    #error "SERVO0_PIN must be defined for your SWITCHING_NOZZLE."
+  #elif SWITCHING_NOZZLE_SERVO_NR == 1 && !PIN_EXISTS(SERVO1)
+    #error "SERVO1_PIN must be defined for your SWITCHING_NOZZLE."
+  #elif SWITCHING_NOZZLE_SERVO_NR == 2 && !PIN_EXISTS(SERVO2)
+    #error "SERVO2_PIN must be defined for your SWITCHING_NOZZLE."
+  #elif SWITCHING_NOZZLE_SERVO_NR == 3 && !PIN_EXISTS(SERVO3)
+    #error "SERVO3_PIN must be defined for your SWITCHING_NOZZLE."
   #endif
 #endif
 
 /**
  * Single Stepper Dual Extruder with switching servo
  */
-#if ENABLED(SWITCHING_EXTRUDER) && NUM_SERVOS < 1
+#if ENABLED(SWITCHING_EXTRUDER)
+  #if NUM_SERVOS < 1
     #error "SWITCHING_EXTRUDER requires NUM_SERVOS >= 1."
+  #elif SWITCHING_EXTRUDER_SERVO_NR == 0 && !PIN_EXISTS(SERVO0)
+    #error "SERVO0_PIN must be defined for your SWITCHING_EXTRUDER."
+  #elif SWITCHING_EXTRUDER_SERVO_NR == 1 && !PIN_EXISTS(SERVO1)
+    #error "SERVO1_PIN must be defined for your SWITCHING_EXTRUDER."
+  #elif SWITCHING_EXTRUDER_SERVO_NR == 2 && !PIN_EXISTS(SERVO2)
+    #error "SERVO2_PIN must be defined for your SWITCHING_EXTRUDER."
+  #elif SWITCHING_EXTRUDER_SERVO_NR == 3 && !PIN_EXISTS(SERVO3)
+    #error "SERVO3_PIN must be defined for your SWITCHING_EXTRUDER."
+  #endif
+  #if EXTRUDERS > 3
+    #if NUM_SERVOS < 2
+      #error "SWITCHING_EXTRUDER with 4 extruders requires NUM_SERVOS >= 2."
+    #elif SWITCHING_EXTRUDER_E23_SERVO_NR == 0 && !PIN_EXISTS(SERVO0)
+      #error "SERVO0_PIN must be defined for your SWITCHING_EXTRUDER."
+    #elif SWITCHING_EXTRUDER_E23_SERVO_NR == 1 && !PIN_EXISTS(SERVO1)
+      #error "SERVO1_PIN must be defined for your SWITCHING_EXTRUDER."
+    #elif SWITCHING_EXTRUDER_E23_SERVO_NR == 2 && !PIN_EXISTS(SERVO2)
+      #error "SERVO2_PIN must be defined for your SWITCHING_EXTRUDER."
+    #elif SWITCHING_EXTRUDER_E23_SERVO_NR == 3 && !PIN_EXISTS(SERVO3)
+      #error "SERVO3_PIN must be defined for your SWITCHING_EXTRUDER."
+    #elif SWITCHING_EXTRUDER_E23_SERVO_NR == SWITCHING_EXTRUDER_SERVO_NR
+      #error "SWITCHING_EXTRUDER_E23_SERVO_NR should be a different extruder from SWITCHING_EXTRUDER_SERVO_NR."
+    #endif
+  #endif
 #endif
 
 /**

Marlin/src/pins/pins_TEENSY35_36.h

@@ -139,7 +139,7 @@ D8    HEATER_BED_PIN      CS1     RX4  A12 31 |   46 * * 47   | 34 A15 PWM
 #endif
 #endif
 
-#ifdef ULTRA_LCD
+#if ENABLED(ULTRA_LCD)
   #define LCD_PINS_RS      40
   #define LCD_PINS_ENABLE  41
   #define LCD_PINS_D4      42

buildroot/bin/env_backup

@@ -2,13 +2,13 @@
 
 [ -z "$1" ] || cd $1
 
-if [ -d ".test" ]; then
+if [ -d .test ]; then
   printf "\033[0;31mEnvironment backup already exists!\033[0m\n"
 else
   mkdir .test
+  cp -r Marlin/src/pins .test/pins
   cp Marlin/Configuration*.h .test/
   [ -f Marlin/_Bootscreen.h ] && cp Marlin/_Bootscreen.h .test/
   [ -f Marlin/_Statusscreen.h ] && cp Marlin/_Statusscreen.h .test/
-  cp -r Marlin/src/pins .test/pins
   printf "\033[0;32mEnvironment Backup created\033[0m\n"
 fi

buildroot/bin/env_restore

@@ -2,25 +2,10 @@
 
 [ -z "$1" ] || cd $1
 
-if [ -d ".test" ]; then
-  cp .test/Configuration*.h Marlin/
-  rm .test/Configuration*.h
+cp Marlin/src/config/default/* Marlin/
+[ -f Marlin/_Bootscreen.h ] && rm Marlin/_Bootscreen.h
+[ -f Marlin/_Statusscreen.h ] && rm Marlin/_Statusscreen.h
+[ -d .test/pins ] && { cp .test/pins/* Marlin/src/pins/ ; rm -rf .test/pins ; }
+[ -d .test ] && rm -r .test
 
-  if [ -f .test/_Bootscreen.h ]; then
-    cp .test/_Bootscreen.h Marlin/
-    rm .test/_Bootscreen.h
-  fi
-
-  if [ -f .test/_Statusscreen.h ]; then
-    cp .test/_Statusscreen.h Marlin/
-    rm .test/_Statusscreen.h
-  fi
-
-  cp -r .test/pins Marlin/src
-  rm -r .test/pins
-
-  rmdir .test
-  printf "\033[0;32mEnvironment Restored\033[0m\n"
-else
-  printf "\033[0;31mEnvironment Backup not available!\033[0m\n"
-fi
+printf "\033[0;32mEnvironment Restored\033[0m\n"

buildroot/bin/restore_configs

@@ -1,17 +1,15 @@
 #!/usr/bin/env bash
+#
+# restore_configs
+#
+# Restore default configs, delete pins backup and dogm bitmaps
+#
 
-cp Marlin/src/config/default/Configuration.h     Marlin/Configuration.h
-cp Marlin/src/config/default/Configuration_adv.h Marlin/Configuration_adv.h
+# Restore the (possibly modified) Configurations
+[ -d ".test" -a -f ".test/Configuration.h" ] && cp .test/Configuration*.h Marlin/
 
-if [ -f Marlin/src/pins/pins_RAMPS.h.backup ]; then
-  cp Marlin/src/pins/pins_RAMPS.h.backup Marlin/src/pins/pins_RAMPS.h
-  rm Marlin/src/pins/pins_RAMPS.h.backup
-fi
+# Restore the original unmodified pins
+[ -d ".test/pins" ] && cp -r .test/pins Marlin/src/pins/
 
-if [ -f Marlin/_Bootscreen.h ]; then
-  rm Marlin/_Bootscreen.h
-fi
-
-if [ -f Marlin/_Statusscreen.h ]; then
-  rm Marlin/_Statusscreen.h
-fi
+# Delete DOGM bitmaps
+rm -f Marlin/_*screen.h

buildroot/bin/update_defaults

@@ -1,4 +1,3 @@
 #!/usr/bin/env bash
 
-cp Marlin/Configuration.h     Marlin/src/config/default/Configuration.h
-cp Marlin/Configuration_adv.h Marlin/src/config/default/Configuration_adv.h
+cp Marlin/Configuration*.h .test/

buildroot/share/tests/DUE_tests

@@ -3,9 +3,14 @@
 # exit on first failure
 set -e
 
-restore_configs
+env_backup
+
 opt_set MOTHERBOARD BOARD_RAMPS4DUE_EFB
+update_defaults
+
 opt_enable S_CURVE_ACCELERATION EEPROM_SETTINGS
 opt_set E0_AUTO_FAN_PIN 8
 opt_set EXTRUDER_AUTO_FAN_SPEED 100
 exec_test $1 $2 "RAMPS4DUE_EFB S_CURVE_ACCELERATION EEPROM_SETTINGS"
+
+env_restore

buildroot/share/tests/LPC1768_tests

@@ -3,8 +3,11 @@
 # exit on first failure
 set -e
 
-restore_configs
+env_backup
+
 opt_set MOTHERBOARD BOARD_RAMPS_14_RE_ARM_EFB
+update_defaults
+
 exec_test $1 $2 "Build Re-ARM Default Configuration"
 
 restore_configs
@@ -60,5 +63,4 @@ opt_enable FAN_SOFT_PWM SDSUPPORT
 opt_enable USE_XMAX_PLUG
 exec_test $1 $2 "MKS SBASE Many less common options"
 
-#clean up
-restore_configs
+env_restore

buildroot/share/tests/STM32F1_tests

@@ -3,10 +3,12 @@
 # exit on first failure
 set -e
 
-restore_configs
+env_backup
+
 opt_set MOTHERBOARD BOARD_STM32F1R
+update_defaults
+
 opt_enable EEPROM_SETTINGS EEPROM_CHITCHAT REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT
 exec_test $1 $2 "STM32F1R EEPROM_SETTINGS EEPROM_CHITCHAT REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT"
 
-#cleanup
-restore_configs
+env_restore

buildroot/share/tests/megaatmega2560_tests

@@ -3,15 +3,13 @@
 # exit on first failure
 set -e
 
-#
-# Backup pins_RAMPS.h
-#
-cp Marlin/src/pins/pins_RAMPS.h Marlin/src/pins/pins_RAMPS.h.backup
+env_backup
+
 #
 # Build with the default configurations
 #
-restore_configs
 exec_test $1 $2 "Default Configuration"
+
 #
 # Test 2 extruders (one MAX6675) and heated bed on basic RAMPS 1.4
 # Test a "Fix Mounted" Probe with Safe Homing, some arc options,
@@ -311,5 +309,4 @@ exec_test $1 $2 "TMC2208 Config"
 #
 #
 
-#clean up
-restore_configs
+env_restore

buildroot/share/tests/start_tests

@@ -1,11 +1,17 @@
 #!/usr/bin/env bash
+#
+# start_tests
+#
+# Run one or more tests
+#
+
 export PATH="$PATH:$( cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P )"
 export PATH="$PATH:./buildroot/bin"
 
 # exit on first failure
 set -e
 
-exec_test () {
+exec_test() {
   printf "\033[0;32m[Test $2] \033[0m$3... "
   if build_marlin_pio $1 "-e $2"; then
     printf "\033[0;32mPassed\033[0m\n"
@@ -18,9 +24,6 @@ exec_test () {
 }
 export -f exec_test
 
-env_backup
-printf "Running \033[0;32m$2\033[0m Tests\n"
-
 if [[ $3 = "--deep-clean" ]]; then
   echo "Deleting all PlatformIO caches, downloads and installed packages..."
   env_clean --deep
@@ -36,8 +39,9 @@ if [[ $2 = "ALL" ]]; then
     $f $1 $testenv
   done
 else
+  printf "Running \033[0;32m$2\033[0m Tests\n"
   exec_test $1 "$2 --target clean" "Setup Build Environment"
   $2_tests $1 $2
 fi
+
 printf "\033[0;32mAll tests completed successfully\033[0m\n"
-env_restore

buildroot/share/tests/teensy35_tests

@@ -3,9 +3,11 @@
 # exit on first failure
 set -e
 
-restore_configs
+env_backup
+
 opt_set MOTHERBOARD BOARD_TEENSY35_36
-cp Marlin/src/pins/pins_RAMPS.h Marlin/src/pins/pins_RAMPS.h.backup
+update_defaults
+
 #
 # Test Teensy3.5 with default config
 #
@@ -37,17 +39,17 @@ exec_test $1 $2 "Sled Z Probe with Linear leveling"
 #
 # Test a Servo Probe
 #
-restore_configs
-opt_enable NUM_SERVOS Z_PROBE_SERVO_NR Z_SERVO_ANGLES DEACTIVATE_SERVOS_AFTER_MOVE
-opt_set NUM_SERVOS 1
-opt_enable AUTO_BED_LEVELING_3POINT DEBUG_LEVELING_FEATURE EEPROM_SETTINGS
-exec_test $1 $2 "Servo Probe"
+# restore_configs
+# opt_enable NUM_SERVOS Z_PROBE_SERVO_NR Z_SERVO_ANGLES DEACTIVATE_SERVOS_AFTER_MOVE
+# opt_set NUM_SERVOS 1
+# opt_enable AUTO_BED_LEVELING_3POINT DEBUG_LEVELING_FEATURE EEPROM_SETTINGS
+# exec_test $1 $2 "Servo Probe"
 #
 # ...with AUTO_BED_LEVELING_3POINT, DEBUG_LEVELING_FEATURE, EEPROM_SETTINGS, EEPROM_CHITCHAT, EXTENDED_CAPABILITIES_REPORT, and AUTO_REPORT_TEMPERATURES
 #
-opt_enable AUTO_BED_LEVELING_3POINT DEBUG_LEVELING_FEATURE EEPROM_SETTINGS
-opt_enable_adv EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES
-exec_test $1 $2 "...with AUTO_BED_LEVELING_3POINT, DEBUG_LEVELING_FEATURE, EEPROM_SETTINGS, EEPROM_CHITCHAT, EXTENDED_CAPABILITIES_REPORT, and AUTO_REPORT_TEMPERATURES"
+# opt_enable AUTO_BED_LEVELING_3POINT DEBUG_LEVELING_FEATURE EEPROM_SETTINGS
+# opt_enable_adv EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES
+# exec_test $1 $2 "...with AUTO_BED_LEVELING_3POINT, DEBUG_LEVELING_FEATURE, EEPROM_SETTINGS, EEPROM_CHITCHAT, EXTENDED_CAPABILITIES_REPORT, and AUTO_REPORT_TEMPERATURES"
 #
 # Test MESH_BED_LEVELING feature, with LCD
 #
@@ -64,12 +66,12 @@ exec_test $1 $2 "Mixing Extruder"
 #
 # Test SWITCHING_EXTRUDER
 #
-restore_configs
-opt_set EXTRUDERS 2
-opt_enable NUM_SERVOS
-opt_set NUM_SERVOS 1
-opt_enable SWITCHING_EXTRUDER ULTIMAKERCONTROLLER
-exec_test $1 $2 "SWITCHING_EXTRUDER"
+# restore_configs
+# opt_set EXTRUDERS 2
+# opt_enable NUM_SERVOS
+# opt_set NUM_SERVOS 1
+# opt_enable SWITCHING_EXTRUDER ULTIMAKERCONTROLLER
+# exec_test $1 $2 "SWITCHING_EXTRUDER"
 #
 # Enable COREXY
 #
@@ -92,5 +94,4 @@ opt_add_adv Z2_MAX_PIN 2
 opt_enable USE_XMAX_PLUG
 exec_test $1 $2 "Z_DUAL_STEPPER_DRIVERS, Z_DUAL_ENDSTOPS"
 
-#cleanup
-restore_configs
+env_restore