Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-12 19:10:32 +03:00
Code Issues Wiki Activity

Pico - fix getCycleCounter (#14446)

Browse source
This commit is contained in:
mjs1441 2025-06-15 09:32:41 +01:00 • committed by GitHub
parent 6df77b6fe6
commit 37dfce881b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/platform/PICO/system.c
View file

@ -73,9 +73,10 @@ uint32_t systemUniqueId[3] = { 0 };
static uint32_t usTicks = 0; static uint32_t usTicks = 0;
static float usTicksInv = 0.0f; static float usTicksInv = 0.0f;
#define PICO_DWT_CTRL ((uint32_t *)(PPB_BASE + M33_DWT_CTRL_OFFSET)) // These are defined in pico-sdk headers as volatile uint32_t types
#define PICO_DWT_CYCCNT ((uint32_t *)(PPB_BASE + M33_DWT_CYCCNT_OFFSET)) #define PICO_DWT_CTRL m33_hw->dwt_ctrl
#define PICO_DEMCR ((uint32_t *)(PPB_BASE + M33_DEMCR_OFFSET)) #define PICO_DWT_CYCCNT m33_hw->dwt_cyccnt
#define PICO_DEMCR m33_hw->demcr
void cycleCounterInit(void) void cycleCounterInit(void)
{ {
@ -84,11 +85,11 @@ void cycleCounterInit(void)
usTicksInv = 1e6f / SystemCoreClock; usTicksInv = 1e6f / SystemCoreClock;
// Global DWT enable // Global DWT enable
*PICO_DEMCR |= M33_DEMCR_TRCENA_BITS; PICO_DEMCR |= M33_DEMCR_TRCENA_BITS;
// Reset and enable cycle counter // Reset and enable cycle counter
*PICO_DWT_CYCCNT = 0; PICO_DWT_CYCCNT = 0;
*PICO_DWT_CTRL |= M33_DWT_CTRL_CYCCNTENA_BITS; PICO_DWT_CTRL |= M33_DWT_CTRL_CYCCNTENA_BITS;
} }
void systemInit(void) void systemInit(void)
@ -140,7 +141,7 @@ void delay(uint32_t ms)
uint32_t getCycleCounter(void) uint32_t getCycleCounter(void)
{ {
return *PICO_DWT_CYCCNT; return PICO_DWT_CYCCNT;
} }
// Conversion routines copied from platform/common/stm32/system.c // Conversion routines copied from platform/common/stm32/system.c