adding utils directory to Cmake

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

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...
-}
-*/
-

bsl/csl/stm32f042/Src/pin.c

@@ -21,7 +21,8 @@
 */
 
 #include "pin.h"
-#include <assert.h>
+#include "utils_assert.h"
+
 
 #define MODER_IN		0x0UL	
 #define MODER_OUT		0x1UL		

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)

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); 

utils/CMakeLists.txt

@@ -0,0 +1,2 @@
+
+add_subdirectory(assert)

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)

utils/assert/utils_assert.c

@@ -1,4 +1,4 @@
-#include "assert.h"
+#include "utils_assert.h"
 
 void assert(int check)
 {

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