Librairie adaptée au laboratoire 2
Dependencies: ST_INTERFACES X_NUCLEO_COMMON
Fork of X_NUCLEO_6180XA1 by
Revision 22:1a6327e9a7e6, committed 2015-10-28
- Comitter:
- gallonm
- Date:
- Wed Oct 28 14:56:22 2015 +0000
- Parent:
- 21:5fb360508b6e
- Child:
- 23:dfb5ccc7b780
- Commit message:
- Updated destructor of x_nucleo_6180xa1.h; Fixed VL6180x_cfg.h
Changed in this revision
Components/VL6180X/vl6180x_cfg.h | Show annotated file Show diff for this revision Revisions of this file |
x_nucleo_6180xa1.h | Show annotated file Show diff for this revision Revisions of this file |
--- a/Components/VL6180X/vl6180x_cfg.h Wed Oct 28 13:23:49 2015 +0000 +++ b/Components/VL6180X/vl6180x_cfg.h Wed Oct 28 14:56:22 2015 +0000 @@ -58,7 +58,7 @@ * @li 3 : Fixed scaling by 3 * @li -1 -2 -3 : Run time programmable through @a VL6180x_UpscaleSetScaling(). Default scaling factore is -VL6180x_UPSCALE_SUPPORT \n */ -#define VL6180x_UPSCALE_SUPPORT -3 // -1 to -3 +#define VL6180x_UPSCALE_SUPPORT -1 /** * @def VL6180x_ALS_SUPPORT @@ -106,7 +106,7 @@ * Device that do not formally support extended ranging should only be used with a scaling factor of 1. * Correct operation with scaling factor other than 1 (>200mm ) is not granted by ST. */ -#define VL6180x_EXTENDED_RANGE 1 // 0 to 1 +#define VL6180x_EXTENDED_RANGE 0 #if (VL6180x_EXTENDED_RANGE) && (VL6180x_ALS_SUPPORT)
--- a/x_nucleo_6180xa1.h Wed Oct 28 13:23:49 2015 +0000 +++ b/x_nucleo_6180xa1.h Wed Oct 28 14:56:22 2015 +0000 @@ -140,6 +140,18 @@ delete sensor_right; sensor_right=NULL; } + delete digit1; + delete digit2; + delete digit3; + delete digit4; + delete dispA; + delete dispB; + delete dispC; + delete dispD; + delete dispE; + delete dispF; + delete dispG; + delete display; } DevI2C *dev_i2c; @@ -153,7 +165,6 @@ STMPE1600DigiOut *gpio0_bottom; STMPE1600DigiOut *gpio0_left; STMPE1600DigiOut *gpio0_right; - STMPE1600DigiOut *digit1; STMPE1600DigiOut *digit2;