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

Fix current_temperature_chamber compile error

Browse Source 
Fix #10505
This commit is contained in:
Scott Lahteine 2018-04-24 07:53:45 -05:00
parent 50cc55d172
commit ad3b95c8ea
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Marlin/temperature.cpp
View File

@ -559,8 +559,11 @@ int Temperature::getHeaterPower(const int heater) {
HOTEND_LOOP() HOTEND_LOOP()
if (current_temperature[e] > EXTRUDER_AUTO_FAN_TEMPERATURE) if (current_temperature[e] > EXTRUDER_AUTO_FAN_TEMPERATURE)
SBI(fanState, pgm_read_byte(&fanBit[e])); SBI(fanState, pgm_read_byte(&fanBit[e]));
if (current_temperature_chamber > EXTRUDER_AUTO_FAN_TEMPERATURE)
SBI(fanState, pgm_read_byte(&fanBit[5])); #if HAS_TEMP_CHAMBER
if (current_temperature_chamber > EXTRUDER_AUTO_FAN_TEMPERATURE)
SBI(fanState, pgm_read_byte(&fanBit[5]));
#endif
uint8_t fanDone = 0; uint8_t fanDone = 0;
for (uint8_t f = 0; f < COUNT(fanPin); f++) { for (uint8_t f = 0; f < COUNT(fanPin); f++) {

8
Marlin/temperature.h
View File

@ -168,11 +168,6 @@ class Temperature {
#endif #endif
#endif #endif
#if HAS_TEMP_CHAMBER
static float current_temperature_chamber;
static int16_t current_temperature_chamber_raw;
#endif
#if ENABLED(BABYSTEPPING) #if ENABLED(BABYSTEPPING)
static volatile int babystepsTodo[3]; static volatile int babystepsTodo[3];
#endif #endif
@ -270,9 +265,10 @@ class Temperature {
#if HAS_TEMP_CHAMBER #if HAS_TEMP_CHAMBER
static uint16_t raw_temp_chamber_value; static uint16_t raw_temp_chamber_value;
static float current_temperature_chamber;
static int16_t current_temperature_chamber_raw;
#endif #endif
#ifdef MAX_CONSECUTIVE_LOW_TEMPERATURE_ERROR_ALLOWED #ifdef MAX_CONSECUTIVE_LOW_TEMPERATURE_ERROR_ALLOWED
static uint8_t consecutive_low_temperature_error[HOTENDS]; static uint8_t consecutive_low_temperature_error[HOTENDS];
#endif #endif