summaryrefslogtreecommitdiff
path: root/users
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-05-30 18:07:56 +0000
committerQMK Bot <hello@qmk.fm>2022-05-30 18:07:56 +0000
commite4be4d282c8d4afea18b6225f4af1d4012726213 (patch)
tree8aa54dc9239db9e0956db46a8d092406cb44eb64 /users
parent9a2943d22146281fd666f34f19720d81ac782abf (diff)
parentcc7a3f8dc775805665377f228f27bff97420a036 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'users')
-rw-r--r--users/sethBarberee/config.h4
-rw-r--r--users/sethBarberee/rgb_light.c2
-rw-r--r--users/sethBarberee/sethBarberee.c15
-rw-r--r--users/sethBarberee/sethBarberee.h5
-rw-r--r--users/sethBarberee/wrappers.h16
5 files changed, 41 insertions, 1 deletions
diff --git a/users/sethBarberee/config.h b/users/sethBarberee/config.h
index 785c7bc88d..c97d39151b 100644
--- a/users/sethBarberee/config.h
+++ b/users/sethBarberee/config.h
@@ -60,6 +60,10 @@
# define TAPPING_TERM 200
#endif
+#if !defined(LAYER_STATE_16BIT) && !defined(LAYER_STATE_8BIT) && !defined(LAYER_STATE_32BIT)
+# define LAYER_STATE_8BIT
+#endif
+
/* Disable unused and unneeded features to reduce on firmware size */
#ifdef LOCKING_SUPPORT_ENABLE
# undef LOCKING_SUPPORT_ENABLE
diff --git a/users/sethBarberee/rgb_light.c b/users/sethBarberee/rgb_light.c
index 51cc938c52..d1f43080c3 100644
--- a/users/sethBarberee/rgb_light.c
+++ b/users/sethBarberee/rgb_light.c
@@ -19,7 +19,7 @@
layer_state_t layer_state_set_rgb_light(layer_state_t state){
switch(get_highest_layer(state)) {
case _QWERTY:
- rgblight_set_hsv_and_mode(HSV_RED, RGBLIGHT_MODE_BREATHING + 3);
+ rgblight_set_hsv_and_mode(HSV_RED, RGBLIGHT_MODE_TWINKLE + 3);
break;
case _LOWER:
rgblight_set_hsv_and_mode(HSV_GREEN, RGBLIGHT_MODE_BREATHING + 3);
diff --git a/users/sethBarberee/sethBarberee.c b/users/sethBarberee/sethBarberee.c
index c5fceee68d..e6e9dbf4a2 100644
--- a/users/sethBarberee/sethBarberee.c
+++ b/users/sethBarberee/sethBarberee.c
@@ -79,6 +79,21 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
SEND_STRING(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION ", Built on: " QMK_BUILDDATE);
}
break;
+ case KC_QWER: // Set default layer to QWERTY
+ if (record->event.pressed) {
+ set_single_persistent_default_layer(_QWERTY);
+ }
+ break;
+ case KC_COLE: // Set default layer to COLEMAK
+ if (record->event.pressed) {
+ set_single_persistent_default_layer(_COLEMAK);
+ }
+ break;
+ case KC_DVOR: // Set default layer to DVORAK
+ if (record->event.pressed) {
+ set_single_persistent_default_layer(_DVORAK);
+ }
+ break;
}
}
return true;
diff --git a/users/sethBarberee/sethBarberee.h b/users/sethBarberee/sethBarberee.h
index 1da79e1a63..ba19a524a4 100644
--- a/users/sethBarberee/sethBarberee.h
+++ b/users/sethBarberee/sethBarberee.h
@@ -21,6 +21,8 @@
enum layers {
_QWERTY,
+ _COLEMAK,
+ _DVORAK,
_LOWER,
_RAISE,
_ADJUST
@@ -28,6 +30,9 @@ enum layers {
enum userspace_keycodes {
KC_VRSN = SAFE_RANGE,
+ KC_QWER,
+ KC_COLE,
+ KC_DVOR,
NEW_SAFE_RANGE
};
diff --git a/users/sethBarberee/wrappers.h b/users/sethBarberee/wrappers.h
index b24f52b332..4767afa82f 100644
--- a/users/sethBarberee/wrappers.h
+++ b/users/sethBarberee/wrappers.h
@@ -44,6 +44,22 @@
#define _________________QWERTY_R2_________________ KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT
#define _________________QWERTY_R3_________________ KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH
+#define _________________COLEMAK_L1________________ KC_Q, KC_W, KC_F, KC_P, KC_G
+#define _________________COLEMAK_L2________________ KC_A, KC_R, KC_S, KC_T, KC_D
+#define _________________COLEMAK_L3________________ KC_Z, KC_X, KC_C, KC_V, KC_B
+
+#define _________________COLEMAK_R1________________ KC_J, KC_L, KC_U, KC_Y, KC_SCLN
+#define _________________COLEMAK_R2________________ KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT
+#define _________________COLEMAK_R3________________ KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH
+
+#define _________________DVORAK_L1_________________ KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y
+#define _________________DVORAK_L2_________________ KC_A, KC_O, KC_E, KC_U, KC_I
+#define _________________DVORAK_L3_________________ KC_SCLN, KC_Q, KC_J, KC_K, KC_X
+
+#define _________________DVORAK_R1_________________ KC_F, KC_G, KC_C, KC_R, KC_L
+#define _________________DVORAK_R2_________________ KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH
+#define _________________DVORAK_R3_________________ KC_B, KC_M, KC_W, KC_V, KC_Z
+
#define ________________NUMBER_LEFT________________ KC_1, KC_2, KC_3, KC_4, KC_5
#define ________________NUMBER_RIGHT_______________ KC_6, KC_7, KC_8, KC_9, KC_0
#define _________________FUNC_LEFT_________________ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5