bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Move heater output to Temperature class

Browse Source
This commit is contained in:
Scott Lahteine
2017-09-16 04:44:37 -05:00
parent 63228fc453
commit 71aefc2e22
8 changed files with 980 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/gcode/temperature/M105.h
View File

@ -28,7 +28,7 @@ void gcode_M105() {
#if HAS_TEMP_HOTEND || HAS_TEMP_BED
SERIAL_PROTOCOLPGM(MSG_OK);
print_heaterstates();
thermalManager.print_heaterstates();
#else // !HAS_TEMP_HOTEND && !HAS_TEMP_BED
SERIAL_ERROR_START();
SERIAL_ERRORLNPGM(MSG_ERR_NO_THERMISTORS);

2
Marlin/src/gcode/temperature/M109.cpp
View File

@ -127,7 +127,7 @@ void GcodeSuite::M109() {
now = millis();
if (ELAPSED(now, next_temp_ms)) { //Print temp & remaining time every 1s while waiting
next_temp_ms = now + 1000UL;
print_heaterstates();
thermalManager.print_heaterstates();
#if TEMP_RESIDENCY_TIME > 0
SERIAL_PROTOCOLPGM(" W:");
if (residency_start_ms)

2
Marlin/src/gcode/temperature/M190.h
View File

@ -85,7 +85,7 @@ void gcode_M190() {
now = millis();
if (ELAPSED(now, next_temp_ms)) { //Print Temp Reading every 1 second while heating up.
next_temp_ms = now + 1000UL;
print_heaterstates();
thermalManager.print_heaterstates();
#if TEMP_BED_RESIDENCY_TIME > 0
SERIAL_PROTOCOLPGM(" W:");
if (residency_start_ms)