Bläddra i källkod

Show power output in same order as temp output

Scott Lahteine 9 år sedan
förälder
incheckning
e1970b4b28
1 ändrade filer med 7 tillägg och 7 borttagningar
  1. 7
    7
      Marlin/Marlin_main.cpp

+ 7
- 7
Marlin/Marlin_main.cpp Visa fil

4487
         #endif
4487
         #endif
4488
       }
4488
       }
4489
     #endif
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
     #if HAS_TEMP_BED
4497
     #if HAS_TEMP_BED
4491
       SERIAL_PROTOCOLPGM(" B@:");
4498
       SERIAL_PROTOCOLPGM(" B@:");
4492
       #ifdef BED_WATTS
4499
       #ifdef BED_WATTS
4496
         SERIAL_PROTOCOL(thermalManager.getHeaterPower(-1));
4503
         SERIAL_PROTOCOL(thermalManager.getHeaterPower(-1));
4497
       #endif
4504
       #endif
4498
     #endif
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
     #if HOTENDS > 1
4506
     #if HOTENDS > 1
4507
       HOTEND_LOOP() {
4507
       HOTEND_LOOP() {
4508
         SERIAL_PROTOCOLPAIR(" @", e);
4508
         SERIAL_PROTOCOLPAIR(" @", e);

Laddar…
Avbryt
Spara