|
@ -6498,9 +6498,9 @@ inline void gcode_M104() { |
|
|
void print_heaterstates() { |
|
|
void print_heaterstates() { |
|
|
#if HAS_TEMP_HOTEND |
|
|
#if HAS_TEMP_HOTEND |
|
|
SERIAL_PROTOCOLPGM(" T:"); |
|
|
SERIAL_PROTOCOLPGM(" T:"); |
|
|
SERIAL_PROTOCOL_F(thermalManager.degHotend(target_extruder), 1); |
|
|
SERIAL_PROTOCOL(thermalManager.degHotend(target_extruder)); |
|
|
SERIAL_PROTOCOLPGM(" /"); |
|
|
SERIAL_PROTOCOLPGM(" /"); |
|
|
SERIAL_PROTOCOL_F(thermalManager.degTargetHotend(target_extruder), 1); |
|
|
SERIAL_PROTOCOL(thermalManager.degTargetHotend(target_extruder)); |
|
|
#if ENABLED(SHOW_TEMP_ADC_VALUES) |
|
|
#if ENABLED(SHOW_TEMP_ADC_VALUES) |
|
|
SERIAL_PROTOCOLPAIR(" (", thermalManager.rawHotendTemp(target_extruder) / OVERSAMPLENR); |
|
|
SERIAL_PROTOCOLPAIR(" (", thermalManager.rawHotendTemp(target_extruder) / OVERSAMPLENR); |
|
|
SERIAL_PROTOCOLCHAR(')'); |
|
|
SERIAL_PROTOCOLCHAR(')'); |
|
@ -6508,9 +6508,9 @@ inline void gcode_M104() { |
|
|
#endif |
|
|
#endif |
|
|
#if HAS_TEMP_BED |
|
|
#if HAS_TEMP_BED |
|
|
SERIAL_PROTOCOLPGM(" B:"); |
|
|
SERIAL_PROTOCOLPGM(" B:"); |
|
|
SERIAL_PROTOCOL_F(thermalManager.degBed(), 1); |
|
|
SERIAL_PROTOCOL(thermalManager.degBed()); |
|
|
SERIAL_PROTOCOLPGM(" /"); |
|
|
SERIAL_PROTOCOLPGM(" /"); |
|
|
SERIAL_PROTOCOL_F(thermalManager.degTargetBed(), 1); |
|
|
SERIAL_PROTOCOL(thermalManager.degTargetBed()); |
|
|
#if ENABLED(SHOW_TEMP_ADC_VALUES) |
|
|
#if ENABLED(SHOW_TEMP_ADC_VALUES) |
|
|
SERIAL_PROTOCOLPAIR(" (", thermalManager.rawBedTemp() / OVERSAMPLENR); |
|
|
SERIAL_PROTOCOLPAIR(" (", thermalManager.rawBedTemp() / OVERSAMPLENR); |
|
|
SERIAL_PROTOCOLCHAR(')'); |
|
|
SERIAL_PROTOCOLCHAR(')'); |
|
@ -6520,9 +6520,9 @@ inline void gcode_M104() { |
|
|
HOTEND_LOOP() { |
|
|
HOTEND_LOOP() { |
|
|
SERIAL_PROTOCOLPAIR(" T", e); |
|
|
SERIAL_PROTOCOLPAIR(" T", e); |
|
|
SERIAL_PROTOCOLCHAR(':'); |
|
|
SERIAL_PROTOCOLCHAR(':'); |
|
|
SERIAL_PROTOCOL_F(thermalManager.degHotend(e), 1); |
|
|
SERIAL_PROTOCOL(thermalManager.degHotend(e)); |
|
|
SERIAL_PROTOCOLPGM(" /"); |
|
|
SERIAL_PROTOCOLPGM(" /"); |
|
|
SERIAL_PROTOCOL_F(thermalManager.degTargetHotend(e), 1); |
|
|
SERIAL_PROTOCOL(thermalManager.degTargetHotend(e)); |
|
|
#if ENABLED(SHOW_TEMP_ADC_VALUES) |
|
|
#if ENABLED(SHOW_TEMP_ADC_VALUES) |
|
|
SERIAL_PROTOCOLPAIR(" (", thermalManager.rawHotendTemp(e) / OVERSAMPLENR); |
|
|
SERIAL_PROTOCOLPAIR(" (", thermalManager.rawHotendTemp(e) / OVERSAMPLENR); |
|
|
SERIAL_PROTOCOLCHAR(')'); |
|
|
SERIAL_PROTOCOLCHAR(')'); |
|
|