3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-12-01 07:42:37 +00:00
Code Issues Releases Wiki Activity

Temperature report followup (#20687)

Browse Source 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
This commit is contained in:
Giuliano Zaro 2021-01-05 13:18:09 +01:00 committed by Scott Lahteine
parent e3cd293f4e
commit c64a5a4b8f
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Marlin/src/module/temperature.cpp
View File

@ -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(')');