SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #6948 from Bob-the-Kuhn/redundant_temperature

Browse source 
fix redefinition errors for redundant_temperature
This commit is contained in:
Scott Lahteine 2017-06-04 12:16:09 -05:00 committed by GitHub
commit 46752588b9
2 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/temperature.cpp
View file

@ -73,10 +73,6 @@ int16_t Temperature::current_temperature_raw[HOTENDS] = { 0 },
int16_t Temperature::target_temperature_bed = 0; int16_t Temperature::target_temperature_bed = 0;
#endif #endif
#if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT)
float Temperature::redundant_temperature = 0.0;
#endif
#if ENABLED(PIDTEMP) #if ENABLED(PIDTEMP)
#if ENABLED(PID_PARAMS_PER_HOTEND) && HOTENDS > 1 #if ENABLED(PID_PARAMS_PER_HOTEND) && HOTENDS > 1
float Temperature::Kp[HOTENDS] = ARRAY_BY_HOTENDS1(DEFAULT_Kp), float Temperature::Kp[HOTENDS] = ARRAY_BY_HOTENDS1(DEFAULT_Kp),

4
Marlin/temperature.h
View file

@ -112,10 +112,6 @@ class Temperature {
static volatile bool in_temp_isr; static volatile bool in_temp_isr;
#if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT)
static float redundant_temperature;
#endif
static uint8_t soft_pwm_amount[HOTENDS], static uint8_t soft_pwm_amount[HOTENDS],
soft_pwm_amount_bed; soft_pwm_amount_bed;