|
@ -4468,8 +4468,7 @@ inline void gcode_M104() { |
|
|
#endif |
|
|
#endif |
|
|
#if HOTENDS > 1 |
|
|
#if HOTENDS > 1 |
|
|
HOTEND_LOOP() { |
|
|
HOTEND_LOOP() { |
|
|
SERIAL_PROTOCOLPGM(" T"); |
|
|
SERIAL_PROTOCOLPAIR(" T", e); |
|
|
SERIAL_PROTOCOL(e); |
|
|
|
|
|
SERIAL_PROTOCOLCHAR(':'); |
|
|
SERIAL_PROTOCOLCHAR(':'); |
|
|
SERIAL_PROTOCOL_F(thermalManager.degHotend(e), 1); |
|
|
SERIAL_PROTOCOL_F(thermalManager.degHotend(e), 1); |
|
|
SERIAL_PROTOCOLPGM(" /"); |
|
|
SERIAL_PROTOCOLPGM(" /"); |
|
@ -4494,8 +4493,7 @@ inline void gcode_M104() { |
|
|
#endif |
|
|
#endif |
|
|
#if HOTENDS > 1 |
|
|
#if HOTENDS > 1 |
|
|
HOTEND_LOOP() { |
|
|
HOTEND_LOOP() { |
|
|
SERIAL_PROTOCOLPGM(" @"); |
|
|
SERIAL_PROTOCOLPAIR(" @", e); |
|
|
SERIAL_PROTOCOL(e); |
|
|
|
|
|
SERIAL_PROTOCOLCHAR(':'); |
|
|
SERIAL_PROTOCOLCHAR(':'); |
|
|
#ifdef EXTRUDER_WATTS |
|
|
#ifdef EXTRUDER_WATTS |
|
|
SERIAL_PROTOCOL(((EXTRUDER_WATTS) * thermalManager.getHeaterPower(e)) / 127); |
|
|
SERIAL_PROTOCOL(((EXTRUDER_WATTS) * thermalManager.getHeaterPower(e)) / 127); |
|
@ -4507,20 +4505,15 @@ inline void gcode_M104() { |
|
|
#endif |
|
|
#endif |
|
|
#if ENABLED(SHOW_TEMP_ADC_VALUES) |
|
|
#if ENABLED(SHOW_TEMP_ADC_VALUES) |
|
|
#if HAS_TEMP_BED |
|
|
#if HAS_TEMP_BED |
|
|
SERIAL_PROTOCOLPGM(" ADC B:"); |
|
|
SERIAL_PROTOCOLPAIR(" ADC B:", thermalManager.current_temperature_bed_raw / OVERSAMPLENR); |
|
|
SERIAL_PROTOCOL_F(thermalManager.degBed(), 1); |
|
|
|
|
|
SERIAL_PROTOCOLPGM("C->"); |
|
|
|
|
|
SERIAL_PROTOCOL_F(thermalManager.rawBedTemp() / OVERSAMPLENR, 0); |
|
|
|
|
|
#endif |
|
|
#endif |
|
|
HOTEND_LOOP() { |
|
|
HOTEND_LOOP() { |
|
|
SERIAL_PROTOCOLPGM(" T"); |
|
|
SERIAL_PROTOCOLPAIR(" T", e); |
|
|
SERIAL_PROTOCOL(e); |
|
|
|
|
|
SERIAL_PROTOCOLCHAR(':'); |
|
|
SERIAL_PROTOCOLCHAR(':'); |
|
|
SERIAL_PROTOCOL_F(thermalManager.degHotend(e), 1); |
|
|
SERIAL_PROTOCOL(thermalManager.current_temperature_raw[e] / OVERSAMPLENR); |
|
|
SERIAL_PROTOCOLPGM("C->"); |
|
|
|
|
|
SERIAL_PROTOCOL_F(thermalManager.rawHotendTemp(e) / OVERSAMPLENR, 0); |
|
|
|
|
|
} |
|
|
} |
|
|
#endif |
|
|
#endif |
|
|
|
|
|
SERIAL_EOL; |
|
|
} |
|
|
} |
|
|
#endif |
|
|
#endif |
|
|
|
|
|
|
|
|