Skip to content

Commit

Permalink
Fix current_temperature_chamber compile error
Browse files Browse the repository at this point in the history
Fix #10505
  • Loading branch information
thinkyhead committed Apr 24, 2018
1 parent 50cc55d commit ad3b95c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
7 changes: 5 additions & 2 deletions Marlin/temperature.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -559,8 +559,11 @@ int Temperature::getHeaterPower(const int heater) {
HOTEND_LOOP()
if (current_temperature[e] > EXTRUDER_AUTO_FAN_TEMPERATURE)
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;
for (uint8_t f = 0; f < COUNT(fanPin); f++) {
Expand Down
8 changes: 2 additions & 6 deletions Marlin/temperature.h
Original file line number Diff line number Diff line change
Expand Up @@ -168,11 +168,6 @@ class Temperature {
#endif
#endif

#if HAS_TEMP_CHAMBER
static float current_temperature_chamber;
static int16_t current_temperature_chamber_raw;
#endif

#if ENABLED(BABYSTEPPING)
static volatile int babystepsTodo[3];
#endif
Expand Down Expand Up @@ -270,9 +265,10 @@ class Temperature {

#if HAS_TEMP_CHAMBER
static uint16_t raw_temp_chamber_value;
static float current_temperature_chamber;
static int16_t current_temperature_chamber_raw;
#endif


#ifdef MAX_CONSECUTIVE_LOW_TEMPERATURE_ERROR_ALLOWED
static uint8_t consecutive_low_temperature_error[HOTENDS];
#endif
Expand Down

0 comments on commit ad3b95c

Please sign in to comment.