Diff: vl53l3inc/vl53lx_class.h

Revision:

2:ad33ff89d2cf

Parent:

1:96f9b31f585a

--- a/vl53l3inc/vl53lx_class.h	Tue Nov 03 13:58:39 2020 +0000
+++ b/vl53l3inc/vl53lx_class.h	Tue Nov 03 15:08:07 2020 +0000
@@ -130,18 +130,22 @@
      * @param[in] &i2c device I2C to be used for communication
      * @param[in] &pin_gpio1 pin Mbed InterruptIn PinName to be used as component GPIO_1 INT
      * @param[in] DevAddr device address, 0x52 by default
-     */
-  /*   
-    VL53LX(vl53L1X_DevI2C *i2c, int pin, int pin_gpio1) : RangeSensor(), dev_i2c(i2c), gpio0(pin), gpio1Int(pin_gpio1)
+     */   
+    VL53LX(vl53L3_DevI2C *i2c, DigitalOut *pin, PinName pin_gpio1, uint8_t dev_addr = VL53L1X_DEFAULT_DEVICE_ADDRESS) 
+    : RangeSensor(), dev_i2c(i2c), _gpio0(pin)
     {
-      MyDevice.I2cDevAddr = VL53LX_DEFAULT_DEVICE_ADDRESS ;
-      MyDevice.I2cHandle = i2c;
-      Dev = &MyDevice;
-      if (gpio0 >= 0) {
-        pinMode(gpio0, OUTPUT);
-      }
+        MyDevice.I2cDevAddr = dev_addr;
+        MyDevice.I2cHandle = i2c;
+        Dev = &MyDevice;
+      
+        _expgpio0 = NULL;
+        if (pin_gpio1 != NC) {
+            _gpio1Int = new InterruptIn(pin_gpio1);
+        } else {
+            _gpio1Int = NULL;
+        }
     }
-    */
+    
 
     
     VL53LX(vl53L3_DevI2C *i2c, Stmpe1600DigiOut *pin, PinName pin_gpio1, uint8_t dev_addr = VL53LX_DEFAULT_DEVICE_ADDRESS) 
@@ -158,10 +162,7 @@
             _gpio1Int = NULL;
         }
         
-        i2c_inst = i2c;
-        
-
-        
+//        i2c_inst = i2c;      
     }
 
 
@@ -3631,14 +3632,12 @@
 
     /* IO Device */
     vl53L3_DevI2C *dev_i2c;
-    /* Digital out pin */
-    int gpio0;
-   // int gpio1Int;
+    
     /* Device data */
     VL53LX_Dev_t MyDevice;
     VL53LX_DEV Dev;
       
-    vl53L3_DevI2C *i2c_inst;
+//    vl53L3_DevI2C *i2c_inst;
       
     /* Digital out pin */
     DigitalOut *_gpio0;
@@ -3646,6 +3645,7 @@
     Stmpe1600DigiOut *_expgpio0;
     /* Measure detection IRQ */
     InterruptIn *_gpio1Int;
+        
 };
 
 #endif /* _VL53LX_CLASS_H_ */