Merge branch 'dev' into temp-profile-checker

Remove trailing whitespace
Incrment Cmake required version number
2025-05-10 22:35:27 +02:00 · 2024-03-24 14:13:56 +01:00 · 2024-03-24 14:11:33 +01:00
2 changed files with 2 additions and 2 deletions
--- a/stm-firmware/CMakeLists.txt
+++ b/stm-firmware/CMakeLists.txt
@@ -114,7 +114,7 @@ add_executable(${ELFFILE} ${MAIN_SOURCES} ${CFG_PARSER_SRCS} ${UI_SRCS}
 			${STM_PERIPH_SRCS} ${SETTINGS_SRCS} ${SAFETY_SRCS}
 			${SHELLMATTA_SRCS} ${UPDATER_SRCS} ${PROFILE_SRCS}
 		)
-	
+
 add_dependencies(${ELFFILE} updater-ram-code-header-blob generate-version-header)


--- a/stm-firmware/updater/ram-code/CMakeLists.txt
+++ b/stm-firmware/updater/ram-code/CMakeLists.txt
@@ -2,7 +2,7 @@ project(updater-ram-code)
 set(CMAKE_SYSTEM_NAME Generic)
 set(CMAKE_SYSTEM_PROCESSOR arm)
 set(CMAKE_CROSSCOMPILING 1)
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.18)

 set(CMAKE_TOOLCHAIN_FILE "arm-none-eabi-gcc.cmake")
Author	SHA1	Message	Date
Mario Hüttel	6ca38419ad	Merge branch 'dev' into temp-profile-checker	2025-05-10 22:35:27 +02:00
Mario Hüttel	5c429ec894	Remove trailing whitespace	2024-03-24 14:13:56 +01:00
Mario Hüttel	62ef147105	Incrment Cmake required version number	2024-03-24 14:11:33 +01:00