Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added Xd75 and viterbi keymaps, refactored my userspace. #8776

Merged
merged 25 commits into from
Apr 28, 2020
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
b1b5176
Fix bug with layer caching in get_event_keycode
drashna Apr 5, 2020
f62426c
Improve naming
drashna Apr 6, 2020
a227a87
new xd75 keymap
EricGebhart Apr 11, 2020
285dae5
Merge branch 'bug/process_after_fix' of http://github.com/drashna/qmk…
EricGebhart Apr 11, 2020
7794c78
Revert "Improve naming"
EricGebhart Apr 11, 2020
bde075f
Added a viterbi keymap
EricGebhart Apr 11, 2020
ce56c18
refactor
EricGebhart Apr 13, 2020
51ef03e
new xd75 keymap
EricGebhart Apr 11, 2020
dfb2e0d
Revert "Improve naming"
EricGebhart Apr 11, 2020
b92952b
Added a viterbi keymap
EricGebhart Apr 11, 2020
12bc132
refactor
EricGebhart Apr 13, 2020
56717a9
Merge branch 'xd75' of https://github.com/ericgebhart/qmk_firmware in…
EricGebhart Apr 13, 2020
ce8f1a6
remerge again.
EricGebhart Apr 13, 2020
a4155c5
And again, revert accidental changes.
EricGebhart Apr 13, 2020
20ef71d
pragma once, remove user name
EricGebhart Apr 14, 2020
c799196
reset and rebase.
EricGebhart Apr 14, 2020
244ec3d
cleaned up copyright
EricGebhart Apr 14, 2020
9765ff3
Making the ergodox consistent with the the others.
EricGebhart Apr 14, 2020
8c9cfe5
remove pragma once where it is unecessary to see if Travis likes it.
EricGebhart Apr 15, 2020
77d74b4
revert again.
EricGebhart Apr 16, 2020
80216a2
replace unknown whitespace characters.
EricGebhart Apr 16, 2020
c3c329c
Refactor of rules.mk
EricGebhart Apr 19, 2020
dd51649
Added viterbi rules.mk back.
EricGebhart Apr 19, 2020
2b2d8c7
removed all but revision folder.
EricGebhart Apr 20, 2020
8eacafd
removed rules.mk, default folder doesn't actually work.
EricGebhart Apr 21, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
432 changes: 231 additions & 201 deletions keyboards/ergodox_ez/keymaps/ericgebhart/keymap.c

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ SRC += ericgebhart.c

MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
COMMAND_ENABLE = yes # Commands for debug and configuration
NKRO_ENABLE = yes # USB Nkey Rollover - for issues, see github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
SWAP_HANDS_ENABLE= yes # Allow swapping hands of keyboard
COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = no # USB Nkey Rollover - for issues, see github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
SWAP_HANDS_ENABLE= no # Allow swapping hands of keyboard
KEY_LOCK_ENABLE = yes # Enable the KC_LOCK key
TAP_DANCE_ENABLE = yes # Enable the tap dance feature.
CONSOLE_ENABLE = yes # Console for debug
CONSOLE_ENABLE = no # Console for debug

BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration
UNICODE_ENABLE = no
Expand Down
32 changes: 32 additions & 0 deletions keyboards/keebio/viterbi/keymaps/ericgebhart/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/*
Copyright 2017 Danny Nguyen <[email protected]>

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/>.
*/

#pragma once

// #define USE_I2C

/* Select hand configuration */

// #define MASTER_RIGHT
// #define EE_HANDS

#undef RGBLED_NUM
#define RGBLIGHT_ANIMATIONS
#define RGBLED_NUM 12
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
193 changes: 193 additions & 0 deletions keyboards/keebio/viterbi/keymaps/ericgebhart/keymap.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,193 @@
/*
Copyright 2018 Eric Gebhart <[email protected]>

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 "keymap_bepo.h"
#include "ericgebhart.h"

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

[DVORAK] = LAYOUT_ortho_5x14_wrapper(
KC_GRV, ___12_DVORAK_1___, KC_SLASH,
TAB_BKTAB, ___12_DVORAK_2___, KC_MINUS,
KC_LSFT, ___12_DVORAK_3___, KC_RSFT,
___ORTHO_14_BOTTOM___,
___ORTHO_14_THUMBS_BOTTOM___
),

[QWERTY] = LAYOUT_ortho_5x14_wrapper(
KC_GRV, ___12_QWERTY_1___, KC_SLASH,
TAB_BKTAB, ___12_QWERTY_2___, KC_MINUS,
KC_LSFT, ___12_QWERTY_3___, KC_RSFT,
___ORTHO_14_BOTTOM___,
___ORTHO_14_THUMBS_BOTTOM___
),

[COLEMAK] = LAYOUT_ortho_5x14_wrapper(
KC_GRV, ___12_COLEMAK_1___, KC_SLASH,
TAB_BKTAB, ___12_COLEMAK_2___, KC_MINUS,
KC_LSFT, ___12_COLEMAK_3___, KC_RSFT,
___ORTHO_14_BOTTOM___,
___ORTHO_14_THUMBS_BOTTOM___
),

[WORKMAN] = LAYOUT_ortho_5x14_wrapper(
KC_GRV, ___12_WORKMAN_1___, KC_SLASH,
TAB_BKTAB, ___12_WORKMAN_2___, KC_MINUS,
KC_LSFT, ___12_WORKMAN_3___, KC_RSFT,
___ORTHO_14_BOTTOM___,
___ORTHO_14_THUMBS_BOTTOM___
),

[NORMAN] = LAYOUT_ortho_5x14_wrapper(
KC_GRV, ___12_NORMAN_1___, KC_SLASH,
TAB_BKTAB, ___12_NORMAN_2___, KC_MINUS,
KC_LSFT, ___12_NORMAN_3___, KC_RSFT,
___ORTHO_14_BOTTOM___,
___ORTHO_14_THUMBS_BOTTOM___
),

[DVORAK_ON_BEPO] = LAYOUT_ortho_5x14_wrapper(
KC_GRV, ___12_DVORAK_B_1___, KC_SLASH,
TAB_BKTAB, ___12_DVORAK_B_2___, KC_MINUS,
KC_LSFT, ___12_DVORAK_B_3___, KC_RSFT,
___ORTHO_14_BOTTOM_FR___,
___ORTHO_14_THUMBS_BOTTOM___
),

[BEPO] = LAYOUT_ortho_5x14_wrapper(
KC_GRV, ___12_DVORAK_B_1___, KC_SLASH,
TAB_BKTAB, ___12_DVORAK_B_2___, KC_MINUS,
KC_LSFT, ___12_DVORAK_B_3___, KC_RSFT,
___ORTHO_14_BOTTOM_BP___,
___ORTHO_14_THUMBS_BOTTOM___
),

[XMONAD] = LAYOUT_ortho_5x14_wrapper(
___, ___12_DVORAK_1___, ___,
___, ___12_DVORAK_2___, ___,
___, ___12_DVORAK_3___, ___,
___14___,
___14___
),

[XMONAD_FR] = LAYOUT_ortho_5x14_wrapper(
___, ___12_DVORAK_B_1___, ___,
___, ___12_DVORAK_B_2___, ___,
___, ___12_DVORAK_B_3___, ___,
___14___,
___14___
),


// SYMBOLS
[SYMB] = LAYOUT_ortho_5x14_wrapper(
___14_SYMB_1___,
___14_SYMB_2___,
___14_SYMB_3___,
___14_SYMB_4___,
___14___
),

[KEYPAD] = LAYOUT_ortho_5x14_wrapper(
___14_KP_1___,
___14_KP_2___,
___14_KP_3___,
___14_KP_4___,
___14___
),

[KEYPAD_ON_BEPO] = LAYOUT_ortho_5x14_wrapper(
___14_KP_B_1___,
___14_KP_B_2___,
___14_KP_B_3___,
___14_KP_B_4___,
___14___
),

[SYMB_ON_BEPO] = LAYOUT_ortho_5x14_wrapper(
___14_SYMB_B_1___,
___14_SYMB_B_2___,
___14_SYMB_B_3___,
___14_SYMB_B_4___,
___14___
),

// MEDIA AND MOUSE
[MDIA] = LAYOUT_ortho_5x14_wrapper(
___14_MDIA_1___,
___14_MDIA_2___,
___14_MDIA_3___,
___14_MDIA_4___,
___14___
),

[LAYERS] = LAYOUT_ortho_5x14_wrapper(
___14_LAYERS_1___,
___14_LAYERS_2___,
___14_LAYERS_3___,
___14___,
___14___
),

[_RGB] = LAYOUT_ortho_5x14_wrapper(
___14_RGB_1___,
___14_RGB_2___,
___14_RGB_3___,
___14___,
___14___
),
};

/* bool process_record_user(uint16_t keycode, keyrecord_t *record) { */
/* switch (keycode) { */
/* case QWERTY: */
/* if (record->event.pressed) { */
/* set_single_persistent_default_layer(_QWERTY); */
/* } */
/* return false; */
/* break; */
/* case LOWER: */
/* if (record->event.pressed) { */
/* layer_on(_LOWER); */
/* update_tri_layer(_LOWER, _RAISE, _ADJUST); */
/* } else { */
/* layer_off(_LOWER); */
/* update_tri_layer(_LOWER, _RAISE, _ADJUST); */
/* } */
/* return false; */
/* break; */
/* case RAISE: */
/* if (record->event.pressed) { */
/* layer_on(_RAISE); */
/* update_tri_layer(_LOWER, _RAISE, _ADJUST); */
/* } else { */
/* layer_off(_RAISE); */
/* update_tri_layer(_LOWER, _RAISE, _ADJUST); */
/* } */
/* return false; */
/* break; */
/* case ADJUST: */
/* if (record->event.pressed) { */
/* layer_on(_ADJUST); */
/* } else { */
/* layer_off(_ADJUST); */
/* } */
/* return false; */
/* break; */
/* } */
/* return true; */
/* } */
18 changes: 18 additions & 0 deletions keyboards/keebio/viterbi/keymaps/ericgebhart/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
USER_NAME := ericgebhart
EricGebhart marked this conversation as resolved.
Show resolved Hide resolved
SRC += ericgebhart.c

MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = no # USB Nkey Rollover - for issues, see github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
SWAP_HANDS_ENABLE= no # Allow swapping hands of keyboard
KEY_LOCK_ENABLE = yes # Enable the KC_LOCK key
TAP_DANCE_ENABLE = yes # Enable the tap dance feature.
CONSOLE_ENABLE = no # Console for debug

BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration
UNICODE_ENABLE = no
SLEEP_LED_ENABLE = no
API_SYSEX_ENABLE = no
RGBLIGHT_ENABLE = no
RGBLIGHT_ANIMATION = no
28 changes: 28 additions & 0 deletions keyboards/xd75/keymaps/ericgebhart/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/* Copyright 2017 Benjamin Kesselring
*
* 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/>.
*/

#pragma once

#undef RGBLED_NUM
#define RGBLED_NUM 6
#define RGBLIGHT_LAYERS

#undef RGBLIGHT_ANIMATIONS
//#define RGBLIGHT_HUE_STEP 8
//#define RGBLIGHT_SAT_STEP 8


// place overrides here
Loading