From c11620f148de40619958e205c961f10ee5cbe75a Mon Sep 17 00:00:00 2001 From: key Date: Tue, 9 Nov 2021 16:39:38 +0100 Subject: [PATCH] Started celaning the STM generated files as they are not needed anymore. TODO please check the readme ! --- CMakeLists.txt | 2 +- bsl/csl/interfaces/delay.h | 1 - bsl/csl/interfaces/deviceSetup.h | 2 ++ bsl/csl/interfaces/pin.h | 3 ++- bsl/csl/interfaces/usart.h | 1 - bsl/csl/stm32f042/CMakeLists.txt | 1 - .../ST/STM32F0xx/Include/system_stm32f0xx.h | 1 - bsl/csl/stm32f042/Src/CMakeLists.txt | 15 --------------- bsl/csl/stm32f042/Src/delay.c | 1 + bsl/csl/stm32f042/Src/deviceSetup.c | 2 +- bsl/csl/stm32f042/Src/usart.c | 1 + bsl/csl/stm32f042/{ => oldSTM}/Inc/stm32_assert.h | 0 .../stm32f042/{ => oldSTM}/Inc/stm32f0xx_csl.h | 0 bsl/csl/stm32f042/{ => oldSTM}/Inc/stm32f0xx_it.h | 0 .../stm32f042/{ => oldSTM}/Inc/stm_pin.hpp.bak | 0 bsl/csl/stm32f042/{Src => oldSTM}/stm32f0xx_csl.c | 0 bsl/csl/stm32f042/{Src => oldSTM}/stm32f0xx_it.c | 0 .../stm32f042/{Src => oldSTM}/system_stm32f0xx.c | 0 bsl/csl/stm32f042/startup/startup_stm32f042x6.s | 2 +- bsl/nucleo_f042k6/bslConfig.cmake | 1 - bsl/nucleo_f042k6/bsl_nucleo_f042k6.cpp | 1 - bsl/nucleo_f042k6/bsl_nucleo_f042k6.hpp | 1 - main.c | 3 +-- main.cpp | 3 ++- 24 files changed, 12 insertions(+), 29 deletions(-) rename bsl/csl/stm32f042/{ => oldSTM}/Inc/stm32_assert.h (100%) rename bsl/csl/stm32f042/{ => oldSTM}/Inc/stm32f0xx_csl.h (100%) rename bsl/csl/stm32f042/{ => oldSTM}/Inc/stm32f0xx_it.h (100%) rename bsl/csl/stm32f042/{ => oldSTM}/Inc/stm_pin.hpp.bak (100%) rename bsl/csl/stm32f042/{Src => oldSTM}/stm32f0xx_csl.c (100%) rename bsl/csl/stm32f042/{Src => oldSTM}/stm32f0xx_it.c (100%) rename bsl/csl/stm32f042/{Src => oldSTM}/system_stm32f0xx.c (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2fb144e..3df1212 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,7 +42,7 @@ message("${Blue} |--> Libs used\t\t: ${EXTRA_LIBS} ${ColourReset}") #################################################################################################### #EXECUTABLE #################################################################################################### -add_executable(${EXECUTABLE} main.cpp) +add_executable(${EXECUTABLE} main.c) target_compile_options(${EXECUTABLE} PRIVATE ${CPP_FLAGS}) target_compile_definitions(${EXECUTABLE} PRIVATE ${CPP_DEFS}) target_include_directories(${EXECUTABLE} PUBLIC ${CPP_INCLUDES}) diff --git a/bsl/csl/interfaces/delay.h b/bsl/csl/interfaces/delay.h index 6d40cc8..b1b08d1 100644 --- a/bsl/csl/interfaces/delay.h +++ b/bsl/csl/interfaces/delay.h @@ -5,7 +5,6 @@ extern "C" { #endif #include -#include "../stm32f042/Drivers/CMSIS/Device/ST/STM32F0xx/Include/stm32f0xx.h" void delayMs(uint16_t delay); diff --git a/bsl/csl/interfaces/deviceSetup.h b/bsl/csl/interfaces/deviceSetup.h index 2790d6c..675187f 100644 --- a/bsl/csl/interfaces/deviceSetup.h +++ b/bsl/csl/interfaces/deviceSetup.h @@ -7,6 +7,8 @@ extern "C" { #include +extern uint32_t systemCoreClock; /*!< System Clock Frequency (Core Clock) */ + void setupInit(); void setupClock(); void setupBus(); diff --git a/bsl/csl/interfaces/pin.h b/bsl/csl/interfaces/pin.h index f5b14bc..9a6438c 100644 --- a/bsl/csl/interfaces/pin.h +++ b/bsl/csl/interfaces/pin.h @@ -31,8 +31,9 @@ extern "C" { #include #ifdef ARM_MCU -#include "../stm32f042/Drivers/CMSIS/Device/ST/STM32F0xx/Include/stm32f042x6.h" /*! Enum of the awailable pins for this package */ + + #include "stm32f042x6.h" typedef enum { // NAME = BASE ADDR | PORT | PIN NO diff --git a/bsl/csl/interfaces/usart.h b/bsl/csl/interfaces/usart.h index aa5eb0e..a349900 100644 --- a/bsl/csl/interfaces/usart.h +++ b/bsl/csl/interfaces/usart.h @@ -28,7 +28,6 @@ extern "C" { #include "pin.h" -#include "../stm32f042/Drivers/CMSIS/Device/ST/STM32F0xx/Include/stm32f042x6.h" #define NO_PARITY_CTRL 0 #define PARITY_CTRL 1 diff --git a/bsl/csl/stm32f042/CMakeLists.txt b/bsl/csl/stm32f042/CMakeLists.txt index 7e58b05..26e056c 100644 --- a/bsl/csl/stm32f042/CMakeLists.txt +++ b/bsl/csl/stm32f042/CMakeLists.txt @@ -3,6 +3,5 @@ project(Csl_Stm32f0xx ASM C CXX) # do this intead sf declaring languages in the #################################################################################################### #SUBDIRECTORIES #################################################################################################### -add_subdirectory(Drivers) add_subdirectory(startup) add_subdirectory(Src) diff --git a/bsl/csl/stm32f042/Drivers/CMSIS/Device/ST/STM32F0xx/Include/system_stm32f0xx.h b/bsl/csl/stm32f042/Drivers/CMSIS/Device/ST/STM32F0xx/Include/system_stm32f0xx.h index 3b71cfe..3d6afd2 100644 --- a/bsl/csl/stm32f042/Drivers/CMSIS/Device/ST/STM32F0xx/Include/system_stm32f0xx.h +++ b/bsl/csl/stm32f042/Drivers/CMSIS/Device/ST/STM32F0xx/Include/system_stm32f0xx.h @@ -55,7 +55,6 @@ is no need to call the 2 first functions listed above, since SystemCoreClock variable is updated automatically. */ -extern uint32_t SystemCoreClock; /*!< System Clock Frequency (Core Clock) */ extern const uint8_t AHBPrescTable[16]; /*!< AHB prescalers table values */ extern const uint8_t APBPrescTable[8]; /*!< APB prescalers table values */ diff --git a/bsl/csl/stm32f042/Src/CMakeLists.txt b/bsl/csl/stm32f042/Src/CMakeLists.txt index aaacca0..e0962a8 100644 --- a/bsl/csl/stm32f042/Src/CMakeLists.txt +++ b/bsl/csl/stm32f042/Src/CMakeLists.txt @@ -1,18 +1,3 @@ -set (STMSRC_INCLUDES - ../Inc - ) - -set(STMSRC_SOURCES - stm32f0xx_csl.c - system_stm32f0xx.c - ) - -add_library(stmSources ${STMSRC_SOURCES}) -target_compile_options(stmSources PRIVATE ${C_FLAGS}) -target_compile_definitions(stmSources PRIVATE ${C_DEFS}) -target_include_directories(stmSources PUBLIC ${STMSRC_INCLUDES}) -target_link_libraries(stmSources sub::drivers) -add_library(sub::sources ALIAS stmSources) add_library(stmDelay delay.c) target_compile_options(stmDelay PRIVATE ${C_FLAGS}) diff --git a/bsl/csl/stm32f042/Src/delay.c b/bsl/csl/stm32f042/Src/delay.c index 8181c14..3e8736d 100644 --- a/bsl/csl/stm32f042/Src/delay.c +++ b/bsl/csl/stm32f042/Src/delay.c @@ -1,4 +1,5 @@ #include "delay.h" +#include "stm32f042x6.h" void delayMs(uint16_t delay) diff --git a/bsl/csl/stm32f042/Src/deviceSetup.c b/bsl/csl/stm32f042/Src/deviceSetup.c index 78dd717..d29c89b 100644 --- a/bsl/csl/stm32f042/Src/deviceSetup.c +++ b/bsl/csl/stm32f042/Src/deviceSetup.c @@ -1,5 +1,5 @@ #include"deviceSetup.h" -#include "../stm32f042/Drivers/CMSIS/Device/ST/STM32F0xx/Include/stm32f0xx.h" +#include "stm32f042x6.h" #define SET_BIT(REG, BIT) ((REG) |= (BIT)) diff --git a/bsl/csl/stm32f042/Src/usart.c b/bsl/csl/stm32f042/Src/usart.c index df400b5..de4e6d3 100644 --- a/bsl/csl/stm32f042/Src/usart.c +++ b/bsl/csl/stm32f042/Src/usart.c @@ -22,6 +22,7 @@ #include"usart.h" #include"pin.h" +#include "stm32f042x6.h" #define SYST_CLK 8000000 diff --git a/bsl/csl/stm32f042/Inc/stm32_assert.h b/bsl/csl/stm32f042/oldSTM/Inc/stm32_assert.h similarity index 100% rename from bsl/csl/stm32f042/Inc/stm32_assert.h rename to bsl/csl/stm32f042/oldSTM/Inc/stm32_assert.h diff --git a/bsl/csl/stm32f042/Inc/stm32f0xx_csl.h b/bsl/csl/stm32f042/oldSTM/Inc/stm32f0xx_csl.h similarity index 100% rename from bsl/csl/stm32f042/Inc/stm32f0xx_csl.h rename to bsl/csl/stm32f042/oldSTM/Inc/stm32f0xx_csl.h diff --git a/bsl/csl/stm32f042/Inc/stm32f0xx_it.h b/bsl/csl/stm32f042/oldSTM/Inc/stm32f0xx_it.h similarity index 100% rename from bsl/csl/stm32f042/Inc/stm32f0xx_it.h rename to bsl/csl/stm32f042/oldSTM/Inc/stm32f0xx_it.h diff --git a/bsl/csl/stm32f042/Inc/stm_pin.hpp.bak b/bsl/csl/stm32f042/oldSTM/Inc/stm_pin.hpp.bak similarity index 100% rename from bsl/csl/stm32f042/Inc/stm_pin.hpp.bak rename to bsl/csl/stm32f042/oldSTM/Inc/stm_pin.hpp.bak diff --git a/bsl/csl/stm32f042/Src/stm32f0xx_csl.c b/bsl/csl/stm32f042/oldSTM/stm32f0xx_csl.c similarity index 100% rename from bsl/csl/stm32f042/Src/stm32f0xx_csl.c rename to bsl/csl/stm32f042/oldSTM/stm32f0xx_csl.c diff --git a/bsl/csl/stm32f042/Src/stm32f0xx_it.c b/bsl/csl/stm32f042/oldSTM/stm32f0xx_it.c similarity index 100% rename from bsl/csl/stm32f042/Src/stm32f0xx_it.c rename to bsl/csl/stm32f042/oldSTM/stm32f0xx_it.c diff --git a/bsl/csl/stm32f042/Src/system_stm32f0xx.c b/bsl/csl/stm32f042/oldSTM/system_stm32f0xx.c similarity index 100% rename from bsl/csl/stm32f042/Src/system_stm32f0xx.c rename to bsl/csl/stm32f042/oldSTM/system_stm32f0xx.c diff --git a/bsl/csl/stm32f042/startup/startup_stm32f042x6.s b/bsl/csl/stm32f042/startup/startup_stm32f042x6.s index 7bf1334..c7e58a6 100644 --- a/bsl/csl/stm32f042/startup/startup_stm32f042x6.s +++ b/bsl/csl/stm32f042/startup/startup_stm32f042x6.s @@ -114,7 +114,7 @@ LoopFillZerobss: bcc FillZerobss /* Call the clock system intitialization function.*/ - bl SystemInit + bl setupInit /* Call static constructors */ bl __libc_init_array /* Call the application's entry point.*/ diff --git a/bsl/nucleo_f042k6/bslConfig.cmake b/bsl/nucleo_f042k6/bslConfig.cmake index b690af7..5d1d509 100644 --- a/bsl/nucleo_f042k6/bslConfig.cmake +++ b/bsl/nucleo_f042k6/bslConfig.cmake @@ -74,7 +74,6 @@ set (CPP_DEFS ${C_DEFS}) list(APPEND EXTRA_LIBS sub::startup) list(APPEND EXTRA_LIBS sub::translator) -list(APPEND EXTRA_LIBS sub::sources) list(APPEND EXTRA_LIBS sub::delay) list(APPEND EXTRA_LIBS sub::pin) list(APPEND EXTRA_LIBS sub::usart) diff --git a/bsl/nucleo_f042k6/bsl_nucleo_f042k6.cpp b/bsl/nucleo_f042k6/bsl_nucleo_f042k6.cpp index e08e086..463489a 100644 --- a/bsl/nucleo_f042k6/bsl_nucleo_f042k6.cpp +++ b/bsl/nucleo_f042k6/bsl_nucleo_f042k6.cpp @@ -2,7 +2,6 @@ Nucleo_f042k6::Nucleo_f042k6() { - stmStart(); } Nucleo_f042k6::~Nucleo_f042k6(){} diff --git a/bsl/nucleo_f042k6/bsl_nucleo_f042k6.hpp b/bsl/nucleo_f042k6/bsl_nucleo_f042k6.hpp index b54e442..3b5a050 100644 --- a/bsl/nucleo_f042k6/bsl_nucleo_f042k6.hpp +++ b/bsl/nucleo_f042k6/bsl_nucleo_f042k6.hpp @@ -2,7 +2,6 @@ #define BSL_NUCLEO_F042K6_H #include "../csl/interfaces/pin.h" -#include "stm32f0xx_csl.h" class Nucleo_f042k6 { diff --git a/main.c b/main.c index a8bd47f..1d8c0f0 100644 --- a/main.c +++ b/main.c @@ -1,6 +1,6 @@ #include "main.h" #include "delay.h" -#include "stm32f0xx_csl.h" +#include "deviceSetup.h" #include "usart.h" #include "ascii.h" @@ -8,7 +8,6 @@ int main(int argc, char *argv[]) { uint8_t i = 0; uint8_t a = '0'; -// stmStart(); delayInitMs(8000000, 1000); diff --git a/main.cpp b/main.cpp index 36ff8b4..2b5c4c0 100644 --- a/main.cpp +++ b/main.cpp @@ -11,7 +11,6 @@ int main(int argc, char *argv[]) bool latch = false; bool latch_old = false; -// setupInit(); delayInitMs(8000000, 1000); // FreeRTOS_Delay dly; @@ -19,6 +18,8 @@ int main(int argc, char *argv[]) pinConfig(pinB3, output, pushPull, def_res, def_speed); pinConfig(pinA0, input, def_stage, pullDown, def_speed); + + setupInit(); // This is the sescond call of System init the asebly start code is calling it before the main. usartInit( usart2, pinA2, pinA15,