From 85c4cfb0cddab47ceb14ed158559ffd4fa7af288 Mon Sep 17 00:00:00 2001
From: Alberto Nidasio <alberto.nidasio@skywarder.eu>
Date: Sat, 10 Dec 2022 18:33:29 +0100
Subject: [PATCH] Updated cmake script and removed unnecessary supported boards
---
CMakeLists.txt | 4 +--
cmake/boards.cmake | 35 ++++++++++++++++++++
mxgui/drivers/display_stm32f4discovery.cpp | 21 ++++--------
mxgui/drivers/display_stm32f4discovery.h | 12 +------
mxgui/drivers/event_stm32f4discovery.cpp | 17 ++--------
mxgui/drivers/event_stm32f4discovery.h | 15 ++-------
mxgui/drivers/event_types_stm32f4discovery.h | 15 ++-------
7 files changed, 51 insertions(+), 68 deletions(-)
create mode 100644 cmake/boards.cmake
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 439ed4e..ca65063 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,9 +28,9 @@ if(NOT KPATH)
message(FATAL_ERROR "Kernel directory not found")
endif()
-include(${KPATH}/config/boards.cmake)
+include(cmake/boards.cmake)
-foreach(OPT_BOARD ${BOARDS})
+foreach(OPT_BOARD ${MXGUI_BOARDS})
set(DFLAGS -MMD -MP)
include(${KPATH}/config/options.cmake)
diff --git a/cmake/boards.cmake b/cmake/boards.cmake
new file mode 100644
index 0000000..b5dacfd
--- /dev/null
+++ b/cmake/boards.cmake
@@ -0,0 +1,35 @@
+# Copyright (c) 2022 Skyward Experimental Rocketry
+# Author: Alberto Nidasio
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+set(MXGUI_BOARDS
+ stm32f407vg_bitsboard
+ stm32f103ve_mp3v2
+ stm32f103ze_redbull_v2
+ stm32f205rg_sony-newman
+ stm32f429zi_oledboard2
+ stm32f429zi_stm32f4discovery
+ stm32f429zi_skyward_groundstation
+ stm32f429zi_skyward_groundstation_v2
+ stm32f429zi_skyward_groundstation_parafoil
+ stm32f429zi_skyward_parafoil
+ stm32f103ze_stm3210e-eval
+ stm32f103ve_strive_mini
+)
diff --git a/mxgui/drivers/display_stm32f4discovery.cpp b/mxgui/drivers/display_stm32f4discovery.cpp
index 3194f18..e5b37ac 100644
--- a/mxgui/drivers/display_stm32f4discovery.cpp
+++ b/mxgui/drivers/display_stm32f4discovery.cpp
@@ -34,21 +34,12 @@
using namespace std;
using namespace miosix;
-#if defined(_BOARD_STM32F429ZI_STM32F4DISCOVERY) || \
- defined(_BOARD_STM32F429ZI_OLEDBOARD2) || \
- defined(_BOARD_STM32F429ZI_SKYWARD_ANAKIN) || \
- defined(_BOARD_STM32F429ZI_SKYWARD_HOMEONE) || \
- defined(_BOARD_STM32F429ZI_SKYWARD_ROGALLINA) || \
- defined(_BOARD_STM32F429ZI_SKYWARD_DEATHST) || \
- defined(_BOARD_STM32F429ZI_SKYWARD_DEATHST_X) || \
- defined(_BOARD_STM32F429ZI_SKYWARD_DEATHST_V3) || \
- defined(_BOARD_STM32F429ZI_SKYWARD_GS) || \
- defined(_BOARD_STM32F429ZI_SKYWARD_GS_V2) || \
- defined(_BOARD_STM32F429ZI_SKYWARD_GS_PARAFOIL) || \
- defined(_BOARD_STM32F429ZI_HRE_TEST_STAND) || \
- defined(_BOARD_STM32F429ZI_SKYWARD_PYXIS_AUXILIARY) || \
- defined(_BOARD_STM32F429ZI_SKYWARD_PARAFOIL) || \
- defined(_BOARD_STM32F429ZI_SKYWARD_RIG)
+#if defined(_BOARD_STM32F429ZI_STM32F4DISCOVERY) || \
+ defined(_BOARD_STM32F429ZI_OLEDBOARD2) || \
+ defined(_BOARD_STM32F429ZI_SKYWARD_GS) || \
+ defined(_BOARD_STM32F429ZI_SKYWARD_GS_V2) || \
+ defined(_BOARD_STM32F429ZI_SKYWARD_GS_PARAFOIL) || \
+ defined(_BOARD_STM32F429ZI_SKYWARD_PARAFOIL)
namespace mxgui
{
diff --git a/mxgui/drivers/display_stm32f4discovery.h b/mxgui/drivers/display_stm32f4discovery.h
index 8a722de..1778753 100644
--- a/mxgui/drivers/display_stm32f4discovery.h
+++ b/mxgui/drivers/display_stm32f4discovery.h
@@ -35,20 +35,10 @@
#if defined(_BOARD_STM32F429ZI_STM32F4DISCOVERY) || \
defined(_BOARD_STM32F429ZI_OLEDBOARD2) || \
- defined(_BOARD_STM32F429ZI_SKYWARD_ANAKIN) || \
- defined(_BOARD_STM32F429ZI_SKYWARD_HOMEONE) || \
- defined(_BOARD_STM32F429ZI_SKYWARD_ROGALLINA) || \
- defined(_BOARD_STM32F429ZI_SKYWARD_DEATHST) || \
- defined(_BOARD_STM32F429ZI_SKYWARD_DEATHST_X) || \
- defined(_BOARD_STM32F429ZI_SKYWARD_DEATHST_V3) || \
defined(_BOARD_STM32F429ZI_SKYWARD_GS) || \
defined(_BOARD_STM32F429ZI_SKYWARD_GS_V2) || \
defined(_BOARD_STM32F429ZI_SKYWARD_GS_PARAFOIL) || \
- defined(_BOARD_STM32F429ZI_HRE_TEST_STAND) || \
- defined(_BOARD_STM32F429ZI_SKYWARD_PYXIS_AUXILIARY) || \
- defined(_BOARD_STM32F429ZI_SKYWARD_PARAFOIL) || \
- defined(_BOARD_STM32F205RC_SKYWARD_CIUTI) || \
- defined(_BOARD_STM32F429ZI_SKYWARD_RIG)
+ defined(_BOARD_STM32F429ZI_SKYWARD_PARAFOIL)
#include <config/mxgui_settings.h>
diff --git a/mxgui/drivers/event_stm32f4discovery.cpp b/mxgui/drivers/event_stm32f4discovery.cpp
index 04561b6..96a850b 100644
--- a/mxgui/drivers/event_stm32f4discovery.cpp
+++ b/mxgui/drivers/event_stm32f4discovery.cpp
@@ -28,23 +28,12 @@
#include <config/mxgui_settings.h>
-#if (defined(_BOARD_STM32F4DISCOVERY) || \
- defined(_BOARD_STM32F429ZI_STM32F4DISCOVERY) || \
- defined(_BOARD_STM32F429ZI_OLEDBOARD2) || \
- defined(_BOARD_STM32F429ZI_SKYWARD_ANAKIN) || \
- defined(_BOARD_STM32F429ZI_SKYWARD_HOMEONE) || \
- defined(_BOARD_STM32F429ZI_SKYWARD_ROGALLINA) || \
- defined(_BOARD_STM32F429ZI_SKYWARD_DEATHST) || \
- defined(_BOARD_STM32F429ZI_SKYWARD_DEATHST_X) || \
- defined(_BOARD_STM32F429ZI_SKYWARD_DEATHST_V3)) || \
+#if defined(_BOARD_STM32F429ZI_STM32F4DISCOVERY) || \
+ defined(_BOARD_STM32F429ZI_OLEDBOARD2) || \
defined(_BOARD_STM32F429ZI_SKYWARD_GS) || \
defined(_BOARD_STM32F429ZI_SKYWARD_GS_V2) || \
defined(_BOARD_STM32F429ZI_SKYWARD_GS_PARAFOIL) || \
- defined(_BOARD_STM32F429ZI_HRE_TEST_STAND) || \
- defined(_BOARD_STM32F429ZI_SKYWARD_PYXIS_AUXILIARY) || \
- defined(_BOARD_STM32F429ZI_SKYWARD_PARAFOIL) || \
- defined(_BOARD_STM32F429ZI_SKYWARD_RIG) || \
- defined(_BOARD_STM32F205RC_SKYWARD_CIUTI) && defined(MXGUI_LEVEL_2)
+ defined(_BOARD_STM32F429ZI_SKYWARD_PARAFOIL) && defined(MXGUI_LEVEL_2)
#include <algorithm>
diff --git a/mxgui/drivers/event_stm32f4discovery.h b/mxgui/drivers/event_stm32f4discovery.h
index 8334fe8..d821434 100644
--- a/mxgui/drivers/event_stm32f4discovery.h
+++ b/mxgui/drivers/event_stm32f4discovery.h
@@ -37,23 +37,12 @@
#ifndef EVENT_STM32F4DISCOVERY_H
#define EVENT_STM32F4DISCOVERY_H
-#if defined(_BOARD_STM32F4DISCOVERY) || \
- defined(_BOARD_STM32F429ZI_STM32F4DISCOVERY) || \
+#if defined(_BOARD_STM32F429ZI_STM32F4DISCOVERY) || \
defined(_BOARD_STM32F429ZI_OLEDBOARD2) || \
- defined(_BOARD_STM32F429ZI_SKYWARD_ANAKIN) || \
- defined(_BOARD_STM32F429ZI_SKYWARD_HOMEONE) || \
- defined(_BOARD_STM32F429ZI_SKYWARD_ROGALLINA) || \
- defined(_BOARD_STM32F429ZI_SKYWARD_DEATHST) || \
- defined(_BOARD_STM32F429ZI_SKYWARD_DEATHST_X) || \
- defined(_BOARD_STM32F429ZI_SKYWARD_DEATHST_V3) || \
defined(_BOARD_STM32F429ZI_SKYWARD_GS) || \
defined(_BOARD_STM32F429ZI_SKYWARD_GS_V2) || \
defined(_BOARD_STM32F429ZI_SKYWARD_GS_PARAFOIL) || \
- defined(_BOARD_STM32F429ZI_HRE_TEST_STAND) || \
- defined(_BOARD_STM32F429ZI_SKYWARD_PYXIS_AUXILIARY) || \
- defined(_BOARD_STM32F429ZI_SKYWARD_PARAFOIL) || \
- defined(_BOARD_STM32F205RC_SKYWARD_CIUTI) || \
- defined(_BOARD_STM32F429ZI_SKYWARD_RIG)
+ defined(_BOARD_STM32F429ZI_SKYWARD_PARAFOIL)
namespace mxgui
{
diff --git a/mxgui/drivers/event_types_stm32f4discovery.h b/mxgui/drivers/event_types_stm32f4discovery.h
index 587502a..faa708f 100644
--- a/mxgui/drivers/event_types_stm32f4discovery.h
+++ b/mxgui/drivers/event_types_stm32f4discovery.h
@@ -28,23 +28,12 @@
#ifndef EVENT_TYPES_STM32F4DISCOVERY_H
#define EVENT_TYPES_STM32F4DISCOVERY_H
-#if defined(_BOARD_STM32F4DISCOVERY) || \
- defined(_BOARD_STM32F429ZI_STM32F4DISCOVERY) || \
+#if defined(_BOARD_STM32F429ZI_STM32F4DISCOVERY) || \
defined(_BOARD_STM32F429ZI_OLEDBOARD2) || \
- defined(_BOARD_STM32F429ZI_SKYWARD_ANAKIN) || \
- defined(_BOARD_STM32F429ZI_SKYWARD_HOMEONE) || \
- defined(_BOARD_STM32F429ZI_SKYWARD_ROGALLINA) || \
- defined(_BOARD_STM32F429ZI_SKYWARD_DEATHST) || \
- defined(_BOARD_STM32F429ZI_SKYWARD_DEATHST_X) || \
- defined(_BOARD_STM32F429ZI_SKYWARD_DEATHST_V3) || \
defined(_BOARD_STM32F429ZI_SKYWARD_GS) || \
defined(_BOARD_STM32F429ZI_SKYWARD_GS_V2) || \
defined(_BOARD_STM32F429ZI_SKYWARD_GS_PARAFOIL) || \
- defined(_BOARD_STM32F429ZI_HRE_TEST_STAND) || \
- defined(_BOARD_STM32F429ZI_SKYWARD_PYXIS_AUXILIARY) || \
- defined(_BOARD_STM32F429ZI_SKYWARD_PARAFOIL) || \
- defined(_BOARD_STM32F205RC_SKYWARD_CIUTI) || \
- defined(_BOARD_STM32F429ZI_SKYWARD_RIG)
+ defined(_BOARD_STM32F429ZI_SKYWARD_PARAFOIL)
class EventType
{
--
GitLab