From d0bcecc26354dc29062795bd7d33c0d6ee8463d3 Mon Sep 17 00:00:00 2001 From: key Date: Sat, 20 Nov 2021 14:47:02 +0100 Subject: [PATCH] adding utils directory to Cmake --- CMakeLists.txt | 10 ++++++---- bsl/csl/stm32f042/Device/hardwareDescription.h | 16 ---------------- bsl/csl/stm32f042/Src/pin.c | 3 ++- bsl/nucleo_f042k6/bslConfig.cmake | 10 +++++----- main.cpp | 2 -- utils/CMakeLists.txt | 2 ++ utils/assert/CMakeLists.txt | 5 +++++ utils/assert/{assert.c => utils_assert.c} | 2 +- utils/assert/{assert.h => utils_assert.h} | 0 utils/menu/menu.h | 9 +++------ 10 files changed, 24 insertions(+), 35 deletions(-) create mode 100644 utils/CMakeLists.txt create mode 100644 utils/assert/CMakeLists.txt rename utils/assert/{assert.c => utils_assert.c} (72%) rename utils/assert/{assert.h => utils_assert.h} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index bd0d827..bd944a6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,11 +23,13 @@ set(EXECUTABLE ${PROJECT_NAME}) #Create the executable #CONFIG FILE #################################################################################################### set(INTERFACES_DIR ${CMAKE_SOURCE_DIR}/bsl/csl/interfaces) +set(UTILS_DIR ${CMAKE_SOURCE_DIR}/utils/assert) #################################################################################################### -#SUBDIRECTORIES +#SUBDIRECTORIES Will add the given folders to the porject an check for CmakeLists.txt #################################################################################################### include(${PROJECT_DEFS}) +add_subdirectory(utils) add_subdirectory(bsl) set(BSL_HEADER_FILE ${CMAKE_SOURCE_DIR}/bsl/raspberry/bsl_raspberry.hpp) @@ -43,9 +45,9 @@ message("${Blue} |--> Libs used\t\t: ${EXTRA_LIBS} ${ColourReset}") #EXECUTABLE #################################################################################################### add_executable(${EXECUTABLE} main.cpp) -target_compile_options(${EXECUTABLE} PRIVATE ${CPP_FLAGS}) -target_compile_definitions(${EXECUTABLE} PRIVATE ${CPP_DEFS}) -target_include_directories(${EXECUTABLE} PUBLIC ${CPP_INCLUDES}) +target_compile_options(${EXECUTABLE} PRIVATE ${MAIN_FLAGS}) +target_compile_definitions(${EXECUTABLE} PRIVATE ${MAIN_DEFS}) +target_include_directories(${EXECUTABLE} PUBLIC ${MAIN_INCLUDES}) #################################################################################################### #LINKING EXECUTEABLE diff --git a/bsl/csl/stm32f042/Device/hardwareDescription.h b/bsl/csl/stm32f042/Device/hardwareDescription.h index 5171ed8..d12a011 100644 --- a/bsl/csl/stm32f042/Device/hardwareDescription.h +++ b/bsl/csl/stm32f042/Device/hardwareDescription.h @@ -4,7 +4,6 @@ // this file contains all the specific hardware definitions for the given chip stm32f042x6. // Its used for the interfaces for the CSL. - #define PACKAGE_LQFP32 1 #define MAX_USART_CHANNEL_COUNT 2 @@ -113,18 +112,3 @@ static const uint8_t altFunc_List[MAX_N_PORTS_COUNT][MAX_PORT_PINS_COUNT] = { 0b00000000 //N.A } }; - - -/* -void setAlt(pin_no_t id, uint8_t af) -{ - // check for index overshoot - assert(MAX_NO_ALT_PER_PIN < af); - - // fail if list entry returns 0 - //assert(pinAltList[((id & 0xF0) >> 4)][id & 0x0F]) != 0); - - // setup alt function here... -} -*/ - diff --git a/bsl/csl/stm32f042/Src/pin.c b/bsl/csl/stm32f042/Src/pin.c index 5697267..96ea668 100644 --- a/bsl/csl/stm32f042/Src/pin.c +++ b/bsl/csl/stm32f042/Src/pin.c @@ -21,7 +21,8 @@ */ #include "pin.h" -#include +#include "utils_assert.h" + #define MODER_IN 0x0UL #define MODER_OUT 0x1UL diff --git a/bsl/nucleo_f042k6/bslConfig.cmake b/bsl/nucleo_f042k6/bslConfig.cmake index ed4a459..f6f2c60 100644 --- a/bsl/nucleo_f042k6/bslConfig.cmake +++ b/bsl/nucleo_f042k6/bslConfig.cmake @@ -24,9 +24,8 @@ set(CLS_USED ${CMAKE_SOURCE_DIR}/bsl/csl/stm32f042) #################################################################################################### set(CSL_INCLUDES - # ${CMAKE_SOURCE_DIR}/bsl/csl/stm32f042/Inc + ${UTILS_DIR} ${CMAKE_SOURCE_DIR}/bsl/csl/stm32f042/CMSIS/Include - #${CMAKE_SOURCE_DIR}/bsl/csl/stm32f042/Drivers/CMSIS/Device/ST/STM32F0xx/Include ${CMAKE_SOURCE_DIR}/bsl/csl/stm32f042/Device) # For flags please check https://manned.org/arm-none-eabi-gcc/34fd6095 @@ -68,9 +67,9 @@ set(LINKER_FLAGS -Wl,--gc-sections) #The order is important -set (CPP_INCLUDES ${CMAKE_SOURCE_DIR}) -set (CPP_FLAGS ${C_FLAGS}) -set (CPP_DEFS ${C_DEFS}) +set (MAIN_INCLUDES ${CMAKE_SOURCE_DIR}) +set (MAIN_FLAGS ${C_FLAGS}) +set (MAIN_DEFS ${C_DEFS}) list(APPEND EXTRA_LIBS sub::startup) list(APPEND EXTRA_LIBS sub::translator) @@ -78,3 +77,4 @@ list(APPEND EXTRA_LIBS sub::delay) list(APPEND EXTRA_LIBS sub::pin) list(APPEND EXTRA_LIBS sub::usart) list(APPEND EXTRA_LIBS sub::init) +list(APPEND EXTRA_LIBS sub::assert) diff --git a/main.cpp b/main.cpp index 4b73425..4c4622d 100644 --- a/main.cpp +++ b/main.cpp @@ -8,8 +8,6 @@ int main(int argc, char *argv[]) { uint8_t i = 0; uint8_t a = '0'; - bool latch = false; - bool latch_old = false; delayInitMs(8000000, 1000); diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt new file mode 100644 index 0000000..a3dbdf3 --- /dev/null +++ b/utils/CMakeLists.txt @@ -0,0 +1,2 @@ + +add_subdirectory(assert) diff --git a/utils/assert/CMakeLists.txt b/utils/assert/CMakeLists.txt new file mode 100644 index 0000000..cb04a50 --- /dev/null +++ b/utils/assert/CMakeLists.txt @@ -0,0 +1,5 @@ +add_library(assert utils_assert.c) +target_compile_options(assert PRIVATE ${C_FLAGS}) +target_compile_definitions(assert PRIVATE ${C_DEFS}) +target_include_directories(assert PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CSL_INCLUDES}) +add_library(sub::assert ALIAS assert) diff --git a/utils/assert/assert.c b/utils/assert/utils_assert.c similarity index 72% rename from utils/assert/assert.c rename to utils/assert/utils_assert.c index 51bb067..9b70296 100644 --- a/utils/assert/assert.c +++ b/utils/assert/utils_assert.c @@ -1,4 +1,4 @@ -#include "assert.h" +#include "utils_assert.h" void assert(int check) { diff --git a/utils/assert/assert.h b/utils/assert/utils_assert.h similarity index 100% rename from utils/assert/assert.h rename to utils/assert/utils_assert.h diff --git a/utils/menu/menu.h b/utils/menu/menu.h index c064940..85e218e 100644 --- a/utils/menu/menu.h +++ b/utils/menu/menu.h @@ -8,7 +8,6 @@ * @brief Basic menu implementation for diefferent use cases ************************************************************************************************** */ - #ifndef _MENU_H #define _MENU_H @@ -28,16 +27,14 @@ uint8_t menuGetEscape(); uint8_t menuGetReturn(); uint8_t menuGetClear(); - void menuSendEnter(); -void menuGetEscape(); -void menuGetReturn(); -void menuGetClear(); +void menuSendEscape(); +void menuSendReturn(); +void menuSendClear(); void menuPrintChar(uint8_t char); void menuMainMenu(); - #ifdef __cplusplus } #endif