Diff: LidarLitev2.cpp

Revision:

1:238f6a0108e7

Parent:

0:7e6c07be1754

diff -r 7e6c07be1754 -r 238f6a0108e7 LidarLitev2.cpp
--- a/LidarLitev2.cpp	Thu Oct 22 18:52:54 2015 +0000
+++ b/LidarLitev2.cpp	Thu Oct 22 23:49:53 2015 +0000
@@ -14,85 +14,77 @@
 {
     char reset[2] = {0x00, 0x00};           //Register and value to Reset the Lidar to orgional settings
     char aquisition[2] = {0x04, 0x00};      //Register and value to set the acquisition to 1/3 default value
-    switch (config){
+    switch (config) {
         case 0: //Deafault config
             nackack = 1;
-            while(nackack !=0)
-            {
+            while(nackack !=0) {
                 //wait_ms(1);
                 nackack = i2c.write(LidarLitev2_addr, reset, 2); // Resets the Lidar settings
             }
-            
+
             break;
         case 1:
             nackack = 1;
-            while(nackack !=0)
-            {
+            while(nackack !=0) {
                 //wait_ms(1);
                 nackack = i2c.write(LidarLitev2_addr, aquisition, 2);  // Set the acquisition to 1/3 default value
             }
             break;
-        }          
+    }
 }
 
 void LidarLitev2::beginContinuous(bool modePinLow, char interval, char numberOfReadings,int LidarLitev2_addr)
 {
     char reg_freq[2] = {0x45, interval};    // Sets the time between measurements through reg 0x45
-    
+
     nackack = 1;
-    while(nackack !=0)
-            {
-                nackack =i2c.write(LidarLitev2_addr, reg_freq, 2, false);  //Write to register 0x45 the interval time
-            }
-  //  Set register 0x04 to 0x20 to look at "NON-default" value of velocity scale
-  //  If you set bit 0 of 0x04 to "1" then the mode pin will be low when done
+    while(nackack !=0) {
+        nackack =i2c.write(LidarLitev2_addr, reg_freq, 2, false);  //Write to register 0x45 the interval time
+    }
+    //  Set register 0x04 to 0x20 to look at "NON-default" value of velocity scale
+    //  If you set bit 0 of 0x04 to "1" then the mode pin will be low when done
     char reg_modePin[2] = {0x04, 0x21}; // Default modePin Setting
     if (!modePinLow) reg_modePin[1] = 0x20;
-    
+
     nackack = 1;
-    while(nackack !=0)
-            {
-                nackack =i2c.write(LidarLitev2_addr, reg_modePin, 2, false);
-            }
+    while(nackack !=0) {
+        nackack =i2c.write(LidarLitev2_addr, reg_modePin, 2, false);
+    }
     char reg_numOfReadings[2] = {0x11, numberOfReadings};  // Set the number of readings through reg 0x11
-    
+
     nackack = 1;
-    while(nackack !=0)
-            {
-                nackack =i2c.write(LidarLitev2_addr, reg_numOfReadings, 2, false);   // writes into Reg_numofreadings the number of readings desired
-            }
+    while(nackack !=0) {
+        nackack =i2c.write(LidarLitev2_addr, reg_numOfReadings, 2, false);   // writes into Reg_numofreadings the number of readings desired
+    }
     char reg_reading_distance[2] = {0x00, 0x04};  // Iniates reg_readDistance
     nackack = 1;
-    while(nackack !=0)
-            {
-                nackack =i2c.write(LidarLitev2_addr, reg_reading_distance, 2, false);   // writes into Reg_readDistance to begin continuos reading
-            }
+    while(nackack !=0) {
+        nackack =i2c.write(LidarLitev2_addr, reg_reading_distance, 2, false);   // writes into Reg_readDistance to begin continuos reading
+    }
 }
 
-int LidarLitev2::distance(bool stablizePreampFlag, bool takeReference, int LidarLitev2_addr){
+int LidarLitev2::distance(bool stablizePreampFlag, bool takeReference, int LidarLitev2_addr)
+{
     // Standard read distance protocol without continuous
-    
+
     char reg_dc[2] = {0x00, 0x04};  // Iniates reg_readDistance
     if(!stablizePreampFlag) reg_dc[1] = 0x03;
-    
+
     nackack = 1;
-    while(nackack !=0)
-    {
+    while(nackack !=0) {
         nackack = i2c.write(LidarLitev2_addr, reg_dc, 2); // writes into Reg_readDistance to begin a reading
     }
-    
+
     char data[2];
     char reg_read[1] = {0x8f};  // Register to read distance value from
-    
+
     nackack = 1;
-    while(nackack !=0)
-    {
+    while(nackack !=0) {
         nackack = i2c.write(LidarLitev2_addr, reg_read, 1); // Ready to read from reg distance
     }
-    
+
     nackack = 1;
-    while(nackack !=0)
-    {
+    while(nackack !=0) {
         nackack = i2c.read(LidarLitev2_addr, data, 2);  // Read from reg distance 2bytes of information
     }
     int distance = ((uint8_t)data[0]<<8) + (uint8_t)data[1]; //Combine byes to a int to be returned as the distance measured
@@ -103,17 +95,15 @@
 {
     char data[2];
     char reg_read[1] = {0x8f}; // Register to read distance value from
-    
+
     nackack = 1;
-    while(nackack !=0)
-            {
-                nackack =i2c.write(LidarLitev2_addr, reg_read, 1); // Ready to read from reg distance
-            }
+    while(nackack !=0) {
+        nackack =i2c.write(LidarLitev2_addr, reg_read, 1); // Ready to read from reg distance
+    }
     nackack = 1;
-    while(nackack !=0)
-            {
-                nackack =i2c.read(LidarLitev2_addr, data, 2); // Read from reg distance 2bytes of information
-            }
+    while(nackack !=0) {
+        nackack =i2c.read(LidarLitev2_addr, data, 2); // Read from reg distance 2bytes of information
+    }
     int distance = ((uint8_t)data[0]<<8) + (uint8_t)data[1]; //Combine byes to a int to be returned as the distance measured
     return distance;
 }