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

Add my userspace and keymaps for kyria and zen/rev1 #10541

Merged
merged 50 commits into from
Oct 18, 2020
Merged
Show file tree
Hide file tree
Changes from 45 commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
e8978a0
Adding my keymap
cwebster2 Aug 28, 2020
24d0d8a
Add a starter keymap for kyria
cwebster2 Aug 28, 2020
ef01670
Updated keymap
cwebster2 Aug 29, 2020
66cf686
Add auto shift, tapping modifications and gravatar oled bitmap
cwebster2 Sep 3, 2020
77a8fef
Add flashing helper scripts
cwebster2 Sep 4, 2020
7503f3c
Updates to my keymap
cwebster2 Sep 18, 2020
f735afd
Enable raw hid and rgblight sleep
cwebster2 Sep 18, 2020
412d8a8
Cleanup
cwebster2 Sep 18, 2020
832de97
Updated keymap and board features
cwebster2 Sep 19, 2020
66999ac
Merge remote-tracking branch 'upstream/master' into master
cwebster2 Sep 19, 2020
2fc0753
Remove some RGB modes for space
cwebster2 Sep 19, 2020
e1e0b11
Start working on a miryoku-like keymap.
cwebster2 Sep 20, 2020
faeb432
more work on keymaps
cwebster2 Sep 21, 2020
641cbd2
Fine tuning home row mods
cwebster2 Sep 22, 2020
ca3f223
update keymap
cwebster2 Sep 23, 2020
809ff5b
Keymap update
cwebster2 Sep 23, 2020
6b04363
add split transport
cwebster2 Sep 23, 2020
57bf121
keymap
cwebster2 Sep 23, 2020
2537ba9
Merge remote-tracking branch 'upstream/master' into cw-kyria-keymap
cwebster2 Sep 23, 2020
e3a642c
cherry pick from develop
cwebster2 Sep 23, 2020
bafff0a
merge develop
cwebster2 Sep 23, 2020
10bbbda
fix
cwebster2 Sep 23, 2020
2ef663b
keymap iterations
cwebster2 Sep 25, 2020
4528cac
Refactoring
cwebster2 Sep 26, 2020
db07536
Merge branch 'master' of github.com:qmk/qmk_firmware into cw-kyria-ke…
cwebster2 Sep 26, 2020
c778046
continued refactoring
cwebster2 Sep 27, 2020
bd8a6ce
messing with rgb
cwebster2 Sep 27, 2020
9b6ed24
update layer coloring
cwebster2 Sep 27, 2020
16e643c
continued refactoring
cwebster2 Sep 28, 2020
e14d59b
more features
cwebster2 Sep 29, 2020
4275174
modifier color
cwebster2 Sep 29, 2020
ca5e0f5
Move stuff to userspace
cwebster2 Oct 2, 2020
4c41580
Moving stuff out to userspace
cwebster2 Oct 2, 2020
646ef9b
refactoring into userspace
cwebster2 Oct 2, 2020
9b97a1c
More refactoring
cwebster2 Oct 3, 2020
65787d5
Fixing some errors in the keymap and changing the oled output
cwebster2 Oct 4, 2020
000cb22
Sync zen1 keymap to my userspace config
cwebster2 Oct 4, 2020
459aff3
Merge branch 'master' of github.com:qmk/qmk_firmware into cw-kyria-ke…
cwebster2 Oct 4, 2020
7de07c5
Update copyright notices and revert transport.c to master
cwebster2 Oct 4, 2020
455adf7
Swap tab and esc
cwebster2 Oct 4, 2020
9ac8715
Remove a file accidentally created
cwebster2 Oct 4, 2020
261fb54
Use LTO_ENABLE to turn on Link_Time_Optimization
cwebster2 Oct 5, 2020
0d8db75
Drop modtap thumbs on game layout
cwebster2 Oct 5, 2020
78112bf
Update game keymap
cwebster2 Oct 7, 2020
74c55ed
More iteration on the game keymap
cwebster2 Oct 7, 2020
003e2b5
Add oled indications of kitty and i3 mod
cwebster2 Oct 8, 2020
76a5b7f
Promote colemak to default
cwebster2 Oct 12, 2020
2692f94
Update tapping term for modtap keys
cwebster2 Oct 12, 2020
fe12f3c
Add per key tapping term
cwebster2 Oct 12, 2020
f094e07
Use left modifiers on right side
cwebster2 Oct 13, 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
54 changes: 54 additions & 0 deletions keyboards/kyria/keymaps/cwebster2/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
/* Copyright 2020 Casey Webster <[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

#ifdef OLED_DRIVER_ENABLE
#define OLED_DISPLAY_128X64
#endif

#ifdef RGBLIGHT_ENABLE
//#define RGBLIGHT_ANIMATIONS
//#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_BREATHING
//#define RGBLIGHT_EFFECT_CHRISTMAS
//#define RGBLIGHT_EFFECT_KNIGHT
//#define RGBLIGHT_EFFECT_RAINBOW_MOOD
//#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
//#define RGBLIGHT_EFFECT_RGB_TEST
//#define RGBLIGHT_EFFECT_SNAKE
//#define RGBLIGHT_EFFECT_STATIC_GRADIENT
//#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_SLEEP
#define RGBLIGHT_LIMIT_VAL 128
#define RGBLIGHT_LAYERS
#define RGBLIGHT_MAX_LAYERS 16
//#define RGBLIGHT_STARTUP_ANIMATION
#endif

#ifdef COMBO_ENABLE
#define COMBO_COUNT 2
#endif

#define QMK_KEYS_PER_SCAN 4

#define EE_HANDS

//#define DEBUG_MATRIX_SCAN_RATE
//#define SPLIT_MODS_ENABLE
388 changes: 388 additions & 0 deletions keyboards/kyria/keymaps/cwebster2/keymap.c

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions keyboards/kyria/keymaps/cwebster2/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
OLED_DRIVER_ENABLE = yes # Enables the use of OLED displays
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
RAW_ENABLE = yes
WPM_ENABLE = yes
COMBO_ENABLE = no
34 changes: 34 additions & 0 deletions keyboards/rgbkb/zen/rev1/keymaps/cwebster2/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/*
Copyright 2020 Casey Webster <[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

#include "config_common.h"

/* Use I2C or Serial, not both */

#define USE_SERIAL

#define EE_HANDS

#ifdef COMBO_ENABLE
#define COMBO_COUNT 2
#endif

#define QMK_KEYS_PER_SCAN 4

#define EE_HANDS
116 changes: 116 additions & 0 deletions keyboards/rgbkb/zen/rev1/keymaps/cwebster2/keymap.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
/* Copyright 2020 Casey Webster <[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 QMK_KEYBOARD_H
#include "rev1.h"
#include "cwebster2.h"

#define LAYOUT_zen_base( \
L01, L02, L03, L04, L05, R05, R04, R03, R02, R01, \
L11, L12, L13, L14, L15, R15, R14, R13, R12, R11, \
L21, L22, L23, L24, L25, R25, R24, R23, R22, R21, \
L33, L34, L35, R35, R34, R33 \
) \
LAYOUT_zen_wrapper ( \
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_EQL, \
KC_GRV, L01, L02, L03, L04, L05, R05, R04, R03, R02, R01, KC_BSLS, \
KC_CTLBS, L11, L12, L13, L14, L15, R15, R14, R13, R12, R11, KC_QUOT, \
KC_EQL, L21, L22, L23, L24, L25, R25, R24, R23, R22, R21, KC_MINS, \
KC_LCCL, KC_LGUI, SCMD_T(KC_LBRC), C_S_T(KC_MINS), L33, L34, L35, R35, R34, R33, TO(_GAME), KC_PSCR, KC_ALTCL, KC_LSFT \
)
#define LAYOUT_zen_base_wrapper(...) LAYOUT_zen_base(__VA_ARGS__)


const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/*
* Base Layer: QWERTY
*/
[_QWERTY] = LAYOUT_zen_base_wrapper(
/* ,-----------------------. ,-----------------------. */
_______QWERTY_L1______, _______QWERTY_R1______,
_______QWERTY_L2______, _______QWERTY_R2______,
_______QWERTY_L3______, _______QWERTY_R3______,
_______THUMBS_L_______, _______THUMBS_R_______
/* `---------------------' `---------------------' */
),
[_COLEMAK] = LAYOUT_zen_wrapper(
/* ,-----------------------. ,-----------------------. */
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_EQL,
KC_GRV, _______COLEMAK_L1_____, _______COLEMAK_R1_____, KC_BSLS,
KC_CTLBS, _______COLEMAK_L2_____, _______COLEMAK_R2_____, KC_SCLN,
KC_EQL, _______COLEMAK_L3_____, _______COLEMAK_R3_____, KC_MINS,
KC_LCCL, KC_LGUI, SCMD_T(KC_LBRC), C_S_T(KC_MINS), _______THUMBS_L_______, _______THUMBS_R_______, TO(_QWERTY), KC_PSCR, KC_ALTCL, KC_LSFT
/* `---------------------' `---------------------' */
),
// GAME layout -- qwerty without homerow mods
[_GAME] = LAYOUT_zen_wrapper(
/* ,-------------------------------------------. ,-------------------------------------------. */
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_EQL,
KC_GRV, _______QWERTY_L1______, _______QWERTY_R1______, KC_BSLS,
KC_CTLBS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
KC_EQL, _______QWERTY_L3______, _______QWERTY_R3______, KC_MINS,
KC_LCCL, KC_LGUI, SCMD_T(KC_LBRC), C_S_T(KC_MINS), _______THUMBS_L_______, _______THUMBS_R_______, TO(_COLEMAK), KC_PSCR, KC_ALTCL, KC_LSFT
/* `----------------------------------' `----------------------------------' */
),
[_FN] = LAYOUT_zen_base_wrapper(
/* ,-----------------------. ,-----------------------. */
_______FN_______L1____, _______INACTIVE_R1____,
_______FN_______L2____, _______INACTIVE_R2____,
_______FN_______L3____, _______NAV______R2____,
_______FN________T____, _______INACTIVE__T____
/* `---------------------' `---------------------' */
),
[_SYMBOLS] = LAYOUT_zen_base_wrapper(
/* ,-----------------------. ,-----------------------. */
_______SYM______L1____, _______INACTIVE_R1____,
_______SYM______L2____, _______INACTIVE_R2____,
_______SYM______L3____, _______INACTIVE_R3____,
_______SYM_______T____, _______INACTIVE__T____
/* `---------------------' `---------------------' */
),
[_NUM] = LAYOUT_zen_base_wrapper(
/* ,-----------------------. ,-----------------------. */
_______NUM______L1____, _______INACTIVE_R1____,
_______NUM______L2____, _______INACTIVE_R2____,
_______NUM______L3____, _______INACTIVE_R3____,
_______NUM_______T____, _______INACTIVE__T____
/* `---------------------' `---------------------' */
),
[_NAV] = LAYOUT_zen_base_wrapper(
/* ,-----------------------. ,-----------------------. */
_______INACTIVE_L1____, _______NAV______R1____,
_______INACTIVE_L2____, _______NAV______R2____,
_______INACTIVE_L3____, _______NAV______R3____,
_______INACTIVE__T____, _______NAV_______T____
/* `---------------------' `---------------------' */
),
[_MOUSE] = LAYOUT_zen_base_wrapper(
/* ,-----------------------. ,-----------------------. */
_______INACTIVE_L1____, _______MOUSE____R1____,
_______INACTIVE_L2____, _______MOUSE____R2____,
_______INACTIVE_L3____, _______MOUSE____R3____,
_______INACTIVE__T____, _______MOUSE_____T____
/* `---------------------' `---------------------' */
),
[_MEDIA] = LAYOUT_zen_base_wrapper(
/* ,-----------------------. ,-----------------------. */
_______INACTIVE_L1____, _______MEDIA____R1____,
_______INACTIVE_L2____, _______MEDIA____R2____,
_______INACTIVE_L3____, _______MEDIA____R3____,
_______INACTIVE__T____, _______MEDIA_____T____
/* `---------------------' `---------------------' */
),
};

2 changes: 2 additions & 0 deletions keyboards/rgbkb/zen/rev1/keymaps/cwebster2/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
RGBLIGHT_ENABLE = no
RAW_ENABLE = yes
57 changes: 57 additions & 0 deletions users/cwebster2/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
/* Copyright 2020 Casey Webster <[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 TAPPING_TOGGLE 1
#define TAPPING_TERM 200
//#define TAPPING_FORCE_HOLD
#undef PERMISSIVE_HOLD
#define IGNORE_MOD_TAP_INTERRUPT
#define NO_ACTION_ONESHOT

#ifdef AUTO_SHIFT_ENABLE
#define AUTO_SHIFT_TIMEOUT 200
#define NO_AUTO_SHIFT_SPECIAL
#define NO_AUTO_SHIFT_ALPHA
#endif

#undef MOUSEKEY_DELAY
#define MOUSEKEY_DELAY 0
#undef MOUSEKEY_INTERVAL
#define MOUSEKEY_INTERVAL 16
#undef MOUSEKEY_WHEEL_DELAY
#define MOUSEKEY_WHEEL_DELAY 0
#undef MOUSEKEY_MAX_SPEED
#define MOUSEKEY_MAX_SPEED 6
#undef MOUSEKEY_TIME_TO_MAX
#define MOUSEKEY_TIME_TO_MAX 64

#ifdef LOCKING_SUPPORT_ENABLE
# undef LOCKING_SUPPORT_ENABLE
#endif
#ifdef LOCKING_RESYNC_ENABLE
# undef LOCKING_RESYNC_ENABLE
#endif

#define NO_ACTION_MACRO
#define NO_ACTION_FUNCTION
#ifndef NO_DEBUG
#define NO_DEBUG
#endif // !NO_DEBUG
#if !defined(NO_PRINT) && !defined(CONSOLE_ENABLE)
#define NO_PRINT
#endif // !NO_PRINT

65 changes: 65 additions & 0 deletions users/cwebster2/cwebster2.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
/* Copyright 2020 Casey Webster <[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 "cwebster2.h"

userspace_config_t userspace_config;

__attribute__((weak)) void matrix_scan_keymap(void) {}

void matrix_scan_user(void) {
static bool has_ran_yet;
if (!has_ran_yet) {
has_ran_yet = true;
startup_user();
}

matrix_scan_keymap();
}

void keyboard_post_init_rgb(void) {
#if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_STARTUP_ANIMATION)
/*if (userspace_config.rgb_layer_change) { rgblight_enable_noeeprom(); }*/
/*if (rgblight_config.enable) {*/
/*layer_state_set_user(layer_state);*/
/*uint16_t old_hue = rgblight_config.hue;*/
uint16_t old_hue = 170;
rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
for (uint16_t i = 255; i > 0; i--) {
rgblight_sethsv_noeeprom( ( i + old_hue) % 255, 255, 255);
matrix_scan();
wait_ms(10);
}
/*}*/
#endif
/*layer_state_set_user(layer_state);*/
}

__attribute__((weak)) void eeconfig_init_keymap(void) {}

void eeconfig_init_user(void) {
userspace_config.raw = 0;
userspace_config.rgb_layer_change = true;
eeconfig_update_user(userspace_config.raw);
eeconfig_init_keymap();
keyboard_init();
}

bool hasAllBitsInMask(uint8_t value, uint8_t mask) {
value &= 0xF;
mask &= 0xF;

return (value & mask) == mask;
}
51 changes: 51 additions & 0 deletions users/cwebster2/cwebster2.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
/* Copyright 2020 Casey Webster <[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

#include "my_miryoku.h"
#include "keycodes.h"
#include "eeprom.h"

#define LAYOUT_kyria_wrapper(...) LAYOUT(__VA_ARGS__)
#define LAYOUT_zen_wrapper(...) LAYOUT(__VA_ARGS__)

enum userspace_layers {
_QWERTY = 0,
_COLEMAK,
_GAME,
_FN,
_SYMBOLS,
_NUM,
_NAV,
_MOUSE,
_MEDIA,
__LAST
};

void keyboard_post_init_rgb(void);
void matrix_scan_keymap(void);
void eeconfig_init_keymap(void);
bool hasAllBitsInMask(uint8_t value, uint8_t mask);


typedef union {
uint32_t raw;
struct {
bool rgb_layer_change :1;
};
} userspace_config_t;

extern userspace_config_t userspace_config;
Loading