Librairie adaptée au laboratoire 2
Dependencies: ST_INTERFACES X_NUCLEO_COMMON
Fork of X_NUCLEO_6180XA1 by
Revision 19:39ea6bab0e5b, committed 2015-10-28
- Comitter:
- mapellil
- Date:
- Wed Oct 28 09:28:52 2015 +0000
- Parent:
- 18:c98aa73dc4a5
- Child:
- 20:dd8390d615bf
- Commit message:
- Removed some undefined funct preventing the lib to be self contained. Added Serial pc global variable.
Changed in this revision
--- a/Components/VL6180X/vl6180x_class.cpp Tue Oct 27 15:53:31 2015 +0000 +++ b/Components/VL6180X/vl6180x_class.cpp Wed Oct 28 09:28:52 2015 +0000 @@ -66,6 +66,10 @@ #define VL6180X_LOG_ENABLE 0 #endif +#ifdef MY_LOG +Serial pc(USBTX, USBRX); +#endif + #if VL6180x_RANGE_STATUS_ERRSTRING /**@def VL6180x_HAVE_RANGE_STATUS_ERRSTRING * @brief is defined when @a #VL6180x_RANGE_STATUS_ERRSTRING is enable @@ -630,8 +634,7 @@ if (IntStatus == RES_INT_STAT_GPIO_NEW_SAMPLE_READY) { break; /* break on new data (status is 0) */ } - - VL6180x_PollDelay(dev); + wait_ms(10); }; if (!status) { @@ -842,8 +845,7 @@ if( IntStatus.status.Range == RES_INT_STAT_GPIO_NEW_SAMPLE_READY){ break; } - - VL6180x_PollDelay(dev); + wait_ms(10); } /* //![single_shot_snipet] */
--- a/Components/VL6180X/vl6180x_platform.h Tue Oct 27 15:53:31 2015 +0000 +++ b/Components/VL6180X/vl6180x_platform.h Wed Oct 28 09:28:52 2015 +0000 @@ -69,11 +69,11 @@ }while(0) #else /* VL6180X_LOG_ENABLE no logging */ - void OnErrLog(void); - #define LOG_FUNCTION_START(...) (void)0 - #define LOG_FUNCTION_END(...) (void)0 - #define LOG_FUNCTION_END_FMT(...) (void)0 - #define VL6180x_ErrLog(... ) OnErrLog() //(void)0 + //void OnErrLog(void); + #define LOG_FUNCTION_START(...) //(void)0 + #define LOG_FUNCTION_END(...) //(void)0 + #define LOG_FUNCTION_END_FMT(...) //(void)0 + #define VL6180x_ErrLog(... ) //OnErrLog() //(void)0 #endif @@ -102,12 +102,6 @@ #define VL6180xDevDataSet(dev, field, data) (dev->Data.field)=(data) -void VL6180x_PollDelay(VL6180xDev_t dev); - -void DISP_ExecLoopBody(void); -#define VL6180x_PollDelay(dev) DISP_ExecLoopBody(); - - #endif /* VL6180x_PLATFORM */