Diff: libs/Kernel.h

Revision:

3:f151d08d335c

Parent:

2:1df0b61d3b5a

--- a/libs/Kernel.h	Fri Feb 28 18:52:52 2014 -0800
+++ b/libs/Kernel.h	Sun Mar 02 06:33:08 2014 +0000
@@ -7,12 +7,14 @@
 
 #ifndef KERNEL_H
 #define KERNEL_H
+
+#include "mbed.h"
+
 #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/Pauser.h"
 #include "libs/PublicData.h"
 #include "modules/communication/SerialConsole.h"
@@ -21,8 +23,6 @@
 #include "modules/robot/Planner.h"
 #include "modules/robot/Robot.h"
 #include "modules/robot/Stepper.h"
-#include "mri.h"
-#include <array>
 
 #define THEKERNEL Kernel::instance
 
@@ -60,13 +60,13 @@
         int debug;
         SlowTicker*       slow_ticker;
         StepTicker*       step_ticker;
-        Adc*              adc;
+        AnalogIn*         adc;
         PublicData*       public_data;
         bool              use_leds;
         string            current_path;
 
     private:
-        std::array<std::vector<Module*>, NUMBER_OF_DEFINED_EVENTS> hooks; // When a module asks to be called for a specific event ( a hook ), this is where that request is remembered
+        std::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
 
 };