Diff: Sources/DistanceSensors.cpp

Revision:

1:388c915756f5

Parent:

0:d267b248eff4

Child:

4:67d7177c213f

--- a/Sources/DistanceSensors.cpp	Sat Mar 11 10:14:00 2017 +0000
+++ b/Sources/DistanceSensors.cpp	Sun Mar 19 12:20:26 2017 +0000
@@ -3,32 +3,33 @@
 
 
 
-Robot::DistanceSensors::DistanceSensors() 
+DistanceSensors::DistanceSensors() 
 {
     //Nothing
 }
     
-Robot::DistanceSensors::DistanceSensors(AnalogIn* sensorVoltage, DigitalOut* bit0, DigitalOut* bit1, DigitalOut* bit2, int number)
+DistanceSensors::DistanceSensors(AnalogIn* sensorVoltage, DigitalOut* bit0, DigitalOut* bit1, DigitalOut* bit2, int number)
 {   
     init(sensorVoltage, bit0, bit1, bit2, number);
 }
 
 //initialise
-void Robot::DistanceSensors::init(AnalogIn* sensorVoltage, DigitalOut* bit0, DigitalOut* bit1, DigitalOut* bit2, int number)
+void DistanceSensors::init(AnalogIn* sensorVoltage, DigitalOut* bit0, DigitalOut* bit1, DigitalOut* bit2, int number)
 {
     this->sensorVoltage = sensorVoltage;
     this->bit0 = bit0;
     this->bit1 = bit1;
-    this->bit2 = bit2;    
+    this->bit2 = bit2;
+    this->number = number;
 }
 
 
-Robot::DistanceSensors::~DistanceSensors()
+DistanceSensors::~DistanceSensors()
 { 
 }
 
 
-float Robot::DistanceSensors::read()//Return the distance of an object
+float DistanceSensors::read()//Return the distance of an object
 {  
     *bit0 = number & 1; // Set the first bit of the Sensors MUX
     *bit1 = number & 2; // Set the second bit of the Sensors MUX
@@ -39,7 +40,7 @@
     return Distance;
 }
 
-Robot::DistanceSensors::operator float()
+DistanceSensors::operator float()
 { 
     return read();
 }