浏览代码

Fix LCD menus + DAC (#19907)

Jason Smith 4 年前
父节点
当前提交
bdb3f1ae2f
没有帐户链接到提交者的电子邮件
共有 2 个文件被更改,包括 9 次插入4 次删除
  1. 3
    3
      Marlin/src/module/settings.cpp
  2. 6
    1
      buildroot/tests/at90usb1286_dfu-tests

+ 3
- 3
Marlin/src/module/settings.cpp 查看文件

@@ -3800,7 +3800,7 @@ void MarlinSettings::reset() {
3800 3800
       #endif
3801 3801
     #endif
3802 3802
 
3803
-    #if HAS_MOTOR_CURRENT_SPI || HAS_MOTOR_CURRENT_PWM
3803
+    #if EITHER(HAS_MOTOR_CURRENT_SPI, HAS_MOTOR_CURRENT_PWM)
3804 3804
       CONFIG_ECHO_HEADING("Stepper motor currents:");
3805 3805
       CONFIG_ECHO_START();
3806 3806
       #if HAS_MOTOR_CURRENT_PWM
@@ -3818,10 +3818,10 @@ void MarlinSettings::reset() {
3818 3818
         SERIAL_CHAR(' ', 'B');                                 // B (maps to E1 by default)
3819 3819
         SERIAL_ECHOLN(stepper.motor_current_setting[4]);
3820 3820
       #endif
3821
-    #elif HAS_MOTOR_CURRENT_I2C                                // i2c-based has any number of values
3821
+    #elif ENABLED(HAS_MOTOR_CURRENT_I2C)                       // i2c-based has any number of values
3822 3822
       // Values sent over i2c are not stored.
3823 3823
       // Indexes map directly to drivers, not axes.
3824
-    #elif ENABLED(HAS_MOTOR_CURRENT_DAC)                                // DAC-based has 4 values, for X Y Z E
3824
+    #elif ENABLED(HAS_MOTOR_CURRENT_DAC)                       // DAC-based has 4 values, for X Y Z E
3825 3825
       // Values sent over i2c are not stored. Uses indirect mapping.
3826 3826
     #endif
3827 3827
 

+ 6
- 1
buildroot/tests/at90usb1286_dfu-tests 查看文件

@@ -11,7 +11,12 @@ set -e
11 11
 #
12 12
 restore_configs
13 13
 opt_set MOTHERBOARD BOARD_PRINTRBOARD
14
-exec_test $1 $2 "Default Configuration"
14
+exec_test $1 $2 "Printrboard Configuration"
15
+
16
+restore_configs
17
+opt_set MOTHERBOARD BOARD_PRINTRBOARD_REVF
18
+opt_enable MINIPANEL
19
+exec_test $1 $2 "Printrboard RevF with MiniPanel and Stepper DAC (in pins file)"
15 20
 
16 21
 # clean up
17 22
 restore_configs

正在加载...
取消
保存