Skip to content

Commit

Permalink
Revert "Personal keymap updates (#18763)"
Browse files Browse the repository at this point in the history 
This reverts commit 538dbb5.
  • Loading branch information
@keyboard-magpie
keyboard-magpie authored Nov 15, 2022
1 parent 538dbb5 commit b643493
Show file tree
Hide file tree
Showing 8 changed files with 56 additions and 229 deletions.
14 changes: 0 additions & 14 deletions keyboards/eyeohdesigns/babyv/keymaps/bghull/combos.def
View file

This file was deleted.

7 changes: 0 additions & 7 deletions keyboards/eyeohdesigns/babyv/keymaps/bghull/config.h
View file

This file was deleted.

122 changes: 0 additions & 122 deletions keyboards/eyeohdesigns/babyv/keymaps/bghull/keymap.c
View file

This file was deleted.

8 changes: 0 additions & 8 deletions keyboards/eyeohdesigns/babyv/keymaps/bghull/rules.mk
View file

This file was deleted.

14 changes: 0 additions & 14 deletions keyboards/planck/keymaps/bghull/combos.def
View file

This file was deleted.

7 changes: 0 additions & 7 deletions keyboards/planck/keymaps/bghull/config.h
View file

This file was deleted.

108 changes: 54 additions & 54 deletions keyboards/planck/keymaps/bghull/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,86 +16,86 @@

#include QMK_KEYBOARD_H
#include "keymap_steno.h"
#include "g/keymap_combo.h"
#include "muse.h"

#define COMBO_ONLY_FROM_LAYER QWERTY

enum planck_layers {
QWERTY,
COLMAK,
NAVNUM,
FUNC

_QWERTY,
_STENO,
_NUMPAD,
_FUNC
};

#define BspNAV LT(NAVNUM, KC_BSPC)
#define SpcFUN LT(FUNC, KC_SPC)
#define OneSFT OSM(MOD_LSFT)
#define OneALT OSM(MOD_LALT)
#define OneCTL OSM(MOD_LCTL)
#define OneWIN OSM(MOD_LGUI)

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* QWERTY

/* Qwerty
* ,-----------------------------------------------------------------------------------.
* | Q | W | E | R | T | | Y | U | I | O | P |
* |------+------+------+------+------+-------------+------+------+------+------+------|
* | A | S | D | F | G | | H | J | K | L | ; : |
* | Tab | Q | W | E | R | T | Y | U | I | O | P | Del |
* |------+------+------+------+------+-------------+------+------+------+------+------|
* | Z | X | C | V | B | | N | M | , < | . > | ' " |
* |NUMPAD| A | S | D | F | G | H | J | K | L | ; : | Enter|
* |------+------+------+------+------+------|------+------+------+------+------+------|
* | Shift| Z | X | C | V | B | N | M | , < | . > | up | / ? |
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | | Ctrl |NAVNUM| |Space |BspNAV| |
* |Es/Ctl|MACROS|STENO | Alt | Bspc | Space | Ctrl | ' " | lt | dn | rt |
* `-----------------------------------------------------------------------------------'
*/
[QWERTY] = LAYOUT_planck_grid(
KC_Q, KC_W, KC_E, KC_R, KC_T, _______, _______, KC_Y, KC_U, KC_I, KC_O, KC_P,
KC_A, KC_S, KC_D, KC_F, KC_G, _______, _______, KC_H, KC_J, KC_K, KC_L, KC_SCLN,
KC_Z, KC_X, KC_C, KC_V, KC_B, _______, _______, KC_N, KC_M, KC_COMM, KC_DOT, KC_QUOT,
_______, _______, _______, KC_LCTL, MO(NAVNUM),_______, _______, KC_SPC, BspNAV, _______, _______, _______
[_QWERTY] = LAYOUT_planck_grid(
LGUI_T(KC_TAB), KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL,
MO(_NUMPAD), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_SLSH,
LCTL_T(KC_ESC),MO(_FUNC),DF(_STENO), KC_LALT, KC_BSPC, KC_SPC ,_______ , KC_LCTL, KC_QUOT, KC_LEFT, KC_DOWN, KC_RGHT
),

[COLMAK] = LAYOUT_planck_grid(
KC_Q, KC_W, KC_F, KC_P, KC_B, _______, _______, KC_J, KC_L, KC_U, KC_Y, KC_SCLN,
KC_A, KC_R, KC_S, KC_T, KC_G, _______, _______, KC_M, KC_N, KC_E, KC_I, KC_O,
KC_Z, KC_X, KC_C, KC_D, KC_V, _______, _______, KC_K, KC_H, KC_COMM, KC_DOT, KC_QUOT,
_______, _______, _______, KC_LCTL, MO(NAVNUM),_______, _______, KC_SPC, BspNAV, _______, _______, _______

/* Plover layer (http://opensteno.org)
* ,-----------------------------------------------------------------------------------.
* | # | # | # | # | # | # | # | # | # | # | # | # |
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | FN | S | T | P | H | * | * | F | P | L | T | D |
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | | S | K | W | R | * | * | R | B | G | S | Z |
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | | |QWERTY| A | O | | E | U | PWR | RES1 | RES2 |
* `-----------------------------------------------------------------------------------'
*/
[_STENO] = LAYOUT_planck_grid(
STN_N1, STN_N2, STN_N3, STN_N4, STN_N5, STN_N6, STN_N7, STN_N8, STN_N9, STN_NA, STN_NB, STN_NC ,
STN_FN, STN_S1, STN_TL, STN_PL, STN_HL, STN_ST1, STN_ST3, STN_FR, STN_PR, STN_LR, STN_TR, STN_DR ,
XXXXXXX, STN_S2, STN_KL, STN_WL, STN_RL, STN_ST2, STN_ST4, STN_RR, STN_BR, STN_GR, STN_SR, STN_ZR ,
XXXXXXX, XXXXXXX, DF(_QWERTY),STN_A,STN_O, XXXXXXX, XXXXXXX, STN_E, STN_U, STN_PWR, STN_RE1, STN_RE2
),
/* NAVNUM

/*
* ,-----------------------------------------------------------------------------------.
* |Enter | Home | Up | End | | RST | - | 7 | 8 | 9 | 0 |
* | |RClick| MsU |LClick|WheelU| ( | ) | 7 | 8 | 9 | 0 | |
* |------+------+------+------+------+------+------+------+------+------+------+------|
* |OneSFT| Left | Down |Right | ` ~ | CLMK | + | 4 | 5 | 6 |Enter |
* | | MsL | MsD | MsR |WheelD| [{ | ]} | 4 | 5 | 6 | + | -_ |
* |------+------+------+------+------+------+------+------+------+------+------+------|
* |OneCTL|OneALT| Tab | _ |OneWIN| QWER | = | 1 | 2 | 3 | |
* | | Mute | VolD | VolU | `~ | _ | = | 1 | 2 | 3 | PgUp | \ | |
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | | | | |SpcFUN| Ctrl | |
* | | |QK_BOOT | | | | | . | Home | PgDn | End |
* `-----------------------------------------------------------------------------------'
*/
[NAVNUM] = LAYOUT_planck_grid(
KC_ENT, KC_HOME, KC_UP, KC_END, _______, _______, RESET, KC_PMNS, KC_7, KC_8, KC_9, KC_0,
OneSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_GRV, _______, DF(COLMAK), KC_PPLS, KC_4, KC_5, KC_6, KC_ENT,
OneCTL, OneALT, KC_TAB, KC_UNDS, OneWIN, _______, DF(QWERTY), KC_EQL, KC_1, KC_2, KC_3, _______,
_______, _______, _______, _______, _______, _______, _______, SpcFUN, KC_LCTL, _______, _______, _______
[_NUMPAD] = LAYOUT_planck_grid(
_______, KC_BTN2, KC_MS_U, KC_BTN1, KC_WH_U, KC_LPRN, KC_RPRN, KC_7, KC_8, KC_9, KC_0, _______,
_______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, KC_LBRC, KC_RBRC, KC_4, KC_5, KC_6, KC_PPLS, KC_MINS,
_______, KC_MUTE, KC_VOLD, KC_VOLU, KC_GRAVE, KC_UNDS, KC_EQL, KC_1, KC_2, KC_3, KC_PGUP, KC_BSLS,
_______, XXXXXXX, QK_BOOT, _______, _______, _______, _______, _______, KC_PDOT, KC_HOME, KC_PGDN, KC_END
),
/* FUNC: Mousekeys + F keys

/* Dynamic macros + Winkey combos
* ,-----------------------------------------------------------------------------------.
* | |Rclick| MsUp |Lclick| WhUp | | | F7 | F8 | F9 | F10 |
* | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 |
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | | MsLt | MsDn | MsRt | WhDn | |OneALT| F4 | F5 | F6 | F11 |
* | W2 | | | | | | | | | | | QK_BOOT|
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | | |Mclick| | | | | F1 | F2 | F3 | F12 |
* | W3 | | | | | | | | | | | |
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | | | | | | | |
* | W4 | | | | | | | | | | |
* `-----------------------------------------------------------------------------------'
*/
[FUNC] = LAYOUT_planck_grid(
_______, KC_BTN2, KC_MS_U, KC_BTN1, KC_WH_U, _______, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10,
_______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, _______, OneALT , KC_F4, KC_F5, KC_F6, KC_F11,
_______, _______, KC_BTN3, _______, _______, _______, _______, _______, KC_F1, KC_F2, KC_F3, KC_F12,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
[_FUNC] = LAYOUT_planck_grid(
KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 , KC_F12,
LGUI(KC_2), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
LGUI(KC_3), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
LGUI(KC_4), _______, DM_REC1, DM_PLY1, DM_RSTP, _______, _______, _______, _______, _______, _______, _______
),

};

5 changes: 2 additions & 3 deletions keyboards/planck/keymaps/bghull/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
SRC += muse.c
AUTO_SHIFT_ENABLE = yes
MOUSEKEY_ENABLE = yes
AUDIO_ENABLE = no
COMBO_ENABLE = yes
VPATH += keyboards/gboards
STENO_ENABLE = yes
AUDIO_ENABLE = no

0 comments on commit b643493

Please sign in to comment.