From 87777d1cdd51539ab319cc4157348d88c1bf6809 Mon Sep 17 00:00:00 2001
From: Tyler Thrailkill <tylerbthrailkill@gmail.com>
Date: Wed, 13 Apr 2022 08:19:24 -0600
Subject: [Keymap] Fix snowe keymap after updates to QMK (#16777)

---
 users/snowe/ocean_dream.h |  2 +-
 users/snowe/oled_setup.c  | 24 ++++++++++++++----------
 users/snowe/snowe.h       |  2 +-
 users/snowe/wrappers.h    |  2 +-
 4 files changed, 17 insertions(+), 13 deletions(-)

(limited to 'users/snowe')

diff --git a/users/snowe/ocean_dream.h b/users/snowe/ocean_dream.h
index 498375559a..57e0b91557 100644
--- a/users/snowe/ocean_dream.h
+++ b/users/snowe/ocean_dream.h
@@ -22,7 +22,7 @@
  * Features:
  * You can turn on and off features in this section
  */
-#define ENABLE_MOON            // Uses 182 bytes
+//#define ENABLE_MOON            // Uses 182 bytes
 #define ENABLE_WAVE            // Uses 844 bytes
 #define ENABLE_SHOOTING_STARS  // Uses 872 bytes
 #define ENABLE_ISLAND
diff --git a/users/snowe/oled_setup.c b/users/snowe/oled_setup.c
index dfc4b085e3..be54d9f558 100644
--- a/users/snowe/oled_setup.c
+++ b/users/snowe/oled_setup.c
@@ -25,15 +25,16 @@
 #    include <stdio.h>  // for keylog?
 
 oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    if (!is_master) {
+    if (!is_keyboard_master()) {
         return OLED_ROTATION_270;  // flips the display 180 degrees if offhand
     }
     return OLED_ROTATION_270;
 }
 
 #    define L_BASE 0
-#    define L_LOWER 2
-#    define L_RAISE 4
+#    define L_GAME 2
+#    define L_LOWER 4
+#    define L_RAISE 6
 #    define L_ADJUST 8
 
 void oled_render_layer_state(void) {
@@ -42,18 +43,21 @@ void oled_render_layer_state(void) {
         case L_BASE:
             oled_write_ln_P(PSTR("Main"), false);
             break;
+        case L_GAME:
+            oled_write_ln_P(PSTR("Game"), false);
+            break;
         case L_LOWER:
             oled_write_ln_P(PSTR("Bot"), false);
             break;
         case L_RAISE:
             oled_write_ln_P(PSTR("Top"), false);
             break;
-        case L_ADJUST:
-        case L_ADJUST | L_LOWER:
-        case L_ADJUST | L_RAISE:
-        case L_ADJUST | L_LOWER | L_RAISE:
-            oled_write_ln_P(PSTR("Comb"), false);
-            break;
+//        case L_ADJUST:
+//        case L_ADJUST | L_LOWER:
+//        case L_ADJUST | L_RAISE:
+//        case L_ADJUST | L_LOWER | L_RAISE:
+//            oled_write_ln_P(PSTR("Comb"), false);
+//            break;
     }
 }
 
@@ -122,7 +126,7 @@ void render_bootmagic_status(void) {
 }
 
 bool oled_task_user(void) {
-    if (is_master) {
+    if (is_keyboard_master()) {
         oled_render_layer_state();
         oled_render_keylog();
         render_bootmagic_status();
diff --git a/users/snowe/snowe.h b/users/snowe/snowe.h
index 21764ca507..6a2fc2aba1 100644
--- a/users/snowe/snowe.h
+++ b/users/snowe/snowe.h
@@ -40,4 +40,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 
 
-enum layers { _MAIN, _LOWER, _UPPER, _ADJUST };
+enum layers { _MAIN, _GAMING, _LOWER, _UPPER, _ADJUST };
diff --git a/users/snowe/wrappers.h b/users/snowe/wrappers.h
index 485f8de542..9ef7dce607 100644
--- a/users/snowe/wrappers.h
+++ b/users/snowe/wrappers.h
@@ -85,7 +85,7 @@ NOTE: These are all the same length.  If you do a search/replace
 
 
 #define _________________ADJUST_L1_________________        RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_TOG
-#define _________________ADJUST_L2_________________        MU_TOG , CK_TOGG, AU_ON,   AU_OFF,  AG_NORM
+#define _________________ADJUST_L2_________________        MU_TOG , TG(_GAMING), AU_ON,   AU_OFF,  AG_NORM
 #define _________________ADJUST_L3_________________        RGB_RMOD,RGB_HUD,RGB_SAD, RGB_VAD, _______
 #define _________________ADJUST_R1_________________        _______, _______, _______, _______, _______
 #define _________________ADJUST_R2_________________        RESET,   CG_TOGG, _______, _______, _______
-- 
cgit v1.2.3