From 2a4cdf5a5dba07d7297b0ec61d418d9f19fff20b Mon Sep 17 00:00:00 2001
From: Jason Smith <jason.inet@gmail.com>
Date: Tue, 27 Oct 2020 19:40:12 -0700
Subject: [PATCH] Fix LCD menus + DAC (#19907)
---
Marlin/src/module/settings.cpp | 6 +++---
buildroot/tests/at90usb1286_dfu-tests | 7 ++++++-
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 2ae4be5f49b..fc432b7e9b5 100644
--- 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
index 7571994ec47..a9b7e2bbb09 100644
--- 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