Browse Source

L64xx M906 Fix status variable, formatting (#16597)

Bob Kuhn 5 years ago
parent
commit
a1f5245e27
1 changed files with 6 additions and 8 deletions
  1. 6
    8
      Marlin/src/gcode/feature/L6470/M906.cpp

+ 6
- 8
Marlin/src/gcode/feature/L6470/M906.cpp View File

110
       const float comp_coef = 1600.0f / L6470_ADC_out_limited;
110
       const float comp_coef = 1600.0f / L6470_ADC_out_limited;
111
       const uint16_t MicroSteps = _BV(motor.GetParam(L6470_STEP_MODE) & 0x07);
111
       const uint16_t MicroSteps = _BV(motor.GetParam(L6470_STEP_MODE) & 0x07);
112
 
112
 
113
-      say_axis_status(axis, status);
113
+      say_axis_status(axis, sh.STATUS_AXIS_RAW);
114
 
114
 
115
       SERIAL_ECHOPGM("...OverCurrent Threshold: ");
115
       SERIAL_ECHOPGM("...OverCurrent Threshold: ");
116
       sprintf_P(temp_buf, PSTR("%2d ("), OverCurrent_Threshold);
116
       sprintf_P(temp_buf, PSTR("%2d ("), OverCurrent_Threshold);
181
       const uint16_t L6470_ADC_out = motor.GetParam(L6470_ADC_OUT) & 0x1F,
181
       const uint16_t L6470_ADC_out = motor.GetParam(L6470_ADC_OUT) & 0x1F,
182
                      L6474_TVAL_val = motor.GetParam(L6474_TVAL) & 0x7F;
182
                      L6474_TVAL_val = motor.GetParam(L6474_TVAL) & 0x7F;
183
 
183
 
184
-      say_axis_status(axis, status);
184
+      say_axis_status(axis, sh.STATUS_AXIS_RAW);
185
 
185
 
186
       SERIAL_ECHOPGM("...OverCurrent Threshold: ");
186
       SERIAL_ECHOPGM("...OverCurrent Threshold: ");
187
       sprintf_P(temp_buf, PSTR("%2d ("), OverCurrent_Threshold);
187
       sprintf_P(temp_buf, PSTR("%2d ("), OverCurrent_Threshold);
192
       sprintf_P(temp_buf, PSTR("%2d ("), L6474_TVAL_val);
192
       sprintf_P(temp_buf, PSTR("%2d ("), L6474_TVAL_val);
193
       SERIAL_ECHO(temp_buf);
193
       SERIAL_ECHO(temp_buf);
194
       SERIAL_ECHO((L6474_TVAL_val + 1) * motor.STALL_CURRENT_CONSTANT_INV);
194
       SERIAL_ECHO((L6474_TVAL_val + 1) * motor.STALL_CURRENT_CONSTANT_INV);
195
-      SERIAL_ECHOLNPGM(" mA   Motor Status: NA)");
195
+      SERIAL_ECHOLNPGM(" mA)   Motor Status: NA");
196
 
196
 
197
       const uint16_t MicroSteps = _BV(motor.GetParam(L6470_STEP_MODE) & 0x07); //NOMORE(MicroSteps, 16);
197
       const uint16_t MicroSteps = _BV(motor.GetParam(L6470_STEP_MODE) & 0x07); //NOMORE(MicroSteps, 16);
198
-      SERIAL_ECHOLNPAIR("...MicroSteps: ", MicroSteps,
199
-                        "   ADC_OUT: ", L6470_ADC_out,
200
-                        "   Vs_compensation: NA");
201
-
202
-      SERIAL_EOL();
198
+      SERIAL_ECHOPAIR("...MicroSteps: ", MicroSteps,
199
+                      "   ADC_OUT: ", L6470_ADC_out);
203
 
200
 
201
+      SERIAL_ECHOLNPGM("   Vs_compensation: NA\n");
204
       SERIAL_ECHOLNPGM("...KVAL_HOLD: NA"
202
       SERIAL_ECHOLNPGM("...KVAL_HOLD: NA"
205
                        "   KVAL_RUN : NA"
203
                        "   KVAL_RUN : NA"
206
                        "   KVAL_ACC: NA"
204
                        "   KVAL_ACC: NA"

Loading…
Cancel
Save