Sam Walsh / X_NUCLEO_6180XA1

Time of Flight Sensor

Dependencies:   ST_INTERFACES X_NUCLEO_COMMON

Dependents:   Ultrasound_And_IMU

Fork of X_NUCLEO_6180XA1 by ST

Files at this revision

API Documentation at this revision

Revision 45:70e4abd970a9, committed 2016-03-15

Comitter:
mapellil
Date:
Tue Mar 15 16:26:36 2016 +0000
Parent:
44:36d12d319078
Child:
46:116dadbc80f1
Commit message:
functions VL6180x_I2Cxx are now called passing dev rather than Device as a function argument

Changed in this revision

Components/VL6180X/vl6180x_class.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/Components/VL6180X/vl6180x_class.cpp	Tue Mar 15 12:51:39 2016 +0000
+++ b/Components/VL6180X/vl6180x_class.cpp	Tue Mar 15 16:26:36 2016 +0000
@@ -2508,7 +2508,7 @@
 {
    int  status;
  
-   status=VL6180x_I2CWrite(Device->I2cAddr, index, &data,(uint8_t)1);
+   status=VL6180x_I2CWrite(dev->I2cAddr, index, &data,(uint8_t)1);
    return status;
 }
  
@@ -2516,7 +2516,7 @@
 {
    int  status;
    
-   status=VL6180x_I2CWrite(Device->I2cAddr, index, (uint8_t *)&data,(uint8_t)2);
+   status=VL6180x_I2CWrite(dev->I2cAddr, index, (uint8_t *)&data,(uint8_t)2);
    return status;
 }
  
@@ -2524,7 +2524,7 @@
 {
    int  status;
    
-   status=VL6180x_I2CWrite(Device->I2cAddr, index, (uint8_t *)&data,(uint8_t)4);
+   status=VL6180x_I2CWrite(dev->I2cAddr, index, (uint8_t *)&data,(uint8_t)4);
    return status;
 }
  
@@ -2533,7 +2533,7 @@
    int  status;
     
    uint8_t buffer;
-   status=VL6180x_I2CRead(Device->I2cAddr, index, &buffer,1);
+   status=VL6180x_I2CRead(dev->I2cAddr, index, &buffer,1);
    if(!status)
    {
       *data=buffer;
@@ -2546,7 +2546,7 @@
    int  status;
     
    uint8_t buffer[2];
-   status=VL6180x_I2CRead(Device->I2cAddr, index, buffer, 2);
+   status=VL6180x_I2CRead(dev->I2cAddr, index, buffer, 2);
    if(!status)
    {
       memcpy(data, buffer, 2);
@@ -2558,7 +2558,7 @@
 {
    int status;
    uint8_t buffer[4];
-   status=VL6180x_I2CRead(Device->I2cAddr, index, buffer,4);
+   status=VL6180x_I2CRead(dev->I2cAddr, index, buffer,4);
    if(!status)
    {
       memcpy(data, buffer, 4);
@@ -2571,15 +2571,15 @@
    int  status;
    uint8_t buffer;
  
-   status=VL6180x_I2CWrite(Device->I2cAddr, index, (uint8_t *)&buffer,(uint8_t)0);
+   status=VL6180x_I2CWrite(dev->I2cAddr, index, (uint8_t *)&buffer,(uint8_t)0);
    if(!status)
    {
       /* read data direct onto buffer */
-      status=VL6180x_I2CRead(Device->I2cAddr, index, &buffer,1);
+      status=VL6180x_I2CRead(dev->I2cAddr, index, &buffer,1);
       if(!status)
       {
          buffer=(buffer & AndData)|OrData;
-         status=VL6180x_I2CWrite(Device->I2cAddr, index, &buffer, (uint8_t)1);
+         status=VL6180x_I2CWrite(dev->I2cAddr, index, &buffer, (uint8_t)1);
       }
    }
    return status;
@@ -2820,8 +2820,8 @@
            return (r_status|l_status);
        
       case(range_continuous_polling_high_threshold):
-        status=VL6180x_RangeConfigInterrupt(Device, CONFIG_GPIO_INTERRUPT_LEVEL_HIGH);
-        status=VL6180x_AlsConfigInterrupt(Device, CONFIG_GPIO_INTERRUPT_DISABLED);
+        r_status=VL6180x_RangeConfigInterrupt(Device, CONFIG_GPIO_INTERRUPT_LEVEL_HIGH);
+        l_status=VL6180x_AlsConfigInterrupt(Device, CONFIG_GPIO_INTERRUPT_DISABLED);
         if((!r_status)&&(!l_status))
         {
            status=RangeSetHighThreshold(high);
@@ -2834,8 +2834,8 @@
            return (r_status|l_status);
                 
       case(range_continuous_polling_out_of_window):
-        status=VL6180x_RangeConfigInterrupt(Device, CONFIG_GPIO_INTERRUPT_OUT_OF_WINDOW);
-        status=VL6180x_AlsConfigInterrupt(Device, CONFIG_GPIO_INTERRUPT_DISABLED);
+        r_status=VL6180x_RangeConfigInterrupt(Device, CONFIG_GPIO_INTERRUPT_OUT_OF_WINDOW);
+        l_status=VL6180x_AlsConfigInterrupt(Device, CONFIG_GPIO_INTERRUPT_DISABLED);
         if((!r_status)&&(!l_status))
         {
            status=VL6180x_RangeSetThresholds(Device,low,high,1);
@@ -2848,8 +2848,8 @@
            return (r_status|l_status);
                 
       case(als_continuous_polling_low_threshold):
-        status=VL6180x_AlsConfigInterrupt(Device, CONFIG_GPIO_INTERRUPT_LEVEL_LOW);
-        status=VL6180x_RangeConfigInterrupt(Device, CONFIG_GPIO_INTERRUPT_DISABLED);
+        l_status=VL6180x_AlsConfigInterrupt(Device, CONFIG_GPIO_INTERRUPT_LEVEL_LOW);
+        r_status=VL6180x_RangeConfigInterrupt(Device, CONFIG_GPIO_INTERRUPT_DISABLED);
         if((!r_status)&&(!l_status))
         {
            status=AlsSetLowThreshold(low);
@@ -2862,8 +2862,8 @@
            return (r_status|l_status);
             
       case(als_continuous_polling_high_threshold):
-        status=VL6180x_AlsConfigInterrupt(Device, CONFIG_GPIO_INTERRUPT_LEVEL_HIGH);
-        status=VL6180x_RangeConfigInterrupt(Device, CONFIG_GPIO_INTERRUPT_DISABLED);
+        l_status=VL6180x_AlsConfigInterrupt(Device, CONFIG_GPIO_INTERRUPT_LEVEL_HIGH);
+        r_status=VL6180x_RangeConfigInterrupt(Device, CONFIG_GPIO_INTERRUPT_DISABLED);
         if((!r_status)&&(!l_status))
         {
            status=AlsSetHighThreshold(high);
@@ -2876,8 +2876,8 @@
            return (r_status|l_status);
                 
       case(als_continuous_polling_out_of_window):
-        status=VL6180x_AlsConfigInterrupt(Device, CONFIG_GPIO_INTERRUPT_OUT_OF_WINDOW);
-        status=VL6180x_RangeConfigInterrupt(Device, CONFIG_GPIO_INTERRUPT_DISABLED);
+        l_status=VL6180x_AlsConfigInterrupt(Device, CONFIG_GPIO_INTERRUPT_OUT_OF_WINDOW);
+        r_status=VL6180x_RangeConfigInterrupt(Device, CONFIG_GPIO_INTERRUPT_DISABLED);
         if((!r_status)&&(!l_status))
         {
            status=VL6180x_AlsSetThresholds(Device,low,high);
@@ -2890,8 +2890,8 @@
            return (r_status|l_status);
                 
       case(range_continuous_interrupt_low_threshold):
-        status=VL6180x_RangeConfigInterrupt(Device, CONFIG_GPIO_INTERRUPT_LEVEL_LOW);
-        status=VL6180x_AlsConfigInterrupt(Device, CONFIG_GPIO_INTERRUPT_DISABLED);
+        r_status=VL6180x_RangeConfigInterrupt(Device, CONFIG_GPIO_INTERRUPT_LEVEL_LOW);
+        l_status=VL6180x_AlsConfigInterrupt(Device, CONFIG_GPIO_INTERRUPT_DISABLED);
         if((!r_status)&&(!l_status))
         {
            status=RangeSetLowThreshold(low);
@@ -2904,8 +2904,8 @@
            return (r_status|l_status);                  
             
       case(range_continuous_interrupt_high_threshold):   
-        status=VL6180x_RangeConfigInterrupt(Device, CONFIG_GPIO_INTERRUPT_LEVEL_HIGH);
-        status=VL6180x_AlsConfigInterrupt(Device, CONFIG_GPIO_INTERRUPT_DISABLED);
+        r_status=VL6180x_RangeConfigInterrupt(Device, CONFIG_GPIO_INTERRUPT_LEVEL_HIGH);
+        l_status=VL6180x_AlsConfigInterrupt(Device, CONFIG_GPIO_INTERRUPT_DISABLED);
         if((!r_status)&&(!l_status))
         {
            status=RangeSetHighThreshold(high);
@@ -2918,8 +2918,8 @@
            return (r_status|l_status);
                 
        case(range_continuous_interrupt_out_of_window):
-        status=VL6180x_RangeConfigInterrupt(Device, CONFIG_GPIO_INTERRUPT_OUT_OF_WINDOW);
-        status=VL6180x_AlsConfigInterrupt(Device, CONFIG_GPIO_INTERRUPT_DISABLED);
+        r_status=VL6180x_RangeConfigInterrupt(Device, CONFIG_GPIO_INTERRUPT_OUT_OF_WINDOW);
+        l_status=VL6180x_AlsConfigInterrupt(Device, CONFIG_GPIO_INTERRUPT_DISABLED);
         if((!r_status)&&(!l_status))
         {
            status=VL6180x_RangeSetThresholds(Device,low,high,1);
@@ -2932,8 +2932,8 @@
            return (r_status|l_status);
             
       case(als_continuous_interrupt_low_threshold):
-        status=VL6180x_AlsConfigInterrupt(Device, CONFIG_GPIO_INTERRUPT_LEVEL_LOW);
-        status=VL6180x_RangeConfigInterrupt(Device, CONFIG_GPIO_INTERRUPT_DISABLED);
+        l_status=VL6180x_AlsConfigInterrupt(Device, CONFIG_GPIO_INTERRUPT_LEVEL_LOW);
+        r_status=VL6180x_RangeConfigInterrupt(Device, CONFIG_GPIO_INTERRUPT_DISABLED);
         if((!r_status)&&(!l_status))
         {
            status=AlsSetLowThreshold(low);
@@ -2946,8 +2946,8 @@
            return (r_status|l_status);  
                 
       case(als_continuous_interrupt_high_threshold):
-        status=VL6180x_AlsConfigInterrupt(Device, CONFIG_GPIO_INTERRUPT_LEVEL_HIGH);
-        status=VL6180x_RangeConfigInterrupt(Device, CONFIG_GPIO_INTERRUPT_DISABLED);
+        l_status=VL6180x_AlsConfigInterrupt(Device, CONFIG_GPIO_INTERRUPT_LEVEL_HIGH);
+        r_status=VL6180x_RangeConfigInterrupt(Device, CONFIG_GPIO_INTERRUPT_DISABLED);
         if((!r_status)&&(!l_status))
         {
            status=AlsSetHighThreshold(high);
@@ -2960,8 +2960,8 @@
            return (r_status|l_status);
                 
       case(als_continuous_interrupt_out_of_window):
-        status=VL6180x_AlsConfigInterrupt(Device, CONFIG_GPIO_INTERRUPT_OUT_OF_WINDOW);
-        status=VL6180x_RangeConfigInterrupt(Device, CONFIG_GPIO_INTERRUPT_DISABLED);
+        l_status=VL6180x_AlsConfigInterrupt(Device, CONFIG_GPIO_INTERRUPT_OUT_OF_WINDOW);
+        r_status=VL6180x_RangeConfigInterrupt(Device, CONFIG_GPIO_INTERRUPT_DISABLED);
         if((!r_status)&&(!l_status))
         {
            status=VL6180x_AlsSetThresholds(Device,low,high);