everything working again

CMakeLists.txt

@@ -10,6 +10,13 @@ cmake_minimum_required(VERSION 3.13)
 # set(CMAKE_VERBOSE TRUE)
 
 set(CMAKE_SCRIPT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+set(CMAKE_COMMON_SCRIPT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/example_common/cmake")
+
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_SCRIPT_PATH})
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_COMMON_SCRIPT_PATH})
+
+message(STATUS ${CMAKE_MODULE_PATH})
+
 set(STM32_CMAKE_PATH "${CMAKE_SCRIPT_PATH}/stm32-cmake")
 set(STM32_CUBE_H7_PATH STM32CubeH7)
 set(STM32_TOOLCHAIN_PATH $ENV{STM32_TOOLCHAIN_PATH})
@@ -97,17 +104,6 @@ configure_file(${FSFW_CONFIG_PATH}/OBSWConfig.h.in OBSWConfig.h)
 configure_file(${BSP_NUCLEO_PATH}/Inc/FreeRTOSConfig.h.in FreeRTOSConfig.h)
 configure_file(${BSP_NUCLEO_PATH}/Inc/lwipopts.h.in lwipopts.h)
 
-if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-  set(WARNING_FLAGS -Wall -Wextra -Wimplicit-fallthrough=1
-                    -Wno-unused-parameter -Wno-psabi)
-
-  set(FSFW_WARNING_FLAGS ${WARNING_FLAGS})
-elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-  add_compile_options(/permissive- /d2SSAOptimizer-)
-  # To avoid nameclashes with min and max macro
-  add_compile_definitions(NOMINMAX)
-endif()
-
 # ##############################################################################
 # Executable and Sources
 # ##############################################################################
@@ -178,32 +174,16 @@ target_link_libraries(
           LwIP::IPv4
           LwIP::NETIF)
 
+include(common)
+get_common_build_flags(${TARGET_NAME})
+
 # Add include paths for all sources.
 target_include_directories(
   ${TARGET_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
                          ${CMAKE_CURRENT_BINARY_DIR} ${FSFW_CONFIG_PATH})
 
-if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+target_compile_options(${TARGET_NAME} PRIVATE ${COMMON_COMPILE_OPTS} ${COMMON_WARNING_FLAGS})
-  target_link_options(${TARGET_NAME} PRIVATE "-Wl,-Map=${TARGET_NAME}.map")
+target_link_options(${TARGET_NAME} PRIVATE ${COMMON_LINK_OPTS})
-
-  # Remove unused sections.
-  target_compile_options(${TARGET_NAME} PRIVATE "-ffunction-sections"
-                                                "-fdata-sections")
-
-  # Removed unused sections.
-  if(NOT FSFW_OSAL MATCHES rtems)
-    target_link_options(${TARGET_NAME} PRIVATE "-Wl,--gc-sections")
-  endif()
-elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-
-endif()
-
-if(CMAKE_VERBOSE)
-  message(STATUS "Warning flags: ${WARNING_FLAGS}")
-endif()
-
-# Compile options for all sources.
-target_compile_options(${TARGET_NAME} PRIVATE ${WARNING_FLAGS})
 
 if(TGT_BSP)
   set(TARGET_STRING "Target BSP: ${TGT_BSP}")
@@ -218,7 +198,7 @@ string(CONCAT POST_BUILD_COMMENT "Build directory: ${CMAKE_BINARY_DIR}\n"
 stm32_add_linker_script(${TARGET_NAME} "PRIVATE"
                         "${BSP_NUCLEO_PATH}/STM32H743ZITx_FLASH.ld")
 
-include(${CMAKE_SCRIPT_PATH}/BuildType.cmake)
+include(BuildType)
 set_build_type()
 
 stm32_print_size_of_target(${TARGET_NAME})

bsp_stm32h7_freertos/NUCLEO-H743ZI/Inc/stm32h7xx_nucleo.h

@@ -19,6 +19,10 @@
  ******************************************************************************
  */
 
+#ifndef USE_HAL_UART_REGISTER_CALLBACKS
+#define USE_HAL_UART_REGISTER_CALLBACKS 1
+#endif
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef STM32H7XX_NUCLEO_H
 #define STM32H7XX_NUCLEO_H

bsp_stm32h7_freertos/NUCLEO-H743ZI/Src/syscalls.c

@@ -55,8 +55,8 @@ int _write(int file, const void *ptr, size_t len) {
         HAL_UART_Transmit(&huart3, (uint8_t *)"\r", 1, DEBUG_UART_MS_TIMEOUT);
       }
 #endif
-      uint8_t *character = (uint8_t *)ptr;
+      const uint8_t *character = (const uint8_t *)ptr;
-      HAL_UART_Transmit(&huart3, (uint8_t *)(character + i), 1,
+      HAL_UART_Transmit(&huart3, (const uint8_t *)(character + i), 1,
                         DEBUG_UART_MS_TIMEOUT);
     }
     return len;

bsp_stm32h7_freertos/utility/print.c

@@ -2,5 +2,5 @@
 #include <hardware_init.h>
 
 void printChar(const char *character) {
-  HAL_UART_Transmit(&huart3, (uint8_t *)character, 1, DEBUG_UART_MS_TIMEOUT);
+  HAL_UART_Transmit(&huart3, (const uint8_t *)character, 1, DEBUG_UART_MS_TIMEOUT);
 }

cmake/BuildType.cmake

@@ -1,45 +0,0 @@
-function(set_build_type)
-
-message(STATUS "Used build generator: ${CMAKE_GENERATOR}")
-
-# Set a default build type if none was specified
-set(DEFAULT_BUILD_TYPE "RelWithDebInfo")
-if(EXISTS "${CMAKE_SOURCE_DIR}/.git")
-	set(DEFAULT_BUILD_TYPE "Debug")
-endif()
-
-if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-	message(STATUS 
-		"Setting build type to '${DEFAULT_BUILD_TYPE}' as none was specified."
-	)
-	set(CMAKE_BUILD_TYPE "${DEFAULT_BUILD_TYPE}" CACHE
-		STRING "Choose the type of build." FORCE
-	)
-	# Set the possible values of build type for cmake-gui
-	set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
-		"Debug" "Release" "MinSizeRel" "RelWithDebInfo"
-	)
-endif()
-
-if(${CMAKE_BUILD_TYPE} MATCHES "Debug")
-	message(STATUS 
-		"Building Debug application with flags: ${CMAKE_C_FLAGS_DEBUG}"
-	)
-elseif(${CMAKE_BUILD_TYPE} MATCHES "RelWithDebInfo")
-	message(STATUS 
-		"Building Release (Debug) application with "
-		"flags: ${CMAKE_C_FLAGS_RELWITHDEBINFO}"
-	)
-elseif(${CMAKE_BUILD_TYPE} MATCHES "MinSizeRel")
-	message(STATUS 
-		"Building Release (Size) application with "
-		"flags: ${CMAKE_C_FLAGS_MINSIZEREL}"
-	)
-else()
-	message(STATUS 
-		"Building Release (Speed) application with "
-		"flags: ${CMAKE_C_FLAGS_RELEASE}"
-	)
-endif()
-
-endfunction()

example_common

@@ -1 +1 @@
-Subproject commit ff569dd02c5915de5804914d7bfcc1d9688befca
+Subproject commit c564fa37fde467a0216c041bb81eeed7343ac505

fsfw

@@ -1 +1 @@
-Subproject commit 44402883b509f2116d48269edff3068a63c4c204
+Subproject commit 678f8710c6656c70c56f4ea6e0ee6c0195052bff

tmtc/.gitignore

@@ -0,0 +1 @@
+/tmtc_conf.json

tmtc/common_tmtc

@@ -1 +1 @@
-Subproject commit 7d197dbe4be46b63377936610ea0d01572c0a930
+Subproject commit 3cca54f66fe72f292787499e1e9bf2497a2cfdbf

tmtc/def_tmtc_conf.json

@@ -0,0 +1,4 @@
+{
+    "com_if": "udp",
+    "tcpip_udp_recv_max_size": 1500
+}

tmtc/tmtc_conf.json

@@ -1,6 +0,0 @@
-{
-    "com_if": "udp",
-    "tcpip_udp_ip_addr": "169.254.1.38",
-    "tcpip_udp_port": 7,
-    "tcpip_udp_recv_max_size": 1500
-}

tmtc/tmtccmd

@@ -1 +1 @@
-Subproject commit 890f1193240dc422ade3c4380b8b05733971001f
+Subproject commit 2354f5d2778c7681ddf6602766dd4e68b943e1c0