🏗️ Define HAL_STM32 for HAL/STM32 (#22537)

2021-08-08 21:31:10 -05:00
parent e3c294dc9b
commit a668a9d302
34 changed files with 105 additions and 57 deletions
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
@@ -288,7 +288,7 @@

  // Remove compiler warning on an unused variable
  #ifndef UNUSED
-    #if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
+    #ifdef HAL_STM32
      #define UNUSED(X) (void)X
    #else
      #define UNUSED(x) ((void)(x))
--- a/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32.cpp
@@ -19,7 +19,9 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 *
 */
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
+#include "../../../HAL/platforms.h"
+
+#ifdef HAL_STM32

 #include "../../../inc/MarlinConfigPre.h"

@@ -349,4 +351,4 @@ int WifiSerial::write(uint8_t c) {
 }

 #endif // HAS_TFT_LVGL_UI && MKS_WIFI_MODULE
-#endif // !__STM32F1__
+#endif // HAL_STM32