diff options
| author | Daniel Campora <daniel@wipy.io> | 2015-07-08 13:13:37 +0200 |
|---|---|---|
| committer | Daniel Campora <daniel@wipy.io> | 2015-07-08 13:13:37 +0200 |
| commit | 9220dc466a8d098ed669a33a617edd1118a3e35d (patch) | |
| tree | 2ee5a99e3d86d47d790ace5fbd8d34fa3df4b380 /cc3200/hal | |
| parent | d18ced9cddb4123ba793824bf7370a6593c9a3ae (diff) | |
| download | micropython-9220dc466a8d098ed669a33a617edd1118a3e35d.tar.gz micropython-9220dc466a8d098ed669a33a617edd1118a3e35d.zip | |
cc3200: Correct udelay us to ticks calculation.
Diffstat (limited to 'cc3200/hal')
| -rw-r--r-- | cc3200/hal/cc3200_hal.c | 4 | ||||
| -rw-r--r-- | cc3200/hal/cc3200_hal.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/cc3200/hal/cc3200_hal.c b/cc3200/hal/cc3200_hal.c index afc5fb7241..526211fee2 100644 --- a/cc3200/hal/cc3200_hal.c +++ b/cc3200/hal/cc3200_hal.c @@ -123,9 +123,7 @@ void HAL_Delay(uint32_t delay) { #endif } else { for (int ms = 0; ms < delay; ms++) { - // 500 instead of 1000 us to compensate the overhead of the for loop - // and the function call - UtilsDelay(UTILS_DELAY_US_TO_COUNT(500)); + UtilsDelay(UTILS_DELAY_US_TO_COUNT(1000)); } } } diff --git a/cc3200/hal/cc3200_hal.h b/cc3200/hal/cc3200_hal.h index 5ce93edd2a..dfffe0b7a8 100644 --- a/cc3200/hal/cc3200_hal.h +++ b/cc3200/hal/cc3200_hal.h @@ -37,7 +37,7 @@ #define HAL_FCPU_MHZ 80U #define HAL_FCPU_HZ (1000000U * HAL_FCPU_MHZ) #define HAL_SYSTICK_PERIOD_US 1000U -#define UTILS_DELAY_US_TO_COUNT(us) (((us) * HAL_FCPU_MHZ) / 3) +#define UTILS_DELAY_US_TO_COUNT(us) (((us) * HAL_FCPU_MHZ) / 6) #define HAL_NVIC_INT_CTRL_REG (*((volatile uint32_t *) 0xE000ED04 ) ) #define HAL_VECTACTIVE_MASK (0x1FUL) |