Fixed STMPE1600 writeSYS_CTRL, enabled multi sensors support
Dependencies: ST_INTERFACES X_NUCLEO_COMMON
Fork of X_NUCLEO_53L0A1 by
Diff: Components/VL53L0X/vl53l0x_class.h
- Revision:
- 5:c82a48da3c9e
- Parent:
- 3:613d7f1ef60e
- Child:
- 6:fa6944a8850f
diff -r 613d7f1ef60e -r c82a48da3c9e Components/VL53L0X/vl53l0x_class.h --- a/Components/VL53L0X/vl53l0x_class.h Fri Dec 02 10:44:40 2016 +0000 +++ b/Components/VL53L0X/vl53l0x_class.h Mon Dec 05 11:28:33 2016 +0000 @@ -42,6 +42,7 @@ /* Includes ------------------------------------------------------------------*/ +#include "mbed.h" #include "RangeSensor.h" #include "DevI2C.h" @@ -484,50 +485,9 @@ * @param void * @return 0 on success, @a #CALIBRATION_WARNING if failed */ -// virtual int Init() virtual int Init(void * NewAddr) { -// return VL53L0X_DataInit(&MyDevice); return VL53L0X_DataInit(Device); -/* - int status; - - VL6180x_Off(); - VL6180x_On(); - - status=VL6180x_WaitDeviceBooted(Device); - if(status) { - VL6180x_ErrLog("WaitDeviceBooted fail\n\r"); - } - status=IsPresent(); - if(!status) - { - Device->Present=1; - VL6180x_InitData(Device); - if(status) - { - printf("Failed to init VL6180X sensor!\n\r"); - return status; - } - status=Prepare(); - if(status) - { - printf("Failed to prepare VL6180X!\n\r"); - return status; - } - if(*(uint8_t*)NewAddr!=DEFAULT_DEVICE_ADDRESS) - { - status=SetI2CAddress(*(uint8_t*)NewAddr); - if(status) - { - printf("Failed to change I2C address!\n\r"); - return status; - } - } - Device->Ready=1; - } - return status; -*/ } /** @@ -568,7 +528,6 @@ */ int Prepare() { -// return VL6180x_Prepare(Device); // taken from rangingTest() in vl53l0x_SingleRanging_Example.c VL53L0X_Error Status = VL53L0X_ERROR_NONE; uint32_t refSpadCount; @@ -1399,9 +1358,8 @@ int IsPresent() { int status; - uint8_t id; - status=ReadID(&id); + status=ReadID((uint8_t *)MyDevice.I2cDevAddr); if(status) VL53L0X_ErrLog("Failed to read ID device. Device not present!\n\r"); return status; @@ -1420,9 +1378,6 @@ /* IO Device */ DevI2C &dev_i2c; - /* GPIO expander */ -// STMPE1600 &io_expander; -// ExpGpioPinName xshutdown; /* Digital out pin */ DigitalOut *gpio0; /* GPIO expander */