Increase timeout max to 2040 secs or 34 minutes
authorJim Morris <morris@wolfman.com>
Thu, 20 Oct 2016 21:33:57 +0000 (14:33 -0700)
committerJim Morris <morris@wolfman.com>
Thu, 20 Oct 2016 21:33:57 +0000 (14:33 -0700)
src/modules/tools/temperaturecontrol/TemperatureControl.cpp
src/modules/tools/temperaturecontrol/TemperatureControl.h

index f6cf550..1cb2ebc 100644 (file)
@@ -143,12 +143,12 @@ void TemperatureControl::load_config()
     if(n > 63) n= 63;
     this->runaway_range= n;
 
-    // these need to fit in 7 bits after dividing by 8 so max is 1016 secs or 17 minutes
+    // these need to fit in 7 bits after dividing by 8 so max is 2040 secs or 34 minutes
     n= THEKERNEL->config->value(temperature_control_checksum, this->name_checksum, runaway_heating_timeout_checksum)->by_default(0)->as_number();
-    if(n > 1016) n= 1016;
+    if(n > 2040) n= 2040;
     this->runaway_heating_timeout = n/8; // we have 8 second ticks
     n= THEKERNEL->config->value(temperature_control_checksum, this->name_checksum, runaway_cooling_timeout_checksum)->by_default((float)n)->as_number();
-    if(n > 1016) n= 1016;
+    if(n > 2040) n= 2040;
     this->runaway_cooling_timeout = n/8;
 
     // Max and min temperatures we are not allowed to get over (Safety)
index ce15dcd..9df2969 100644 (file)
@@ -77,12 +77,12 @@ class TemperatureControl : public Module {
             uint16_t set_m_code:10;
             uint16_t set_and_wait_m_code:10;
             uint16_t get_m_code:10;
-            RUNAWAY_TYPE runaway_state:3;
+            RUNAWAY_TYPE runaway_state:2;
             // Temperature runaway config options
             uint8_t runaway_range:6; // max 63
-            uint16_t runaway_heating_timeout:7; // 1016 secs
-            uint16_t runaway_cooling_timeout:7; // 1016 secs
-            uint16_t runaway_timer:7;
+            uint16_t runaway_heating_timeout:8; // 2040 secs
+            uint16_t runaway_cooling_timeout:8; // 2040 secs
+            uint16_t runaway_timer:8;
             uint8_t tick:3;
             bool use_bangbang:1;
             bool waiting:1;