X-Git-Url: https://git.hcoop.net/clinton/Smoothieware.git/blobdiff_plain/e0d0ea8477f3d303d9451617bf257fb7d9998b54..7143d4224e333ea2c934a82395a049f3d29aec0e:/src/modules/tools/temperaturecontrol/TemperatureControl.h diff --git a/src/modules/tools/temperaturecontrol/TemperatureControl.h b/src/modules/tools/temperaturecontrol/TemperatureControl.h index 87f7e331..6f2b755b 100644 --- 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,14 +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; - }; - uint16_t set_m_code; uint16_t set_and_wait_m_code; uint16_t get_m_code; @@ -87,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