From 7b8545b635ecf8fd019f1a972cae8399961e9d28 Mon Sep 17 00:00:00 2001
From: honorless <86894501+lesshonor@users.noreply.github.com>
Date: Wed, 28 Feb 2024 19:38:42 -0500
Subject: [PATCH] fix: detect CONVERT_TO vs MCU in rules.mk

MCU no longer changes to match the converter, resulting in features
being disabled unnecessarily on ARM Micros.

Check for a non-blank CONVERT_TO instead.
---
 keyboards/argo_works/ishi/80/mk0_avr/keymaps/vial/rules.mk      | 2 +-
 .../argo_works/ishi/80/mk0_avr_extra/keymaps/vial/rules.mk      | 2 +-
 keyboards/boardsource/lulu/keymaps/vial/rules.mk                | 2 +-
 keyboards/handwired/prkl30/keymaps/vial/rules.mk                | 2 +-
 keyboards/mechwild/bde/rev2/keymaps/vial/rules.mk               | 2 +-
 keyboards/mechwild/clunker/keymaps/vial/rules.mk                | 2 +-
 keyboards/mechwild/mokulua/mirrored/keymaps/vial/rules.mk       | 2 +-
 keyboards/mechwild/mokulua/standard/keymaps/vial/rules.mk       | 2 +-
 keyboards/mechwild/murphpad/keymaps/vial/rules.mk               | 2 +-
 keyboards/reedskeebs/alish40/keymaps/vial/rules.mk              | 2 +-
 keyboards/splitkb/aurora/lily58/rev1/keymaps/vial/rules.mk      | 2 +-
 keyboards/tweetydabird/lotus58/keymaps/vial/rules.mk            | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/keyboards/argo_works/ishi/80/mk0_avr/keymaps/vial/rules.mk b/keyboards/argo_works/ishi/80/mk0_avr/keymaps/vial/rules.mk
index f21c327b09..4ddefe6ff1 100644
--- a/keyboards/argo_works/ishi/80/mk0_avr/keymaps/vial/rules.mk
+++ b/keyboards/argo_works/ishi/80/mk0_avr/keymaps/vial/rules.mk
@@ -2,7 +2,7 @@ VIA_ENABLE = yes
 VIAL_ENABLE = yes
 LTO_ENABLE = yes
 
-ifeq ($(strip $(MCU)), atmega32u4)
+ifeq ($(strip $(CONVERT_TO)), )
     MAGIC_ENABLE = no
     SPACE_CADET_ENABLE = no
     COMBO_ENABLE = no
diff --git a/keyboards/argo_works/ishi/80/mk0_avr_extra/keymaps/vial/rules.mk b/keyboards/argo_works/ishi/80/mk0_avr_extra/keymaps/vial/rules.mk
index 3bee7fa3ab..a3e183021d 100644
--- a/keyboards/argo_works/ishi/80/mk0_avr_extra/keymaps/vial/rules.mk
+++ b/keyboards/argo_works/ishi/80/mk0_avr_extra/keymaps/vial/rules.mk
@@ -3,7 +3,7 @@ VIA_ENABLE = yes
 VIAL_ENABLE = yes
 LTO_ENABLE = yes
 
-ifeq ($(strip $(MCU)), atmega32u4)
+ifeq ($(strip $(CONVERT_TO)), )
     MAGIC_ENABLE = no
     SPACE_CADET_ENABLE = no
     COMBO_ENABLE = no
diff --git a/keyboards/boardsource/lulu/keymaps/vial/rules.mk b/keyboards/boardsource/lulu/keymaps/vial/rules.mk
index 51fa8e5556..a72e398c1a 100644
--- a/keyboards/boardsource/lulu/keymaps/vial/rules.mk
+++ b/keyboards/boardsource/lulu/keymaps/vial/rules.mk
@@ -3,7 +3,7 @@ VIAL_ENABLE = yes
 
 VIALRGB_ENABLE = yes
 
-ifeq ($(strip $(MCU)), atmega32u4)
+ifeq ($(strip $(CONVERT_TO)), )
     QMK_SETTINGS = no
     COMBO_ENABLE = no
     MOUSEKEY_ENABLE = no
diff --git a/keyboards/handwired/prkl30/keymaps/vial/rules.mk b/keyboards/handwired/prkl30/keymaps/vial/rules.mk
index c852abf313..0d659f5f7c 100644
--- a/keyboards/handwired/prkl30/keymaps/vial/rules.mk
+++ b/keyboards/handwired/prkl30/keymaps/vial/rules.mk
@@ -8,6 +8,6 @@ EXTRAKEY_ENABLE = yes
 CONSOLE_ENABLE = no
 COMMAND_ENABLE = no
 
-ifeq ($(strip $(MCU)), atmega32u4)
+ifeq ($(strip $(CONVERT_TO)), )
     QMK_SETTINGS = no
 endif
diff --git a/keyboards/mechwild/bde/rev2/keymaps/vial/rules.mk b/keyboards/mechwild/bde/rev2/keymaps/vial/rules.mk
index 42b4086c0e..a3d8581a0e 100644
--- a/keyboards/mechwild/bde/rev2/keymaps/vial/rules.mk
+++ b/keyboards/mechwild/bde/rev2/keymaps/vial/rules.mk
@@ -8,7 +8,7 @@ TAP_DANCE_ENABLE = yes
 GRAVE_ESC_ENABLE = yes
 SPACE_CADET_ENABLE = yes
 
-ifeq ($(strip $(MCU)), atmega32u4)
+ifeq ($(strip $(CONVERT_TO)), )
     QMK_SETTINGS = no
     
     KEY_OVERRIDE_ENABLE = no
diff --git a/keyboards/mechwild/clunker/keymaps/vial/rules.mk b/keyboards/mechwild/clunker/keymaps/vial/rules.mk
index 54f702c20c..800ae5c444 100644
--- a/keyboards/mechwild/clunker/keymaps/vial/rules.mk
+++ b/keyboards/mechwild/clunker/keymaps/vial/rules.mk
@@ -3,7 +3,7 @@ VIAL_ENABLE = yes
 LTO_ENABLE = yes
 ENCODER_MAP_ENABLE = yes
 
-ifeq ($(strip $(MCU)), atmega32u4)
+ifeq ($(strip $(CONVERT_TO)), )
     MAGIC_ENABLE = no
     SPACE_CADET_ENABLE = no
     #TAP_DANCE_ENABLE = no    # if space becomes an issue, uncomment
diff --git a/keyboards/mechwild/mokulua/mirrored/keymaps/vial/rules.mk b/keyboards/mechwild/mokulua/mirrored/keymaps/vial/rules.mk
index ac146e0194..cab902dce3 100644
--- a/keyboards/mechwild/mokulua/mirrored/keymaps/vial/rules.mk
+++ b/keyboards/mechwild/mokulua/mirrored/keymaps/vial/rules.mk
@@ -4,7 +4,7 @@ VIAL_ENABLE          = yes
 
 ENCODER_MAP_ENABLE   = yes
 
-ifeq ($(strip $(MCU)), atmega32u4)
+ifeq ($(strip $(CONVERT_TO)), )
     QMK_SETTINGS         = no
 
 	MAGIC_ENABLE         = no
diff --git a/keyboards/mechwild/mokulua/standard/keymaps/vial/rules.mk b/keyboards/mechwild/mokulua/standard/keymaps/vial/rules.mk
index ac146e0194..cab902dce3 100644
--- a/keyboards/mechwild/mokulua/standard/keymaps/vial/rules.mk
+++ b/keyboards/mechwild/mokulua/standard/keymaps/vial/rules.mk
@@ -4,7 +4,7 @@ VIAL_ENABLE          = yes
 
 ENCODER_MAP_ENABLE   = yes
 
-ifeq ($(strip $(MCU)), atmega32u4)
+ifeq ($(strip $(CONVERT_TO)), )
     QMK_SETTINGS         = no
 
 	MAGIC_ENABLE         = no
diff --git a/keyboards/mechwild/murphpad/keymaps/vial/rules.mk b/keyboards/mechwild/murphpad/keymaps/vial/rules.mk
index fefb694245..17e03def63 100644
--- a/keyboards/mechwild/murphpad/keymaps/vial/rules.mk
+++ b/keyboards/mechwild/murphpad/keymaps/vial/rules.mk
@@ -5,7 +5,7 @@ ENCODER_MAP_ENABLE = yes
 MOUSEKEY_ENABLE = yes
 COMBOS_ENABLE = yes
 
-ifeq ($(strip $(MCU)), atmega32u4)
+ifeq ($(strip $(CONVERT_TO)),)
     QMK_SETTINGS = no
     TAP_DANCE_ENABLE = no
     KEY_OVERRIDE_ENABLE = no
diff --git a/keyboards/reedskeebs/alish40/keymaps/vial/rules.mk b/keyboards/reedskeebs/alish40/keymaps/vial/rules.mk
index 85941abba8..05000fcd0d 100644
--- a/keyboards/reedskeebs/alish40/keymaps/vial/rules.mk
+++ b/keyboards/reedskeebs/alish40/keymaps/vial/rules.mk
@@ -2,7 +2,7 @@ ENCODER_MAP_ENABLE = yes
 VIA_ENABLE = yes
 VIAL_ENABLE = yes
 
-ifeq ($(strip $(MCU)), atmega32u4)
+ifeq ($(strip $(CONVERT_TO)), )
     GRAVE_ESC_ENABLE = no
     KEY_OVERRIDE_ENABLE = no
     LTO_ENABLE = yes
diff --git a/keyboards/splitkb/aurora/lily58/rev1/keymaps/vial/rules.mk b/keyboards/splitkb/aurora/lily58/rev1/keymaps/vial/rules.mk
index 840f43bfa3..bfdea065cb 100644
--- a/keyboards/splitkb/aurora/lily58/rev1/keymaps/vial/rules.mk
+++ b/keyboards/splitkb/aurora/lily58/rev1/keymaps/vial/rules.mk
@@ -5,7 +5,7 @@ VIA_ENABLE = yes
 VIAL_ENABLE = yes
 
 # Saving space on atmega32u4
-ifeq ($(strip $(MCU)), atmega32u4)
+ifeq ($(strip $(CONVERT_TO)), )
     OLED_ENABLE = no
     MOUSEKEY_ENABLE = no
     COMBO_ENABLE = no
diff --git a/keyboards/tweetydabird/lotus58/keymaps/vial/rules.mk b/keyboards/tweetydabird/lotus58/keymaps/vial/rules.mk
index 044dc609d6..024fe29257 100644
--- a/keyboards/tweetydabird/lotus58/keymaps/vial/rules.mk
+++ b/keyboards/tweetydabird/lotus58/keymaps/vial/rules.mk
@@ -7,7 +7,7 @@ VIAL_ENABLE = yes
 ENCODER_MAP_ENABLE = yes
 
 # Reduce size on atmega32u4
-ifeq ($(strip $(MCU)), atmega32u4)
+ifeq ($(strip $(CONVERT_TO)), )
     TAP_DANCE_ENABLE = no
     QMK_SETTINGS = no
     KEY_OVERRIDE_ENABLE = no