From c34d7a29a6803f59b8732fdac74f404890c91573 Mon Sep 17 00:00:00 2001 From: Bob-the-Kuhn Date: Sat, 3 Jun 2017 16:40:14 -0500 Subject: [PATCH] fix redefinition errors for redundant_temperature Removing redundant_temperature from public section and leaving it in the private section --- Marlin/temperature.cpp | 4 ---- Marlin/temperature.h | 4 ---- 2 files changed, 8 deletions(-) diff --git a/Marlin/temperature.cpp b/Marlin/temperature.cpp index 376740b9f2..40df64b67a 100644 --- a/Marlin/temperature.cpp +++ b/Marlin/temperature.cpp @@ -73,10 +73,6 @@ int16_t Temperature::current_temperature_raw[HOTENDS] = { 0 }, int16_t Temperature::target_temperature_bed = 0; #endif -#if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT) - float Temperature::redundant_temperature = 0.0; -#endif - #if ENABLED(PIDTEMP) #if ENABLED(PID_PARAMS_PER_HOTEND) && HOTENDS > 1 float Temperature::Kp[HOTENDS] = ARRAY_BY_HOTENDS1(DEFAULT_Kp), diff --git a/Marlin/temperature.h b/Marlin/temperature.h index c75349681a..0e0556f942 100644 --- a/Marlin/temperature.h +++ b/Marlin/temperature.h @@ -112,10 +112,6 @@ class Temperature { 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], soft_pwm_amount_bed;