From b28c10bb67c0f142c28f5ea2fa4674daed0728f2 Mon Sep 17 00:00:00 2001 From: victhor Date: Tue, 17 Feb 2026 19:19:56 +0100 Subject: [PATCH 1/3] Delete all lol --- Core/Src/Runes/Runes.cpp | 174 -------------------------- Core/Src/Runes/generated_metadata.cpp | 28 ++--- Core/Src/stm32h7xx_it.c | 29 ----- deps/ST-LIB | 2 +- 4 files changed, 15 insertions(+), 218 deletions(-) diff --git a/Core/Src/Runes/Runes.cpp b/Core/Src/Runes/Runes.cpp index 8cb788bf..785c78d4 100644 --- a/Core/Src/Runes/Runes.cpp +++ b/Core/Src/Runes/Runes.cpp @@ -98,180 +98,6 @@ unordered_map UART::available_uarts = { uint8_t UART::printf_uart = 0; bool UART::printf_ready = false; -#endif -/************************************************ - * Encoder - ***********************************************/ -#ifdef HAL_TIM_MODULE_ENABLED -#define BASE TimerPeripheral::TIM_TYPE::BASE - -TimerPeripheral encoder_timer(&htim8, {BASE, 0, 65535}, "TIM 8"); - -map, TimerPeripheral*> Encoder::pin_timer_map = {{{PC6, PC7}, &encoder_timer}}; - -#endif -/************************************************ - * Timer - ***********************************************/ -#ifdef HAL_TIM_MODULE_ENABLED - -#define BASE TimerPeripheral::TIM_TYPE::BASE -#define ADVANCED TimerPeripheral::TIM_TYPE::ADVANCED - -TIM_HandleTypeDef* Time::global_timer = &htim2; -set Time::high_precision_timers = {&htim5, &htim24}; -TIM_HandleTypeDef* Time::mid_precision_timer = &htim23; - -TimerPeripheral timer1(&htim1, {ADVANCED}, "TIM 1"); -TimerPeripheral timer2(&htim2, {BASE}, "TIM 2"); -TimerPeripheral timer3(&htim3, {ADVANCED}, "TIM 3"); -TimerPeripheral timer4(&htim4, {ADVANCED}, "TIM 4"); -TimerPeripheral timer12(&htim12, {ADVANCED}, "TIM 12"); -TimerPeripheral timer16(&htim16, {BASE}, "TIM 16"); -TimerPeripheral timer17(&htim17, {BASE}, "TIM 17"); -TimerPeripheral timer15(&htim15, {ADVANCED}, "TIM 15"); -TimerPeripheral timer23(&htim23, {BASE, 275, UINT32_MAX - 1}, "TIM 23"); - -vector> TimerPeripheral::timers = - {timer1, timer2, timer3, timer4, timer12, timer15, timer16, timer17, timer23}; - -#endif - -/************************************************ - * PWM - ***********************************************/ -#ifdef HAL_TIM_MODULE_ENABLED - -#define NORMAL TimerPeripheral::PWM_MODE::NORMAL -#define PHASED TimerPeripheral::PWM_MODE::PHASED - -PWMmap TimerPeripheral::available_pwm = { - {PB14, {timer12, {TIM_CHANNEL_1, NORMAL}}}, - {PB15, {timer12, {TIM_CHANNEL_2, NORMAL}}}, - {PB4, {timer3, {TIM_CHANNEL_1, PHASED}}}, - {PB5, {timer3, {TIM_CHANNEL_2, NORMAL}}}, - {PC8, {timer3, {TIM_CHANNEL_3, NORMAL}}}, - {PD12, {timer4, {TIM_CHANNEL_1, NORMAL}}}, - {PD13, {timer4, {TIM_CHANNEL_2, NORMAL}}}, - {PD15, {timer4, {TIM_CHANNEL_4, NORMAL}}}, - {PE14, {timer1, {TIM_CHANNEL_4, PHASED}}}, - {PE6, {timer15, {TIM_CHANNEL_2, NORMAL}}}, - {PF1, {timer23, {TIM_CHANNEL_2, NORMAL}}}, - {PF2, {timer23, {TIM_CHANNEL_3, NORMAL}}}, - {PF3, {timer23, {TIM_CHANNEL_4, NORMAL}}}, - {PE5, {timer15, {TIM_CHANNEL_1, NORMAL}}}, - {PE11, {timer1, {TIM_CHANNEL_2, NORMAL}}}, -}; - -DualPWMmap TimerPeripheral::available_dual_pwms = { - {{PB8, PB6}, {timer16, {TIM_CHANNEL_1, NORMAL}}}, - {{PB9, PB7}, {timer17, {TIM_CHANNEL_1, PHASED}}}, - {{PE11, PE10}, {timer1, {TIM_CHANNEL_2, PHASED}}}, - {{PE13, PE12}, {timer1, {TIM_CHANNEL_3, PHASED}}}, - {{PE5, PE4}, {timer15, {TIM_CHANNEL_1, NORMAL}}}, - {{PE9, PE8}, {timer1, {TIM_CHANNEL_1, NORMAL}}}, -}; - -#endif - -/************************************************ - * Input Capture - ***********************************************/ -#ifdef HAL_TIM_MODULE_ENABLED - -map InputCapture::available_instances = { - {PF0, InputCapture::Instance(PF0, &timer23, TIM_CHANNEL_1, TIM_CHANNEL_2)} -}; - -#endif - -/************************************************ - * ADC - ***********************************************/ -#if 0 // Legacy ADC (replaced by NewADC). Kept here only as reference. -#if defined(HAL_ADC_MODULE_ENABLED) && defined(HAL_LPTIM_MODULE_ENABLED) - -LowPowerTimer lptim1(*LPTIM1, hlptim1, LPTIM1_PERIOD, "LPTIM 1"); -LowPowerTimer lptim2(*LPTIM2, hlptim2, LPTIM2_PERIOD, "LPTIM 2"); -LowPowerTimer lptim3(*LPTIM3, hlptim3, LPTIM3_PERIOD, "LPTIM 3"); - -vector channels1 = {}; -vector channels2 = {}; -vector channels3 = {}; - -ST_LIB::DMA_Domain::Instance dma_adc1 = {hdma_adc1}; -ST_LIB::DMA_Domain::Instance dma_adc2 = {hdma_adc2}; -ST_LIB::DMA_Domain::Instance dma_adc3 = {hdma_adc3}; - -ADC::InitData init_data1(ADC1, ADC_RESOLUTION_16B, ADC_EXTERNALTRIG_LPTIM1_OUT, - channels1, &dma_adc1, "ADC 1"); -ADC::InitData init_data2(ADC2, ADC_RESOLUTION_16B, ADC_EXTERNALTRIG_LPTIM2_OUT, - channels2, &dma_adc2, "ADC 2"); -ADC::InitData init_data3(ADC3, ADC_RESOLUTION_12B, ADC_EXTERNALTRIG_LPTIM3_OUT, - channels3, &dma_adc3, "ADC 3"); - -ADC::Peripheral ADC::peripherals[3] = { - ADC::Peripheral(&hadc1, lptim1, init_data1), - ADC::Peripheral(&hadc2, lptim2, init_data2), - ADC::Peripheral(&hadc3, lptim3, init_data3) -}; - -map ADC::available_instances = { - {PF11, Instance(&peripherals[0], ADC_CHANNEL_2)}, - {PF12, Instance(&peripherals[0], ADC_CHANNEL_6)}, - {PF13, Instance(&peripherals[1], ADC_CHANNEL_2)}, - {PF14, Instance(&peripherals[1], ADC_CHANNEL_6)}, - {PF5, Instance(&peripherals[2], ADC_CHANNEL_4)}, - {PF6, Instance(&peripherals[2], ADC_CHANNEL_8)}, - {PF7, Instance(&peripherals[2], ADC_CHANNEL_3)}, - {PF8, Instance(&peripherals[2], ADC_CHANNEL_7)}, - {PF9, Instance(&peripherals[2], ADC_CHANNEL_2)}, - {PF10, Instance(&peripherals[2], ADC_CHANNEL_6)}, - {PC2, Instance(&peripherals[2], ADC_CHANNEL_0)}, - {PC3, Instance(&peripherals[2], ADC_CHANNEL_1)}, - {PF10, Instance(&peripherals[2], ADC_CHANNEL_6)}, - {PC0, Instance(&peripherals[0], ADC_CHANNEL_10)}, - {PA0, Instance(&peripherals[0], ADC_CHANNEL_16)}, - {PA3, Instance(&peripherals[0], ADC_CHANNEL_15)}, - {PA4, Instance(&peripherals[0], ADC_CHANNEL_18)}, - {PA5, Instance(&peripherals[0], ADC_CHANNEL_19)}, - {PA6, Instance(&peripherals[0], ADC_CHANNEL_3)}, - {PB0, Instance(&peripherals[0], ADC_CHANNEL_9)}, - {PB1, Instance(&peripherals[0], ADC_CHANNEL_5)} -}; - -uint32_t ADC::ranks[16] = { - ADC_REGULAR_RANK_1, - ADC_REGULAR_RANK_2, - ADC_REGULAR_RANK_3, - ADC_REGULAR_RANK_4, - ADC_REGULAR_RANK_5, - ADC_REGULAR_RANK_6, - ADC_REGULAR_RANK_7, - ADC_REGULAR_RANK_8, - ADC_REGULAR_RANK_9, - ADC_REGULAR_RANK_10, - ADC_REGULAR_RANK_11, - ADC_REGULAR_RANK_12, - ADC_REGULAR_RANK_13, - ADC_REGULAR_RANK_14, - ADC_REGULAR_RANK_15, - ADC_REGULAR_RANK_16 -}; - -#endif -#endif - -/************************************************ - * EXTI - ***********************************************/ -#ifdef HAL_EXTI_MODULE_ENABLED - -map ExternalInterrupt::instances = { - {PE0.gpio_pin, Instance(EXTI0_IRQn)}, - {PE1.gpio_pin, Instance(EXTI1_IRQn)} -}; - #endif /************************************************ diff --git a/Core/Src/Runes/generated_metadata.cpp b/Core/Src/Runes/generated_metadata.cpp index 6350bc43..08634ace 100644 --- a/Core/Src/Runes/generated_metadata.cpp +++ b/Core/Src/Runes/generated_metadata.cpp @@ -1,15 +1,15 @@ /* - * AUTOGENERATED FILE - * DO NOT MODIFY MANUALLY!!! - */ -extern "C" { -const char DESCRIPTION[255] __attribute__((section(".metadata_pool"))) = - "****************" // placeholder for beggining - "20260206T223828" // DateTime using ISO-8601 format - " " // alignment - "dcf817b3" // STLIB commit - "--------" // ADJ commit - "4b3d0ec4" // Board commit - // the '=' is used for unparsing - ; -} +* AUTOGENERATED FILE +* DO NOT MODIFY MANUALLY!!! +*/ +extern "C"{ + const char DESCRIPTION[255] __attribute__((section(".metadata_pool")))= + "****************" // placeholder for beggining + "20260217T191901" // DateTime using ISO-8601 format + " " // alignment + "019403b6" // STLIB commit + "--------" // ADJ commit + "21ba3add" // Board commit + // the '=' is used for unparsing + ; +} \ No newline at end of file diff --git a/Core/Src/stm32h7xx_it.c b/Core/Src/stm32h7xx_it.c index 3e6ae149..e678edca 100644 --- a/Core/Src/stm32h7xx_it.c +++ b/Core/Src/stm32h7xx_it.c @@ -58,9 +58,6 @@ /* External variables --------------------------------------------------------*/ extern ETH_HandleTypeDef heth; -extern DMA_HandleTypeDef hdma_adc1; -extern DMA_HandleTypeDef hdma_adc2; -extern DMA_HandleTypeDef hdma_adc3; extern DMA_HandleTypeDef hdma_i2c2_rx; extern DMA_HandleTypeDef hdma_i2c2_tx; extern I2C_HandleTypeDef hi2c2; @@ -407,32 +404,6 @@ void FDCAN3_IT0_IRQHandler(void) { HAL_FDCAN_IRQHandler(&hfdcan1); } */ void FDCAN3_IT1_IRQHandler(void) { HAL_FDCAN_IRQHandler(&hfdcan1); } -/** - * @brief This function handles EXTI line0 interrupt. - */ -void EXTI0_IRQHandler(void) { - /* USER CODE BEGIN EXTI0_IRQn 0 */ - - /* USER CODE END EXTI0_IRQn 0 */ - HAL_GPIO_EXTI_IRQHandler(GPIO_PIN_0); - /* USER CODE BEGIN EXTI0_IRQn 1 */ - - /* USER CODE END EXTI0_IRQn 1 */ -} - -/** - * @brief This function handles EXTI line1 interrupt. - */ -void EXTI1_IRQHandler(void) { - /* USER CODE BEGIN EXTI1_IRQn 0 */ - - /* USER CODE END EXTI1_IRQn 0 */ - HAL_GPIO_EXTI_IRQHandler(GPIO_PIN_1); - /* USER CODE BEGIN EXTI1_IRQn 1 */ - - /* USER CODE END EXTI1_IRQn 1 */ -} - void FMAC_IRQHandler(void) { HAL_FMAC_IRQHandler(&hfmac); } /** diff --git a/deps/ST-LIB b/deps/ST-LIB index 65d36f43..019403b6 160000 --- a/deps/ST-LIB +++ b/deps/ST-LIB @@ -1 +1 @@ -Subproject commit 65d36f43533e461defac8e84f3e4f7a8ae62a304 +Subproject commit 019403b6af6d71e70bc51d1c508aa19e7d422b3e From 571280bc0b471f054231c5058fae355e1038cc7c Mon Sep 17 00:00:00 2001 From: victhor Date: Tue, 17 Feb 2026 19:21:58 +0100 Subject: [PATCH 2/3] Remove from stm32h7xx_it.h diff --git a/Core/Inc/stm32h7xx_it.h b/Core/Inc/stm32h7xx_it.h index 19b0972..f14abd9 100644 --- a/Core/Inc/stm32h7xx_it.h +++ b/Core/Inc/stm32h7xx_it.h @@ -55,18 +55,6 @@ void SVC_Handler(void); void DebugMon_Handler(void); void PendSV_Handler(void); void SysTick_Handler(void); -void EXTI0_IRQHandler(void); -void EXTI1_IRQHandler(void); -void DMA1_Stream0_IRQHandler(void); -void DMA1_Stream1_IRQHandler(void); -void DMA1_Stream2_IRQHandler(void); -void DMA1_Stream3_IRQHandler(void); -void DMA1_Stream4_IRQHandler(void); -void DMA1_Stream5_IRQHandler(void); -void DMA1_Stream6_IRQHandler(void); -void DMA2_Stream0_IRQHandler(void); -void DMA2_Stream1_IRQHandler(void); -void DMA2_Stream2_IRQHandler(void); void FMAC_IRQHandler(void); void I2C2_EV_IRQHandler(void); void SPI3_IRQHandler(void); @@ -74,8 +62,6 @@ void ETH_IRQHandler(void); void LPTIM1_IRQHandler(void); void LPTIM2_IRQHandler(void); void LPTIM3_IRQHandler(void); -void TIM23_IRQHandler(void); -void TIM24_IRQHandler(void); /* USER CODE BEGIN EFP */ /* USER CODE END EFP */ --- Core/Inc/stm32h7xx_it.h | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/Core/Inc/stm32h7xx_it.h b/Core/Inc/stm32h7xx_it.h index 19b0972c..f14abd9b 100644 --- a/Core/Inc/stm32h7xx_it.h +++ b/Core/Inc/stm32h7xx_it.h @@ -55,18 +55,6 @@ void SVC_Handler(void); void DebugMon_Handler(void); void PendSV_Handler(void); void SysTick_Handler(void); -void EXTI0_IRQHandler(void); -void EXTI1_IRQHandler(void); -void DMA1_Stream0_IRQHandler(void); -void DMA1_Stream1_IRQHandler(void); -void DMA1_Stream2_IRQHandler(void); -void DMA1_Stream3_IRQHandler(void); -void DMA1_Stream4_IRQHandler(void); -void DMA1_Stream5_IRQHandler(void); -void DMA1_Stream6_IRQHandler(void); -void DMA2_Stream0_IRQHandler(void); -void DMA2_Stream1_IRQHandler(void); -void DMA2_Stream2_IRQHandler(void); void FMAC_IRQHandler(void); void I2C2_EV_IRQHandler(void); void SPI3_IRQHandler(void); @@ -74,8 +62,6 @@ void ETH_IRQHandler(void); void LPTIM1_IRQHandler(void); void LPTIM2_IRQHandler(void); void LPTIM3_IRQHandler(void); -void TIM23_IRQHandler(void); -void TIM24_IRQHandler(void); /* USER CODE BEGIN EFP */ /* USER CODE END EFP */ From 29e9845db544292dc686bac2764b6dcee0e376b0 Mon Sep 17 00:00:00 2001 From: victhor Date: Tue, 17 Feb 2026 19:29:34 +0100 Subject: [PATCH 3/3] fix format (?)