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 462dc99..6f2b755 100644 (file)
--- a/src/modules/tools/temperaturecontrol/TemperatureControl.h
+++ b/src/modules/tools/temperaturecontrol/TemperatureControl.h
@@ -23,10 +23,10 @@ class TemperatureControl : public Module {
         void on_main_loop(void* argument);
         void on_gcode_execute(void* argument);
         void on_gcode_received(void* argument);
-        void on_config_reload(void* argument);
         void on_second_tick(void* argument);
         void on_get_public_data(void* argument);
         void on_set_public_data(void* argument);
+        void on_halt(void* argument);
 
         void set_desired_temperature(float desired_temperature);
 
@@ -35,12 +35,14 @@ class TemperatureControl : public Module {
         friend class PID_Autotuner;
 
     private:
+        void load_config();
         uint32_t thermistor_read_tick(uint32_t dummy);
         void pid_process(float);
 
         int pool_index;
 
         float target_temperature;
+        float max_temp;
 
         float preset1;
         float preset2;
@@ -60,18 +62,12 @@ class TemperatureControl : public Module {
 
         Pwm  heater_pin;
 
-        bool use_bangbang;
-        bool waiting;
-        bool min_temp_violated;
-        bool link_to_tool;
-        bool active;
-
         uint16_t set_m_code;
         uint16_t set_and_wait_m_code;
         uint16_t get_m_code;
         struct pad_temperature public_data_return;
 
-        string designator;
+        std::string designator;
 
         void setPIDp(float p);
         void setPIDi(float i);
@@ -85,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