mm
Diff: x_nucleo_53l0a1.cpp
- Revision:
- 14:8320b5ff96fa
- Parent:
- 11:ceaa5a026412
diff -r 615f7e38568c -r 8320b5ff96fa x_nucleo_53l0a1.cpp --- a/x_nucleo_53l0a1.cpp Thu Jun 15 13:33:35 2017 +0000 +++ b/x_nucleo_53l0a1.cpp Mon Aug 07 14:30:21 2017 +0000 @@ -38,84 +38,89 @@ /* Includes ------------------------------------------------------------------*/ #include "x_nucleo_53l0a1.h" +#include "vl53l0x_platform_log.h" /* Static variables ----------------------------------------------------------*/ -X_NUCLEO_53L0A1* X_NUCLEO_53L0A1::_instance = NULL; +X_NUCLEO_53L0A1 *X_NUCLEO_53L0A1::_instance = NULL; -X_NUCLEO_53L0A1* X_NUCLEO_53L0A1::Instance(DevI2C *ext_i2c) +X_NUCLEO_53L0A1 *X_NUCLEO_53L0A1::instance(DevI2C *ext_i2c) { - if(_instance==NULL) - _instance=new X_NUCLEO_53L0A1(ext_i2c); - else - VL53L0X_ErrLog("Failed to create X_NUCLEO_53L0A1 instance\n\r"); - return _instance; + if (_instance == NULL) + _instance = new X_NUCLEO_53L0A1(ext_i2c); + else + VL53L0X_ErrLog("Failed to create X_NUCLEO_53L0A1 instance\n\r"); + return _instance; } -X_NUCLEO_53L0A1* X_NUCLEO_53L0A1::Instance(DevI2C *ext_i2c, - PinName gpio1_centre, - PinName gpio1_left, PinName gpio1_right) +X_NUCLEO_53L0A1 *X_NUCLEO_53L0A1::instance(DevI2C *ext_i2c, + PinName gpio1_centre, + PinName gpio1_left, PinName gpio1_right) { - if(_instance==NULL) - _instance=new X_NUCLEO_53L0A1(ext_i2c, gpio1_centre, gpio1_left, gpio1_right); - else - VL53L0X_ErrLog("Failed to create X_NUCLEO_53L0A1 instance\n\r"); - return _instance; + if (_instance == NULL) + _instance = new X_NUCLEO_53L0A1(ext_i2c, gpio1_centre, gpio1_left, gpio1_right); + else + VL53L0X_ErrLog("Failed to create X_NUCLEO_53L0A1 instance\n\r"); + return _instance; } -int X_NUCLEO_53L0A1::InitBoard() -{ - int status, n_dev=0; +int X_NUCLEO_53L0A1::init_board() +{ + int status, n_dev = 0; + + + + + + sensor_centre->vl53l0x_off(); + sensor_left->vl53l0x_off(); + sensor_right->vl53l0x_off(); + status = sensor_centre->init_sensor(NEW_SENSOR_CENTRE_ADDRESS); + if (status) { + + delete sensor_centre; + delete xshutdown_centre; + sensor_centre = NULL; + xshutdown_centre = NULL; + printf("Sensor centre not present\n\r"); + + } else { + + printf("Sensor centre present\n\r"); + n_dev++; + } + status = sensor_left->init_sensor(NEW_SENSOR_LEFT_ADDRESS); + if (status) { - sensor_centre->VL53L0X_Off(); - sensor_left->VL53L0X_Off(); - sensor_right->VL53L0X_Off(); - status=sensor_centre->InitSensor(NEW_SENSOR_CENTRE_ADDRESS); - if(status) - { - delete sensor_centre; - delete xshutdown_centre; - sensor_centre=NULL; - xshutdown_centre=NULL; - printf("Sensor centre not present\n\r"); - } - else - { - printf("Sensor centre present\n\r"); - n_dev++; - } - status=sensor_left->InitSensor(NEW_SENSOR_LEFT_ADDRESS); - if(status) - { - delete sensor_left; - delete xshutdown_left; - sensor_left=NULL; - xshutdown_left=NULL; - printf("Sensor left not present\n\r"); - } - else - { - printf("Sensor left present\n\r"); - n_dev++; - } + delete sensor_left; + delete xshutdown_left; + sensor_left = NULL; + xshutdown_left = NULL; + printf("Sensor left not present\n\r"); + + } else { + + printf("Sensor left present\n\r"); + n_dev++; + } - status=sensor_right->InitSensor(NEW_SENSOR_RIGHT_ADDRESS); - if(status) - { - delete sensor_right; - delete xshutdown_right; - sensor_right=NULL; - xshutdown_right=NULL; - printf("Sensor right not present\n\r"); - } - else - { - printf("Sensor right present\n\r"); - n_dev++; - } + status = sensor_right->init_sensor(NEW_SENSOR_RIGHT_ADDRESS); + if (status) { + + delete sensor_right; + delete xshutdown_right; + sensor_right = NULL; + xshutdown_right = NULL; + printf("Sensor right not present\n\r"); + + } else { + + printf("Sensor right present\n\r"); + n_dev++; + } - if(n_dev==0) - return 1; - else - return 0; + if (n_dev == 0) + return 1; + else + return 0; }