MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Let compiler do Temperature inlining

Browse Source
This commit is contained in:
Scott Lahteine 2021-04-23 19:36:43 -05:00 committed by Scott Lahteine
parent 9f22aaea2f
commit 7d5714fedd
1 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
Marlin/src/module/temperature.h
View File

@ -324,7 +324,7 @@ class Temperature {
#define HOTEND_TEMPS (HOTENDS + ENABLED(TEMP_SENSOR_1_AS_REDUNDANT)) #define HOTEND_TEMPS (HOTENDS + ENABLED(TEMP_SENSOR_1_AS_REDUNDANT))
static hotend_info_t temp_hotend[HOTEND_TEMPS]; static hotend_info_t temp_hotend[HOTEND_TEMPS];
static const celsius_t hotend_maxtemp[HOTENDS]; static const celsius_t hotend_maxtemp[HOTENDS];
FORCE_INLINE static celsius_t hotend_max_target(const uint8_t e) { return hotend_maxtemp[e] - (HOTEND_OVERSHOOT); } static inline celsius_t hotend_max_target(const uint8_t e) { return hotend_maxtemp[e] - (HOTEND_OVERSHOOT); }
#endif #endif
#if ENABLED(HAS_HEATED_BED) #if ENABLED(HAS_HEATED_BED)
static bed_info_t temp_bed; static bed_info_t temp_bed;
@ -357,20 +357,20 @@ class Temperature {
#if ENABLED(PREVENT_COLD_EXTRUSION) #if ENABLED(PREVENT_COLD_EXTRUSION)
static bool allow_cold_extrude; static bool allow_cold_extrude;
static celsius_t extrude_min_temp; static celsius_t extrude_min_temp;
FORCE_INLINE static bool tooCold(const celsius_t temp) { return allow_cold_extrude ? false : temp < extrude_min_temp - (TEMP_WINDOW); } static inline bool tooCold(const celsius_t temp) { return allow_cold_extrude ? false : temp < extrude_min_temp - (TEMP_WINDOW); }
FORCE_INLINE static bool tooColdToExtrude(const uint8_t E_NAME) { static inline bool tooColdToExtrude(const uint8_t E_NAME) {
return tooCold(degHotend(HOTEND_INDEX)); return tooCold(degHotend(HOTEND_INDEX));
} }
FORCE_INLINE static bool targetTooColdToExtrude(const uint8_t E_NAME) { static inline bool targetTooColdToExtrude(const uint8_t E_NAME) {
return tooCold(degTargetHotend(HOTEND_INDEX)); return tooCold(degTargetHotend(HOTEND_INDEX));
} }
#else #else
FORCE_INLINE static bool tooColdToExtrude(const uint8_t) { return false; } static inline bool tooColdToExtrude(const uint8_t) { return false; }
FORCE_INLINE static bool targetTooColdToExtrude(const uint8_t) { return false; } static inline bool targetTooColdToExtrude(const uint8_t) { return false; }
#endif #endif
FORCE_INLINE static bool hotEnoughToExtrude(const uint8_t e) { return !tooColdToExtrude(e); } static inline bool hotEnoughToExtrude(const uint8_t e) { return !tooColdToExtrude(e); }
FORCE_INLINE static bool targetHotEnoughToExtrude(const uint8_t e) { return !targetTooColdToExtrude(e); } static inline bool targetHotEnoughToExtrude(const uint8_t e) { return !targetTooColdToExtrude(e); }
#if ENABLED(SINGLENOZZLE_STANDBY_FAN) #if ENABLED(SINGLENOZZLE_STANDBY_FAN)
static celsius_t singlenozzle_temp[EXTRUDERS]; static celsius_t singlenozzle_temp[EXTRUDERS];
@ -506,25 +506,25 @@ class Temperature {
static void log_user_thermistor(const uint8_t t_index, const bool eprom=false); static void log_user_thermistor(const uint8_t t_index, const bool eprom=false);
static void reset_user_thermistors(); static void reset_user_thermistors();
static celsius_t user_thermistor_to_deg_c(const uint8_t t_index, const int raw); static celsius_t user_thermistor_to_deg_c(const uint8_t t_index, const int raw);
static bool set_pull_up_res(int8_t t_index, float value) { static inline bool set_pull_up_res(int8_t t_index, float value) {
//if (!WITHIN(t_index, 0, USER_THERMISTORS - 1)) return false; //if (!WITHIN(t_index, 0, USER_THERMISTORS - 1)) return false;
if (!WITHIN(value, 1, 1000000)) return false; if (!WITHIN(value, 1, 1000000)) return false;
user_thermistor[t_index].series_res = value; user_thermistor[t_index].series_res = value;
return true; return true;
} }
static bool set_res25(int8_t t_index, float value) { static inline bool set_res25(int8_t t_index, float value) {
if (!WITHIN(value, 1, 10000000)) return false; if (!WITHIN(value, 1, 10000000)) return false;
user_thermistor[t_index].res_25 = value; user_thermistor[t_index].res_25 = value;
user_thermistor[t_index].pre_calc = true; user_thermistor[t_index].pre_calc = true;
return true; return true;
} }
static bool set_beta(int8_t t_index, float value) { static inline bool set_beta(int8_t t_index, float value) {
if (!WITHIN(value, 1, 1000000)) return false; if (!WITHIN(value, 1, 1000000)) return false;
user_thermistor[t_index].beta = value; user_thermistor[t_index].beta = value;
user_thermistor[t_index].pre_calc = true; user_thermistor[t_index].pre_calc = true;
return true; return true;
} }
static bool set_sh_coeff(int8_t t_index, float value) { static inline bool set_sh_coeff(int8_t t_index, float value) {
if (!WITHIN(value, -0.01f, 0.01f)) return false; if (!WITHIN(value, -0.01f, 0.01f)) return false;
user_thermistor[t_index].sh_c_coeff = value; user_thermistor[t_index].sh_c_coeff = value;
user_thermistor[t_index].pre_calc = true; user_thermistor[t_index].pre_calc = true;
@ -614,13 +614,13 @@ class Temperature {
* Preheating hotends * Preheating hotends
*/ */
#ifdef MILLISECONDS_PREHEAT_TIME #ifdef MILLISECONDS_PREHEAT_TIME
static bool is_preheating(const uint8_t E_NAME) { static inline bool is_preheating(const uint8_t E_NAME) {
return preheat_end_time[HOTEND_INDEX] && PENDING(millis(), preheat_end_time[HOTEND_INDEX]); return preheat_end_time[HOTEND_INDEX] && PENDING(millis(), preheat_end_time[HOTEND_INDEX]);
} }
static void start_preheat_time(const uint8_t E_NAME) { static inline void start_preheat_time(const uint8_t E_NAME) {
preheat_end_time[HOTEND_INDEX] = millis() + MILLISECONDS_PREHEAT_TIME; preheat_end_time[HOTEND_INDEX] = millis() + MILLISECONDS_PREHEAT_TIME;
} }
static void reset_preheat_time(const uint8_t E_NAME) { static inline void reset_preheat_time(const uint8_t E_NAME) {
preheat_end_time[HOTEND_INDEX] = 0; preheat_end_time[HOTEND_INDEX] = 0;
} }
#else #else
@ -631,17 +631,17 @@ class Temperature {
//inline so that there is no performance decrease. //inline so that there is no performance decrease.
//deg=degreeCelsius //deg=degreeCelsius
FORCE_INLINE static celsius_t degHotend(const uint8_t E_NAME) { static inline celsius_t degHotend(const uint8_t E_NAME) {
return TERN0(HAS_HOTEND, temp_hotend[HOTEND_INDEX].celsius); return TERN0(HAS_HOTEND, temp_hotend[HOTEND_INDEX].celsius);
} }
#if ENABLED(SHOW_TEMP_ADC_VALUES) #if ENABLED(SHOW_TEMP_ADC_VALUES)
FORCE_INLINE static int16_t rawHotendTemp(const uint8_t E_NAME) { static inline int16_t rawHotendTemp(const uint8_t E_NAME) {
return TERN0(HAS_HOTEND, temp_hotend[HOTEND_INDEX].raw); return TERN0(HAS_HOTEND, temp_hotend[HOTEND_INDEX].raw);
} }
#endif #endif
FORCE_INLINE static celsius_t degTargetHotend(const uint8_t E_NAME) { static inline celsius_t degTargetHotend(const uint8_t E_NAME) {
return TERN0(HAS_HOTEND, temp_hotend[HOTEND_INDEX].target); return TERN0(HAS_HOTEND, temp_hotend[HOTEND_INDEX].target);
} }
@ -666,11 +666,11 @@ class Temperature {
start_watching_hotend(ee); start_watching_hotend(ee);
} }
FORCE_INLINE static bool isHeatingHotend(const uint8_t E_NAME) { static inline bool isHeatingHotend(const uint8_t E_NAME) {
return temp_hotend[HOTEND_INDEX].target > temp_hotend[HOTEND_INDEX].celsius; return temp_hotend[HOTEND_INDEX].target > temp_hotend[HOTEND_INDEX].celsius;
} }
FORCE_INLINE static bool isCoolingHotend(const uint8_t E_NAME) { static inline bool isCoolingHotend(const uint8_t E_NAME) {
return temp_hotend[HOTEND_INDEX].target < temp_hotend[HOTEND_INDEX].celsius; return temp_hotend[HOTEND_INDEX].target < temp_hotend[HOTEND_INDEX].celsius;
} }
@ -686,11 +686,11 @@ class Temperature {
#endif #endif
#endif #endif
FORCE_INLINE static bool still_heating(const uint8_t e) { static inline bool still_heating(const uint8_t e) {
return degTargetHotend(e) > TEMP_HYSTERESIS && ABS(degHotend(e) - degTargetHotend(e)) > TEMP_HYSTERESIS; return degTargetHotend(e) > TEMP_HYSTERESIS && ABS(degHotend(e) - degTargetHotend(e)) > TEMP_HYSTERESIS;
} }
FORCE_INLINE static bool degHotendNear(const uint8_t e, const_float_t temp) { static inline bool degHotendNear(const uint8_t e, const_float_t temp) {
return ABS(degHotend(e) - temp) < (TEMP_HYSTERESIS); return ABS(degHotend(e) - temp) < (TEMP_HYSTERESIS);
} }
@ -699,12 +699,12 @@ class Temperature {
#if HAS_HEATED_BED #if HAS_HEATED_BED
#if ENABLED(SHOW_TEMP_ADC_VALUES) #if ENABLED(SHOW_TEMP_ADC_VALUES)
FORCE_INLINE static int16_t rawBedTemp() { return temp_bed.raw; } static inline int16_t rawBedTemp() { return temp_bed.raw; }
#endif #endif
FORCE_INLINE static celsius_t degBed() { return temp_bed.celsius; } static inline celsius_t degBed() { return temp_bed.celsius; }
FORCE_INLINE static celsius_t degTargetBed() { return temp_bed.target; } static inline celsius_t degTargetBed() { return temp_bed.target; }
FORCE_INLINE static bool isHeatingBed() { return temp_bed.target > temp_bed.celsius; } static inline bool isHeatingBed() { return temp_bed.target > temp_bed.celsius; }
FORCE_INLINE static bool isCoolingBed() { return temp_bed.target < temp_bed.celsius; } static inline bool isCoolingBed() { return temp_bed.target < temp_bed.celsius; }
#if WATCH_BED #if WATCH_BED
static void start_watching_bed(); static void start_watching_bed();
@ -726,7 +726,7 @@ class Temperature {
static void wait_for_bed_heating(); static void wait_for_bed_heating();
FORCE_INLINE static bool degBedNear(const_float_t temp) { static inline bool degBedNear(const_float_t temp) {
return ABS(degBed() - temp) < (TEMP_BED_HYSTERESIS); return ABS(degBed() - temp) < (TEMP_BED_HYSTERESIS);
} }
@ -734,11 +734,11 @@ class Temperature {
#if HAS_TEMP_PROBE #if HAS_TEMP_PROBE
#if ENABLED(SHOW_TEMP_ADC_VALUES) #if ENABLED(SHOW_TEMP_ADC_VALUES)
FORCE_INLINE static int16_t rawProbeTemp() { return temp_probe.raw; } static inline int16_t rawProbeTemp() { return temp_probe.raw; }
#endif #endif
FORCE_INLINE static celsius_t degProbe() { return temp_probe.celsius; } static inline celsius_t degProbe() { return temp_probe.celsius; }
FORCE_INLINE static bool isProbeBelowTemp(const_float_t target_temp) { return temp_probe.celsius < target_temp; } static inline bool isProbeBelowTemp(const_float_t target_temp) { return temp_probe.celsius < target_temp; }
FORCE_INLINE static bool isProbeAboveTemp(const_float_t target_temp) { return temp_probe.celsius > target_temp; } static inline bool isProbeAboveTemp(const_float_t target_temp) { return temp_probe.celsius > target_temp; }
static bool wait_for_probe(const_float_t target_temp, bool no_wait_for_cooling=true); static bool wait_for_probe(const_float_t target_temp, bool no_wait_for_cooling=true);
#endif #endif
@ -750,13 +750,13 @@ class Temperature {
#if HAS_TEMP_CHAMBER #if HAS_TEMP_CHAMBER
#if ENABLED(SHOW_TEMP_ADC_VALUES) #if ENABLED(SHOW_TEMP_ADC_VALUES)
FORCE_INLINE static int16_t rawChamberTemp() { return temp_chamber.raw; } static inline int16_t rawChamberTemp() { return temp_chamber.raw; }
#endif #endif
FORCE_INLINE static celsius_t degChamber() { return temp_chamber.celsius; } static inline celsius_t degChamber() { return temp_chamber.celsius; }
#if HAS_HEATED_CHAMBER #if HAS_HEATED_CHAMBER
FORCE_INLINE static celsius_t degTargetChamber() { return temp_chamber.target; } static inline celsius_t degTargetChamber() { return temp_chamber.target; }
FORCE_INLINE static bool isHeatingChamber() { return temp_chamber.target > temp_chamber.celsius; } static inline bool isHeatingChamber() { return temp_chamber.target > temp_chamber.celsius; }
FORCE_INLINE static bool isCoolingChamber() { return temp_chamber.target < temp_chamber.celsius; } static inline bool isCoolingChamber() { return temp_chamber.target < temp_chamber.celsius; }
static bool wait_for_chamber(const bool no_wait_for_cooling=true); static bool wait_for_chamber(const bool no_wait_for_cooling=true);
#endif #endif
#endif #endif
@ -776,13 +776,13 @@ class Temperature {
#if HAS_TEMP_COOLER #if HAS_TEMP_COOLER
#if ENABLED(SHOW_TEMP_ADC_VALUES) #if ENABLED(SHOW_TEMP_ADC_VALUES)
FORCE_INLINE static int16_t rawCoolerTemp() { return temp_cooler.raw; } static inline int16_t rawCoolerTemp() { return temp_cooler.raw; }
#endif #endif
FORCE_INLINE static celsius_t degCooler() { return temp_cooler.celsius; } static inline celsius_t degCooler() { return temp_cooler.celsius; }
#if HAS_COOLER #if HAS_COOLER
FORCE_INLINE static celsius_t degTargetCooler() { return temp_cooler.target; } static inline celsius_t degTargetCooler() { return temp_cooler.target; }
FORCE_INLINE static bool isLaserHeating() { return temp_cooler.target > temp_cooler.celsius; } static inline bool isLaserHeating() { return temp_cooler.target > temp_cooler.celsius; }
FORCE_INLINE static bool isLaserCooling() { return temp_cooler.target < temp_cooler.celsius; } static inline bool isLaserCooling() { return temp_cooler.target < temp_cooler.celsius; }
static bool wait_for_cooler(const bool no_wait_for_cooling=true); static bool wait_for_cooler(const bool no_wait_for_cooling=true);
#endif #endif
#endif #endif
@ -794,7 +794,7 @@ class Temperature {
#endif #endif
#if HAS_COOLER #if HAS_COOLER
static void setTargetCooler(const celsius_t celsius) { static inline void setTargetCooler(const celsius_t celsius) {
temp_cooler.target = constrain(celsius, COOLER_MIN_TARGET, COOLER_MAX_TARGET); temp_cooler.target = constrain(celsius, COOLER_MIN_TARGET, COOLER_MAX_TARGET);
start_watching_cooler(); start_watching_cooler();
} }
@ -839,7 +839,7 @@ class Temperature {
* Update the temp manager when PID values change * Update the temp manager when PID values change
*/ */
#if ENABLED(PIDTEMP) #if ENABLED(PIDTEMP)
FORCE_INLINE static void updatePID() { static inline void updatePID() {
TERN_(PID_EXTRUSION_SCALING, last_e_position = 0); TERN_(PID_EXTRUSION_SCALING, last_e_position = 0);
} }
#endif #endif
@ -848,18 +848,18 @@ class Temperature {
#if ENABLED(PROBING_HEATERS_OFF) #if ENABLED(PROBING_HEATERS_OFF)
static void pause(const bool p); static void pause(const bool p);
FORCE_INLINE static bool is_paused() { return paused; } static inline bool is_paused() { return paused; }
#endif #endif
#if HEATER_IDLE_HANDLER #if HEATER_IDLE_HANDLER
static void reset_hotend_idle_timer(const uint8_t E_NAME) { static inline void reset_hotend_idle_timer(const uint8_t E_NAME) {
heater_idle[HOTEND_INDEX].reset(); heater_idle[HOTEND_INDEX].reset();
start_watching_hotend(HOTEND_INDEX); start_watching_hotend(HOTEND_INDEX);
} }
#if HAS_HEATED_BED #if HAS_HEATED_BED
static void reset_bed_idle_timer() { static inline void reset_bed_idle_timer() {
heater_idle[IDLE_INDEX_BED].reset(); heater_idle[IDLE_INDEX_BED].reset();
start_watching_bed(); start_watching_bed();
} }