浏览代码

Fix stepper DAC compile

Fixes #17438
Scott Lahteine 5 年前
父节点
当前提交
3ea23712eb
共有 1 个文件被更改,包括 5 次插入7 次删除
  1. 5
    7
      Marlin/src/feature/dac/stepper_dac.cpp

+ 5
- 7
Marlin/src/feature/dac/stepper_dac.cpp 查看文件

29
 #if ENABLED(DAC_STEPPER_CURRENT)
29
 #if ENABLED(DAC_STEPPER_CURRENT)
30
 
30
 
31
 #include "stepper_dac.h"
31
 #include "stepper_dac.h"
32
+#include "../../MarlinCore.h" // for SP_X_LBL...
32
 
33
 
33
 bool dac_present = false;
34
 bool dac_present = false;
34
 constexpr xyze_uint8_t dac_order = DAC_STEPPER_ORDER;
35
 constexpr xyze_uint8_t dac_order = DAC_STEPPER_ORDER;
85
 
86
 
86
 void dac_print_values() {
87
 void dac_print_values() {
87
   if (!dac_present) return;
88
   if (!dac_present) return;
88
-
89
   SERIAL_ECHO_MSG("Stepper current values in % (Amps):");
89
   SERIAL_ECHO_MSG("Stepper current values in % (Amps):");
90
   SERIAL_ECHO_START();
90
   SERIAL_ECHO_START();
91
-  SERIAL_ECHOLNPAIR_P(
91
+  SERIAL_ECHOPAIR_P(  SP_X_LBL, dac_perc(X_AXIS), PSTR(" ("), dac_amps(X_AXIS), PSTR(")"));
92
-    SP_X_LBL, dac_perc(X_AXIS), PSTR(" ("), dac_amps(X_AXIS), PSTR(")")
92
+  SERIAL_ECHOPAIR_P(  SP_Y_LBL, dac_perc(Y_AXIS), PSTR(" ("), dac_amps(Y_AXIS), PSTR(")"));
93
-    SP_Y_LBL, dac_perc(Y_AXIS), PSTR(" ("), dac_amps(Y_AXIS), PSTR(")")
93
+  SERIAL_ECHOPAIR_P(  SP_Z_LBL, dac_perc(Z_AXIS), PSTR(" ("), dac_amps(Z_AXIS), PSTR(")"));
94
-    SP_Z_LBL, dac_perc(Z_AXIS), PSTR(" ("), dac_amps(Z_AXIS), PSTR(")")
94
+  SERIAL_ECHOLNPAIR_P(SP_E_LBL, dac_perc(E_AXIS), PSTR(" ("), dac_amps(E_AXIS), PSTR(")"));
95
-    SP_E_LBL, dac_perc(E_AXIS), PSTR(" ("), dac_amps(E_AXIS), PSTR(")")
96
-  );
97
 }
95
 }
98
 
96
 
99
 void dac_commit_eeprom() {
97
 void dac_commit_eeprom() {

正在加载...
取消
保存