aboutsummaryrefslogtreecommitdiff
path: root/keyboards/jj40
diff options
context:
space:
mode:
authorStefano <warste@gmail.com>2020-05-07 01:31:22 +0200
committerGitHub <noreply@github.com>2020-05-07 00:31:22 +0100
commit19513fac5ff7543d116c2808822420d9ac12906f (patch)
treeb84bd4e24eec9240161e609822f1ccc5cb6f92d6 /keyboards/jj40
parent7bb9c76c807ab4aa58c390a88e0bb5bc81955de2 (diff)
downloadqmk_firmware-19513fac5ff7543d116c2808822420d9ac12906f.tar.gz
qmk_firmware-19513fac5ff7543d116c2808822420d9ac12906f.zip
jj28 (jj40 SuperMicro) update (#8885)
* jj28 (jj40 SuperMicro) update * Update keyboards/jj40/keymaps/stevexyz/config.h Co-Authored-By: Joel Challis <git@zvecr.com> * removed jpegs * Update keyboards/jj40/keymaps/stevexyz/keymap.c Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/jj40/keymaps/stevexyz/keymap.c Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/jj40/keymaps/stevexyz/keymap.c Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: stevexyz <warste@removethisandleavegoogle.com> Co-authored-by: Joel Challis <git@zvecr.com>
Diffstat (limited to 'keyboards/jj40')
-rw-r--r--keyboards/jj40/keymaps/stevexyz/config.h12
-rw-r--r--keyboards/jj40/keymaps/stevexyz/keyboard-layout-editor-raw-data.txt4
-rw-r--r--keyboards/jj40/keymaps/stevexyz/keymap.c71
-rw-r--r--keyboards/jj40/keymaps/stevexyz/readme.md5
-rw-r--r--keyboards/jj40/keymaps/stevexyz/rules.mk1
5 files changed, 51 insertions, 42 deletions
diff --git a/keyboards/jj40/keymaps/stevexyz/config.h b/keyboards/jj40/keymaps/stevexyz/config.h
index 4d4825f9b..84c02dddd 100644
--- a/keyboards/jj40/keymaps/stevexyz/config.h
+++ b/keyboards/jj40/keymaps/stevexyz/config.h
@@ -1,6 +1,8 @@
1#pragma once
1 2
2// Behaviors That Can Be Configured 3// Behaviors That Can Be Configured
3 4
5
4#define TAPPING_TERM 250 6#define TAPPING_TERM 250
5 // how long before a tap becomes a hold, if set above 500, a key tapped during the tapping term will turn it into a hold too 7 // how long before a tap becomes a hold, if set above 500, a key tapped during the tapping term will turn it into a hold too
6 8
@@ -9,18 +11,18 @@
9#define IGNORE_MOD_TAP_INTERRUPT 11#define IGNORE_MOD_TAP_INTERRUPT
10 // makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the TAPPING_TERM for both keys. 12 // makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the TAPPING_TERM for both keys.
11 13
14#define TAPPING_FORCE_HOLD
15 // makes it possible to use a dual role key as modifier shortly after having been tapped (see Hold after tap)
16 // Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle)
17
18
12/* 19/*
13 #define TAPPING_TERM_PER_KEY 20 #define TAPPING_TERM_PER_KEY
14 // enables handling for per key TAPPING_TERM settings 21 // enables handling for per key TAPPING_TERM settings
15 #define RETRO_TAPPING 22 #define RETRO_TAPPING
16 // tap anyway, even after TAPPING_TERM, if there was no other key interruption between press and release 23 // tap anyway, even after TAPPING_TERM, if there was no other key interruption between press and release
17 // See Retro Tapping for details
18 #define TAPPING_TOGGLE 2 24 #define TAPPING_TOGGLE 2
19 // how many taps before triggering the toggle 25 // how many taps before triggering the toggle
20 #define TAPPING_FORCE_HOLD
21 // makes it possible to use a dual role key as modifier shortly after having been tapped
22 // See Hold after tap
23 // Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle)
24 #define LEADER_TIMEOUT 300 26 #define LEADER_TIMEOUT 300
25 // how long before the leader key times out 27 // how long before the leader key times out
26 // If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped. 28 // If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped.
diff --git a/keyboards/jj40/keymaps/stevexyz/keyboard-layout-editor-raw-data.txt b/keyboards/jj40/keymaps/stevexyz/keyboard-layout-editor-raw-data.txt
deleted file mode 100644
index 0117b5e2e..000000000
--- a/keyboards/jj40/keymaps/stevexyz/keyboard-layout-editor-raw-data.txt
+++ /dev/null
@@ -1,4 +0,0 @@
1[{c:"#eeddcc",g:true,a:7},"","","","","","","","","","","",""],
2["",{c:"#cccccc",g:false,a:4,fa:[2,1,5,5,8]},"F11\nF1\n!\n1\nQ","F12\nF2\n@\n2\nW","Layer Num\nF3\n#\n3\nE","Layer Light\nF4\n$\n4\nR","\nF5\n%\n5\nT","\nF6\n^\n6\nY","\nF7\n&\n7\nU","\nF8\n*\n8\nI","Layer Mouse\nF9\n(\n9\nO","\nF10\n)\n0\nP",{c:"#eeddcc",g:true,a:7},""],
3["",{c:"#cccccc",t:"#000000\n\n\n\n\n\n\n\n\n\n#804020",g:false,a:4,fa:[2,1,5,5,8,0,2,2,0,0,1]},"Caps\n\n\n\nA\n\nEsc\nTab\n\n\nshift",{fa:[2,2,5,5,8,0,2,2,0,0,1]},"<i class='fa fa-volume-off'></i>\n<i class='fa fa-angle-double-left'></i>\n~\n`\nS\n\n\n\n\n\nfn","<i class='fa fa-volume-down'></i>\n<i class='fa fa-angle-double-down'></i>\n_\n-\nD\n\n\n\n\n\nnum",{t:"#000000"},"<i class='fa fa-volume-up'></i>\n<i class='fa fa-angle-double-up'></i>\n+\n=\nF",{t:"#000000\n\n\n\n\n\n\n\n\n\n#804020"},"<i class='fa fa-play'></i>\n<i class='fa fa-angle-double-right'></i>\n{\n[\nG\n\n\n\n\n\n<i class='fa fa-apple'></i>","<i class='fa fa-step-forward'></i>\n<i class='fa fa-arrow-left'></i>\n}\n]\nH\n\n\n\n\n\n<i class='fa fa-apple'></i>",{t:"#000000"},"\n<i class='fa fa-arrow-down'></i>\n|\n\\\nJ",{t:"#000000\n\n\n\n\n\n\n\n\n\n#804020"},"\n<i class='fa fa-arrow-up'></i>\n:\n;\nK\n\n\n\n\n\nfn","\n<i class='fa fa-arrow-right'></i>\n\"\n'\nL\n\n\n\n\n\nnum",{c:"#eeddcc",f:1,fa:[2,2,5,5,8,0,2,2,0,0,0]},"Ins\n\n\n\n\n\nBS\nDel\n\n\nshift",{t:"#000000",g:true,a:7,f:3},""],
4["","",{c:"#cccccc",t:"#000000\n#804020",g:false,a:5,fa:[0,1,0,0,8]},"\nctrl\n\n\nZ","\nalt\n\n\nX",{t:"#000000\n\n\n\n\n\n\n\n\n\n#804020",a:4,fa:[2,1,0,0,8,0,0,0,0,0,1]},"^\n\n\n\nC\n\n\n\n\n\nfn","^\n\n\n\nV\n\n\n\n\n\nnum",{fa:[2,1,5,5,8,0,0,0,0,0,1]},"Prnt Scrn\n\n<\n,\nB\n\n\n\n\n\nshift","Scr Lock\n\n>\n.\nN\n\n\n\n\n\nalt","Paus\n\n?\n/\nM\n\n\n\n\n\nctrl",{t:"#000000\n#804020",a:5},"\nshift",{c:"#eeddcc",t:"#000000",g:true,a:7},"",""]
diff --git a/keyboards/jj40/keymaps/stevexyz/keymap.c b/keyboards/jj40/keymaps/stevexyz/keymap.c
index 4045d0710..02601a30d 100644
--- a/keyboards/jj40/keymaps/stevexyz/keymap.c
+++ b/keyboards/jj40/keymaps/stevexyz/keymap.c
@@ -22,6 +22,12 @@
22 */ 22 */
23 23
24 24
25/*
26 * Nice to have:
27 * - tap dancing (p=backspace, q=escape, a=tab, vowel=accentedletter and same for consonant as the french c)
28 */
29
30
25#include QMK_KEYBOARD_H 31#include QMK_KEYBOARD_H
26 32
27enum layers { 33enum layers {
@@ -38,20 +44,24 @@ enum custom_keycodes {
38 CK_TRIPLEZERO = SAFE_RANGE, 44 CK_TRIPLEZERO = SAFE_RANGE,
39}; 45};
40 46
47#define CK_CONFIGINIT EEPROM_RESET
48
41enum { 49enum {
42 TD_ENT_BSPC = 0, 50 TD_P_BSPC = 0,
43 TD_KPENT_BSPC, 51 TD_Q_ESC,
44 TD_E_GRAVE, 52 TD_A_TAB,
45 TD_A_GRAVE, 53 TD_A_GRAVE,
54 TD_E_GRAVE,
55 TD_E_ACUTE,
56 TD_I_GRAVE,
46 TD_O_GRAVE, 57 TD_O_GRAVE,
47 TD_U_GRAVE, 58 TD_U_GRAVE,
48 TD_I_GRAVE,
49 TD_E_ACUTE,
50}; 59};
51qk_tap_dance_action_t tap_dance_actions[] = { 60qk_tap_dance_action_t tap_dance_actions[] = {
52 [TD_ENT_BSPC] = ACTION_TAP_DANCE_DOUBLE(KC_ENT, KC_BSPC), 61 [TD_P_BSPC] = ACTION_TAP_DANCE_DOUBLE(KC_P, KC_BSPC),
53 [TD_KPENT_BSPC] = ACTION_TAP_DANCE_DOUBLE(KC_KP_ENTER, KC_BSPC), 62 [TD_Q_ESC] = ACTION_TAP_DANCE_DOUBLE(KC_Q, KC_ESC),
54 [TD_E_GRAVE] = ACTION_TAP_DANCE_DOUBLE(KC_E, KC_E), 63 [TD_A_TAB] = ACTION_TAP_DANCE_DOUBLE(KC_A, KC_TAB),
64 //[TD_E_GRAVE] = ACTION_TAP_DANCE_DOUBLE(KC_E, KC_EGRAVE),
55}; 65};
56 66
57 67
@@ -83,18 +93,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
83 * |------+------+------+------+------+-------------+------+------+------+------+------| 93 * |------+------+------+------+------+-------------+------+------+------+------+------|
84 * | | | | | | | | | | | | | 94 * | | | | | | | | | | | | |
85 * | | A | S | D | F | G | H | J | K | L | Enter| | 95 * | | A | S | D | F | G | H | J | K | L | Enter| |
86 * | | Shift| FnNav|NumSym| ____ | OSkey| OSkey| ____ | FnNav|NumSym| Shift| | 96 * | | Shift| FnNav|NumSym| AltGr| OSkey| OSkey| AltGr| FnNav|NumSym| Shift| |
87 * |------+------+------+------+------+------+------|------+------+------+------+------+ 97 * |------+------+------+------+------+------+------|------+------+------+------+------+
88 * | | | | | | | | | | | | | 98 * | | | | | | | | | | | | |
89 * | | | Z | X | C | V | B | N | M | Space| | | 99 * | | | Z | X | C | V | B | N | M | Space| | |
90 * | | | Ctrl | Alt | FnNav|NumSym| Shift| Alt | Ctrl | Shift| | | 100 * | | | Ctrl | Alt | FnNav|NumSym| Shift| Alt | Ctrl | Shift| | |
91 * `-----------------------------------------------------------------------------------' 101 * `-----------------------------------------------------------------------------------'
92 */ 102 */
93 [LAYER_HOME] = LAYOUT_ortho_4x12( 103 [LAYER_HOME] = LAYOUT_ortho_4x12(
94 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 104 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
95 XXXXXXX, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, XXXXXXX, 105 XXXXXXX, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, XXXXXXX,
96 XXXXXXX, MT(MOD_LSFT, KC_A), LT(LAYER_FUNC, KC_S), LT(LAYER_NUMSYM, KC_D), KC_F, MT(MOD_LGUI, KC_G), MT(MOD_RGUI, KC_H), KC_J, LT(LAYER_FUNC, KC_K), LT(LAYER_NUMSYM, KC_L), MT(MOD_RSFT, KC_ENT), XXXXXXX, 106 XXXXXXX, MT(MOD_LSFT, KC_A), LT(LAYER_FUNC, KC_S), LT(LAYER_NUMSYM, KC_D), MT(MOD_RALT, KC_F), MT(MOD_LGUI, KC_G), MT(MOD_RGUI, KC_H), MT(MOD_RALT, KC_J), LT(LAYER_FUNC, KC_K), LT(LAYER_NUMSYM, KC_L), MT(MOD_RSFT, KC_ENT), XXXXXXX,
97 XXXXXXX, XXXXXXX, MT(MOD_LCTL, KC_Z), MT(MOD_LALT, KC_X), LT(LAYER_FUNC, KC_C), LT(LAYER_NUMSYM, KC_V), MT(MOD_LSFT, KC_B), MT(MOD_RALT, KC_N), MT(MOD_RCTL, KC_M), MT(MOD_RSFT, KC_SPC), XXXXXXX, XXXXXXX ), 107 XXXXXXX, XXXXXXX, MT(MOD_LCTL, KC_Z), MT(MOD_LALT, KC_X), LT(LAYER_FUNC, KC_C), LT(LAYER_NUMSYM, KC_V), MT(MOD_LSFT, KC_B), MT(MOD_LALT, KC_N), MT(MOD_RCTL, KC_M), MT(MOD_RSFT, KC_SPC), XXXXXXX, XXXXXXX ),
98 108
99/* Function and Navigation Layer 109/* Function and Navigation Layer
100 * ,-----------------------------------------------------------------------------------. 110 * ,-----------------------------------------------------------------------------------.
@@ -108,18 +118,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
108 * |------+------+------+------+------+-------------+------+------+------+------+------| 118 * |------+------+------+------+------+-------------+------+------+------+------+------|
109 * | | | | | | | | | | | | | 119 * | | | | | | | | | | | | |
110 * | | ESC | Home | PgDn | PgUp | End | Left | Down | Up | Right| Baksp| | 120 * | | ESC | Home | PgDn | PgUp | End | Left | Down | Up | Right| Baksp| |
111 * | | Shift|xxxxxx|SysLay| ____ | ____ | ____ | ____ |xxxxxx|SysLay| Shift| | 121 * | | Shift| ____ |SysLay| AltGr| OSkey| OSkey| AltGr| ____ |SysLay| Shift| |
112 * |------+------+------+------+------+------+------|------+------+------+------+------+ 122 * |------+------+------+------+------+------+------|------+------+------+------+------+
113 * | | | | | | | | | | | | | 123 * | | | | | | | | | | | | |
114 * | | | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | | | 124 * | | | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | | |
115 * | | | Ctrl | Alt |xxxxxx|SysLay| Shift| Alt | Ctrl | Shift| | | 125 * | | | Ctrl | Alt | ____ |SysLay| Shift| Alt | Ctrl | Shift| | |
116 * `-----------------------------------------------------------------------------------' 126 * `-----------------------------------------------------------------------------------'
117 */ 127 */
118 [LAYER_FUNC] = LAYOUT_ortho_4x12( 128 [LAYER_FUNC] = LAYOUT_ortho_4x12(
119 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 129 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
120 XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX, 130 XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX,
121 XXXXXXX, MT(MOD_LSFT, KC_ESC), KC_HOME, LT(LAYER_SYST, KC_PGDN), KC_PGUP, KC_END, KC_LEFT, KC_DOWN, KC_UP, LT(LAYER_SYST, KC_RGHT), MT(MOD_RSFT, KC_BSPC), XXXXXXX, 131 XXXXXXX, MT(MOD_LSFT, KC_ESC), KC_HOME, LT(LAYER_SYST, KC_PGDN), MT(MOD_RALT, KC_PGUP), MT(MOD_LGUI, KC_END), MT(MOD_RGUI, KC_LEFT), MT(MOD_RALT, KC_DOWN), KC_UP, LT(LAYER_SYST, KC_RGHT), MT(MOD_RSFT, KC_BSPC), XXXXXXX,
122 XXXXXXX, XXXXXXX, KC_LCTL, KC_LALT, KC_TRNS, MO(LAYER_SYST), KC_LSFT, KC_RALT, KC_RCTL, MT(MOD_RSFT, KC_SPC), XXXXXXX, XXXXXXX ), 132 XXXXXXX, XXXXXXX, KC_LCTL, KC_LALT, KC_NO, MO(LAYER_SYST), KC_LSFT, KC_LALT, KC_RCTL, MT(MOD_RSFT, KC_SPC), XXXXXXX, XXXXXXX ),
123 133
124/* Number and Symbols Layer 134/* Number and Symbols Layer
125 * ,-----------------------------------------------------------------------------------. 135 * ,-----------------------------------------------------------------------------------.
@@ -133,18 +143,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
133 * |------+------+------+------+------+-------------+------+------+------+------+------| 143 * |------+------+------+------+------+-------------+------+------+------+------+------|
134 * | | | ~ | _ | + | { | } | | | : | " | | | 144 * | | | ~ | _ | + | { | } | | | : | " | | |
135 * | | TAB | ` | - | = | [ | ] | \ | ; | ' | | | 145 * | | TAB | ` | - | = | [ | ] | \ | ; | ' | | |
136 * | | Shift|SysLay|xxxxxx| ____ | ____ | ____ | ____ |SysLay|xxxxxx| Shift| | 146 * | | Shift|SysLay| ____ | AltGr| OSkey| OSkey| AltGr|SysLay| ____ | Shift| |
137 * |------+------+------+------+------+------+------|------+------+------+------+------+ 147 * |------+------+------+------+------+------+------|------+------+------+------+------+
138 * | | | | | | | < | > | ? | | | | 148 * | | | | | | | < | > | ? | | | |
139 * | | | ____ | ____ | ____ | ____ | , | . | / | ____ | | | 149 * | | | ____ | ____ | ____ | ____ | , | . | / | ____ | | |
140 * | | | Ctrl | Alt |SysLay|xxxxxx| Shift| ____ | ____ | Shift| | | 150 * | | | Ctrl | Alt |SysLay| ____ | Shift| Alt | Ctrl | Shift| | |
141 * `-----------------------------------------------------------------------------------' 151 * `-----------------------------------------------------------------------------------'
142 */ 152 */
143 [LAYER_NUMSYM] = LAYOUT_ortho_4x12( 153 [LAYER_NUMSYM] = LAYOUT_ortho_4x12(
144 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 154 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
145 XXXXXXX, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, XXXXXXX, 155 XXXXXXX, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, XXXXXXX,
146 XXXXXXX, MT(MOD_LSFT, KC_TAB), LT(LAYER_SYST, KC_GRV), KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, LT(LAYER_SYST, KC_SCLN), KC_QUOT, MT(MOD_RSFT, KC_DEL), XXXXXXX, 156 XXXXXXX, MT(MOD_LSFT, KC_TAB), LT(LAYER_SYST, KC_GRV), KC_MINS, MT(MOD_RALT, KC_EQL), MT(MOD_LGUI, KC_LBRC), MT(MOD_RGUI, KC_RBRC), MT(MOD_RALT, KC_BSLS), LT(LAYER_SYST, KC_SCLN), KC_QUOT, MT(MOD_RSFT, KC_DEL), XXXXXXX,
147 XXXXXXX, XXXXXXX, KC_LCTL, KC_LALT, MO(LAYER_SYST), KC_TRNS, MT(MOD_LSFT, KC_COMM), KC_DOT, KC_SLSH, MT(MOD_RSFT, KC_SPC), XXXXXXX, XXXXXXX ), 157 XXXXXXX, XXXXXXX, KC_LCTL, KC_LALT, MO(LAYER_SYST), KC_NO, MT(MOD_LSFT, KC_COMM), MT(MOD_LALT, KC_DOT), MT(MOD_RCTL, KC_SLSH), MT(MOD_RSFT, KC_SPC), XXXXXXX, XXXXXXX ),
148 158
149/* System Layer 159/* System Layer
150 * ,-----------------------------------------------------------------------------------. 160 * ,-----------------------------------------------------------------------------------.
@@ -153,11 +163,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
153 * | | | | | | | | | | | | | 163 * | | | | | | | | | | | | |
154 * |------+------+------+------+------+------+------+------+------+------+------+------| 164 * |------+------+------+------+------+------+------+------+------+------+------+------|
155 * | | | | | | | | | | | | | 165 * | | | | | | | | | | | | |
156 * | | F11 | F12 |NumLay|LghLay| ____ | ____ | ____ | ____ |MouLay|Backsp| | 166 * | | F11 | F12 |NumLay|LghLay| ____ |KbInit| Power|SysReq|MouLay|Backsp| |
157 * | | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | | 167 * | | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | |
158 * |------+------+------+------+------+-------------+------+------+------+------+------| 168 * |------+------+------+------+------+-------------+------+------+------+------+------|
159 * | | | | | | | | | | | | | 169 * | | | | | | | | | | | | |
160 * | | Caps | Mute | Vol- | Vol+ | Play | Next | ____ | ____ | ____ | Ins | | 170 * | | Caps | Mute | Vol- | Vol+ | Play | Next | ____ | ____ |OSMenu| Ins | |
161 * | | Shift| ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | Shift| | 171 * | | Shift| ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | Shift| |
162 * |------+------+------+------+------+------+------|------+------+------+------+------+ 172 * |------+------+------+------+------+------+------|------+------+------+------+------+
163 * | | | | | | | | | | | | | 173 * | | | | | | | | | | | | |
@@ -167,9 +177,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
167 */ 177 */
168 [LAYER_SYST] = LAYOUT_ortho_4x12( 178 [LAYER_SYST] = LAYOUT_ortho_4x12(
169 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 179 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
170 XXXXXXX, KC_F11, KC_F12, TG(LAYER_NUMONLY), TG(LAYER_LIGHTS), KC_NO, KC_NO, KC_NO, KC_NO, TG(LAYER_MOUSE), KC_BSPC, XXXXXXX, 180 XXXXXXX, KC_F11, KC_F12, TG(LAYER_NUMONLY), TG(LAYER_LIGHTS), KC_NO, CK_CONFIGINIT, KC_POWER, KC_SYSREQ, TG(LAYER_MOUSE), KC_BSPC, XXXXXXX,
171 XXXXXXX, MT(MOD_LSFT, KC_CAPS), KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY, KC_MNXT, KC_NO, KC_NO, KC_NO, MT(MOD_RSFT, KC_INS), XXXXXXX, 181 XXXXXXX, MT(MOD_LSFT, KC_CAPS), KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY, KC_MNXT, KC_NO, KC_NO, KC_APP, MT(MOD_RSFT, KC_INS), XXXXXXX,
172 XXXXXXX, XXXXXXX, KC_LCTL, KC_LALT, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, MT(MOD_RSFT, KC_SPC), XXXXXXX, XXXXXXX ), 182 XXXXXXX, XXXXXXX, KC_LCTL, KC_LALT, KC_NO, KC_NO, KC_PSCR, KC_SLCK, KC_PAUS, MT(MOD_RSFT, KC_SPC), XXXXXXX, XXXXXXX ),
173 183
174/* Numeric Keypad 184/* Numeric Keypad
175 * ,-----------------------------------------------------------------------------------. 185 * ,-----------------------------------------------------------------------------------.
@@ -233,7 +243,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
233 * |------+------+------+------+------+-------------+------+------+------+------+------| 243 * |------+------+------+------+------+-------------+------+------+------+------+------|
234 * | | | | | | | | | | | | | 244 * | | | | | | | | | | | | |
235 * | | Left | Down | Right| Whl- | ____ | ____ | ____ | ____ | ____ | Enter| | 245 * | | Left | Down | Right| Whl- | ____ | ____ | ____ | ____ | ____ | Enter| |
236 * | | ____ | ____ | ____ | ____ | OSkey| OSkey| ____ | ____ | ____ | ____ | | 246 * | | ____ | ____ | ____ | ____ | OSkey| OSkey| AltGr| ____ | ____ | ____ | |
237 * |------+------+------+------+------+------+------|------+------+------+------+------+ 247 * |------+------+------+------+------+------+------|------+------+------+------+------+
238 * | | | | | | | | | | | | | 248 * | | | | | | | | | | | | |
239 * | | | ____ | ____ | ____ | ____ | ____ | ____ | ____ | Space| | | 249 * | | | ____ | ____ | ____ | ____ | ____ | ____ | ____ | Space| | |
@@ -243,14 +253,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
243 [LAYER_MOUSE] = LAYOUT_ortho_4x12( 253 [LAYER_MOUSE] = LAYOUT_ortho_4x12(
244 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 254 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
245 XXXXXXX, KC_MS_BTN1, KC_MS_UP, KC_MS_BTN2, KC_MS_WH_UP, KC_MS_ACCEL0, KC_MS_ACCEL1, KC_MS_ACCEL2, KC_NO, TG(LAYER_MOUSE), KC_NO, XXXXXXX, 255 XXXXXXX, KC_MS_BTN1, KC_MS_UP, KC_MS_BTN2, KC_MS_WH_UP, KC_MS_ACCEL0, KC_MS_ACCEL1, KC_MS_ACCEL2, KC_NO, TG(LAYER_MOUSE), KC_NO, XXXXXXX,
246 XXXXXXX, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_MS_WH_DOWN, KC_LGUI, KC_RGUI, KC_NO, KC_NO, KC_NO, KC_ENT, XXXXXXX, 256 XXXXXXX, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_MS_WH_DOWN, KC_LGUI, KC_RGUI, KC_RALT, KC_NO, KC_NO, KC_ENT, XXXXXXX,
247 XXXXXXX, XXXXXXX, KC_LCTL, KC_LALT, KC_NO, KC_NO, KC_LSFT, KC_RALT, KC_RCTL, MT(MOD_RSFT, KC_SPC), XXXXXXX, XXXXXXX ), 257 XXXXXXX, XXXXXXX, KC_LCTL, KC_LALT, KC_NO, KC_NO, KC_LSFT, KC_LALT, KC_RCTL, MT(MOD_RSFT, KC_SPC), XXXXXXX, XXXXXXX ),
248 258
249}; 259};
250 260
251 261
252void matrix_init_user(void) { 262void matrix_init_user(void) {
253 // set num lock on at start independently of state (for numonly layer to work) 263 // eeconfig_init(); // reset keyboard to a standard default state; useful when new releases messup with eeprom values
264 // set num lock on at start (for numonly layer to work)
254 if (!(host_keyboard_leds() & (1<<USB_LED_NUM_LOCK))) { 265 if (!(host_keyboard_leds() & (1<<USB_LED_NUM_LOCK))) {
255 SEND_STRING(SS_TAP(X_NUMLOCK)); //register_code(KC_NUMLOCK); unregister_code(KC_NUMLOCK); 266 SEND_STRING(SS_TAP(X_NUMLOCK)); //register_code(KC_NUMLOCK); unregister_code(KC_NUMLOCK);
256 } 267 }
diff --git a/keyboards/jj40/keymaps/stevexyz/readme.md b/keyboards/jj40/keymaps/stevexyz/readme.md
index d404bcc0b..4b09f0f1b 100644
--- a/keyboards/jj40/keymaps/stevexyz/readme.md
+++ b/keyboards/jj40/keymaps/stevexyz/readme.md
@@ -1,6 +1,7 @@
1# jj28 (aka jj40 super micro edition :)) 1# jj28 (aka jj40 super micro edition :))
2 2
3With this configuration a 4x12 jj40 (with 48 keys) is transformed into an ortholinear PyroL-vderm 28 keys inspired layout one. This keyboard can be actually called jj28! 3With this configuration a 4x12 jj40 (with 48 keys) is being removed 20 keys and transformed into an ortholinear Alpha28 PyroL-vderm 28 keys inspired layout one.
4This keyboard can be actually called jj28!
4 5
5![Bare layout](https://i.ibb.co/7GK1LY7/layout-0.jpg) 6![Bare layout](https://i.ibb.co/7GK1LY7/layout-0.jpg)
6 7
@@ -15,6 +16,6 @@ Surely you have an additional option, and personally, after using it as a daily
15 16
16Notes on layout: 17Notes on layout:
17After few tests I found out that the space at the end is the best for people that are very used to “standard” keyboards (basically almost everybody), retaining years of muscle memory. 18After few tests I found out that the space at the end is the best for people that are very used to “standard” keyboards (basically almost everybody), retaining years of muscle memory.
18Moreover, also shift, fn and numsym layer keys are good to be replicated on central line (and also keeping in the order will allow a single finger shift+fn on the left and also shift+num on the right). 19And moreover, also shift, fn and numsym layer keys are good to be replicated on central line.
19 20
20[Keyboard layout editor](http://www.keyboard-layout-editor.com/#/) raw data in keyboard-layout-editor-raw-data.txt file. 21[Keyboard layout editor](http://www.keyboard-layout-editor.com/#/) raw data in keyboard-layout-editor-raw-data.txt file.
diff --git a/keyboards/jj40/keymaps/stevexyz/rules.mk b/keyboards/jj40/keymaps/stevexyz/rules.mk
index 612e5d775..1e4d0dedf 100644
--- a/keyboards/jj40/keymaps/stevexyz/rules.mk
+++ b/keyboards/jj40/keymaps/stevexyz/rules.mk
@@ -8,7 +8,6 @@ COMMAND_ENABLE = no # Commands for debug and configuration
8NKRO_ENABLE = no # USB Nkey Rollover (see: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work) 8NKRO_ENABLE = no # USB Nkey Rollover (see: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work)
9BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality on B7 by default 9BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality on B7 by default
10RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow 10RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
11RGBLIGHT_CUSTOM_DRIVER = yes
12MIDI_ENABLE = no # MIDI support (+2400 to 4200, depending on config) 11MIDI_ENABLE = no # MIDI support (+2400 to 4200, depending on config)
13UNICODE_ENABLE = no # Unicode 12UNICODE_ENABLE = no # Unicode
14BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID 13BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID