some more optimizations

diff --git a/src/main.cpp b/src/main.cpp
index aea1a6b..230cc3f 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -162,6 +162,7 @@ void init() {
     kernel->add_module( new Network() );
     #endif
     #ifndef NO_TOOLS_TEMPERATURESWITCH
+    // Must be loaded after TemperatureControlPool
     kernel->add_module( new TemperatureSwitch() );
     #endif
 

diff --git a/src/modules/tools/temperatureswitch/TemperatureSwitch.cpp b/src/modules/tools/temperatureswitch/TemperatureSwitch.cpp
index 4dafb42..979d207 100755 (executable)
--- a/src/modules/tools/temperatureswitch/TemperatureSwitch.cpp
+++ b/src/modules/tools/temperatureswitch/TemperatureSwitch.cpp
@@ -42,20 +42,17 @@ TemperatureSwitch::TemperatureSwitch()
 // Load module
 void TemperatureSwitch::on_module_loaded()
 {
+    // TODO load multiple instances of temperature switch linked to different temp controls and switches
+
     // free up space if not loaded
     if (!THEKERNEL->config->value(temperatureswitch_checksum, temperatureswitch_hotend_checksum, temperatureswitch_enable_checksum)->by_default(false)->as_bool()) {
         delete this;
         return;
     }
 
-    // settings
-    this->on_config_reload(this);
-}
+    // load settings
 
-// Get config
-void TemperatureSwitch::on_config_reload(void *argument)
-{
-    // get the list of temperature controllers and remove any that fon't have designator == "T"
+    // get the list of temperature controllers and remove any that don't have designator == "T"
     vector<uint16_t> controller_list;
     THEKERNEL->config->get_module_list(&controller_list, temperature_control_checksum);
 

diff --git a/src/modules/tools/temperatureswitch/TemperatureSwitch.h b/src/modules/tools/temperatureswitch/TemperatureSwitch.h
index d322636..286ecc4 100755 (executable)
--- a/src/modules/tools/temperatureswitch/TemperatureSwitch.h
+++ b/src/modules/tools/temperatureswitch/TemperatureSwitch.h
@@ -27,7 +27,6 @@ class TemperatureSwitch : public Module
     public:
         TemperatureSwitch();
         void on_module_loaded();
-        void on_config_reload(void *argument);
         void on_second_tick(void *argument);
 
     private: