From e1970b4b287b9e69d6a90b9ab1f8784438e0ca0a Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Thu, 28 Jul 2016 16:03:16 -0700
Subject: [PATCH] Show power output in same order as temp output
---
Marlin/Marlin_main.cpp | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index 63b69b55ef..9f7e78b1e2 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -4487,6 +4487,13 @@ inline void gcode_M104() {
#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));
+ #endif
#if HAS_TEMP_BED
SERIAL_PROTOCOLPGM(" B@:");
#ifdef BED_WATTS
@@ -4496,13 +4503,6 @@ inline void gcode_M104() {
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));
- #endif
#if HOTENDS > 1
HOTEND_LOOP() {
SERIAL_PROTOCOLPAIR(" @", e);
--
GitLab