TemperatureControl: allow setting PID values indepdendently with M301

diff --git a/src/modules/tools/temperaturecontrol/TemperatureControl.cpp b/src/modules/tools/temperaturecontrol/TemperatureControl.cpp
index 832aa1d..57b9517 100644 (file)
--- a/src/modules/tools/temperaturecontrol/TemperatureControl.cpp
+++ b/src/modules/tools/temperaturecontrol/TemperatureControl.cpp
@@ -157,15 +157,18 @@ void TemperatureControl::on_gcode_execute(void* argument){
         }
         if (gcode->m == 301)
         {
-            if (gcode->has_letter('P'))
-                this->p_factor = gcode->get_value('P');
-            if (gcode->has_letter('I'))
-                this->i_factor = gcode->get_value('I');
-            if (gcode->has_letter('D'))
-                this->d_factor = gcode->get_value('D');
-            if (gcode->has_letter('X'))
-                this->i_max    = gcode->get_value('X');
-            gcode->stream->printf("%s: Pf:%g If:%g Df:%g X(I_max):%g Pv:%g Iv:%g Dv:%g O:%d\n", this->designator.c_str(), this->p_factor, this->i_factor, this->d_factor, this->i_max, this->p, this->i, this->d, o);
+            if (gcode->has_letter('S') && (gcode->get_value('S') == this->pool_index))
+            {
+                if (gcode->has_letter('P'))
+                    this->p_factor = gcode->get_value('P');
+                if (gcode->has_letter('I'))
+                    this->i_factor = gcode->get_value('I');
+                if (gcode->has_letter('D'))
+                    this->d_factor = gcode->get_value('D');
+                if (gcode->has_letter('X'))
+                    this->i_max    = gcode->get_value('X');
+            }
+            gcode->stream->printf("%s(S%d): Pf:%g If:%g Df:%g X(I_max):%g Pv:%g Iv:%g Dv:%g O:%d\n", this->designator.c_str(), this->pool_index, this->p_factor, this->i_factor, this->d_factor, this->i_max, this->p, this->i, this->d, o);
         }
     }
 }

diff --git a/src/modules/tools/temperaturecontrol/TemperatureControl.h b/src/modules/tools/temperaturecontrol/TemperatureControl.h
index e3abcf7..6f4185c 100644 (file)
--- a/src/modules/tools/temperaturecontrol/TemperatureControl.h
+++ b/src/modules/tools/temperaturecontrol/TemperatureControl.h
@@ -98,7 +98,9 @@ class TemperatureControl : public Module {
         uint16_t set_m_code;
         uint16_t set_and_wait_m_code;
         uint16_t get_m_code;
+
         string designator;
+        int pool_index;
 };
 
 #endif

diff --git a/src/modules/tools/temperaturecontrol/TemperatureControlPool.cpp b/src/modules/tools/temperaturecontrol/TemperatureControlPool.cpp
index fdad1cc..301fa90 100644 (file)
--- a/src/modules/tools/temperaturecontrol/TemperatureControlPool.cpp
+++ b/src/modules/tools/temperaturecontrol/TemperatureControlPool.cpp
@@ -24,6 +24,7 @@ void TemperatureControlPool::on_module_loaded(){
         // If module is enabled
         if( this->kernel->config->value(temperature_control_checksum, modules[i], enable_checksum )->as_bool() == true ){
             TemperatureControl* controller = new TemperatureControl(modules[i]);
+            controller->pool_index = i;
             this->kernel->add_module(controller);
             this->controllers.push_back( controller );
         }