From 74df828acc98dc2c637d30dcd21557f0026d5b25 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Thu, 28 Jul 2016 16:02:54 -0700
Subject: [PATCH] Show ADC values inline rather than after
---
Marlin/Marlin_main.cpp | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index 777d910163..63b69b55ef 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -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,6 +4481,10 @@ 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
#if HAS_TEMP_BED
@@ -4503,17 +4515,6 @@ inline void gcode_M104() {
#endif
}
#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
--
GitLab