From 4900cde915d191fc4bbab72a3cfe39442228b141 Mon Sep 17 00:00:00 2001 From: Luca Date: Thu, 28 Aug 2025 13:09:47 -0700 Subject: [PATCH] Fixed cmakelists --- CMakeLists.txt | 6 +++--- Core/Include/Reg/SHAL_TIM_REG.h | 4 ++++ Core/Include/SHAL.h | 2 +- Core/Include/SHAL_TIM.h | 7 ------- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8dc0306..457dd52 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,14 +23,14 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS ON) set(MX_INCLUDE_DIRECTORIES - ${CMAKE_CURRENT_SOURCE_DIR}/Core/Include - ${CMAKE_CURRENT_SOURCE_DIR}/Core/Include/* ${CMAKE_CURRENT_SOURCE_DIR}/Drivers/CMSIS/Device/ST/${MCU_FAMILY}/Include ${CMAKE_CURRENT_SOURCE_DIR}/Drivers/CMSIS/Include ) set(PROJECT_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/Core/Include + ${CMAKE_CURRENT_SOURCE_DIR}/Core/Include/Reg ) file(GLOB_RECURSE PROJECT_SOURCES @@ -89,4 +89,4 @@ add_custom_command(TARGET ${EXECUTABLE} POST_BUILD ${EXECUTABLE}.hex COMMAND ${CMAKE_OBJCOPY} -O binary $ ${EXECUTABLE}.bin -) \ No newline at end of file +) diff --git a/Core/Include/Reg/SHAL_TIM_REG.h b/Core/Include/Reg/SHAL_TIM_REG.h index 0c2d3cd..b4b2221 100644 --- a/Core/Include/Reg/SHAL_TIM_REG.h +++ b/Core/Include/Reg/SHAL_TIM_REG.h @@ -37,6 +37,8 @@ constexpr RCC_Peripheral getTimerRCC(Timer_Key t) { case Timer_Key::S_TIM16: return {Bus::APB2, &RCC->APB2ENR, RCC_APB2ENR_TIM16EN}; case Timer_Key::S_TIM17: return {Bus::APB2, &RCC->APB2ENR, RCC_APB2ENR_TIM17EN}; } + + return {Bus::APB2, &RCC->APB2ENR, RCC_APB2ENR_TIM1EN}; } //Get actual register value based on enum @@ -50,6 +52,7 @@ constexpr volatile TIM_TypeDef* getTimerRegister(Timer_Key t) { case Timer_Key::S_TIM16: return TIM16; case Timer_Key::S_TIM17: return TIM17; } + return TIM1; } constexpr IRQn_Type getIRQn(Timer_Key t) { @@ -62,6 +65,7 @@ constexpr IRQn_Type getIRQn(Timer_Key t) { case Timer_Key::S_TIM16: return TIM16_IRQn; case Timer_Key::S_TIM17: return TIM17_IRQn; } + return TIM1_BRK_UP_TRG_COM_IRQn; } diff --git a/Core/Include/SHAL.h b/Core/Include/SHAL.h index 543b9ff..d79a854 100644 --- a/Core/Include/SHAL.h +++ b/Core/Include/SHAL.h @@ -8,7 +8,7 @@ #ifndef SHAL_H #define SHAL_H - +#include "SHAL_TIM.h" #endif diff --git a/Core/Include/SHAL_TIM.h b/Core/Include/SHAL_TIM.h index 277440d..62f8be0 100644 --- a/Core/Include/SHAL_TIM.h +++ b/Core/Include/SHAL_TIM.h @@ -29,11 +29,4 @@ private: }; -extern "C" void TIM2_IRQHandler(void){ - if(TIM2->SR & TIM_SR_UIF) { - - } -} - - #endif \ No newline at end of file