From 3d402203cd1e8022d75475e131d2e3890e9633bc Mon Sep 17 00:00:00 2001
From: Clemens Elflein <clemens1@familie-elflein.de>
Date: Wed, 6 Nov 2024 19:14:37 +0100
Subject: [PATCH] fixed Docker build

---
 CMakeLists.txt                | 4 ++++
 Dockerfile                    | 4 +++-
 cmake/gcc-arm-none-eabi.cmake | 4 ++--
 ext/xbot_framework            | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index de39969..1d9ec03 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,6 +34,10 @@ set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES
         CXX_STANDARD_REQUIRED ON
         CXX_EXTENSIONS ON
 )
+
+target_compile_options(${CMAKE_PROJECT_NAME} PUBLIC -Wall -Wextra -Werror)
+
+
 # Add lib subdirectory
 add_subdirectory(ext)
 
diff --git a/Dockerfile b/Dockerfile
index 2056564..815ba2c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,9 @@ FROM ubuntu:22.04 AS builder
 LABEL authors="Clemens Elflein"
 
 RUN apt-get update && apt-get install -y  \
-    gcc-arm-none-eabi  \
+    gcc-arm-none-eabi git \
+    libasio-dev iproute2 \
+    python3 python3-venv python3-pip \
     cmake \
     make \
     && rm -rf /var/lib/apt/lists/*
diff --git a/cmake/gcc-arm-none-eabi.cmake b/cmake/gcc-arm-none-eabi.cmake
index 896be8a..68bbca8 100644
--- a/cmake/gcc-arm-none-eabi.cmake
+++ b/cmake/gcc-arm-none-eabi.cmake
@@ -27,7 +27,7 @@ add_compile_definitions(CORTEX_USE_FPU=TRUE)
 set(TARGET_FLAGS "-mcpu=cortex-m7 -mfpu=fpv5-d16 -mfloat-abi=hard -fomit-frame-pointer -falign-functions=16 -mthumb -fno-common -flto")
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${TARGET_FLAGS}")
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror -Wpedantic -fdata-sections -ffunction-sections")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fdata-sections -ffunction-sections")
 if(CMAKE_BUILD_TYPE MATCHES Debug)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0 -g3 -DDEBUG_BUILD")
 endif()
@@ -36,7 +36,7 @@ if(CMAKE_BUILD_TYPE MATCHES Release)
 endif()
 
 set(CMAKE_ASM_FLAGS "${CMAKE_C_FLAGS} -x assembler-with-cpp -MMD -MP")
-set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -fno-rtti -fno-exceptions -fno-threadsafe-statics")
+set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -fno-rtti -fno-exceptions -fno-threadsafe-statics -Wno-volatile")
 
 set(CMAKE_C_LINK_FLAGS "${TARGET_FLAGS}")
 set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} --specs=nosys.specs")
diff --git a/ext/xbot_framework b/ext/xbot_framework
index f294ec9..d9120a4 160000
--- a/ext/xbot_framework
+++ b/ext/xbot_framework
@@ -1 +1 @@
-Subproject commit f294ec96efee4349a6ca7a79ec9698c2c0b611db
+Subproject commit d9120a498d3fce354b9ee60b96700fce7c074ade