From 35d2ddd59f7d02c1826aee844c4af6043ed2b215 Mon Sep 17 00:00:00 2001
From: Damiano Amatruda <damiano.amatruda@skywarder.eu>
Date: Thu, 18 Nov 2021 03:33:03 +0100
Subject: [PATCH] Fix compilation for all stm32f429 boards
* Fixes error "'EventType' has not been declared"
* Adds support for all Skyward stm32f429zi boards
---
mxgui/drivers/display_stm32f4discovery.cpp | 8 +++++++-
mxgui/drivers/display_stm32f4discovery.h | 8 +++++++-
mxgui/drivers/event_stm32f4discovery.cpp | 10 +++++++++-
mxgui/drivers/event_stm32f4discovery.h | 9 ++++++++-
mxgui/drivers/event_types_stm32f4discovery.h | 9 ++++++++-
5 files changed, 39 insertions(+), 5 deletions(-)
diff --git a/mxgui/drivers/display_stm32f4discovery.cpp b/mxgui/drivers/display_stm32f4discovery.cpp
index ed8650b..353254c 100644
--- a/mxgui/drivers/display_stm32f4discovery.cpp
+++ b/mxgui/drivers/display_stm32f4discovery.cpp
@@ -32,7 +32,13 @@
using namespace std;
using namespace miosix;
-#ifdef _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)
namespace mxgui {
diff --git a/mxgui/drivers/display_stm32f4discovery.h b/mxgui/drivers/display_stm32f4discovery.h
index 2182bbd..a3e8345 100644
--- a/mxgui/drivers/display_stm32f4discovery.h
+++ b/mxgui/drivers/display_stm32f4discovery.h
@@ -33,7 +33,13 @@
#ifndef DISPLAY_STM32F4DISCOVERY_H
#define DISPLAY_STM32F4DISCOVERY_H
-#ifdef _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)
#include <config/mxgui_settings.h>
#include "display.h"
diff --git a/mxgui/drivers/event_stm32f4discovery.cpp b/mxgui/drivers/event_stm32f4discovery.cpp
index a4889d6..3c895cf 100644
--- a/mxgui/drivers/event_stm32f4discovery.cpp
+++ b/mxgui/drivers/event_stm32f4discovery.cpp
@@ -28,7 +28,15 @@
#include <config/mxgui_settings.h>
-#if defined(_BOARD_STM32F429ZI_STM32F4DISCOVERY) && defined(MXGUI_LEVEL_2)
+#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(MXGUI_LEVEL_2)
#include "event_stm32f4discovery.h"
#include "miosix.h"
diff --git a/mxgui/drivers/event_stm32f4discovery.h b/mxgui/drivers/event_stm32f4discovery.h
index bf98ba3..ab73ada 100644
--- a/mxgui/drivers/event_stm32f4discovery.h
+++ b/mxgui/drivers/event_stm32f4discovery.h
@@ -36,7 +36,14 @@
#ifndef EVENT_STM32F4DISCOVERY_H
#define EVENT_STM32F4DISCOVERY_H
-#ifdef _BOARD_STM32F429ZI_STM32F4DISCOVERY
+#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)
namespace mxgui {
diff --git a/mxgui/drivers/event_types_stm32f4discovery.h b/mxgui/drivers/event_types_stm32f4discovery.h
index d83202a..fcc6a36 100644
--- a/mxgui/drivers/event_types_stm32f4discovery.h
+++ b/mxgui/drivers/event_types_stm32f4discovery.h
@@ -28,7 +28,14 @@
#ifndef EVENT_TYPES_STM32F4DISCOVERY_H
#define EVENT_TYPES_STM32F4DISCOVERY_H
-#ifdef _BOARD_STM32F429ZI_STM32F4DISCOVERY
+#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)
class EventType
{
--
GitLab