aboutsummaryrefslogtreecommitdiff
path: root/keyboards/jj40
diff options
context:
space:
mode:
authorKenneth Aloysius <krusli@users.noreply.github.com>2018-04-20 02:28:55 +1000
committerDrashna Jaelre <drashna@live.com>2018-04-19 09:28:55 -0700
commitd3c6da7afff15fa493d7a6c8b00ec6e4ac7274f3 (patch)
treeb06c185b24898f601e55cfe214cb1e494708e7f7 /keyboards/jj40
parent47f55f417b9ecd2199b0b253e6dfb6881f9a8746 (diff)
downloadqmk_firmware-d3c6da7afff15fa493d7a6c8b00ec6e4ac7274f3.tar.gz
qmk_firmware-d3c6da7afff15fa493d7a6c8b00ec6e4ac7274f3.zip
Updated personal keymaps, fixed Let's Split default keymap, updated JJ40 README (#2704)
* 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
Diffstat (limited to 'keyboards/jj40')
-rw-r--r--keyboards/jj40/README.md15
-rw-r--r--keyboards/jj40/keymaps/krusli/config.h2
-rw-r--r--keyboards/jj40/keymaps/krusli/keymap.c135
-rw-r--r--keyboards/jj40/keymaps/krusli/readme.md4
-rw-r--r--keyboards/jj40/keymaps/krusli/rules.mk2
5 files changed, 95 insertions, 63 deletions
diff --git a/keyboards/jj40/README.md b/keyboards/jj40/README.md
index 563f5788e..1b47ab816 100644
--- a/keyboards/jj40/README.md
+++ b/keyboards/jj40/README.md
@@ -18,13 +18,24 @@ Note that this is a complete replacement for the firmware, so you won't be
18using Bootmapper Client to change any keyboard settings, since not all the 18using Bootmapper Client to change any keyboard settings, since not all the
19USB report options are supported. 19USB report options are supported.
20 20
21In addition you may need the AVR toolchain and `bootloadHID` for flashing: 21In addition you may need the AVR toolchain and `bootloadHID` ([GitHub repo](https://github.com/whiteneon/bootloadHID)) for flashing:
22 22
23For macOS:
23``` 24```
24$ brew cask install crosspack-avr 25$ brew cask install crosspack-avr
25$ brew install --HEAD https://raw.githubusercontent.com/robertgzr/homebrew-tap/master/bootloadhid.rb 26$ brew install --HEAD https://raw.githubusercontent.com/robertgzr/homebrew-tap/master/bootloadhid.rb
26``` 27```
27 28
29For Linux:
30```
31$ sudo apt install libusb-dev
32$ wget https://www.obdev.at/downloads/vusb/bootloadHID.2012-12-08.tar.gz
33$ tar -xzf bootloadHID.2012-12-08.tar.gz
34$ cd bootloadHID.2012-12-08/commandline
35$ make
36$ sudo cp bootloadHID /usr/bin
37```
38
28In order to use the `./program` script, which can reboot the board into 39In order to use the `./program` script, which can reboot the board into
29the bootloader, you'll need Python 2 with PyUSB installed: 40the bootloader, you'll need Python 2 with PyUSB installed:
30 41
@@ -32,7 +43,7 @@ the bootloader, you'll need Python 2 with PyUSB installed:
32$ pip install pyusb 43$ pip install pyusb
33``` 44```
34 45
35If you prefer, you can just build it and flash the firmware directly with 46If you prefer (or are having issues with a `program` flash), you can just build it (`make jj40:<keymap-name>` and flash the firmware (`.hex` file) directly with
36`bootloadHID` if you boot the board while holding down `Backspace` (`Top Right Key`) to keep it 47`bootloadHID` if you boot the board while holding down `Backspace` (`Top Right Key`) to keep it
37in the bootloader: 48in the bootloader:
38 49
diff --git a/keyboards/jj40/keymaps/krusli/config.h b/keyboards/jj40/keymaps/krusli/config.h
index 52aaa8f24..6d98a37a6 100644
--- a/keyboards/jj40/keymaps/krusli/config.h
+++ b/keyboards/jj40/keymaps/krusli/config.h
@@ -4,6 +4,6 @@
4#include "../../config.h" 4#include "../../config.h"
5 5
6#define PREVENT_STUCK_MODIFIERS 6#define PREVENT_STUCK_MODIFIERS
7#define TAPPING_TERM 300 7// #define TAPPING_TERM 300
8 8
9#endif 9#endif
diff --git a/keyboards/jj40/keymaps/krusli/keymap.c b/keyboards/jj40/keymaps/krusli/keymap.c
index df692cc48..2e6e9a76e 100644
--- a/keyboards/jj40/keymaps/krusli/keymap.c
+++ b/keyboards/jj40/keymaps/krusli/keymap.c
@@ -4,6 +4,7 @@
4#define _QWERTY 0 4#define _QWERTY 0
5#define _LOWER 1 5#define _LOWER 1
6#define _RAISE 2 6#define _RAISE 2
7#define _NUMPAD 3
7 8
8enum custom_keycodes { 9enum custom_keycodes {
9 QWERTY = SAFE_RANGE, 10 QWERTY = SAFE_RANGE,
@@ -15,66 +16,84 @@ void matrix_scan_user(void) {
15 // runs at every matrix scan. 16 // runs at every matrix scan.
16} 17}
17 18
18enum { 19// enum {
19 TD_H_E = 0 20// TD_H_E = 0
20}; 21// };
21 22//
22qk_tap_dance_action_t tap_dance_actions[] = { 23// qk_tap_dance_action_t tap_dance_actions[] = {
23 [TD_H_E] = ACTION_TAP_DANCE_DOUBLE(KC_HOME, KC_END) 24// [TD_H_E] = ACTION_TAP_DANCE_DOUBLE(KC_HOME, KC_END)
24}; 25// };
25 26
26const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 27const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
27/* Qwerty 28 /* Qwerty
28 * ,-----------------------------------------------------------------------------------. 29 * ,-----------------------------------------------------------------------------------.
29 * | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp | 30 * | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp |
30 * |------+------+------+------+------+-------------+------+------+------+------+------| 31 * |------+------+------+------+------+-------------+------+------+------+------+------|
31 * | Esc | A | S | D | F | G | H | J | K | L | ; | " | 32 * | Esc | A | S | D | F | G | H | J | K | L | ; | " |
32 * |------+------+------+------+------+------|------+------+------+------+------+------| 33 * |------+------+------+------+------+------|------+------+------+------+------+------|
33 * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | 34 * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter |
34 * |------+------+------+------+------+------+------+------+------+------+------+------| 35 * |------+------+------+------+------+------+------+------+------+------+------+------|
35 * | | Ctrl | GUI | Alt |Lower | Space |Raise | Left | Down | Up |Right | 36 * | | Ctrl | GUI | Alt |Lower | Space |Raise | Left | Down | Up |Right |
36 * `-----------------------------------------------------------------------------------' 37 * `-----------------------------------------------------------------------------------'
37 */ 38 */
38[_QWERTY] = KEYMAP( \ 39 [_QWERTY] = KEYMAP( \
39 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ 40 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \
40 KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ 41 KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \
41 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , \ 42 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , \
42 TD(TD_H_E), KC_LCTL, KC_LGUI, KC_LALT, MO(_LOWER), KC_SPC, MO(_RAISE), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ 43 TO(_NUMPAD),KC_LCTL, KC_LGUI, KC_LALT, MO(_LOWER), KC_SPC, MO(_RAISE), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \
43), 44 ),
45
46 /* Lower
47 * ,-----------------------------------------------------------------------------------.
48 * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp |
49 * |------+------+------+------+------+-------------+------+------+------+------+------|
50 * | Del | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | | \ | | |
51 * |------+------+------+------+------+------|------+------+------+------+------+------|
52 * | | F7 | F8 | F9 | F10 | F11 | F12 | RGB | RGB | RGB | RGB |Enter |
53 * |------+------+------+------+------+------+------+------+------+------+------+------|
54 * | | RGB | RGB | RGB | | | Next | Vol- | Vol+ | Play | |
55 * `-----------------------------------------------------------------------------------'
56 */
57 [_LOWER] = KEYMAP( \
58 KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \
59 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \
60 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, _______, \
61 _______, RGB_SAD, RGB_SAI, RGB_HUI, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
62 ),
44 63
45/* Lower 64 /* Raise
46 * ,-----------------------------------------------------------------------------------. 65 * ,-----------------------------------------------------------------------------------.
47 * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp | 66 * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp |
48 * |------+------+------+------+------+-------------+------+------+------+------+------| 67 * |------+------+------+------+------+-------------+------+------+------+------+------|
49 * | Del | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | | \ | | | 68 * | Del | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ |
50 * |------+------+------+------+------+------|------+------+------+------+------+------| 69 * |------+------+------+------+------+------|------+------+------+------+------+------|
51 * | | F7 | F8 | F9 | F10 | F11 | F12 | | | | |Enter | 70 * | | F7 | F8 | F9 | F10 | F11 | F12 | Home | End | PgUp | PgDn |Enter |
52 * |------+------+------+------+------+------+------+------+------+------+------+------| 71 * |------+------+------+------+------+------+------+------+------+------+------+------|
53 * | | | | | | | | Next | Vol- | Vol+ | Play | 72 * | | Prev | Play | Next | | | | Next | Vol- | Vol+ | Play |
54 * `-----------------------------------------------------------------------------------' 73 * `-----------------------------------------------------------------------------------'
55 */ 74 */
56[_LOWER] = KEYMAP( \ 75 [_RAISE] = KEYMAP( \
57 KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \ 76 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \
58 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \ 77 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \
59 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______,_______, _______, _______, \ 78 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_HOME, KC_END, KC_PGUP, KC_PGDN, _______, \
60 BL_TOGG, BL_STEP, BL_BRTG, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ 79 _______, KC_MRWD, KC_MPLY, KC_MNXT, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
61), 80 ),
62 81
63/* Raise 82 /* Numpad
64 * ,-----------------------------------------------------------------------------------. 83 * ,-----------------------------------------------------------------------------------.
65 * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | 84 * | Esc | 7 | 8 | 9 | * | / | | | | | | |
66 * |------+------+------+------+------+-------------+------+------+------+------+------| 85 * |------+------+------+------+------+-------------+------+------+------+------+------|
67 * | Del | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ | 86 * | <-- | 4 | 5 | 6 | + | - | | | | | | |
68 * |------+------+------+------+------+------|------+------+------+------+------+------| 87 * |------+------+------+------+------+------|------+------+------+------+------+------|
69 * | | F7 | F8 | F9 | F10 | F11 | F12 | RGB | RGB | RGB | RGB |Enter | 88 * | | 1 | 2 | 3 |Enter |Enter | | | | | | |
70 * |------+------+------+------+------+------+------+------+------+------+------+------| 89 * |------+------+------+------+------+------+------+------+------+------+------+------|
71 * | RGB | RGB | RGB | RGB | | | | Next | Vol- | Vol+ | Play | 90 * |Qwerty| 0 | . | . |Enter |Enter | | | | | |
72 * `-----------------------------------------------------------------------------------' 91 * `-----------------------------------------------------------------------------------'
73 */ 92 */
74[_RAISE] = KEYMAP( \ 93 [_NUMPAD] = KEYMAP( \
75 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ 94 KC_ESC, KC_P7, KC_P8, KC_P9, KC_PAST, KC_PSLS, _______, _______, _______, _______, _______, _______, \
76 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \ 95 KC_BSPC, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_PMNS, _______, _______, _______, _______, _______, _______, \
77 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, _______, \ 96 _______, KC_P1, KC_P2, KC_P3, KC_PENT, KC_PENT, _______, _______, _______, _______, _______, _______, \
78 RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ 97 TO(_QWERTY),KC_P0, KC_PDOT, KC_PDOT, KC_PENT, _______, _______, _______, _______, _______, _______ \
79) 98 )
80}; 99};
diff --git a/keyboards/jj40/keymaps/krusli/readme.md b/keyboards/jj40/keymaps/krusli/readme.md
index 75a84d0e6..ed760e8a6 100644
--- a/keyboards/jj40/keymaps/krusli/readme.md
+++ b/keyboards/jj40/keymaps/krusli/readme.md
@@ -1,2 +1,4 @@
1# krusli 1# krusli
2Default JJ40 keymap, adapted with RGB underglow support. GUI and LAlt is also swapped. 2JJ40 keymap based off the default Planck layout with a numpad layer and with RGB underglow controls.
3
4GUI and LAlt is also swapped to their standard positions.
diff --git a/keyboards/jj40/keymaps/krusli/rules.mk b/keyboards/jj40/keymaps/krusli/rules.mk
index e5ddcae8d..5c6bb684e 100644
--- a/keyboards/jj40/keymaps/krusli/rules.mk
+++ b/keyboards/jj40/keymaps/krusli/rules.mk
@@ -1 +1 @@
TAP_DANCE_ENABLE = yes # TAP_DANCE_ENABLE = yes
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-18 20:35:14 +0000