Diff: main.cpp

Revision:

2:c537f1ebad7b

Parent:

1:d5adc483bce0

Child:

3:a3144a45f44c

diff -r d5adc483bce0 -r c537f1ebad7b main.cpp
--- a/main.cpp	Tue Oct 22 09:41:35 2019 +0000
+++ b/main.cpp	Tue Oct 22 10:05:12 2019 +0000
@@ -10,62 +10,40 @@
 #define addr3   (0x2B)
 #define addr4   (0x2C)
 
-//Macro for addresses
-// I²C address of VL6180 shifted by 1 bit                        
-//(0x29 << 1) so the R/W command can be added
-#define ADDR1   (addr1<<1)
-#define ADDR2   (addr2<<1)
-#define ADDR3   (addr3<<1)
-#define ADDR4   (addr4<<1)
-
 int main() {
     int range1; 
     int range2;
-    int range3=0;
-    int range4=0; 
+    int range3;
+    int range4; 
     
-    // Create and init sensor 1
+    // Create sensors
     Sensor sensor1(I2C_SDA, I2C_SCL, PC_9);
     Sensor sensor2(I2C_SDA, I2C_SCL, PC_11);
-    //Sensor sensor3(I2C_SDA, I2C_SCL, PD_2);
-    //Sensor sensor4(I2C_SDA, I2C_SCL, PG_3);
+    Sensor sensor3(I2C_SDA, I2C_SCL, PD_2);
+    Sensor sensor4(I2C_SDA, I2C_SCL, PG_3);
  
-    /*
-    SHDN_1 = 0;
-    SHDN_3 = 0;
-    SHDN_2 = 0;
-    SHDN_4 = 0;
-    wait_ms(0.5);
-    */
     sensor1.turnOff();
     sensor2.turnOff();
-   // sensor3.turnOff();
-   // sensor4.turnOff();
+    sensor3.turnOff();
+    sensor4.turnOff();
     wait_ms(0.5);
  
     sensor1.turnOff();
     sensor2.turnOn();
-   // sensor3.turnOff();
-    //sensor4.turnOff();
-    
-    /*
-    SHDN_1 = 0;
-    SHDN_2 = 1;
-    SHDN_3 = 0;
-    SHDN_4 = 0;
-    */
+    sensor3.turnOff();
+    sensor4.turnOff();
     
     sensor2.init();
-    sensor2.changeAddress(ADDR2);
-    /*
+    sensor2.changeAddress(addr2);
+    
     sensor3.turnOn();
     sensor3.init();
-    sensor3.changeAddress(ADDR3);
-    
+    sensor3.changeAddress(addr3);
+
     sensor4.turnOn();
     sensor4.init();
-    sensor4.changeAddress(ADDR4);
-    */
+    sensor4.changeAddress(addr4);
+    
     sensor1.turnOn();
     sensor1.init();
     /*
@@ -92,8 +70,8 @@
     {            
         range1 = sensor1.read();
         range2 = sensor2.read();
-        //range3 = sensor3.read();
-        //range4 = sensor4.read();         
+        range3 = sensor3.read();
+        range4 = sensor4.read();         
 
         pc.printf("Range one = %d | range two = %d | range three = %d | range four = %d\r\n",range1, range2, range3, range4);       
         wait_ms(100);