remove on_config_reload event

diff --git a/src/libs/Config.cpp b/src/libs/Config.cpp
index d1df1fa..b4e11b7 100644 (file)
--- a/src/libs/Config.cpp
+++ b/src/libs/Config.cpp
@@ -52,21 +52,6 @@ void Config::on_module_loaded() {}
 
 void Config::on_console_line_received( void *argument ) {}
 
-// Set a value in the config cache, but not in any config source
-void Config::set_string( string setting, string value )
-{
-    if(!is_config_cache_loaded()) return;
-
-    ConfigValue *cv = new ConfigValue;
-    cv->found = true;
-    get_checksums(cv->check_sums, setting);
-    cv->value = value;
-
-    this->config_cache->replace_or_push_back(cv);
-
-    THEKERNEL->call_event(ON_CONFIG_RELOAD);
-}
-
 // Get a list of modules, used by module "pools" that look for the "enable" keyboard to find things like "moduletype.modulename.enable" as the marker of a new instance of a module
 void Config::get_module_list(vector<uint16_t> *list, uint16_t family)
 {

diff --git a/src/libs/Module.cpp b/src/libs/Module.cpp
index 89ea65f..0878712 100644 (file)
--- a/src/libs/Module.cpp
+++ b/src/libs/Module.cpp
@@ -21,7 +21,6 @@ const ModuleCallback kernel_callback_functions[NUMBER_OF_DEFINED_EVENTS] = {
     &Module::on_speed_change,
     &Module::on_block_begin,
     &Module::on_block_end,
-    &Module::on_config_reload,
     &Module::on_play,
     &Module::on_pause,
     &Module::on_idle,

diff --git a/src/libs/Module.h b/src/libs/Module.h
index 7080c0d..8997b83 100644 (file)
--- a/src/libs/Module.h
+++ b/src/libs/Module.h
@@ -17,7 +17,6 @@ enum _EVENT_ENUM {
     ON_SPEED_CHANGE,
     ON_BLOCK_BEGIN,
     ON_BLOCK_END,
-    ON_CONFIG_RELOAD,
     ON_PLAY,
     ON_PAUSE,
     ON_IDLE,
@@ -51,7 +50,6 @@ public:
     virtual void on_speed_change(void*){};
     virtual void on_block_begin(void*){};
     virtual void on_block_end(void*){};
-    virtual void on_config_reload(void*){};
     virtual void on_play(void*){};
     virtual void on_pause(void*){};
     virtual void on_idle(void*){};

diff --git a/src/modules/robot/Conveyor.cpp b/src/modules/robot/Conveyor.cpp
index 9ec7561..d1f3ce7 100644 (file)
--- a/src/modules/robot/Conveyor.cpp
+++ b/src/modules/robot/Conveyor.cpp
@@ -60,7 +60,6 @@ Conveyor::Conveyor(){
 void Conveyor::on_module_loaded(){
     register_for_event(ON_IDLE);
     register_for_event(ON_MAIN_LOOP);
-    register_for_event(ON_CONFIG_RELOAD);
 
     on_config_reload(this);
 }

diff --git a/src/modules/robot/Planner.cpp b/src/modules/robot/Planner.cpp
index 30cbce6..059de15 100644 (file)
--- a/src/modules/robot/Planner.cpp
+++ b/src/modules/robot/Planner.cpp
@@ -41,7 +41,6 @@ Planner::Planner(){
 }
 
 void Planner::on_module_loaded(){
-    register_for_event(ON_CONFIG_RELOAD);
     this->on_config_reload(this);
 }
 

diff --git a/src/modules/robot/Robot.cpp b/src/modules/robot/Robot.cpp
index 0ac9704..ba88c1d 100644 (file)
--- a/src/modules/robot/Robot.cpp
+++ b/src/modules/robot/Robot.cpp
@@ -129,7 +129,6 @@ Robot::Robot()
 //Called when the module has just been loaded
 void Robot::on_module_loaded()
 {
-    register_for_event(ON_CONFIG_RELOAD);
     this->register_for_event(ON_GCODE_RECEIVED);
     this->register_for_event(ON_GET_PUBLIC_DATA);
     this->register_for_event(ON_SET_PUBLIC_DATA);

diff --git a/src/modules/robot/Stepper.cpp b/src/modules/robot/Stepper.cpp
index f82b803..6a4b6a1 100644 (file)
--- a/src/modules/robot/Stepper.cpp
+++ b/src/modules/robot/Stepper.cpp
@@ -42,7 +42,6 @@ Stepper::Stepper(){
 
 //Called when the module has just been loaded
 void Stepper::on_module_loaded(){
-    register_for_event(ON_CONFIG_RELOAD);
     this->register_for_event(ON_BLOCK_BEGIN);
     this->register_for_event(ON_BLOCK_END);
     this->register_for_event(ON_GCODE_EXECUTE);

diff --git a/src/modules/tools/endstops/Endstops.cpp b/src/modules/tools/endstops/Endstops.cpp
index 47b2838..a24930b 100644 (file)
--- a/src/modules/tools/endstops/Endstops.cpp
+++ b/src/modules/tools/endstops/Endstops.cpp
@@ -113,7 +113,6 @@ void Endstops::on_module_loaded()
         return;
     }
 
-    register_for_event(ON_CONFIG_RELOAD);
     register_for_event(ON_GCODE_RECEIVED);
     register_for_event(ON_GET_PUBLIC_DATA);
     register_for_event(ON_SET_PUBLIC_DATA);

diff --git a/src/modules/tools/extruder/Extruder.cpp b/src/modules/tools/extruder/Extruder.cpp
index 6ba48e0..5dcfdd7 100644 (file)
--- a/src/modules/tools/extruder/Extruder.cpp
+++ b/src/modules/tools/extruder/Extruder.cpp
@@ -85,7 +85,6 @@ void Extruder::on_module_loaded()
     this->on_config_reload(this);
 
     // We work on the same Block as Stepper, so we need to know when it gets a new one and drops one
-    register_for_event(ON_CONFIG_RELOAD);
     this->register_for_event(ON_BLOCK_BEGIN);
     this->register_for_event(ON_BLOCK_END);
     this->register_for_event(ON_GCODE_RECEIVED);

diff --git a/src/modules/tools/switch/Switch.cpp b/src/modules/tools/switch/Switch.cpp
index 6ceff1c..ad277db 100644 (file)
--- a/src/modules/tools/switch/Switch.cpp
+++ b/src/modules/tools/switch/Switch.cpp
@@ -49,7 +49,6 @@ void Switch::on_module_loaded()
 {
     this->switch_changed = false;
 
-    register_for_event(ON_CONFIG_RELOAD);
     this->register_for_event(ON_GCODE_RECEIVED);
     this->register_for_event(ON_GCODE_EXECUTE);
     this->register_for_event(ON_MAIN_LOOP);

diff --git a/src/modules/tools/temperaturecontrol/TemperatureControl.cpp b/src/modules/tools/temperaturecontrol/TemperatureControl.cpp
index aecc8b0..8c66c3f 100644 (file)
--- a/src/modules/tools/temperaturecontrol/TemperatureControl.cpp
+++ b/src/modules/tools/temperaturecontrol/TemperatureControl.cpp
@@ -84,7 +84,6 @@ void TemperatureControl::on_module_loaded()
     this->on_config_reload(this);
 
     // Register for events
-    register_for_event(ON_CONFIG_RELOAD);
     this->register_for_event(ON_GCODE_EXECUTE);
     this->register_for_event(ON_GCODE_RECEIVED);
     this->register_for_event(ON_MAIN_LOOP);

diff --git a/src/modules/tools/toolmanager/ToolManager.cpp b/src/modules/tools/toolmanager/ToolManager.cpp
index 56385e0..bc5a022 100644 (file)
--- a/src/modules/tools/toolmanager/ToolManager.cpp
+++ b/src/modules/tools/toolmanager/ToolManager.cpp
@@ -38,7 +38,6 @@ ToolManager::ToolManager(){
 void ToolManager::on_module_loaded(){
     this->on_config_reload(this);
 
-    this->register_for_event(ON_CONFIG_RELOAD);
     this->register_for_event(ON_GCODE_RECEIVED);
     this->register_for_event(ON_GET_PUBLIC_DATA);
     this->register_for_event(ON_SET_PUBLIC_DATA);

diff --git a/src/modules/tools/zprobe/ZProbe.cpp b/src/modules/tools/zprobe/ZProbe.cpp
index c8f848a..4638f99 100644 (file)
--- a/src/modules/tools/zprobe/ZProbe.cpp
+++ b/src/modules/tools/zprobe/ZProbe.cpp
@@ -63,7 +63,6 @@ void ZProbe::on_module_loaded()
     // load settings
     this->on_config_reload(this);
     // register event-handlers
-    register_for_event(ON_CONFIG_RELOAD);
     register_for_event(ON_GCODE_RECEIVED);
     register_for_event(ON_IDLE);
 

diff --git a/src/modules/utils/PlayLed/PlayLed.cpp b/src/modules/utils/PlayLed/PlayLed.cpp
index 0772624..96c647f 100644 (file)
--- a/src/modules/utils/PlayLed/PlayLed.cpp
+++ b/src/modules/utils/PlayLed/PlayLed.cpp
@@ -29,8 +29,6 @@ void PlayLed::on_module_loaded()
         return;
     }
 
-    register_for_event(ON_CONFIG_RELOAD);
-
     //register_for_event(ON_PLAY);
     //TODO: these two events happen in interrupt context and it's extremely important they don't last long. This should be done by checking the size of the queue once a second or something
     //register_for_event(ON_BLOCK_BEGIN);

diff --git a/src/modules/utils/configurator/Configurator.cpp b/src/modules/utils/configurator/Configurator.cpp
index 861d250..0a29473 100644 (file)
--- a/src/modules/utils/configurator/Configurator.cpp
+++ b/src/modules/utils/configurator/Configurator.cpp
@@ -171,32 +171,9 @@ void Configurator::config_load_command( string parameters, StreamOutput *stream
         get_checksums(cs, key);
         stream->printf( "checksum of %s = %02X %02X %02X\n", key.c_str(), cs[0], cs[1], cs[2]);
 
-    } else if(source == "") {
-        THEKERNEL->config->config_cache_load();
-        THEKERNEL->call_event(ON_CONFIG_RELOAD);
-        stream->printf( "Reloaded settings\r\n" );
-        THEKERNEL->config->config_cache_clear();
-
-    } else if(file_exists(source)) {
-        FileConfigSource fcs(source, "userfile");
-        THEKERNEL->config->config_cache_load(false);
-        fcs.transfer_values_to_cache(THEKERNEL->config->config_cache);
-        THEKERNEL->call_event(ON_CONFIG_RELOAD);
-        stream->printf( "Loaded settings from %s\r\n", source.c_str() );
-        THEKERNEL->config->config_cache_clear();
 
     } else {
-        uint16_t source_checksum = get_checksum(source);
-        for(unsigned int i = 0; i < THEKERNEL->config->config_sources.size(); i++) {
-            if( THEKERNEL->config->config_sources[i]->is_named(source_checksum) ) {
-                THEKERNEL->config->config_cache_load(false);
-                THEKERNEL->config->config_sources[i]->transfer_values_to_cache(THEKERNEL->config->config_cache);
-                THEKERNEL->call_event(ON_CONFIG_RELOAD);
-                stream->printf( "Loaded settings from %s\r\n", source.c_str() );
-                THEKERNEL->config->config_cache_clear();
-                break;
-            }
-        }
+        stream->printf( "unsupported option\n" );
     }
 }