updated headers following merge of xhume into edge

diff --git a/src/modules/robot/Planner.cpp b/src/modules/robot/Planner.cpp
index d80cb64..c24182d 100644 (file)
--- a/src/modules/robot/Planner.cpp
+++ b/src/modules/robot/Planner.cpp
@@ -12,7 +12,6 @@ using namespace std;
 #include "../communication/utils/Gcode.h"
 #include "libs/Module.h"
 #include "libs/Kernel.h"
-#include "wait_api.h" // mbed lib
 #include "Block.h"
 #include "Planner.h"
 #include "Player.h" 

diff --git a/src/modules/robot/Player.cpp b/src/modules/robot/Player.cpp
index c151b3b..01b65b5 100644 (file)
--- a/src/modules/robot/Player.cpp
+++ b/src/modules/robot/Player.cpp
@@ -12,6 +12,8 @@ using namespace std;
 #include "../communication/utils/Gcode.h"
 #include "libs/Module.h"
 #include "libs/Kernel.h"
+#include "Timer.h" // mbed.h lib
+#include "wait_api.h" // mbed.h lib
 #include "Block.h"
 #include "Player.h"
 #include "Planner.h"
@@ -85,7 +87,7 @@ void Player::pop_and_process_new_block(int debug){
 }
 
 void Player::wait_for_queue(int free_blocks){
-    Timer t;
+    mbed::Timer t;
     while( this->queue.size() >= this->queue.capacity()-free_blocks ){
         t.reset();
         t.start();

diff --git a/src/modules/utils/simpleshell/SimpleShell.cpp b/src/modules/utils/simpleshell/SimpleShell.cpp
index 0bbceb4..d13cf3d 100644 (file)
--- a/src/modules/utils/simpleshell/SimpleShell.cpp
+++ b/src/modules/utils/simpleshell/SimpleShell.cpp
@@ -7,7 +7,6 @@
 
 
 #include "libs/Kernel.h"
-#include "wait_api.h" // mbed.h lib
 #include "SimpleShell.h"
 #include "libs/nuts_bolts.h"
 #include "libs/utils.h"