From 859dab864a0738f577d1da8e7189748ed8109c44 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sat, 23 Nov 2024 17:43:45 +0000
Subject: [PATCH] Remove keyboard use of eeconfig_read_default_layer (#24635)

---
 .../comet46/keymaps/default-rgbled/keymap.c   | 21 +++++++---------
 .../satt/comet46/keymaps/default/keymap.c     | 24 +++++++------------
 2 files changed, 16 insertions(+), 29 deletions(-)

diff --git a/keyboards/satt/comet46/keymaps/default-rgbled/keymap.c b/keyboards/satt/comet46/keymaps/default-rgbled/keymap.c
index 704eb2dd70b..773857db1d2 100644
--- a/keyboards/satt/comet46/keymaps/default-rgbled/keymap.c
+++ b/keyboards/satt/comet46/keymaps/default-rgbled/keymap.c
@@ -171,8 +171,7 @@ void matrix_init_user(void) {
 }
 
 void matrix_scan_user(void) {
-  uint8_t layer = get_highest_layer(layer_state);
-  uint8_t default_layer = biton32(eeconfig_read_default_layer());
+  uint8_t layer = get_highest_layer(layer_state | default_layer_state);
   switch (layer) {
     case _LOWER:
       set_led_red;
@@ -183,18 +182,14 @@ void matrix_scan_user(void) {
     case _ADJUST:
       set_led_magenta;
       break;
+    case _COLEMAK:
+      set_led_white;
+      break;
+    case _DVORAK:
+      set_led_yellow;
+      break;
     default:
-      switch (default_layer) {
-        case _COLEMAK:
-          set_led_white;
-          break;
-        case _DVORAK:
-          set_led_yellow;
-          break;
-        default:
-          set_led_green;
-          break;
-      }
+      set_led_green;
       break;
   }
 };
diff --git a/keyboards/satt/comet46/keymaps/default/keymap.c b/keyboards/satt/comet46/keymaps/default/keymap.c
index c8c58951c87..5d9f1faed75 100644
--- a/keyboards/satt/comet46/keymaps/default/keymap.c
+++ b/keyboards/satt/comet46/keymaps/default/keymap.c
@@ -153,24 +153,16 @@ bool oled_task_user(void) {
   // Layer state
   char layer_str[22];
   oled_write_P(PSTR("Layer: "), false);
-  uint8_t layer = get_highest_layer(layer_state);
-  uint8_t default_layer = get_highest_layer(eeconfig_read_default_layer());
+  uint8_t layer = get_highest_layer(layer_state | default_layer_state);
   switch (layer) {
     case _QWERTY:
-      switch (default_layer) {
-        case _QWERTY:
-          snprintf(layer_str, sizeof(layer_str), "Qwerty");
-          break;
-        case _COLEMAK:
-          snprintf(layer_str, sizeof(layer_str), "Colemak");
-          break;
-        case _DVORAK:
-          snprintf(layer_str, sizeof(layer_str), "Dvorak");
-          break;
-        default:
-          snprintf(layer_str, sizeof(layer_str), "Undef-%d", default_layer);
-          break;
-      }
+      snprintf(layer_str, sizeof(layer_str), "Qwerty");
+      break;
+    case _COLEMAK:
+      snprintf(layer_str, sizeof(layer_str), "Colemak");
+      break;
+    case _DVORAK:
+      snprintf(layer_str, sizeof(layer_str), "Dvorak");
       break;
     case _RAISE:
       snprintf(layer_str, sizeof(layer_str), "Raise");