From e463405c7769d3f6ecd08ddf5990991def73bcb7 Mon Sep 17 00:00:00 2001 From: gullradriel <3157857+gullradriel@users.noreply.github.com> Date: Sun, 26 Jan 2025 16:26:02 +0100 Subject: [PATCH 1/2] fix cmake_minimum_required to 3.16 (#2499) --- CMakeLists.txt | 2 +- firmware/CMakeLists.txt | 2 +- firmware/standalone/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3aff31c87..0fbd8a82f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ # Boston, MA 02110-1301, USA. # -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.16) cmake_policy(SET CMP0005 NEW) set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_LIST_DIR}/firmware/toolchain-arm-cortex-m.cmake) diff --git a/firmware/CMakeLists.txt b/firmware/CMakeLists.txt index bc613db18..161be343b 100644 --- a/firmware/CMakeLists.txt +++ b/firmware/CMakeLists.txt @@ -18,7 +18,7 @@ # Boston, MA 02110-1301, USA. # -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.16) project(firmware) diff --git a/firmware/standalone/CMakeLists.txt b/firmware/standalone/CMakeLists.txt index ea1dd0fd1..e6e603d5c 100644 --- a/firmware/standalone/CMakeLists.txt +++ b/firmware/standalone/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.16) project(standalone_apps) From 54ad82a42361df4ecbb920d8a5706c6929a83e12 Mon Sep 17 00:00:00 2001 From: gullradriel <3157857+gullradriel@users.noreply.github.com> Date: Sun, 26 Jan 2025 16:27:29 +0100 Subject: [PATCH 2/2] fix fallthrough warning (#2497) --- firmware/chibios-portapack/ext/fatfs/src/ff.c | 1 + 1 file changed, 1 insertion(+) diff --git a/firmware/chibios-portapack/ext/fatfs/src/ff.c b/firmware/chibios-portapack/ext/fatfs/src/ff.c index 862f0a56f..960d7af2a 100644 --- a/firmware/chibios-portapack/ext/fatfs/src/ff.c +++ b/firmware/chibios-portapack/ext/fatfs/src/ff.c @@ -1060,6 +1060,7 @@ DWORD get_fat ( /* 0xFFFFFFFF:Disk error, 1:Internal error, 2..0x7FFFFFFF:Cluste } } /* go to default */ + __attribute__ ((fallthrough)); #endif default: val = 1; /* Internal error */