Merge remote-tracking branch 'origin/master' into develop

keyboards/jacky_studio/bear_65/keymaps/stanrc85/keymap.c

@@ -0,0 +1,68 @@
+/* Copyright 2021 Stanrc85
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "stanrc85.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT_full_bs(
+             KC_ESC,  KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6,           KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL,    KC_BSPC,     KC_DEL,
+            KC_PGUP,  KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T,                 KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
+        MO(_FN2_60),  KC_CTLE, KC_A, KC_S, KC_D, KC_F, KC_G,                KC_H, KC_J, KC_K, KC_L,  KC_SCLN,   KC_QUOT,   KC_ENT,
+                      KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B,                KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
+                      KC_LCTL,    KC_LALT, LT_BPCF, KC_LGUI,                LT_SPCF,    TD_TWIN,                        KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [_DEFAULT] = LAYOUT_full_bs(
+             KC_ESC,  KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6,           KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL,    KC_BSPC,     KC_DEL,
+            KC_PGUP,  KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T,                 KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
+           KC_PGDN,   KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G,                KC_H, KC_J, KC_K, KC_L,  KC_SCLN,   KC_QUOT,   KC_ENT,
+                      KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B,                KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
+                      KC_LCTL,     KC_LALT, KC_SPC, MO(_FN1_60),            KC_SPC,     MO(_FN2_60),                    KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [_FN1_60] = LAYOUT_full_bs(
+             _______, _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,         KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,     KC_INS,
+            _______,  _______, _______, _______, _______, _______, KC_VOLU,                KC_PGUP, KC_BSPC, KC_UP,   KC_DEL,  KC_PSCR, _______, _______, _______,
+           _______,   KC_CAPS, _______, _______, KC_LCTL, KC_LSFT, KC_VOLD,                KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT,  _______,   _______,   _______,
+                      _______, KC_RDP, _______, _______, _______, _______,                 _______, _______, _______, _______, _______, _______, _______, _______,
+                      _______,     _______, _______, _______,                              _______,     _______,                        _______, _______, _______
+    ),
+    [_FN2_60] = LAYOUT_full_bs(
+             _______, _______, _______, _______, _______, _______, _______, _______,       _______, _______, _______, _______, _______, _______,  _______,     RGB_TOG,
+            _______,  _______, _______, _______, _______, _______, _______,                _______, _______, _______, _______, _______, _______,  _______, RESET,
+           _______,   _______, _______, _______, _______, _______, _______,                _______, _______, _______, _______,  _______,   _______,   KC_MAKE,
+                      _______, _______, _______, _______, _______, _______,                _______, NK_TOGG, _______, _______, _______, _______, RGB_MOD, RGB_VAI,
+                      TG(_DEFAULT), _______, _______, _______,                             _______,     _______,                        RGB_HUD, RGB_VAD, RGB_HUI
+    )
+};
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    switch (get_highest_layer(state)) {
+    case _FN1_60:
+        break;
+    case _FN2_60:
+        rgb_matrix_mode_noeeprom(RGB_MATRIX_RAINBOW_MOVING_CHEVRON);
+        break;
+    case _DEFAULT:
+        rgb_matrix_mode_noeeprom(RGB_MATRIX_MULTISPLASH);
+        break;
+    case _QWERTY:
+        rgb_matrix_mode_noeeprom(RGB_MATRIX_TYPING_HEATMAP);
+        break;
+    default: //  for any other layers, or the default layer
+        break;
+    }
+    return state;
+}

keyboards/jacky_studio/bear_65/keymaps/stanrc85/rules.mk

@@ -0,0 +1 @@
+USER_NAME := stanrc85

users/stanrc85/rules.mk

@@ -2,7 +2,6 @@ TAP_DANCE_ENABLE = yes
 EXTRAKEY_ENABLE = yes
 BACKLIGHT_ENABLE = no
 COMMAND_ENABLE = no
-BOOTMAGIC_ENABLE = no
 MOUSEKEY_ENABLE = no
 AUDIO_ENABLE = no
 CONSOLE_ENABLE = no
@@ -31,4 +30,9 @@ endif
 ifeq ($(strip $(KEYBOARD)), boardsource/the_mark)
   RGB_MATRIX_ENABLE = yes
   RGBLIGHT_ENABLE = no
-endif
+endif
+ifeq ($(strip $(KEYBOARD)), jacky_studio/bear_65)
+  BACKLIGHT_ENABLE = yes
+  RGB_MATRIX_ENABLE = yes
+  RGBLIGHT_ENABLE = no
+endif