fixed gaming not going to other layers

keyboards/crkbd/keymaps/emdashii/config.h

@@ -88,7 +88,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #    define ENABLE_RGB_MATRIX_ALPHAS_MODS
 // #    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
 // #    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#    define ENABLE_RGB_MATRIX_BREATHING
+// #    define ENABLE_RGB_MATRIX_BREATHING
 // #    define ENABLE_RGB_MATRIX_BAND_SAT
 // #    define ENABLE_RGB_MATRIX_BAND_VAL
 // #    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
@@ -106,11 +106,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #    define ENABLE_RGB_MATRIX_DUAL_BEACON
 // #    define ENABLE_RGB_MATRIX_RAINBOW_BEACON
 // #    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-// #    define ENABLE_RGB_MATRIX_RAINDROPS
+#    define ENABLE_RGB_MATRIX_RAINDROPS
 // #    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
 // #    define ENABLE_RGB_MATRIX_HUE_BREATHING
 // #    define ENABLE_RGB_MATRIX_HUE_PENDULUM
-// #    define ENABLE_RGB_MATRIX_HUE_WAVE
+#    define ENABLE_RGB_MATRIX_HUE_WAVE
 // #    define ENABLE_RGB_MATRIX_PIXEL_RAIN
 // #    define ENABLE_RGB_MATRIX_PIXEL_FLOW
 // #    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
@@ -120,11 +120,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
 #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
 // #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-// #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
 // #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
 // #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
 // #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+// #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
 // #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
 #    define ENABLE_RGB_MATRIX_SPLASH
 // #    define ENABLE_RGB_MATRIX_MULTISPLASH

keyboards/crkbd/keymaps/emdashii/keycodes.h

@@ -19,11 +19,11 @@
 enum crkbd_layers {
   _QWERTY,
   _NAVIGATION,
+  _GAMING,
   _NUMBER,
   _SYMBOL,
   _FUNCTION,
-  _ADJUST,
-  _GAMING
+  _ADJUST
 };
 
 

keyboards/crkbd/keymaps/emdashii/keymap.c

@@ -60,11 +60,29 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_NAVIGATION] = LAYOUT_split_3x6_3(
       TABLGUI, KC_PGUP,  KC_HOME,  KC_UP,  KC_END, KC_BTN1,                      KC_ACL0, KC_WH_U, KC_MS_U, KC_WH_D, XXXXXXX, KC_BSPC,
       LQWERTY, KC_PGDN,  KC_LEFT,KC_DOWN, KC_RGHT, KC_BTN3,                      KC_ACL1, KC_MS_L, KC_MS_D, KC_MS_R, XXXXXXX,  KC_DEL,
-      KC_LSFT,  KC_INS, XXXXXXX, TABBKWD, TABFWRD, KC_BTN2,                      KC_ACL2, KC_WH_L, XXXXXXX, KC_WH_R, XXXXXXX,  KC_ESC,
+      KC_LSFT,  KC_INS, LOSLFUN, TABBKWD, TABFWRD, KC_BTN2,                      KC_ACL2, KC_WH_L, XXXXXXX, KC_WH_R, XXXXXXX,  KC_ESC,
                                           KC_LALT, CTRLSPC, CTRLSFT,    LQWERTY, CTRLSPC, TO(_ADJUST)
 
   ),
 
+// Gaming
+//  ,-----------------------------------------------------.                    ,-----------------------------------------------------.
+//  | Tab    |   Q    |   W    |   E    |   R    |   T    |                    |   Y    |   U    |   I    |   O    |   P    | Bksp   |
+//  |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+//  | Shift  |   A    |   S    |   D    |   F    |   G    |                    |   H    |   J    |   K    |   L    |   ;    |   '    |
+//  |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+//  | Ctrl   |   Z    |   X    |   C    |   V    |   B    |                    |   N    |   M    |   ,    |   .    |   /    |  Esc   |
+//  `--------+--------+--------+--------+--------+--------+--------.  .--------+--------+--------+--------+--------+--------+--------'
+//                                      |   F3   | Space  |Fun/Num |  | QWERTY | Spc/Num| Enter  |
+//                                      `--------------------------'  `--------------------------'
+  [_GAMING] = LAYOUT_split_3x6_3(
+       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                         KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,  KC_BSPC,
+      KC_LSFT,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                         KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,
+      KC_LCTL,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                         KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_ESC,
+                                            KC_F3,  KC_SPC, LNUMSPC,     LQWERTY, LOSLFUN,  KC_ENT
+
+  ),
+
 // Number
 //  ,-----------------------------------------------------.                    ,-----------------------------------------------------.
 //  |   `    |   1    |   2    |   3    |   4    |   5    |                    |   6    |   7    |   8    |   9    |   0    |  Bksp  |
@@ -135,24 +153,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX,                  TO(_NUMBER), XXXXXXX, XXXXXXX, XXXXXXX, KC_BRID, KC_VOLD,
       RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX,                      SQWERTY, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE,
                                           XXXXXXX, XXXXXXX, XXXXXXX,    LQWERTY, TO(_NAVIGATION), TO(_GAMING)
-  ),
-
-// Gaming
-//  ,-----------------------------------------------------.                    ,-----------------------------------------------------.
-//  | Tab    |   Q    |   W    |   E    |   R    |   T    |                    |   Y    |   U    |   I    |   O    |   P    | Bksp   |
-//  |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-//  | Shift  |   A    |   S    |   D    |   F    |   G    |                    |   H    |   J    |   K    |   L    |   ;    |   '    |
-//  |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-//  | Ctrl   |   Z    |   X    |   C    |   V    |   B    |                    |   N    |   M    |   ,    |   .    |   /    |  Esc   |
-//  `--------+--------+--------+--------+--------+--------+--------.  .--------+--------+--------+--------+--------+--------+--------'
-//                                      |   F3   | Space  |Fun/Num |  | QWERTY | Spc/Num| Enter  |
-//                                      `--------------------------'  `--------------------------'
-  [_GAMING] = LAYOUT_split_3x6_3(
-       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                         KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,  KC_BSPC,
-      KC_LSFT,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                         KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,
-      KC_LCTL,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                         KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_ESC,
-                                            KC_F3,  KC_SPC, LNUMSPC,     LQWERTY, LOSLFUN,  KC_ENT
-
   )
 };
 

keyboards/crkbd/keymaps/emdashii/rgb.c

@@ -33,11 +33,11 @@ static const char adjust_other_leds[] = {36, 37, 44, 50, 51, 49, 52, 53, 9};
 /*
   _QWERTY = RGB_CORAL   (calm white)
   _NAVIGATION = RGB_PINK
+  _GAMING = RGB_SPRINGGREEN   (blueish white)
   _NUMBER = RGB_GOLDENROD
   _SYMBOL = RGB_ORANGE
   _FUNCTION = RGB_MAGENTA
   _ADJUST = RGB_RED
-  _GAMING = RGB_AZURE   (blueish white)
 */
 
 void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
@@ -64,6 +64,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
             rgb_matrix_set_color(33, RGB_CORAL);        // To qwerty
             rgb_matrix_set_color(25, RGB_CORAL);        // To qwerty
             rgb_matrix_set_color(41, RGB_RED);        // To Adjust
+            rgb_matrix_set_color(20, RGB_MAGENTA);        // To Function keys
             break;
         case _NUMBER:
             for (uint8_t i = 0; i < 10; i++) {
@@ -93,7 +94,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
             rgb_matrix_set_color(33, RGB_CORAL);        // To qwerty
             break;
         case _ADJUST:
-            rgb_matrix_set_color(24, RGB_WHITE);        // Reset key
+            rgb_matrix_set_color(24, RGB_GREEN);        // Reset key
             for (uint8_t i = 0; i < 8; i++) {
                 rgb_matrix_set_color(adjust_leds[i], RGB_RED);
             }
@@ -101,18 +102,18 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
                 rgb_matrix_set_color(adjust_other_leds[i], RGB_RED);
             }
             rgb_matrix_set_color(33, RGB_CORAL);        // To qwerty
-            rgb_matrix_set_color(41, RGB_AZURE);        // To gaming
+            rgb_matrix_set_color(41, RGB_SPRINGGREEN);        // To gaming
             rgb_matrix_set_color(40, RGB_PINK);        // To navigation
             rgb_matrix_set_color(35, RGB_GOLDENROD);        // To number
             break;
         case _GAMING:
             if (is_keyboard_master()) {
                 for (uint8_t i = 0; i < 5; i++) {
-                    rgb_matrix_set_color(gaming_leds[i], RGB_AZURE);
+                    rgb_matrix_set_color(gaming_leds[i], RGB_SPRINGGREEN);
                 }
             }
             rgb_matrix_set_color(33, RGB_CORAL);        // To qwerty
-            rgb_matrix_set_color(13, RGB_AZURE);        // Spacebar
+            rgb_matrix_set_color(13, RGB_SPRINGGREEN);        // Spacebar
             rgb_matrix_set_color(6, RGB_GOLDENROD);        // To numbers, does not work for some reason
             rgb_matrix_set_color(40, RGB_MAGENTA);        // To function keys, does not work for some reason
             break;

keyboards/crkbd/keymaps/emdashii/rules.mk

@@ -6,6 +6,5 @@ OLED_DRIVER     = SSD1306
 WPM_ENABLE 			= no			# Enable word per minute counter
 LTO_ENABLE 			= yes			# Makes hex file smaller
 #OLED_DRIVER_ENABLE = yes			# Enable OLEDs
-#BOOTLOADER        = atmel-dfu		# Comes from toinux DO NOT USE
 
 SRC += ./oled.c ./rgb.c

keyboards/crkbd/keymaps/emdashiiAnimation/keymap.c

@@ -116,7 +116,7 @@ oled_rotation_t oled_init_user(oled_rotation_t rotation) {
 
 void oled_render_layer_state(void) {
     oled_write_P(PSTR("\nLayer: "), false);
-    switch (layer_state) {
+    switch (get_highest_layer(layer_state|default_layer_state)) {
         case L_BASE:
             oled_write_ln_P(PSTR("QWERTY"), false);
             break;