Browse Source

Show power output in same order as temp output

Scott Lahteine 8 years ago
parent
commit
e1970b4b28
1 changed files with 7 additions and 7 deletions
  1. 7
    7
      Marlin/Marlin_main.cpp

+ 7
- 7
Marlin/Marlin_main.cpp View File

@@ -4487,6 +4487,13 @@ inline void gcode_M104() {
4487 4487
         #endif
4488 4488
       }
4489 4489
     #endif
4490
+    SERIAL_PROTOCOLPGM(" @:");
4491
+    #ifdef EXTRUDER_WATTS
4492
+      SERIAL_PROTOCOL(((EXTRUDER_WATTS) * thermalManager.getHeaterPower(target_extruder)) / 127);
4493
+      SERIAL_PROTOCOLCHAR('W');
4494
+    #else
4495
+      SERIAL_PROTOCOL(thermalManager.getHeaterPower(target_extruder));
4496
+    #endif
4490 4497
     #if HAS_TEMP_BED
4491 4498
       SERIAL_PROTOCOLPGM(" B@:");
4492 4499
       #ifdef BED_WATTS
@@ -4496,13 +4503,6 @@ inline void gcode_M104() {
4496 4503
         SERIAL_PROTOCOL(thermalManager.getHeaterPower(-1));
4497 4504
       #endif
4498 4505
     #endif
4499
-    SERIAL_PROTOCOLPGM(" @:");
4500
-    #ifdef EXTRUDER_WATTS
4501
-      SERIAL_PROTOCOL(((EXTRUDER_WATTS) * thermalManager.getHeaterPower(target_extruder)) / 127);
4502
-      SERIAL_PROTOCOLCHAR('W');
4503
-    #else
4504
-      SERIAL_PROTOCOL(thermalManager.getHeaterPower(target_extruder));
4505
-    #endif
4506 4506
     #if HOTENDS > 1
4507 4507
       HOTEND_LOOP() {
4508 4508
         SERIAL_PROTOCOLPAIR(" @", e);

Loading…
Cancel
Save