refactors

[clinton/Smoothieware.git] / src / libs / Kernel.h

diff --git a/src/libs/Kernel.h b/src/libs/Kernel.h
index f11970d..4a2feb7 100644 (file)
--- a/src/libs/Kernel.h
+++ b/src/libs/Kernel.h
@@ -9,6 +9,8 @@
 #define KERNEL_H
 
 #define THEKERNEL Kernel::instance
+#define THECONVEYOR THEKERNEL->conveyor
+#define THEROBOT THEKERNEL->robot
 
 #include "Module.h"
 #include <array>
@@ -24,7 +26,6 @@ class SerialConsole;
 class StreamOutputPool;
 class GcodeDispatch;
 class Robot;
-class Stepper;
 class Planner;
 class StepTicker;
 class Adc;
@@ -42,7 +43,7 @@ class Kernel {
         void register_for_event(_EVENT_ENUM id_event, Module *module);
         void call_event(_EVENT_ENUM id_event, void * argument= nullptr);
 
-        bool kernel_has_event(_EVENT_ENUM id_event, Module *mod);
+        bool kernel_has_event(_EVENT_ENUM id_event, Module *module);
         void unregister_for_event(_EVENT_ENUM id_event, Module *module);
 
         bool is_using_leds() const { return use_leds; }
@@ -60,7 +61,6 @@ class Kernel {
         StreamOutputPool* streams;
         GcodeDispatch*    gcode_dispatch;
         Robot*            robot;
-        Stepper*          stepper;
         Planner*          planner;
         Config*           config;
         Conveyor*         conveyor;