Merge remote-tracking branch 'upstream/edge' into feature/5-axis

diff --combined src/modules/tools/temperaturecontrol/TemperatureControl.cpp
index 76c44a0,224b464..e0daff8
--- 1/src/modules/tools/temperaturecontrol/TemperatureControl.cpp
--- 2/src/modules/tools/temperaturecontrol/TemperatureControl.cpp
+++ b/src/modules/tools/temperaturecontrol/TemperatureControl.cpp
@@@ -64,6 -64,9 +64,9 @@@
  #define preset1_checksum                   CHECKSUM("preset1")
  #define preset2_checksum                   CHECKSUM("preset2")
  
+ #define runaway_range_checksum             CHECKSUM("runaway_range")
+ #define runaway_heating_timeout_checksum   CHECKSUM("runaway_heating_timeout")
+ 
  TemperatureControl::TemperatureControl(uint16_t name, int index)
  {
      name_checksum= name;
@@@ -133,6 -136,10 +136,10 @@@ void TemperatureControl::load_config(
  
      this->designator          = THEKERNEL->config->value(temperature_control_checksum, this->name_checksum, designator_checksum)->by_default(string("T"))->as_string();
  
+     // Runaway parameters
+     this->runaway_range           = THEKERNEL->config->value(temperature_control_checksum, this->name_checksum, runaway_range_checksum)->by_default(0)->as_number();
+     this->runaway_heating_timeout = THEKERNEL->config->value(temperature_control_checksum, this->name_checksum, runaway_heating_timeout_checksum)->by_default(0)->as_number();
+ 
      // Max and min temperatures we are not allowed to get over (Safety)
      this->max_temp = THEKERNEL->config->value(temperature_control_checksum, this->name_checksum, max_temp_checksum)->by_default(300)->as_number();
      this->min_temp = THEKERNEL->config->value(temperature_control_checksum, this->name_checksum, min_temp_checksum)->by_default(0)->as_number();
@@@ -311,7 -318,7 +318,7 @@@ void TemperatureControl::on_gcode_recei
  
              if(this->active) {
                  // required so temp change happens in order
 -                THEKERNEL->conveyor->wait_for_empty_queue();
 +                THEKERNEL->conveyor->wait_for_idle();
  
                  float v = gcode->get_value('S');
  
@@@ -510,8 -517,44 +517,44 @@@ void TemperatureControl::pid_process(fl
  
  void TemperatureControl::on_second_tick(void *argument)
  {
+ 
+     // If waiting for a temperature to be reach, display it to keep host programs up to date on the progress
      if (waiting)
          THEKERNEL->streams->printf("%s:%3.1f /%3.1f @%d\n", designator.c_str(), get_temperature(), ((target_temperature <= 0) ? 0.0 : target_temperature), o);
+ 
+     // Check whether or not there is a temperature runaway issue, if so stop everything and report it
+     if(THEKERNEL->is_halted()) return;
+     
+     if( this->target_temperature <= 0 ){ // If we are not trying to heat, state is NOT_HEATING
+         this->runaway_state = NOT_HEATING;
+     }else{
+         switch( this->runaway_state ){
+             case NOT_HEATING: // If we were previously not trying to heat, but we are now, change to state WAITING_FOR_TEMP_TO_BE_REACHED
+                 if( this->target_temperature > 0 ){
+                     this->runaway_state = WAITING_FOR_TEMP_TO_BE_REACHED;
+                     this->runaway_heating_timer = 0;
+                 }
+                 break;
+             case WAITING_FOR_TEMP_TO_BE_REACHED: // In we are in state 1 ( waiting for temperature to be reached ), and the temperature has been reached, change to state TARGET_TEMPERATURE_REACHED
+                 if( this->get_temperature() >= this->target_temperature ){
+                     this->runaway_state = TARGET_TEMPERATURE_REACHED;
+                 }
+                 this->runaway_heating_timer++;
+                 if( this->runaway_heating_timer > this->runaway_heating_timeout && this->runaway_heating_timeout != 0 ){
+                     this->runaway_heating_timer = 0;
+                     THEKERNEL->streams->printf("Error : Temperature too long to be reached on %s, HALT asserted, TURN POWER OFF IMMEDIATELY - reset or M999 required\n", designator.c_str());
+                     THEKERNEL->call_event(ON_HALT, nullptr);
+                 }
+                 break;
+             case TARGET_TEMPERATURE_REACHED: // If we are in state TARGET_TEMPERATURE_REACHED, check for thermal runaway
+                 // If the temperature is outside the acceptable range
+                 if( fabs( this->get_temperature() - this->target_temperature ) > this->runaway_range && this->runaway_range != 0 ){
+                     THEKERNEL->streams->printf("Error : Temperature runaway on %s, HALT asserted, TURN POWER OFF IMMEDIATELY - reset or M999 required\n", designator.c_str());
+                     THEKERNEL->call_event(ON_HALT, nullptr);
+                 }
+                 break;
+         }
+     }
  }
  
  void TemperatureControl::setPIDp(float p)