MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Merge pull request #4475 from esenapaj/Fix-for-PR-#4452

Browse Source 
Fix for PR #4452 (Additional heater-state output changes)
This commit is contained in:
Scott Lahteine 2016-07-31 01:08:27 -07:00 committed by GitHub
commit 3633d4978b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/Marlin_main.cpp
View File

@ -4462,7 +4462,7 @@ inline void gcode_M104() {
SERIAL_PROTOCOL_F(thermalManager.degTargetHotend(target_extruder), 1); SERIAL_PROTOCOL_F(thermalManager.degTargetHotend(target_extruder), 1);
#if ENABLED(SHOW_TEMP_ADC_VALUES) #if ENABLED(SHOW_TEMP_ADC_VALUES)
SERIAL_PROTOCOLPAIR(" (", thermalManager.current_temperature_raw[target_extruder] / OVERSAMPLENR); SERIAL_PROTOCOLPAIR(" (", thermalManager.current_temperature_raw[target_extruder] / OVERSAMPLENR);
SERIAL_CHAR(')') SERIAL_CHAR(')');
#endif #endif
#endif #endif
#if HAS_TEMP_BED #if HAS_TEMP_BED
@ -4472,7 +4472,7 @@ inline void gcode_M104() {
SERIAL_PROTOCOL_F(thermalManager.degTargetBed(), 1); SERIAL_PROTOCOL_F(thermalManager.degTargetBed(), 1);
#if ENABLED(SHOW_TEMP_ADC_VALUES) #if ENABLED(SHOW_TEMP_ADC_VALUES)
SERIAL_PROTOCOLPAIR(" (", thermalManager.current_temperature_bed_raw / OVERSAMPLENR); SERIAL_PROTOCOLPAIR(" (", thermalManager.current_temperature_bed_raw / OVERSAMPLENR);
SERIAL_CHAR(')') SERIAL_CHAR(')');
#endif #endif
#endif #endif
#if HOTENDS > 1 #if HOTENDS > 1
@ -4484,7 +4484,7 @@ inline void gcode_M104() {
SERIAL_PROTOCOL_F(thermalManager.degTargetHotend(e), 1); SERIAL_PROTOCOL_F(thermalManager.degTargetHotend(e), 1);
#if ENABLED(SHOW_TEMP_ADC_VALUES) #if ENABLED(SHOW_TEMP_ADC_VALUES)
SERIAL_PROTOCOLPAIR(" (", thermalManager.current_temperature_raw[e] / OVERSAMPLENR); SERIAL_PROTOCOLPAIR(" (", thermalManager.current_temperature_raw[e] / OVERSAMPLENR);
SERIAL_CHAR(')') SERIAL_CHAR(')');
#endif #endif
} }
#endif #endif