Browse Source

Fix LCD menus + DAC (#19907)

Jason Smith 4 years ago
parent
commit
bdb3f1ae2f
No account linked to committer's email address
2 changed files with 9 additions and 4 deletions
  1. 3
    3
      Marlin/src/module/settings.cpp
  2. 6
    1
      buildroot/tests/at90usb1286_dfu-tests

+ 3
- 3
Marlin/src/module/settings.cpp View File

3800
       #endif
3800
       #endif
3801
     #endif
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
       CONFIG_ECHO_HEADING("Stepper motor currents:");
3804
       CONFIG_ECHO_HEADING("Stepper motor currents:");
3805
       CONFIG_ECHO_START();
3805
       CONFIG_ECHO_START();
3806
       #if HAS_MOTOR_CURRENT_PWM
3806
       #if HAS_MOTOR_CURRENT_PWM
3818
         SERIAL_CHAR(' ', 'B');                                 // B (maps to E1 by default)
3818
         SERIAL_CHAR(' ', 'B');                                 // B (maps to E1 by default)
3819
         SERIAL_ECHOLN(stepper.motor_current_setting[4]);
3819
         SERIAL_ECHOLN(stepper.motor_current_setting[4]);
3820
       #endif
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
       // Values sent over i2c are not stored.
3822
       // Values sent over i2c are not stored.
3823
       // Indexes map directly to drivers, not axes.
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
       // Values sent over i2c are not stored. Uses indirect mapping.
3825
       // Values sent over i2c are not stored. Uses indirect mapping.
3826
     #endif
3826
     #endif
3827
 
3827
 

+ 6
- 1
buildroot/tests/at90usb1286_dfu-tests View File

11
 #
11
 #
12
 restore_configs
12
 restore_configs
13
 opt_set MOTHERBOARD BOARD_PRINTRBOARD
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
 # clean up
21
 # clean up
17
 restore_configs
22
 restore_configs

Loading…
Cancel
Save