Imbus/cm3-bluepill
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Pull out systick code into system.c

Browse source
This commit is contained in:
Imbus 2025-07-16 15:42:43 +02:00
parent ee0d050110
commit 8636fedb5a
4 changed files with 17 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -1,8 +1,8 @@
PROJECT := main PROJECT := main
BUILD_DIR := bin BUILD_DIR := bin
# CFILES := main.c CFILES := main.c system.c
CFILES += $(wildcard *.c) # CFILES += $(wildcard *.c)
OPENCM3_DIR := ./libopencm3 OPENCM3_DIR := ./libopencm3
# Check if libopencm3 is available before including anything # Check if libopencm3 is available before including anything

31
main.c
View file

@ -4,42 +4,13 @@
#include <libopencm3/stm32/gpio.h> #include <libopencm3/stm32/gpio.h>
#include <libopencm3/stm32/rcc.h> #include <libopencm3/stm32/rcc.h>
#include <stdint.h> #include <stdint.h>
#include "system.h"
volatile uint64_t ticks;
static void gpio_setup(void) { static void gpio_setup(void) {
rcc_periph_clock_enable(RCC_GPIOC); rcc_periph_clock_enable(RCC_GPIOC);
gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ, GPIO_CNF_OUTPUT_PUSHPULL, GPIO13); gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ, GPIO_CNF_OUTPUT_PUSHPULL, GPIO13);
} }
void sys_tick_handler(void) { ticks++; }
static void sys_tick_setup(void) {
ticks = 0;
// rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE16_72MHZ]);
// systick_set_clocksource(STK_CSR_CLKSOURCE_AHB_DIV8);
systick_set_clocksource(STK_CSR_CLKSOURCE_AHB);
// systick_set_reload(48000 - 1);
systick_set_frequency(1000, 72000000);
systick_clear();
systick_interrupt_enable();
systick_counter_enable();
return;
}
static uint64_t sys_ticks_get(void) { return ticks; }
static void delay(volatile uint32_t count) {
while (count-- > 0) {
__asm__("nop");
}
}
int main(void) { int main(void) {
rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
// rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSI_48MHZ]); // rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSI_48MHZ]);

24
system.c
View file

@ -2,30 +2,19 @@
#include <libopencm3/cm3/systick.h> #include <libopencm3/cm3/systick.h>
#include <stdint.h> #include <stdint.h>
volatile uint64_t ticks = 0; volatile uint64_t ticks;
void sys_tick_handler(void) { ticks++; } void sys_tick_handler(void) { ticks++; }
uint64_t get_ticks(void) { return ticks; } uint64_t sys_ticks_get(void) { return ticks; }
void systick_setup(void) {
// systick_set_frequency(1000, 72000000);
systick_set_clocksource(STK_CSR_CLKSOURCE_AHB);
systick_set_reload(72000000 / 1000 - 1); // 1ms tick
systick_clear();
systick_interrupt_enable();
systick_counter_enable();
}
void sys_tick_setup(void) { void sys_tick_setup(void) {
/* Make sure clocks are setup */
ticks = 0; ticks = 0;
// rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE16_72MHZ]);
// systick_set_clocksource(STK_CSR_CLKSOURCE_AHB_DIV8);
systick_set_clocksource(STK_CSR_CLKSOURCE_AHB); systick_set_clocksource(STK_CSR_CLKSOURCE_AHB);
// systick_set_reload(8999);
systick_set_frequency(1000, 72000000); systick_set_frequency(1000, 72000000);
systick_clear(); systick_clear();
systick_interrupt_enable(); systick_interrupt_enable();
@ -33,3 +22,8 @@ void sys_tick_setup(void) {
return; return;
} }
void delay_ms(uint64_t ms) {
uint64_t start = sys_ticks_get();
while ((sys_ticks_get() - start) < ms);
}

6
system.h
View file

@ -2,5 +2,7 @@
#include <stdint.h> #include <stdint.h>
void sys_tick_handler(void); void sys_tick_handler(void);
uint64_t get_ticks(void); uint64_t sys_get_ticks(void);
void systick_setup(void); void sys_tick_setup(void);
uint64_t sys_ticks_get(void);
void delay_ms(uint64_t ms);