|
@@ -112,9 +112,9 @@ class Temperature {
|
112
|
112
|
|
113
|
113
|
#if ENABLED(PREVENT_DANGEROUS_EXTRUDE)
|
114
|
114
|
static float extrude_min_temp;
|
115
|
|
- static FORCE_INLINE bool tooColdToExtrude(uint8_t e) { return degHotend(e) < extrude_min_temp; }
|
|
115
|
+ static bool tooColdToExtrude(uint8_t e) { return degHotend(e) < extrude_min_temp; }
|
116
|
116
|
#else
|
117
|
|
- static FORCE_INLINE bool tooColdToExtrude(uint8_t e) { UNUSED(e); return false; }
|
|
117
|
+ static bool tooColdToExtrude(uint8_t e) { UNUSED(e); return false; }
|
118
|
118
|
#endif
|
119
|
119
|
|
120
|
120
|
private:
|
|
@@ -230,16 +230,16 @@ class Temperature {
|
230
|
230
|
//inline so that there is no performance decrease.
|
231
|
231
|
//deg=degreeCelsius
|
232
|
232
|
|
233
|
|
- static FORCE_INLINE float degHotend(uint8_t extruder) { return current_temperature[extruder]; }
|
234
|
|
- static FORCE_INLINE float degBed() { return current_temperature_bed; }
|
|
233
|
+ static float degHotend(uint8_t extruder) { return current_temperature[extruder]; }
|
|
234
|
+ static float degBed() { return current_temperature_bed; }
|
235
|
235
|
|
236
|
236
|
#if ENABLED(SHOW_TEMP_ADC_VALUES)
|
237
|
|
- static FORCE_INLINE float rawHotendTemp(uint8_t extruder) { return current_temperature_raw[extruder]; }
|
238
|
|
- static FORCE_INLINE float rawBedTemp() { return current_temperature_bed_raw; }
|
|
237
|
+ static float rawHotendTemp(uint8_t extruder) { return current_temperature_raw[extruder]; }
|
|
238
|
+ static float rawBedTemp() { return current_temperature_bed_raw; }
|
239
|
239
|
#endif
|
240
|
240
|
|
241
|
|
- static FORCE_INLINE float degTargetHotend(uint8_t extruder) { return target_temperature[extruder]; }
|
242
|
|
- static FORCE_INLINE float degTargetBed() { return target_temperature_bed; }
|
|
241
|
+ static float degTargetHotend(uint8_t extruder) { return target_temperature[extruder]; }
|
|
242
|
+ static float degTargetBed() { return target_temperature_bed; }
|
243
|
243
|
|
244
|
244
|
#if ENABLED(THERMAL_PROTECTION_HOTENDS) && WATCH_TEMP_PERIOD > 0
|
245
|
245
|
static void start_watching_heater(int e = 0);
|
|
@@ -249,25 +249,25 @@ class Temperature {
|
249
|
249
|
static void start_watching_bed();
|
250
|
250
|
#endif
|
251
|
251
|
|
252
|
|
- static FORCE_INLINE void setTargetHotend(const float& celsius, uint8_t extruder) {
|
|
252
|
+ static void setTargetHotend(const float& celsius, uint8_t extruder) {
|
253
|
253
|
target_temperature[extruder] = celsius;
|
254
|
254
|
#if ENABLED(THERMAL_PROTECTION_HOTENDS) && WATCH_TEMP_PERIOD > 0
|
255
|
255
|
start_watching_heater(extruder);
|
256
|
256
|
#endif
|
257
|
257
|
}
|
258
|
258
|
|
259
|
|
- static FORCE_INLINE void setTargetBed(const float& celsius) {
|
|
259
|
+ static void setTargetBed(const float& celsius) {
|
260
|
260
|
target_temperature_bed = celsius;
|
261
|
261
|
#if ENABLED(THERMAL_PROTECTION_BED) && WATCH_BED_TEMP_PERIOD > 0
|
262
|
262
|
start_watching_bed();
|
263
|
263
|
#endif
|
264
|
264
|
}
|
265
|
265
|
|
266
|
|
- static FORCE_INLINE bool isHeatingHotend(uint8_t extruder) { return target_temperature[extruder] > current_temperature[extruder]; }
|
267
|
|
- static FORCE_INLINE bool isHeatingBed() { return target_temperature_bed > current_temperature_bed; }
|
|
266
|
+ static bool isHeatingHotend(uint8_t extruder) { return target_temperature[extruder] > current_temperature[extruder]; }
|
|
267
|
+ static bool isHeatingBed() { return target_temperature_bed > current_temperature_bed; }
|
268
|
268
|
|
269
|
|
- static FORCE_INLINE bool isCoolingHotend(uint8_t extruder) { return target_temperature[extruder] < current_temperature[extruder]; }
|
270
|
|
- static FORCE_INLINE bool isCoolingBed() { return target_temperature_bed < current_temperature_bed; }
|
|
269
|
+ static bool isCoolingHotend(uint8_t extruder) { return target_temperature[extruder] < current_temperature[extruder]; }
|
|
270
|
+ static bool isCoolingBed() { return target_temperature_bed < current_temperature_bed; }
|
271
|
271
|
|
272
|
272
|
/**
|
273
|
273
|
* The software PWM power for a heater
|
|
@@ -291,7 +291,7 @@ class Temperature {
|
291
|
291
|
*/
|
292
|
292
|
static void updatePID();
|
293
|
293
|
|
294
|
|
- static FORCE_INLINE void autotempShutdown() {
|
|
294
|
+ static void autotempShutdown() {
|
295
|
295
|
#if ENABLED(AUTOTEMP)
|
296
|
296
|
if (planner.autotemp_enabled) {
|
297
|
297
|
planner.autotemp_enabled = false;
|
|
@@ -303,7 +303,7 @@ class Temperature {
|
303
|
303
|
|
304
|
304
|
#if ENABLED(BABYSTEPPING)
|
305
|
305
|
|
306
|
|
- static FORCE_INLINE void babystep_axis(AxisEnum axis, int distance) {
|
|
306
|
+ static void babystep_axis(AxisEnum axis, int distance) {
|
307
|
307
|
#if ENABLED(COREXY) || ENABLED(COREXZ) || ENABLED(COREYZ)
|
308
|
308
|
#if ENABLED(BABYSTEP_XY)
|
309
|
309
|
switch (axis) {
|