Skip to content

Commit

Permalink
Adapt my standard map
Browse files Browse the repository at this point in the history
  • Loading branch information
struckmb committed Jan 17, 2024
1 parent f3b051e commit 13fe085
Show file tree
Hide file tree
Showing 15 changed files with 290 additions and 743 deletions.
20 changes: 0 additions & 20 deletions keyboards/splitkb/kyria/keymaps/adm42/combos.def

This file was deleted.

71 changes: 0 additions & 71 deletions keyboards/splitkb/kyria/keymaps/adm42/config.h

This file was deleted.

300 changes: 0 additions & 300 deletions keyboards/splitkb/kyria/keymaps/adm42/keymap.c

This file was deleted.

249 changes: 0 additions & 249 deletions keyboards/splitkb/kyria/keymaps/adm42/readme.md

This file was deleted.

36 changes: 0 additions & 36 deletions keyboards/splitkb/kyria/keymaps/adm42/rules.mk

This file was deleted.

27 changes: 12 additions & 15 deletions keyboards/splitkb/kyria/keymaps/struckmb/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,34 +16,31 @@

#pragma once

#define BASE_ENABLE
#define QWERTZ_ENABLE
#define BONE_ENABLE
#define COLEMAK_ENABLE
#define MINE_ENABLE
// #define WORKMAN_ENABLE
// #define ARTSENIO_ENABLE
// #define ASETNIOP_ENABLE
/* #define COLEMAK_ENABLE */
/* #define MINE_ENABLE */
/* #define WORKMAN_ENABLE */
/* #define ARTSENIO_ENABLE */
/* #define ASETNIOP_ENABLE */

// deactivated some effects for size reasons
#ifdef RGBLIGHT_ENABLE
/* # define RGBLIGHT_EFFECT_BREATHING */
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
# define RGBLIGHT_EFFECT_SNAKE
/* # define RGBLIGHT_EFFECT_KNIGHT */
/* # define RGBLIGHT_EFFECT_SNAKE */
# define RGBLIGHT_EFFECT_KNIGHT
/* # define RGBLIGHT_EFFECT_CHRISTMAS */
/* # define RGBLIGHT_EFFECT_STATIC_GRADIENT */
/* # define RGBLIGHT_EFFECT_RGB_TEST */
/* # define RGBLIGHT_EFFECT_ALTERNATING */
# define RGBLIGHT_EFFECT_TWINKLE
/* # define RGBLIGHT_EFFECT_TWINKLE */
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
# define RGBLIGHT_DEFAULT_HUE 85
# define RGBLIGHT_DEFAULT_VAL 75
# define RGBLIGHT_SLEEP
# undef RGBLIGHT_LIMIT_VAL
# define RGBLIGHT_LIMIT_VAL 120
# define RGBLIGHT_SPLIT
# define RGBLIGHT_LAYERS
# ifndef RGBLIGHT_LIMIT_VAL
# define RGBLIGHT_LIMIT_VAL 150
# endif
#endif
63 changes: 42 additions & 21 deletions keyboards/splitkb/kyria/keymaps/struckmb/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,53 +3,74 @@
#define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__)

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
#ifdef BASE_ENABLE
[_BASE] = LAYOUT_wrapper(_BSE1_6_L1_, /* */ _BSE1_6_R1_, //
_BSE1_6_L2_, /* */ _BSE1_6_R2_, //
_BSE1_6_L3_, NO_NO_NO_NO, _BSE1_6_R3_, //
_BSE1__5_5_),
[_SYMBOLS] = LAYOUT_wrapper(_BSE2_6_L1_, /* */ _BSE2_6_R1_, //
_BSE2_6_L2_, /* */ _BSE2_6_R2_, //
_BSE2_6_L3_, NO_NO_NO_NO, _BSE2_6_R3_, //
_BSE2__5_5_),
[_FUNCTION] = LAYOUT_wrapper(_BSE3_6_L1_, /* */ _BSE3_6_R1_, //
_BSE3_6_L2_, /* */ _BSE3_6_R2_, //
_BSE3_6_L3_, NO_NO_NO_NO, _BSE3_6_R3_, //
_BSE3__5_5_),
[_MOUSE] = LAYOUT_wrapper(_BSE4_6_L1_, /* */ _BSE4_6_R1_, //
_BSE4_6_L2_, /* */ _BSE4_6_R2_, //
_BSE4_6_L3_, NO_NO_NO_NO, _BSE4_6_R3_, //
_BSE4__5_5_),
#endif // BASE_ENABLE
#ifdef QWERTZ_ENABLE
[_QWERTZ] = LAYOUT_wrapper(_QWER_6_L1_, /* */ _QWER_6_R1_, //
_QWER_6_L2_, /* */ _QWER_6_R2_, //
[_QWERTZ] = LAYOUT_wrapper(_QWER_6_L1_, /* */ _QWER_6_R1_, //
_QWER_6_L2_, /* */ _QWER_6_R2_, //
_QWER_6_L3_, NO_NO_NO_NO, _QWER_6_R3_, //
_THUMB_5_5_),
#endif // QWERTZ_ENABLE
#ifdef BONE_ENABLE
[_BONE] = LAYOUT_wrapper(_BONE_6_L1_, /* */ _BONE_6_R1_, //
_BONE_6_L2_, /* */ _BONE_6_R2_, //
[_BONE] = LAYOUT_wrapper(_BONE_6_L1_, /* */ _BONE_6_R1_, //
_BONE_6_L2_, /* */ _BONE_6_R2_, //
_BONE_6_L3_, NO_NO_NO_NO, _BONE_6_R3_, //
_THUMB_5_5_),
#endif // BONE_ENABLE
#ifdef COLEMAK_ENABLE
[_COLEMAK_DH] = LAYOUT_wrapper(_COLE_6_L1_, /* */ _COLE_6_R1_, //
_COLE_6_L2_, /* */ _COLE_6_R2_, //
[_COLEMAK_DH] = LAYOUT_wrapper(_COLE_6_L1_, /* */ _COLE_6_R1_, //
_COLE_6_L2_, /* */ _COLE_6_R2_, //
_COLE_6_L3_, NO_NO_NO_NO, _COLE_6_R3_, //
_THUMB_5_5_),
#endif // COLEMAK_ENABLE
#ifdef MINE_ENABLE
[_MINE] = LAYOUT_wrapper(_MINE_6_L1_, /* */ _MINE_6_R1_, //
_MINE_6_L2_, /* */ _MINE_6_R2_, //
_MINE_6_L3_, NO_NO_NO_NO, _MINE_6_R3_, //
_THUMB_5_5_),
[_MINE] = LAYOUT_wrapper(_MINE_6_L1_, /* */ _MINE_6_R1_, //
_MINE_6_L2_, /* */ _MINE_6_R2_, //
_MINE_6_L3_, NO_NO_NO_NO, _MINE_6_R3_, //
_THUMB_5_5_),
#endif // MINE_ENABLE
#ifdef WORKMAN_ENABLE
[_WORKMAN] = LAYOUT_wrapper(_WORK_6_L1_, /* */ _WORK_6_R1_, //
_WORK_6_L2_, /* */ _WORK_6_R2_, //
[_WORKMAN] = LAYOUT_wrapper(_WORK_6_L1_, /* */ _WORK_6_R1_, //
_WORK_6_L2_, /* */ _WORK_6_R2_, //
_WORK_6_L3_, NO_NO_NO_NO, _WORK_6_R3_, //
_THUMB_5_5_),
#endif // WORKMAN_ENABLE

[_SYM_NUM] = LAYOUT_wrapper(_SYMB_6_L1_, /* */ _SYMB_6_R1_, //
_SYMB_6_L2_, /* */ _SYMB_6_R2_, //
#if defined(QWERTZ_ENABLE) || defined(BONE_ENABLE) || defined(COLEMAK_ENABLE) || defined(MINE_ENABLE) || defined(WORKMAN_ENABLE)
[_SYM_NUM] = LAYOUT_wrapper(_SYMB_6_L1_, /* */ _SYMB_6_R1_, //
_SYMB_6_L2_, /* */ _SYMB_6_R2_, //
_SYMB_6_L3_, NO_NO_NO_NO, _SYMB_6_R3_, //
_SYMB_5_5_TB_),
[_NAV_FUN] = LAYOUT_wrapper(_NAVI_6_L1_, /* */ _FUNC_6_R1_, //
_NAVI_6_L2_, /* */ _FUNC_6_R2_, //
[_NAV_FUN] = LAYOUT_wrapper(_NAVI_6_L1_, /* */ _FUNC_6_R1_, //
_NAVI_6_L2_, /* */ _FUNC_6_R2_, //
_NAVI_6_L3_, NO_NO_NO_NO, _FUNC_6_R3_, //
_NAFN_5_5_TB_),
[_MSE_CTL] = LAYOUT_wrapper(_MSME_6_L1_, /* */ _MSME_6_R1_, //
_MSME_6_L2_, /* */ _MSME_6_R2_, //
[_MSE_CTL] = LAYOUT_wrapper(_MSME_6_L1_, /* */ _MSME_6_R1_, //
_MSME_6_L2_, /* */ _MSME_6_R2_, //
_MSME_6_L3_, NO_NO_NO_NO, _MSME_6_R3_, //
_MSME_5_5_TB_),
[_ADJUST] = LAYOUT_wrapper(_CONF_6_L1_, /* */ _CONF_6_R1_, //
_CONF_6_L2_, /* */ _CONF_6_R2_, //
#endif // QWERTZ_ENABLE // BONE_ENABLE // COLEMAK_ENABLE // MINE_ENABLE // WORKMAN_ENABLE
[_ADJUST] = LAYOUT_wrapper(_CONF_6_L1_, /* */ _CONF_6_R1_, //
_CONF_6_L2_, /* */ _CONF_6_R2_, //
_CONF_6_L3_, NO_NO_NO_NO, _CONF_6_R3_, //
_CONF_5_5_TB_)};
_CONF_5_5_TB_),
};

/* The default OLED and rotary encoder code can be found at the bottom of qmk_firmware/keyboards/splitkb/kyria/rev1/rev1.c
* These default settings can be overriden by your own settings in your keymap.c
Expand Down
2 changes: 1 addition & 1 deletion keyboards/splitkb/kyria/keymaps/struckmb/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ OLED_ENABLE = yes
OLED_DRIVER = SSD1306 # Enables the use of OLED displays
ENCODER_ENABLE = yes # Enables the use of one or more encoders
RGB_MATRIX_ENABLE = no # Disable keyboard RGB matrix, as it is enabled by default on rev3
RGBLIGHT_ENABLE = no # Disable keyboard underglow for now to save some space
RGBLIGHT_ENABLE = yes # Disable keyboard underglow for now to save some space
#RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow

COMBO_ENABLE = yes
29 changes: 29 additions & 0 deletions users/struckmb/bs-encoder.c
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,22 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
/* uint8_t this_mod = get_mods(); */
if (index == 2) switch (this_layer) {
# ifdef MOUSEKEY_ENABLE
# ifdef BASE_ENABLE
case _MOUSE:
if (clockwise) {
tap_code(KC_WH_R);
} else {
tap_code(KC_WH_L);
}
# endif // BASE_ENABLE
# if defined(QWERTZ_ENABLE) || defined(BONE_ENABLE) || defined(COLEMAK_ENABLE) || defined(MINE_ENABLE) || defined(WORKMAN_ENABLE)
case _MSE_CTL:
if (clockwise) {
tap_code(KC_WH_R);
} else {
tap_code(KC_WH_L);
}
# endif // QWERTZ_ENABLE // BONE_ENABLE // COLEMAK_ENABLE // MINE_ENABLE // WORKMAN_ENABLE
# endif // MOUSEKEY_ENABLE
default:
if (clockwise) {
Expand All @@ -67,6 +77,24 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
tap_code16(C(S(KC_TAB)));
}
} else switch (this_layer) {
# ifdef BASE_ENABLE
case _FUNCTION:
// navi layer: page up/down
if (clockwise) {
tap_code16(KC_PGDN);
} else {
tap_code16(KC_PGUP);
}
# ifdef MOUSEKEY_ENABLE
case _MOUSE:
if (clockwise) {
tap_code(KC_WH_R);
} else {
tap_code(KC_WH_L);
}
# endif // MOUSEKEY_ENABLE
# endif // BASE_ENABLE
# if defined(QWERTZ_ENABLE) || defined(BONE_ENABLE) || defined(COLEMAK_ENABLE) || defined(MINE_ENABLE) || defined(WORKMAN_ENABLE)
case _NAV_FUN:
// navi layer: page up/down
if (clockwise) {
Expand All @@ -84,6 +112,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
}
break;
# endif // MOUSEKEY_ENABLE
# endif // QWERTZ_ENABLE // BONE_ENABLE // COLEMAK_ENABLE // MINE_ENABLE // WORKMAN_ENABLE
default:
// default: volume up/down
if (clockwise) {
Expand Down
27 changes: 27 additions & 0 deletions users/struckmb/bs-oled.c
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,20 @@ void render_keymap(uint8_t col, uint8_t row, uint8_t def_layer) {
oled_write("Base: ", false);
# endif
switch (def_layer) {
# ifdef BASE_ENABLE
case _BASE:
oled_write("BaseQ", false);
break;
case _SYMBOLS:
oled_write("BaseS", false);
break;
case _FUNCTION:
oled_write("BaseF", false);
break;
case _MOUSE:
oled_write("BaseM", false);
break;
# endif // BASE_ENABLE
# ifdef QWERTZ_ENABLE
case _QWERTZ:
oled_write("QWERT", false);
Expand Down Expand Up @@ -124,6 +138,18 @@ void render_layer(uint8_t col, uint8_t row, uint8_t top_layer) {
case 0:
oled_write("Base ", false);
break;
# ifdef BASE_ENABLE
case _SYMBOLS:
oled_write("Symbol", false);
break;
case _FUNCTION:
oled_write("Nav/Nr", false);
break;
case _MOUSE:
oled_write("Mouse ", false);
break;
# endif // BASE_ENABLE
# if defined(QWERTZ_ENABLE) || defined(BONE_ENABLE) || defined(COLEMAK_ENABLE) || defined(MINE_ENABLE) || defined(WORKMAN_ENABLE)
case _SYM_NUM:
oled_write("Sym/Nr", false);
break;
Expand All @@ -133,6 +159,7 @@ void render_layer(uint8_t col, uint8_t row, uint8_t top_layer) {
case _MSE_CTL:
oled_write("Ms/Ctl", false);
break;
# endif // QWERTZ_ENABLE // BONE_ENABLE // COLEMAK_ENABLE // MINE_ENABLE // WORKMAN_ENABLE
case _ADJUST:
oled_write("Adjust", false);
break;
Expand Down
6 changes: 2 additions & 4 deletions users/struckmb/combos/base.def
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
COMB(BASE_AE, DE_ADIA, DE_A, DE_E)
COMB(BASE_OE, DE_ODIA, DE_O, DE_E)
COMB(BASE_UE, DE_UDIA, DE_U, DE_E)
COMB(BASE_SZ, DE_SS, DE_S, DE_Z)
COMB(NAV_TAB_LEFT, S(C(KC_TAB)), KC_UP, KC_LEFT)
COMB(NAV_TAB_RIGHT, C(KC_TAB), KC_DOWN, KC_RGHT)
Loading

0 comments on commit 13fe085

Please sign in to comment.