From 67e6361ff17dea34a61a02d71c8d04a24c9011cc Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Sun, 30 Jan 2022 13:16:05 +0100 Subject: [PATCH] Fix temperature runaway variable types (merge conflict) --- Firmware/temperature.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index 401218c8d..684dcd444 100755 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -220,10 +220,10 @@ enum TempRunawayStates : uint8_t //=========================================================================== #if (defined (TEMP_RUNAWAY_BED_HYSTERESIS) && TEMP_RUNAWAY_BED_TIMEOUT > 0) || (defined (TEMP_RUNAWAY_EXTRUDER_HYSTERESIS) && TEMP_RUNAWAY_EXTRUDER_TIMEOUT > 0) -static float temp_runaway_status[1 + EXTRUDERS]; +static uint8_t temp_runaway_status[1 + EXTRUDERS]; static float temp_runaway_target[1 + EXTRUDERS]; -static float temp_runaway_timer[1 + EXTRUDERS]; -static int temp_runaway_error_counter[1 + EXTRUDERS]; +static uint32_t temp_runaway_timer[1 + EXTRUDERS]; +static uint16_t temp_runaway_error_counter[1 + EXTRUDERS]; static void temp_runaway_check(uint8_t _heater_id, float _target_temperature, float _current_temperature, float _output, bool _isbed); static void temp_runaway_stop(bool isPreheat, bool isBed);