Fix LCD menus + DAC (MarlinFirmware#19907)

thinkyhead · Apr 29, 2021 · 699f2d1 · 699f2d1
1 parent 3b3b178
commit 699f2d1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
@@ -3800,7 +3800,7 @@ void MarlinSettings::reset() {
       #endif
     #endif
 
-    #if HAS_MOTOR_CURRENT_SPI || HAS_MOTOR_CURRENT_PWM
+    #if EITHER(HAS_MOTOR_CURRENT_SPI, HAS_MOTOR_CURRENT_PWM)
       CONFIG_ECHO_HEADING("Stepper motor currents:");
       CONFIG_ECHO_START();
       #if HAS_MOTOR_CURRENT_PWM
@@ -3818,10 +3818,10 @@ void MarlinSettings::reset() {
         SERIAL_CHAR(' ', 'B');                                 // B (maps to E1 by default)
         SERIAL_ECHOLN(stepper.motor_current_setting[4]);
       #endif
-    #elif HAS_MOTOR_CURRENT_I2C                                // i2c-based has any number of values
+    #elif ENABLED(HAS_MOTOR_CURRENT_I2C)                       // i2c-based has any number of values
       // Values sent over i2c are not stored.
       // Indexes map directly to drivers, not axes.
-    #elif ENABLED(HAS_MOTOR_CURRENT_DAC)                                // DAC-based has 4 values, for X Y Z E
+    #elif ENABLED(HAS_MOTOR_CURRENT_DAC)                       // DAC-based has 4 values, for X Y Z E
       // Values sent over i2c are not stored. Uses indirect mapping.
     #endif
 

diff --git a/buildroot/tests/at90usb1286_dfu-tests b/buildroot/tests/at90usb1286_dfu-tests
@@ -11,7 +11,12 @@ set -e
 #
 restore_configs
 opt_set MOTHERBOARD BOARD_PRINTRBOARD
-exec_test $1 $2 "Default Configuration"
+exec_test $1 $2 "Printrboard Configuration"
+
+restore_configs
+opt_set MOTHERBOARD BOARD_PRINTRBOARD_REVF
+opt_enable MINIPANEL
+exec_test $1 $2 "Printrboard RevF with MiniPanel and Stepper DAC (in pins file)"
 
 # clean up
 restore_configs