zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix LCD menus + DAC (#19907)

Browse source
This commit is contained in:
Jason Smith 2020-10-27 19:40:12 -07:00 committed by Scott Lahteine
parent f5f6170858
commit 2a4cdf5a5d
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Marlin/src/module/settings.cpp
View file

@ -3800,7 +3800,7 @@ void MarlinSettings::reset() {
#endif #endif
#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_HEADING("Stepper motor currents:");
CONFIG_ECHO_START(); CONFIG_ECHO_START();
#if HAS_MOTOR_CURRENT_PWM #if HAS_MOTOR_CURRENT_PWM
@ -3818,10 +3818,10 @@ void MarlinSettings::reset() {
SERIAL_CHAR(' ', 'B'); // B (maps to E1 by default) SERIAL_CHAR(' ', 'B'); // B (maps to E1 by default)
SERIAL_ECHOLN(stepper.motor_current_setting[4]); SERIAL_ECHOLN(stepper.motor_current_setting[4]);
#endif #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. // Values sent over i2c are not stored.
// Indexes map directly to drivers, not axes. // 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. // Values sent over i2c are not stored. Uses indirect mapping.
#endif #endif

7
buildroot/tests/at90usb1286_dfu-tests
View file

@ -11,7 +11,12 @@ set -e
# #
restore_configs restore_configs
opt_set MOTHERBOARD BOARD_PRINTRBOARD 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 # clean up
restore_configs restore_configs