renamed all references to the Player module to Conveyor

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

diff --git a/src/libs/Kernel.h b/src/libs/Kernel.h
index 92d52f7..0f08270 100644 (file)
--- a/src/libs/Kernel.h
+++ b/src/libs/Kernel.h
@@ -1,8 +1,8 @@
-/*  
+/*
       This file is part of Smoothie (http://smoothieware.org/). The motion control part is heavily based on Grbl (https://github.com/simen/grbl).
       Smoothie is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
       Smoothie is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-      You should have received a copy of the GNU General Public License along with Smoothie. If not, see <http://www.gnu.org/licenses/>. 
+      You should have received a copy of the GNU General Public License along with Smoothie. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef KERNEL_H
@@ -10,6 +10,7 @@
 #include "libs/Module.h"
 #include "libs/Config.h"
 #include "libs/SlowTicker.h"
+#include "libs/StreamOutputPool.h"
 #include "libs/StepTicker.h"
 #include "libs/Adc.h"
 #include "libs/Digipot.h"
@@ -25,7 +26,7 @@
 #define ON_MAIN_LOOP               0
 #define ON_CONSOLE_LINE_RECEIVED   1
 #define ON_GCODE_RECEIVED          2
-#define ON_STEPPER_WAKE_UP         3    //TODO : Remove the need for this event, then this event itself eg: have planner call stepper directly
+#define ON_STEPPER_WAKE_UP         3    //TODO : Remove the need for this event, then this event itself eg: have planner call stepper directly
 #define ON_GCODE_EXECUTE           4
 #define ON_SPEED_CHANGE            5
 #define ON_BLOCK_BEGIN             6
@@ -36,14 +37,11 @@
 #define ON_IDLE                    11
 
 
-using namespace std;
-#include <vector>
-
 typedef void (Module::*ModuleCallback)(void * argument);
 
 //Module manager
 class Module;
-class Player;
+class Conveyor;
 class SlowTicker;
 class Kernel {
     public:
@@ -55,12 +53,14 @@ class Kernel {
 
         // These modules are aviable to all other modules
         SerialConsole*    serial;
+        StreamOutputPool* streams;
+
         GcodeDispatch*    gcode_dispatch;
         Robot*            robot;
         Stepper*          stepper;
         Planner*          planner;
         Config*           config;
-        Player*           player;
+        Conveyor*           conveyor;
         Pauser*           pauser;
 
         int debug;
@@ -70,7 +70,7 @@ class Kernel {
         Digipot*          digipot;
 
     private:
-        vector<Module*> hooks[NUMBER_OF_DEFINED_EVENTS]; // When a module asks to be called for a specific event ( a hook ), this is where that request is remembered
+        Module* hooks[NUMBER_OF_DEFINED_EVENTS][32]; // When a module asks to be called for a specific event ( a hook ), this is where that request is remembered
 
 };