Reduce size by 1382 bytes (AVR)

Author: thinkyhead

Marlin/src/module/temperature.cpp

@@ -946,6 +946,24 @@ volatile bool Temperature::raw_temps_ready = false;
 
   #define DEBUG_MPC_AUTOTUNE 1
 
+  millis_t Temperature::MPC_autotuner::curr_time_ms, Temperature::MPC_autotuner::next_report_ms;
+
+  float Temperature::MPC_autotuner::elapsed_heating_time;
+  celsius_float_t Temperature::MPC_autotuner::ambient_temp, Temperature::MPC_autotuner::current_temp;
+  celsius_float_t Temperature::MPC_autotuner::temp_samples[16];
+  uint8_t Temperature::MPC_autotuner::sample_count;
+  uint16_t Temperature::MPC_autotuner::sample_distance;
+  float Temperature::MPC_autotuner::t1_time;
+
+  // Parameters from differential analysis
+  celsius_float_t Temperature::MPC_autotuner::temp_fastest;
+  float Temperature::MPC_autotuner::time_fastest, Temperature::MPC_autotuner::rate_fastest;
+
+  float Temperature::MPC_autotuner::power_fan0;
+  #if HAS_FAN
+    float Temperature::MPC_autotuner::power_fan255;
+  #endif
+
   Temperature::MPC_autotuner::MPC_autotuner(const uint8_t extruderIdx) : e(extruderIdx) {
     TERN_(TEMP_TUNING_MAINTAIN_FAN, adaptive_fan_slowing = false);
   }
@@ -973,7 +991,7 @@ volatile bool Temperature::raw_temps_ready = false;
     millis_t next_test_ms = curr_time_ms + test_interval_ms;
     ambient_temp = current_temp = degHotend(e);
     wait_for_heatup = true;
-    
+
     for (;;) { // Can be interrupted with M108
       if (housekeeping() == CANCELLED) return CANCELLED;
 

Marlin/src/module/temperature.h

@@ -1229,46 +1229,46 @@ class Temperature {
           MeasurementState measure_heatup();
           MeasurementState measure_transfer();
 
-          celsius_float_t get_ambient_temp() { return ambient_temp; }
-          celsius_float_t get_last_measured_temp() { return current_temp; }
+          static celsius_float_t get_ambient_temp() { return ambient_temp; }
+          static celsius_float_t get_last_measured_temp() { return current_temp; }
 
-          float get_elapsed_heating_time() { return elapsed_heating_time; }
-          float get_sample_1_time() { return t1_time; }
-          float get_sample_1_temp() { return temp_samples[0]; }
-          float get_sample_2_temp() { return temp_samples[(sample_count - 1) >> 1]; }
-          float get_sample_3_temp() { return temp_samples[sample_count - 1]; }
-          float get_sample_interval() { return sample_distance * (sample_count >> 1); }
+          static float get_elapsed_heating_time() { return elapsed_heating_time; }
+          static float get_sample_1_time() { return t1_time; }
+          static float get_sample_1_temp() { return temp_samples[0]; }
+          static float get_sample_2_temp() { return temp_samples[(sample_count - 1) >> 1]; }
+          static float get_sample_3_temp() { return temp_samples[sample_count - 1]; }
+          static float get_sample_interval() { return sample_distance * (sample_count >> 1); }
 
-          celsius_float_t get_temp_fastest() { return temp_fastest; }
-          float get_time_fastest() { return time_fastest; }
-          float get_rate_fastest() { return rate_fastest; }
+          static celsius_float_t get_temp_fastest() { return temp_fastest; }
+          static float get_time_fastest() { return time_fastest; }
+          static float get_rate_fastest() { return rate_fastest; }
 
-          float get_power_fan0() { return power_fan0; }
+          static float get_power_fan0() { return power_fan0; }
           #if HAS_FAN
-            float get_power_fan255() { return power_fan255; }
+            static float get_power_fan255() { return power_fan255; }
           #endif
 
         protected:
-          void init_timers() { curr_time_ms = next_report_ms = millis(); }
+          static void init_timers() { curr_time_ms = next_report_ms = millis(); }
           MeasurementState housekeeping();
 
-          millis_t curr_time_ms, next_report_ms;
+          static millis_t curr_time_ms, next_report_ms;
           uint8_t e;
 
-          float elapsed_heating_time;
-          celsius_float_t ambient_temp, current_temp;
-          celsius_float_t temp_samples[16];
-          uint8_t sample_count;
-          uint16_t sample_distance;
-          float t1_time;
+          static float elapsed_heating_time;
+          static celsius_float_t ambient_temp, current_temp;
+          static celsius_float_t temp_samples[16];
+          static uint8_t sample_count;
+          static uint16_t sample_distance;
+          static float t1_time;
 
           // Parameters from differential analysis
-          celsius_float_t temp_fastest;
-          float time_fastest, rate_fastest;
+          static celsius_float_t temp_fastest;
+          static float time_fastest, rate_fastest;
 
-          float power_fan0;
+          static float power_fan0;
           #if HAS_FAN
-            float power_fan255;
+            static float power_fan255;
           #endif
       };