WCH-Templates/CH32X03x
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added better debug functions

Browse source
This commit is contained in:
Logan G 2024-03-21 20:09:34 -06:00
parent 545b390d29
commit 5f3e781619
Signed by: logan
GPG key ID: E328528C921E7A7A
2 changed files with 38 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
Debug/debug.c
View file

@ -29,6 +29,29 @@ void Delay_Init(void)
{ {
p_us = SystemCoreClock / 8000000; p_us = SystemCoreClock / 8000000;
p_ms = (uint16_t)p_us * 1000; p_ms = (uint16_t)p_us * 1000;
SysTick->CTLR &= ~0x8000001F;
SysTick->CTLR |= (1 << 0);
}
uint64_t SysTick_Read(void)
{
uint64_t ticks;
SysTick->CTLR &= ~(1 << 0);
ticks = SysTick->CNT;
SysTick->CTLR |= (1 << 0);
return ticks;
}
uint64_t SysTick_Us(void)
{
return SysTick_Read() / p_us;
}
uint64_t SysTick_Ms(void)
{
return SysTick_Read() / p_ms;
} }
/********************************************************************* /*********************************************************************
@ -47,12 +70,18 @@ void Delay_Us(uint32_t n)
SysTick->SR &= ~(1 << 0); SysTick->SR &= ~(1 << 0);
i = (uint32_t)n * p_us; i = (uint32_t)n * p_us;
SysTick->CMP = SysTick_Read() + i;
while((SysTick->SR & (1 << 0)) != (1 << 0));
/*
SysTick->CMP = i; SysTick->CMP = i;
SysTick->CTLR |= (1 << 4); SysTick->CTLR |= (1 << 4);
SysTick->CTLR |= (1 << 5) | (1 << 0); SysTick->CTLR |= (1 << 5) | (1 << 0);
while((SysTick->SR & (1 << 0)) != (1 << 0)); while((SysTick->SR & (1 << 0)) != (1 << 0));
SysTick->CTLR &= ~(1 << 0); SysTick->CTLR &= ~(1 << 0);
*/
} }
/********************************************************************* /*********************************************************************
@ -71,12 +100,17 @@ void Delay_Ms(uint32_t n)
SysTick->SR &= ~(1 << 0); SysTick->SR &= ~(1 << 0);
i = (uint32_t)n * p_ms; i = (uint32_t)n * p_ms;
SysTick->CMP = SysTick_Read() + i;
while((SysTick->SR & (1 << 0)) != (1 << 0));
/*
SysTick->CMP = i; SysTick->CMP = i;
SysTick->CTLR |= (1 << 4); SysTick->CTLR |= (1 << 4);
SysTick->CTLR |= (1 << 5) | (1 << 0); SysTick->CTLR |= (1 << 5) | (1 << 0);
while((SysTick->SR & (1 << 0)) != (1 << 0)); while((SysTick->SR & (1 << 0)) != (1 << 0));
SysTick->CTLR &= ~(1 << 0); SysTick->CTLR &= ~(1 << 0);
*/
} }
/********************************************************************* /*********************************************************************

5
Debug/debug.h
View file

@ -7,7 +7,7 @@
* Printf , Delay functions. * Printf , Delay functions.
********************************************************************************* *********************************************************************************
* Copyright (c) 2021 Nanjing Qinheng Microelectronics Co., Ltd. * Copyright (c) 2021 Nanjing Qinheng Microelectronics Co., Ltd.
* Attention: This software (modified or not) and binary are used for * Attention: This software (modified or not) and binary are used for
* microcontroller manufactured by Nanjing Qinheng Microelectronics. * microcontroller manufactured by Nanjing Qinheng Microelectronics.
*******************************************************************************/ *******************************************************************************/
#ifndef __DEBUG_H #ifndef __DEBUG_H
@ -39,6 +39,9 @@ extern "C" {
#endif #endif
void Delay_Init(void); void Delay_Init(void);
uint64_t SysTick_Read(void);
uint64_t SysTick_Us(void);
uint64_t SysTick_Ms(void);
void Delay_Us(uint32_t n); void Delay_Us(uint32_t n);
void Delay_Ms(uint32_t n); void Delay_Ms(uint32_t n);
void USART_Printf_Init(uint32_t baudrate); void USART_Printf_Init(uint32_t baudrate);