Permalink
Browse files

updated headers following merge of xhume into edge

  • Loading branch information...
1 parent 34a1d89 commit b01bd3fa4a5115c6ced5236f1885030d6fa4ea11 @logxen committed May 11, 2012
Showing with 3 additions and 3 deletions.
  1. +0 −1 src/modules/robot/Planner.cpp
  2. +3 −1 src/modules/robot/Player.cpp
  3. +0 −1 src/modules/utils/simpleshell/SimpleShell.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"
@@ -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();
@@ -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"

0 comments on commit b01bd3f

Please sign in to comment.