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

Merge pull request #4106 from thinkyhead/rc_temp_compile_err

Browse Source 
Fix compile error with watch_bed_next_ms
This commit is contained in:
Scott Lahteine
2016-06-21 02:48:46 -07:00
committed by GitHub
parent 5e469622c9 dcb8ec32ee
commit 71a7408012
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/temperature.cpp
View File

@@ -101,7 +101,7 @@ unsigned char Temperature::soft_pwm_bed;
millis_t Temperature::watch_heater_next_ms[HOTENDS] = { 0 }; millis_t Temperature::watch_heater_next_ms[HOTENDS] = { 0 };
#endif #endif
#if ENABLED(THERMAL_PROTECTION_HOTENDS) && WATCH_BED_TEMP_PERIOD > 0 #if ENABLED(THERMAL_PROTECTION_BED) && WATCH_BED_TEMP_PERIOD > 0
int Temperature::watch_target_bed_temp = 0; int Temperature::watch_target_bed_temp = 0;
millis_t Temperature::watch_bed_next_ms = 0; millis_t Temperature::watch_bed_next_ms = 0;
#endif #endif

2
Marlin/temperature.h
View File

@@ -105,7 +105,7 @@ class Temperature {
static millis_t watch_heater_next_ms[HOTENDS]; static millis_t watch_heater_next_ms[HOTENDS];
#endif #endif
#if ENABLED(THERMAL_PROTECTION_HOTENDS) && WATCH_BED_TEMP_PERIOD > 0 #if ENABLED(THERMAL_PROTECTION_BED) && WATCH_BED_TEMP_PERIOD > 0
static int watch_target_bed_temp; static int watch_target_bed_temp;
static millis_t watch_bed_next_ms; static millis_t watch_bed_next_ms;
#endif #endif