Browse Source
Temperature report followup (#20687)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
vanilla_fb_2.0.x
Giuliano Zaro
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
9 additions and
6 deletions
-
Marlin/src/module/temperature.cpp
|
@ -1404,8 +1404,7 @@ void Temperature::manage_heater() { |
|
|
SERIAL_ECHOPGM(" M305 "); |
|
|
SERIAL_ECHOPGM(" M305 "); |
|
|
else |
|
|
else |
|
|
SERIAL_ECHO_START(); |
|
|
SERIAL_ECHO_START(); |
|
|
SERIAL_CHAR('P'); |
|
|
SERIAL_CHAR('P', '0' + t_index); |
|
|
SERIAL_CHAR('0' + t_index); |
|
|
|
|
|
|
|
|
|
|
|
const user_thermistor_t &t = user_thermistor[t_index]; |
|
|
const user_thermistor_t &t = user_thermistor[t_index]; |
|
|
|
|
|
|
|
@ -3001,15 +3000,19 @@ void Temperature::tick() { |
|
|
default: k = 'B'; break; |
|
|
default: k = 'B'; break; |
|
|
#endif |
|
|
#endif |
|
|
} |
|
|
} |
|
|
SERIAL_CHAR(' '); |
|
|
SERIAL_CHAR(' ', k); |
|
|
SERIAL_CHAR(k); |
|
|
|
|
|
#if HAS_MULTI_HOTEND |
|
|
#if HAS_MULTI_HOTEND |
|
|
if (e >= 0) SERIAL_CHAR('0' + e); |
|
|
if (e >= 0) SERIAL_CHAR('0' + e); |
|
|
#endif |
|
|
#endif |
|
|
|
|
|
#ifdef SERIAL_FLOAT_PRECISION |
|
|
|
|
|
#define SFP _MIN(SERIAL_FLOAT_PRECISION, 2) |
|
|
|
|
|
#else |
|
|
|
|
|
#define SFP 2 |
|
|
|
|
|
#endif |
|
|
SERIAL_CHAR(':'); |
|
|
SERIAL_CHAR(':'); |
|
|
SERIAL_PRINT(c, _MIN(SERIAL_FLOAT_PRECISION, 2)); |
|
|
SERIAL_PRINT(c, SFP); |
|
|
SERIAL_ECHOPGM(" /"); |
|
|
SERIAL_ECHOPGM(" /"); |
|
|
SERIAL_PRINT(t, _MIN(SERIAL_FLOAT_PRECISION, 2)); |
|
|
SERIAL_PRINT(t, SFP); |
|
|
#if ENABLED(SHOW_TEMP_ADC_VALUES) |
|
|
#if ENABLED(SHOW_TEMP_ADC_VALUES) |
|
|
SERIAL_ECHOPAIR(" (", r * RECIPROCAL(OVERSAMPLENR)); |
|
|
SERIAL_ECHOPAIR(" (", r * RECIPROCAL(OVERSAMPLENR)); |
|
|
SERIAL_CHAR(')'); |
|
|
SERIAL_CHAR(')'); |
|
|