Justin Jordan
Scanner code will include the following: obstacle avoidance, hunting for victims, and localization checks.
Diff: scanner.cpp
- Revision:
- 4:6a8d80954323
- Parent:
- 3:992558a021d7
- Child:
- 5:4d5601a9dffe
--- a/scanner.cpp Mon Mar 21 01:32:09 2016 +0000
+++ b/scanner.cpp Tue Mar 22 03:00:16 2016 +0000
@@ -1,6 +1,6 @@
#include "scanner.h"
#include "mbed.h"
-#include "Gp2x.h"
+#include "LongRangeSensor.h"
#include "VL6180x.h"
// FUNCTION:
@@ -14,8 +14,8 @@
// DESCRIPTION:
// Constructor.
Scanner::Scanner(Serial &pc1, PinName _servoL, PinName _servoR,
- VL6180x &_shortRangeL, VL6180x &_shortRangeR, Gp2x &_longRangeL,
- Gp2x &_longRangeR, float _period) : pc(pc1), servoL(_servoL),
+ VL6180x &_shortRangeL, VL6180x &_shortRangeR, LongRangeSensor &_longRangeL,
+ LongRangeSensor &_longRangeR, float _period) : pc(pc1), servoL(_servoL),
servoR(_servoR), shortRangeL(_shortRangeL),
shortRangeR(_shortRangeR), longRangeL(_longRangeL),
longRangeR(_longRangeR), period(_period)