Browse Source

Drop FORCE_INLINE from temperature.h

`FORCE_INLINE` seems to have no effect on code generation with standard
optimization.
Scott Lahteine 8 years ago
parent
commit
85512e9372
1 changed files with 16 additions and 16 deletions
  1. 16
    16
      Marlin/temperature.h

+ 16
- 16
Marlin/temperature.h View File

112
 
112
 
113
     #if ENABLED(PREVENT_DANGEROUS_EXTRUDE)
113
     #if ENABLED(PREVENT_DANGEROUS_EXTRUDE)
114
       static float extrude_min_temp;
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
     #else
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
     #endif
118
     #endif
119
 
119
 
120
   private:
120
   private:
230
     //inline so that there is no performance decrease.
230
     //inline so that there is no performance decrease.
231
     //deg=degreeCelsius
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
     #if ENABLED(SHOW_TEMP_ADC_VALUES)
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
     #endif
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
     #if ENABLED(THERMAL_PROTECTION_HOTENDS) && WATCH_TEMP_PERIOD > 0
244
     #if ENABLED(THERMAL_PROTECTION_HOTENDS) && WATCH_TEMP_PERIOD > 0
245
       static void start_watching_heater(int e = 0);
245
       static void start_watching_heater(int e = 0);
249
       static void start_watching_bed();
249
       static void start_watching_bed();
250
     #endif
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
       target_temperature[extruder] = celsius;
253
       target_temperature[extruder] = celsius;
254
       #if ENABLED(THERMAL_PROTECTION_HOTENDS) && WATCH_TEMP_PERIOD > 0
254
       #if ENABLED(THERMAL_PROTECTION_HOTENDS) && WATCH_TEMP_PERIOD > 0
255
         start_watching_heater(extruder);
255
         start_watching_heater(extruder);
256
       #endif
256
       #endif
257
     }
257
     }
258
 
258
 
259
-    static FORCE_INLINE void setTargetBed(const float& celsius) {
259
+    static void setTargetBed(const float& celsius) {
260
       target_temperature_bed = celsius;
260
       target_temperature_bed = celsius;
261
       #if ENABLED(THERMAL_PROTECTION_BED) && WATCH_BED_TEMP_PERIOD > 0
261
       #if ENABLED(THERMAL_PROTECTION_BED) && WATCH_BED_TEMP_PERIOD > 0
262
         start_watching_bed();
262
         start_watching_bed();
263
       #endif
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
      * The software PWM power for a heater
273
      * The software PWM power for a heater
291
      */
291
      */
292
     static void updatePID();
292
     static void updatePID();
293
 
293
 
294
-    static FORCE_INLINE void autotempShutdown() {
294
+    static void autotempShutdown() {
295
       #if ENABLED(AUTOTEMP)
295
       #if ENABLED(AUTOTEMP)
296
         if (planner.autotemp_enabled) {
296
         if (planner.autotemp_enabled) {
297
           planner.autotemp_enabled = false;
297
           planner.autotemp_enabled = false;
303
 
303
 
304
     #if ENABLED(BABYSTEPPING)
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
         #if ENABLED(COREXY) || ENABLED(COREXZ) || ENABLED(COREYZ)
307
         #if ENABLED(COREXY) || ENABLED(COREXZ) || ENABLED(COREYZ)
308
           #if ENABLED(BABYSTEP_XY)
308
           #if ENABLED(BABYSTEP_XY)
309
             switch (axis) {
309
             switch (axis) {

Loading…
Cancel
Save