diff options
author | Kenneth Aloysius <krusli@users.noreply.github.com> | 2018-07-24 02:11:56 +0700 |
---|---|---|
committer | Drashna Jaelre <drashna@live.com> | 2018-07-23 12:11:56 -0700 |
commit | f2bc70a2643bd158eb9910c61b682dafab83d41d (patch) | |
tree | 7aaea01088dfbe2cad768a8e9c4257e837383390 /keyboards/jj40/keymaps/krusli | |
parent | 4e41812a6761d5b573d4100ef16e3e9cd0442073 (diff) | |
download | qmk_firmware-f2bc70a2643bd158eb9910c61b682dafab83d41d.tar.gz |
ps2avrgb: fix incorrect avr ports specified (for numlock and capslock LEDs) (#3453)
* Add M6-A keymap
* Update XD60 keymap
* Update XD60 keymap readme
* Update JJ40 and Let's Split keymaps
* Add readme for M6-A
* Fix typo, update JJ40 README
* Update jj40 readme
* Cleanup jj40 keymap
* Revert Let's Split QWERTY layer to default before #2010
* Update numpad layers
* Fix: Let's Split keymap getting stuck mods due to having keycodes assigned on the Raise layer
* Keep ASCII art consistent with keymap
* Staryu: initial port
* Add personal keymap
* Added and updated READMEs
* Fix: default keymap for staryu
* Rudimentary backlight support.
* Enabled mousekeys for default keymap
* use QMK_KEYBOARD_H and LAYOUT
* Update readme.md for NIU mini: flash using avrdude
* Fix missing linebreaks for Staryu README
* Update readme.md
* Update PS2AVRGB boards with new matrix.c
* Update canoe matrix.c; untested
* Fix canoe.c for building (needs matrix_scan_user and matrix_init_user)
* Add personal Iris keymap
* Update keymap
* Update keymap
* Update keymap, disable backlighting and underglow
* Move PrintScreen button
* Add README
* Update personal keymaps
* Add INS key
* Limit USB max power consumption, change Fn to MENU
* Remove Numpad layer (easy to accidentally toggle)
* Fix backlighting for ps2avrgb
* Update comments to refer to actual pin naming
* Possible fix for xyverz ortho keymap: define RGBLED_NUM
* Make led_set_user in backlight.c overridable
* Add changes to address points raised in code review, untested (don't have build env right now)
Diffstat (limited to 'keyboards/jj40/keymaps/krusli')
-rw-r--r-- | keyboards/jj40/keymaps/krusli/keymap.c | 35 | ||||
-rw-r--r-- | keyboards/jj40/keymaps/krusli/numpad.txt | 17 |
2 files changed, 21 insertions, 31 deletions
diff --git a/keyboards/jj40/keymaps/krusli/keymap.c b/keyboards/jj40/keymaps/krusli/keymap.c index 73dd0b287..6fea9d314 100644 --- a/keyboards/jj40/keymaps/krusli/keymap.c +++ b/keyboards/jj40/keymaps/krusli/keymap.c @@ -3,7 +3,6 @@ #define _QWERTY 0 #define _LOWER 1 #define _RAISE 2 -#define _NUMPAD 3 enum custom_keycodes { QWERTY = SAFE_RANGE, @@ -15,14 +14,6 @@ void matrix_scan_user(void) { // runs at every matrix scan. } -// enum { -// TD_H_E = 0 -// }; -// -// qk_tap_dance_action_t tap_dance_actions[] = { -// [TD_H_E] = ACTION_TAP_DANCE_DOUBLE(KC_HOME, KC_END) -// }; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Qwerty * ,-----------------------------------------------------------------------------------. @@ -36,10 +27,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [_QWERTY] = LAYOUT_2U_space( \ - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ - KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , \ - TO(_NUMPAD),KC_LCTL, KC_LGUI, KC_LALT, MO(_LOWER), KC_SPC, MO(_RAISE), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ + KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , \ + _______, KC_LCTL, KC_LGUI, KC_LALT, MO(_LOWER), KC_SPC, MO(_RAISE), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ ), /* Lower @@ -76,23 +67,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \ _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_HOME, KC_END, KC_PGUP, KC_PGDN, _______, \ _______, KC_MRWD, KC_MPLY, KC_MNXT, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ - ), - - /* Numpad - * ,-----------------------------------------------------------------------------------. - * | Esc | 7 | 8 | 9 | * | / | | | | | | | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | <-- | 4 | 5 | 6 | + | - | | | | | | | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | | 1 | 2 | 3 |Enter |Enter | | | | | | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * |Qwerty| 0 | . | . |Enter |Enter | | | | | | - * `-----------------------------------------------------------------------------------' - */ - [_NUMPAD] = LAYOUT_2U_space( \ - KC_ESC, KC_P7, KC_P8, KC_P9, KC_PAST, KC_PSLS, _______, _______, _______, _______, _______, _______, \ - KC_BSPC, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_PMNS, _______, _______, _______, _______, _______, _______, \ - _______, KC_P1, KC_P2, KC_P3, KC_PENT, KC_PENT, _______, _______, _______, _______, _______, _______, \ - TO(_QWERTY),KC_P0, KC_PDOT, KC_PDOT, KC_PENT, _______, _______, _______, _______, _______, _______ \ ) }; diff --git a/keyboards/jj40/keymaps/krusli/numpad.txt b/keyboards/jj40/keymaps/krusli/numpad.txt new file mode 100644 index 000000000..8fbdc1829 --- /dev/null +++ b/keyboards/jj40/keymaps/krusli/numpad.txt @@ -0,0 +1,17 @@ +/* Numpad + * ,-----------------------------------------------------------------------------------. + * | Esc | 7 | 8 | 9 | * | / | | | | | | | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | <-- | 4 | 5 | 6 | + | - | | | | | | | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | | 1 | 2 | 3 |Enter |Enter | | | | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * |Qwerty| 0 | . | . |Enter |Enter | | | | | | + * `-----------------------------------------------------------------------------------' + */ +[_NUMPAD] = LAYOUT_2U_space( \ + KC_ESC, KC_P7, KC_P8, KC_P9, KC_PAST, KC_PSLS, _______, _______, _______, _______, _______, _______, \ + KC_BSPC, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_PMNS, _______, _______, _______, _______, _______, _______, \ + _______, KC_P1, KC_P2, KC_P3, KC_PENT, KC_PENT, _______, _______, _______, _______, _______, _______, \ + TO(_QWERTY),KC_P0, KC_PDOT, KC_PDOT, KC_PENT, _______, _______, _______, _______, _______, _______ \ +) |