Browse Source

fix redefinition errors for redundant_temperature

Removing redundant_temperature from public section and leaving it in the
private section
Bob-the-Kuhn 8 years ago
parent
commit
c34d7a29a6
2 changed files with 0 additions and 8 deletions
  1. 0
    4
      Marlin/temperature.cpp
  2. 0
    4
      Marlin/temperature.h

+ 0
- 4
Marlin/temperature.cpp View File

73
   int16_t Temperature::target_temperature_bed = 0;
73
   int16_t Temperature::target_temperature_bed = 0;
74
 #endif
74
 #endif
75
 
75
 
76
-#if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT)
77
-  float Temperature::redundant_temperature = 0.0;
78
-#endif
79
-
80
 #if ENABLED(PIDTEMP)
76
 #if ENABLED(PIDTEMP)
81
   #if ENABLED(PID_PARAMS_PER_HOTEND) && HOTENDS > 1
77
   #if ENABLED(PID_PARAMS_PER_HOTEND) && HOTENDS > 1
82
     float Temperature::Kp[HOTENDS] = ARRAY_BY_HOTENDS1(DEFAULT_Kp),
78
     float Temperature::Kp[HOTENDS] = ARRAY_BY_HOTENDS1(DEFAULT_Kp),

+ 0
- 4
Marlin/temperature.h View File

112
 
112
 
113
     static volatile bool in_temp_isr;
113
     static volatile bool in_temp_isr;
114
 
114
 
115
-    #if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT)
116
-      static float redundant_temperature;
117
-    #endif
118
-
119
     static uint8_t soft_pwm_amount[HOTENDS],
115
     static uint8_t soft_pwm_amount[HOTENDS],
120
                    soft_pwm_amount_bed;
116
                    soft_pwm_amount_bed;
121
 
117
 

Loading…
Cancel
Save