move some high memory use modules to AHB0 as we started to run out of memory during...

diff --git a/src/libs/Config.h b/src/libs/Config.h
index 9af18cd..4840c21 100644 (file)
--- a/src/libs/Config.h
+++ b/src/libs/Config.h
@@ -17,7 +17,7 @@ class ConfigValue;
 class ConfigSource;
 class ConfigCache;
 
-class Config : public Module {
+class Config  {
     public:
         Config();
         Config(ConfigSource*);

diff --git a/src/libs/Kernel.cpp b/src/libs/Kernel.cpp
index 149005d..2359dcb 100644 (file)
--- a/src/libs/Kernel.cpp
+++ b/src/libs/Kernel.cpp
@@ -101,7 +101,6 @@ Kernel::Kernel(){
     this->grbl_mode= this->config->value( grbl_mode_checksum )->by_default(false)->as_bool();
     this->ok_per_line= this->config->value( ok_per_line_checksum )->by_default(true)->as_bool();
 
-    this->add_module( this->config );
     this->add_module( this->serial );
 
     // HAL stuff
@@ -151,11 +150,10 @@ Kernel::Kernel(){
     this->add_module( this->robot          = new Robot()         );
     this->add_module( this->stepper        = new Stepper()       );
     this->add_module( this->conveyor       = new Conveyor()      );
-    this->add_module( this->configurator   = new Configurator()  );
     this->add_module( this->simpleshell    = new SimpleShell()   );
 
     this->planner = new Planner();
-
+    this->configurator   = new Configurator();
 }
 
 // return a GRBL-like query string for serial ?

diff --git a/src/main.cpp b/src/main.cpp
index 545e22f..acf7899 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -133,11 +133,11 @@ void init() {
 
 
     // Create and add main modules
-    kernel->add_module( new CurrentControl() );
-    kernel->add_module( new KillButton() );
-    kernel->add_module( new PlayLed() );
-    kernel->add_module( new Endstops() );
-    kernel->add_module( new Player() );
+    kernel->add_module( new(AHB0) CurrentControl() );
+    kernel->add_module( new(AHB0) KillButton() );
+    kernel->add_module( new(AHB0) PlayLed() );
+    kernel->add_module( new(AHB0) Endstops() );
+    kernel->add_module( new(AHB0) Player() );
 
 
     // these modules can be completely disabled in the Makefile by adding to EXCLUDE_MODULES
@@ -165,13 +165,10 @@ void init() {
     kernel->add_module( new Spindle() );
     #endif
     #ifndef NO_UTILS_PANEL
-    kernel->add_module( new Panel() );
-    #endif
-    #ifndef NO_TOOLS_TOUCHPROBE
-    kernel->add_module( new Touchprobe() );
+    kernel->add_module( new(AHB0) Panel() );
     #endif
     #ifndef NO_TOOLS_ZPROBE
-    kernel->add_module( new ZProbe() );
+    kernel->add_module( new(AHB0) ZProbe() );
     #endif
     #ifndef NO_TOOLS_SCARACAL
     kernel->add_module( new SCARAcal() );

diff --git a/src/modules/utils/configurator/Configurator.h b/src/modules/utils/configurator/Configurator.h
index c5f6e8d..3752fd2 100644 (file)
--- a/src/modules/utils/configurator/Configurator.h
+++ b/src/modules/utils/configurator/Configurator.h
@@ -9,14 +9,12 @@
 #ifndef configurator_h
 #define configurator_h
 
-#include "Module.h"
-
 #include <string>
 using std::string;
 
 class StreamOutput;
 
-class Configurator : public Module
+class Configurator
 {
 public:
     Configurator() {}