cadey
/
kadis-layouts
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix

This commit is contained in:
Cadey Ratio 2020-11-11 10:53:56 -05:00
parent 80a0f99e7e
commit 2afb2ecf3f
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
moonlander/combos.def
View File

@ -1,6 +1 @@
// Vim-Mode combos
COMB(weEsc, KC_ESC, KC_W, KC_F)
COMB(sdBspc, KC_BSPC, KC_R, KC_S)
COMB(dfTab, KC_TAB, KC_S, KC_T)
COMB(cvEnt, KC_ENT, KC_C, KC_V) COMB(cvEnt, KC_ENT, KC_C, KC_V)
COMB(uiEsc, KC_ESC, KC_J, KC_L)

10
moonlander/keymap.c
View File

@ -92,7 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[2] = LAYOUT_moonlander( [2] = LAYOUT_moonlander(
KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
KC_TRANSPARENT, KC_QUOTE, KC_COMMA, KC_DOT, KC_P, KC_Y, KC_TRANSPARENT, KC_TRANSPARENT, KC_F, KC_G, KC_C, KC_R, KC_L, KC_TRANSPARENT, KC_TRANSPARENT, KC_QUOTE, KC_COMMA, KC_DOT, KC_P, KC_Y, KC_TRANSPARENT, KC_TRANSPARENT, KC_F, KC_G, KC_C, KC_R, KC_L, KC_TRANSPARENT,
KC_TRANSPARENT, KC_A, KC_O, KC_E, KC_U, KC_I, KC_TRANSPARENT, KC_TRANSPARENT, KC_D, KC_H, KC_T, KC_N, KC_S, KC_TRANSPARENT, KC_TRANSPARENT, KC_A, KC_O, KC_E, KC_U, KC_I, KC_TRANSPARENT, KC_TRANSPARENT, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SCOLON,
KC_TRANSPARENT, KC_SCOLON, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_TRANSPARENT, KC_TRANSPARENT, KC_SCOLON, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_TRANSPARENT,
KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
@ -103,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRANSPARENT, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, DYN_REC_START1, DYN_REC_START2, KC_SCROLLLOCK, KC_7, KC_8, KC_9, KC_ASTR, KC_F12, KC_TRANSPARENT, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, DYN_REC_START1, DYN_REC_START2, KC_SCROLLLOCK, KC_7, KC_8, KC_9, KC_ASTR, KC_F12,
KC_PGUP, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_GRAVE, DYN_MACRO_PLAY1, DYN_MACRO_PLAY2,KC_NUMLOCK, KC_4, KC_5, KC_6, KC_KP_PLUS, KC_MINUS, KC_PGUP, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_GRAVE, DYN_MACRO_PLAY1, DYN_MACRO_PLAY2,KC_NUMLOCK, KC_4, KC_5, KC_6, KC_KP_PLUS, KC_MINUS,
KC_PGDOWN, KC_PERC, KC_CIRC, KC_LBRACKET, KC_RBRACKET, KC_TILD, KC_AMPR, KC_1, KC_2, KC_3, KC_BSLASH, KC_TRANSPARENT, KC_PGDOWN, KC_PERC, KC_CIRC, KC_LBRACKET, KC_RBRACKET, KC_TILD, KC_AMPR, KC_1, KC_2, KC_3, KC_BSLASH, KC_TRANSPARENT,
KC_TRANSPARENT, KC_COMMA, KC_LCTRL, KC_LALT, KC_TRANSPARENT, KC_TRANSPARENT, RGB_TOG, KC_RGUI, KC_DOT, KC_0, KC_EQUAL, KC_TRANSPARENT, KC_TRANSPARENT, KC_COMMA, KC_LCTRL, KC_LALT, PRINT_WPM, KC_TRANSPARENT, RGB_TOG, KC_RGUI, KC_DOT, KC_0, KC_EQUAL, KC_TRANSPARENT,
RGB_VAD, RGB_VAI, KC_HOME, RGB_VAD, RGB_VAI, KC_HOME,
KC_END, RGB_HUD, RGB_HUI KC_END, RGB_HUD, RGB_HUI
), ),
@ -433,7 +433,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return false; return false;
case PRINT_WPM: case PRINT_WPM:
if (record->event.pressed) { if (record->event.pressed) {
//SEND_STRING(sprintf("Current WPM: %d\n", get_current_wpm())); char display[20];
snprintf(display, 20, "\n%d\n", get_current_wpm());
send_string((const char *)display);
} }
return false; return false;
} }

4
moonlander/rules.mk
View File

@ -7,9 +7,9 @@ DYNAMIC_MACRO_ENABLE = yes
SRC = matrix.c SRC = matrix.c
RGBLIGHT_ENABLE = no RGBLIGHT_ENABLE = no
RGB_MATRIX_ENABLE = yes RGB_MATRIX_ENABLE = yes
COMBO_ENABLE = yes
VPATH += keyboards/gboards/
WPM_ENABLE = yes WPM_ENABLE = yes
STENO_ENABLE = yes STENO_ENABLE = yes
LEADER_ENABLE = yes LEADER_ENABLE = yes
USER_NAME := kadis USER_NAME := kadis
COMBO_ENABLE = yes
VPATH += keyboards/gboards/