|
|
|
@ -4459,12 +4459,20 @@ inline void gcode_M104() {
|
|
|
|
|
SERIAL_PROTOCOL_F(thermalManager.degHotend(target_extruder), 1);
|
|
|
|
|
SERIAL_PROTOCOLPGM(" /");
|
|
|
|
|
SERIAL_PROTOCOL_F(thermalManager.degTargetHotend(target_extruder), 1);
|
|
|
|
|
#if ENABLED(SHOW_TEMP_ADC_VALUES)
|
|
|
|
|
SERIAL_PROTOCOLPAIR(" (", thermalManager.current_temperature_raw[target_extruder] / OVERSAMPLENR);
|
|
|
|
|
SERIAL_CHAR(')')
|
|
|
|
|
#endif
|
|
|
|
|
#endif
|
|
|
|
|
#if HAS_TEMP_BED
|
|
|
|
|
SERIAL_PROTOCOLPGM(" B:");
|
|
|
|
|
SERIAL_PROTOCOL_F(thermalManager.degBed(), 1);
|
|
|
|
|
SERIAL_PROTOCOLPGM(" /");
|
|
|
|
|
SERIAL_PROTOCOL_F(thermalManager.degTargetBed(), 1);
|
|
|
|
|
#if ENABLED(SHOW_TEMP_ADC_VALUES)
|
|
|
|
|
SERIAL_PROTOCOLPAIR(" (", thermalManager.current_temperature_bed_raw / OVERSAMPLENR);
|
|
|
|
|
SERIAL_CHAR(')')
|
|
|
|
|
#endif
|
|
|
|
|
#endif
|
|
|
|
|
#if HOTENDS > 1
|
|
|
|
|
HOTEND_LOOP() {
|
|
|
|
@ -4473,47 +4481,25 @@ inline void gcode_M104() {
|
|
|
|
|
SERIAL_PROTOCOL_F(thermalManager.degHotend(e), 1);
|
|
|
|
|
SERIAL_PROTOCOLPGM(" /");
|
|
|
|
|
SERIAL_PROTOCOL_F(thermalManager.degTargetHotend(e), 1);
|
|
|
|
|
#if ENABLED(SHOW_TEMP_ADC_VALUES)
|
|
|
|
|
SERIAL_PROTOCOLPAIR(" (", thermalManager.current_temperature_raw[e] / OVERSAMPLENR);
|
|
|
|
|
SERIAL_CHAR(')')
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
SERIAL_PROTOCOLPGM(" @:");
|
|
|
|
|
SERIAL_PROTOCOL(thermalManager.getHeaterPower(target_extruder));
|
|
|
|
|
#if HAS_TEMP_BED
|
|
|
|
|
SERIAL_PROTOCOLPGM(" B@:");
|
|
|
|
|
#ifdef BED_WATTS
|
|
|
|
|
SERIAL_PROTOCOL(((BED_WATTS) * thermalManager.getHeaterPower(-1)) / 127);
|
|
|
|
|
SERIAL_PROTOCOLCHAR('W');
|
|
|
|
|
#else
|
|
|
|
|
SERIAL_PROTOCOL(thermalManager.getHeaterPower(-1));
|
|
|
|
|
#endif
|
|
|
|
|
#endif
|
|
|
|
|
SERIAL_PROTOCOLPGM(" @:");
|
|
|
|
|
#ifdef EXTRUDER_WATTS
|
|
|
|
|
SERIAL_PROTOCOL(((EXTRUDER_WATTS) * thermalManager.getHeaterPower(target_extruder)) / 127);
|
|
|
|
|
SERIAL_PROTOCOLCHAR('W');
|
|
|
|
|
#else
|
|
|
|
|
SERIAL_PROTOCOL(thermalManager.getHeaterPower(target_extruder));
|
|
|
|
|
SERIAL_PROTOCOL(thermalManager.getHeaterPower(-1));
|
|
|
|
|
#endif
|
|
|
|
|
#if HOTENDS > 1
|
|
|
|
|
HOTEND_LOOP() {
|
|
|
|
|
SERIAL_PROTOCOLPAIR(" @", e);
|
|
|
|
|
SERIAL_PROTOCOLCHAR(':');
|
|
|
|
|
#ifdef EXTRUDER_WATTS
|
|
|
|
|
SERIAL_PROTOCOL(((EXTRUDER_WATTS) * thermalManager.getHeaterPower(e)) / 127);
|
|
|
|
|
SERIAL_PROTOCOLCHAR('W');
|
|
|
|
|
#else
|
|
|
|
|
SERIAL_PROTOCOL(thermalManager.getHeaterPower(e));
|
|
|
|
|
#endif
|
|
|
|
|
SERIAL_PROTOCOL(thermalManager.getHeaterPower(e));
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
#if ENABLED(SHOW_TEMP_ADC_VALUES)
|
|
|
|
|
#if HAS_TEMP_BED
|
|
|
|
|
SERIAL_PROTOCOLPAIR(" ADC B:", thermalManager.current_temperature_bed_raw / OVERSAMPLENR);
|
|
|
|
|
#endif
|
|
|
|
|
HOTEND_LOOP() {
|
|
|
|
|
SERIAL_PROTOCOLPAIR(" T", e);
|
|
|
|
|
SERIAL_PROTOCOLCHAR(':');
|
|
|
|
|
SERIAL_PROTOCOL(thermalManager.current_temperature_raw[e] / OVERSAMPLENR);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
SERIAL_EOL;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|