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 */ diff --git a/Core/Src/Runes/Runes.cpp b/Core/Src/Runes/Runes.cpp index fd9812f3..e0368308 100644 --- a/Core/Src/Runes/Runes.cpp +++ b/Core/Src/Runes/Runes.cpp @@ -87,83 +87,6 @@ bool UART::printf_ready = false; #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 - /************************************************ * I2C ***********************************************/ 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 6b1e7789..b9b29a6a 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;