test
Dependencies: ST_INTERFACES X_NUCLEO_COMMON
Diff: x_nucleo_53l0a1.h
- Revision:
- 1:01b8004bc0a7
- Parent:
- 0:c523920bcc09
- Child:
- 2:58b5e9097aa3
- Child:
- 4:4e1576541eed
diff -r c523920bcc09 -r 01b8004bc0a7 x_nucleo_53l0a1.h --- a/x_nucleo_53l0a1.h Mon Nov 28 11:25:33 2016 +0000 +++ b/x_nucleo_53l0a1.h Mon Nov 28 14:52:49 2016 +0000 @@ -2,8 +2,8 @@ ****************************************************************************** * @file x_nucleo_53L0A1.h * @author IMG - * @version V0.0.1 - * @date 27-June-2016 + * @version V1.0.0 + * @date 28-November-2016 * @brief Header file for class X_NUCLEO_53L0A1 representing a X-NUCLEO-53L0A1 * expansion board ****************************************************************************** @@ -77,11 +77,11 @@ xshutdown_centre=new STMPE1600DigiOut(*dev_i2c, GPIO_15, (0x42 * 2)); // U19 on schematic sensor_centre=new VL53L0X(*dev_i2c, *xshutdown_centre, A2); -// xshutdown_left=new STMPE1600DigiOut(*dev_i2c, GPIO_14, (0x43 * 2)); // U21 on schematic -// sensor_left=new VL53L0X(*dev_i2c, *xshutdown_left, D8); + xshutdown_left=new STMPE1600DigiOut(*dev_i2c, GPIO_14, (0x43 * 2)); // U21 on schematic + sensor_left=new VL53L0X(*dev_i2c, *xshutdown_left, D8); -// xshutdown_right=new STMPE1600DigiOut(*dev_i2c, GPIO_15, (0x43 * 2)); // U21 on schematic -// sensor_right=new VL53L0X(*dev_i2c, *xshutdown_right, D2); + xshutdown_right=new STMPE1600DigiOut(*dev_i2c, GPIO_15, (0x43 * 2)); // U21 on schematic + sensor_right=new VL53L0X(*dev_i2c, *xshutdown_right, D2); } /** Constructor 2 @@ -104,11 +104,11 @@ xshutdown_centre=new STMPE1600DigiOut(*dev_i2c, GPIO_15, (0x42 * 2)); // U19 on schematic sensor_centre=new VL53L0X(*dev_i2c, *xshutdown_centre, gpio1_centre); -// xshutdown_left=new STMPE1600DigiOut(*dev_i2c, GPIO_14, (0x43 * 2)); // U21 on schematic -// sensor_left=new VL53L0X(*dev_i2c, *xshutdown_left, gpio1_left); + xshutdown_left=new STMPE1600DigiOut(*dev_i2c, GPIO_14, (0x43 * 2)); // U21 on schematic + sensor_left=new VL53L0X(*dev_i2c, *xshutdown_left, gpio1_left); -// xshutdown_right=new STMPE1600DigiOut(*dev_i2c, GPIO_15, (0x43 * 2)); // U21 on schematic -// sensor_right=new VL53L0X(*dev_i2c, *xshutdown_right, gpio1_right); + xshutdown_right=new STMPE1600DigiOut(*dev_i2c, GPIO_15, (0x43 * 2)); // U21 on schematic + sensor_right=new VL53L0X(*dev_i2c, *xshutdown_right, gpio1_right); } /** Destructor @@ -125,7 +125,7 @@ delete sensor_centre; sensor_centre=NULL; } -/* if(xshutdown_left!=NULL) + if(xshutdown_left!=NULL) { delete xshutdown_left; xshutdown_left=NULL; @@ -145,7 +145,7 @@ delete sensor_right; sensor_right=NULL; } -*/ + delete stmpe1600_exp0; stmpe1600_exp0 = NULL; delete stmpe1600_exp1; @@ -181,13 +181,13 @@ DevI2C *dev_i2c; VL53L0X *sensor_centre; -// VL53L0X *sensor_left; -// VL53L0X *sensor_right; + VL53L0X *sensor_left; + VL53L0X *sensor_right; STMPE1600 *stmpe1600_exp0; STMPE1600 *stmpe1600_exp1; STMPE1600DigiOut *xshutdown_centre; -// STMPE1600DigiOut *xshutdown_left; -// STMPE1600DigiOut *xshutdown_right; + STMPE1600DigiOut *xshutdown_left; + STMPE1600DigiOut *xshutdown_right; Display *display; private: