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

Add HAS_HEATED_BED conditional (#10495)

Browse Source
This commit is contained in:
Scott Lahteine
2018-04-23 17:13:01 -05:00
committed by GitHub
parent 10a25f733e
commit cb46cb8480
19 changed files with 303 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/gcode/bedlevel/G26.cpp
View File

@ -417,7 +417,7 @@ inline bool look_for_lines_to_connect() {
*/
inline bool turn_on_heaters() {
millis_t next = millis() + 5000UL;
#if HAS_TEMP_BED
#if HAS_HEATED_BED
#if ENABLED(ULTRA_LCD)
if (g26_bed_temp > 25) {
lcd_setstatusPGM(PSTR("G26 Heating Bed."), 99);
@ -839,7 +839,7 @@ void GcodeSuite::G26() {
#endif
if (!g26_keep_heaters_on) {
#if HAS_TEMP_BED
#if HAS_HEATED_BED
thermalManager.setTargetBed(0);
#endif
thermalManager.setTargetHotend(0, 0);

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

@ -365,7 +365,7 @@ void GcodeSuite::process_parsed_command(
case 113: M113(); break; // M113: Set Host Keepalive interval
#endif
#if HAS_HEATER_BED && HAS_TEMP_BED
#if HAS_HEATED_BED
case 140: M140(); break; // M140: Set bed temperature
case 190: M190(); break; // M190: Wait for bed temperature to reach target
#endif

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

@ -547,7 +547,7 @@ private:
#endif
#endif
#if HAS_HEATER_BED && HAS_TEMP_BED
#if HAS_HEATED_BED
static void M140();
static void M190();
#endif

4
Marlin/src/gcode/temperature/M140_M190.cpp
View File

@ -22,7 +22,7 @@
#include "../../inc/MarlinConfig.h"
#if HAS_HEATER_BED && HAS_TEMP_BED
#if HAS_HEATED_BED
#include "../gcode.h"
#include "../../module/temperature.h"
@ -177,4 +177,4 @@ void GcodeSuite::M190() {
#endif
}
#endif // HAS_HEATER_BED && HAS_TEMP_BED
#endif // HAS_HEATED_BED