Sfoglia il codice sorgente

Fix temperature runaway variable types (merge conflict)

Alex Voinea 3 anni fa
parent
commit
67e6361ff1
1 ha cambiato i file con 3 aggiunte e 3 eliminazioni
  1. 3 3
      Firmware/temperature.cpp

+ 3 - 3
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)
 #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_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_check(uint8_t _heater_id, float _target_temperature, float _current_temperature, float _output, bool _isbed);
 static void temp_runaway_stop(bool isPreheat, bool isBed);
 static void temp_runaway_stop(bool isPreheat, bool isBed);