Merge pull request #566 from wolfmanjm/upstreamedge

[clinton/Smoothieware.git] / src / modules / tools / temperaturecontrol / TemperatureControl.h

diff --git a/src/modules/tools/temperaturecontrol/TemperatureControl.h b/src/modules/tools/temperaturecontrol/TemperatureControl.h
index 1c52f19..6f2b755 100644 (file)
--- a/src/modules/tools/temperaturecontrol/TemperatureControl.h
+++ b/src/modules/tools/temperaturecontrol/TemperatureControl.h
@@ -42,6 +42,7 @@ class TemperatureControl : public Module {
         int pool_index;
 
         float target_temperature;
+        float max_temp;
 
         float preset1;
         float preset2;
@@ -61,15 +62,6 @@ class TemperatureControl : public Module {
 
         Pwm  heater_pin;
 
-        struct {
-            bool use_bangbang:1;
-            bool waiting:1;
-            bool min_temp_violated:1;
-            bool link_to_tool:1;
-            bool active:1;
-            bool readonly:1;
-        };
-
         uint16_t set_m_code;
         uint16_t set_and_wait_m_code;
         uint16_t get_m_code;
@@ -89,6 +81,16 @@ class TemperatureControl : public Module {
         float i_factor;
         float d_factor;
         float PIDdt;
+
+        struct {
+            bool use_bangbang:1;
+            bool waiting:1;
+            bool min_temp_violated:1;
+            bool link_to_tool:1;
+            bool active:1;
+            bool readonly:1;
+            bool windup:1;
+        };
 };
 
 #endif