aboutsummaryrefslogtreecommitdiff
path: root/keyboards/helix
diff options
context:
space:
mode:
authorYasuhiro SHIMIZU <the.phantom.bane@gmail.com>2020-05-26 12:16:03 +0900
committerGitHub <noreply@github.com>2020-05-25 20:16:03 -0700
commitba5e1f1bae1d724ab9b08229c2ce89d8d7714706 (patch)
treee6e5c1895ed55ebee09edc9d58d7867ae93c1e59 /keyboards/helix
parente4823aadec24bca0ecfd1184562d27a49fd20544 (diff)
downloadqmk_firmware-ba5e1f1bae1d724ab9b08229c2ce89d8d7714706.tar.gz
qmk_firmware-ba5e1f1bae1d724ab9b08229c2ce89d8d7714706.zip
[Keymap] update helix/rev2:yshrsmz keymap (#9047)
* update helix keymap * use set_single_persistent_default_layer
Diffstat (limited to 'keyboards/helix')
-rw-r--r--keyboards/helix/rev2/keymaps/yshrsmz/config.h4
-rw-r--r--keyboards/helix/rev2/keymaps/yshrsmz/keymap.c334
-rw-r--r--keyboards/helix/rev2/keymaps/yshrsmz/rules.mk3
3 files changed, 206 insertions, 135 deletions
diff --git a/keyboards/helix/rev2/keymaps/yshrsmz/config.h b/keyboards/helix/rev2/keymaps/yshrsmz/config.h
index d70f23c3e..b8c1041cd 100644
--- a/keyboards/helix/rev2/keymaps/yshrsmz/config.h
+++ b/keyboards/helix/rev2/keymaps/yshrsmz/config.h
@@ -17,10 +17,10 @@ GNU General Public License for more details.
17You should have received a copy of the GNU General Public License 17You should have received a copy of the GNU General Public License
18along with this program. If not, see <http://www.gnu.org/licenses/>. 18along with this program. If not, see <http://www.gnu.org/licenses/>.
19*/ 19*/
20
20#pragma once 21#pragma once
21 22
22/* auto shift config */ 23// place overrides here
23#define AUTO_SHIFT_TIMEOUT 150
24 24
25// If you need more program area, try select and reduce rgblight modes to use. 25// If you need more program area, try select and reduce rgblight modes to use.
26 26
diff --git a/keyboards/helix/rev2/keymaps/yshrsmz/keymap.c b/keyboards/helix/rev2/keymaps/yshrsmz/keymap.c
index e5b5f57d9..bd8796d06 100644
--- a/keyboards/helix/rev2/keymaps/yshrsmz/keymap.c
+++ b/keyboards/helix/rev2/keymaps/yshrsmz/keymap.c
@@ -11,7 +11,6 @@
11 #include "ssd1306.h" 11 #include "ssd1306.h"
12#endif 12#endif
13 13
14extern keymap_config_t keymap_config;
15 14
16#ifdef RGBLIGHT_ENABLE 15#ifdef RGBLIGHT_ENABLE
17//Following line allows macro to read current RGB settings 16//Following line allows macro to read current RGB settings
@@ -26,20 +25,24 @@ extern uint8_t is_master;
26// entirely and just use numbers. 25// entirely and just use numbers.
27enum layer_number { 26enum layer_number {
28 _QWERTY = 0, 27 _QWERTY = 0,
28 _COLEMAK,
29 _DVORAK,
29 _LOWER, 30 _LOWER,
30 _RAISE, 31 _RAISE,
31 _FUNC,
32 _ADJUST 32 _ADJUST
33}; 33};
34 34
35enum custom_keycodes { 35enum custom_keycodes {
36 QWERTY = SAFE_RANGE, 36 QWERTY = SAFE_RANGE,
37 COLEMAK,
38 DVORAK,
37 LOWER, 39 LOWER,
38 RAISE, 40 RAISE,
39 FUNC,
40 ADJUST, 41 ADJUST,
42 BACKLIT,
41 EISU, 43 EISU,
42 KANA 44 KANA,
45 RGBRST
43}; 46};
44 47
45enum macro_keycodes { 48enum macro_keycodes {
@@ -54,85 +57,106 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
54 57
55 /* Qwerty 58 /* Qwerty
56 * ,-----------------------------------------. ,-----------------------------------------. 59 * ,-----------------------------------------. ,-----------------------------------------.
57 * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | = | 60 * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Del |
58 * |------+------+------+------+------+------| |------+------+------+------+------+------| 61 * |------+------+------+------+------+------| |------+------+------+------+------+------|
59 * | Tab | Q | W | E | R | T | | Y | U | I | O | P | - | 62 * | Tab | Q | W | E | R | T | | Y | U | I | O | P | Bksp |
60 * |------+------+------+------+------+------| |------+------+------+------+------+------| 63 * |------+------+------+------+------+------| |------+------+------+------+------+------|
61 * | ESC | A | S | D | F | G | | H | J | K | L | ; | ' | 64 * | Ctrl | A | S | D | F | G | | H | J | K | L | ; | ' |
62 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| 65 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
63 * |Shift | Z | X | C | V | B | Fn | Fn | N | M | , | . | / |Shift | 66 * | Shift| Z | X | C | V | B | [ | ] | N | M | , | . | / |Enter |
64 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| 67 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
65 * | EISU | Ctrl | Alt | GUI |Lower |Space | Bksp |Enter |Space |Raise | GUI | Alt | Ctrl | KANA | 68 * |Adjust| Esc | Alt | GUI | EISU |Lower |Space |Space |Raise | KANA | Left | Down | Up |Right |
66 * `-------------------------------------------------------------------------------------------------' 69 * `-------------------------------------------------------------------------------------------------'
67 */ 70 */
68 [_QWERTY] = LAYOUT( \ 71 [_QWERTY] = LAYOUT( \
69 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_EQL, \ 72 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, \
70 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, \ 73 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \
71 KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ 74 KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \
72 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, FUNC, FUNC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , \ 75 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LBRC, KC_RBRC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , \
73 EISU, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_BSPC, KC_ENT, KC_SPC, RAISE, KC_RGUI, KC_RALT, KC_RCTL, KANA \ 76 ADJUST, KC_ESC, KC_LALT, KC_LGUI, EISU, LOWER, KC_SPC, KC_SPC, RAISE, KANA, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \
74 ), 77 ),
75 78
76 /* Lower 79 /* Colemak
77 * ,-----------------------------------------. ,-----------------------------------------. 80 * ,-----------------------------------------. ,-----------------------------------------.
78 * | ~ | ! | @ | # | $ | % | | ^ | & | * | ( | ) | | 81 * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Del |
79 * |------+------+------+------+------+------| |------+------+------+------+------+------| 82 * |------+------+------+------+------+------| |------+------+------+------+------+------|
80 * | ~ | ! | @ | # | $ | % | | ^ | & | * | ( | ) | | 83 * | Tab | Q | W | F | P | G | | J | L | U | Y | ; | Bksp |
81 * |------+------+------+------+------+------| |------+------+------+------+------+------| 84 * |------+------+------+------+------+------| |------+------+------+------+------+------|
82 * | Del | F1 | F2 | F3 | F4 | F5 | | F6 | _ | + | { | } | | | 85 * | Ctrl | A | R | S | T | D | | H | N | E | I | O | ' |
83 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| 86 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
84 * | | F7 | F8 | F9 | F10 | F11 | | | F12 | | | | | | 87 * | Shift| Z | X | C | V | B | [ | ] | K | M | , | . | / |Enter |
85 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| 88 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
86 * | | | | | | | | | | | Next | Vol- | Vol+ | Play | 89 * |Adjust| Esc | Alt | GUI | EISU |Lower |Space |Space |Raise | KANA | Left | Down | Up |Right |
87 * `-------------------------------------------------------------------------------------------------' 90 * `-------------------------------------------------------------------------------------------------'
88 */ 91 */
89 [_LOWER] = LAYOUT( \ 92 [_COLEMAK] = LAYOUT( \
90 KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, \ 93 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, \
91 KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, \ 94 KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, \
92 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \ 95 KC_LCTL, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, \
93 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, _______, _______, KC_F12, _______, _______, _______, _______, _______, \ 96 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LBRC, KC_RBRC, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , \
94 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ 97 ADJUST, KC_ESC, KC_LALT, KC_LGUI, EISU, LOWER, KC_SPC, KC_SPC, RAISE, KANA, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \
95 ), 98 ),
96 99
97 /* Raise 100 /* Dvorak
98 * ,-----------------------------------------. ,-----------------------------------------. 101 * ,-----------------------------------------. ,-----------------------------------------.
99 * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Bksp | 102 * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Bksp |
100 * |------+------+------+------+------+------| |------+------+------+------+------+------| 103 * |------+------+------+------+------+------| |------+------+------+------+------+------|
101 * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Del | 104 * | Tab | ' | , | . | P | Y | | F | G | C | R | L | Del |
102 * |------+------+------+------+------+------| |------+------+------+------+------+------| 105 * |------+------+------+------+------+------| |------+------+------+------+------+------|
103 * | Del | F1 | F2 | F3 | F4 | F5 | | F6 | - | = | [ | ] | \ | 106 * | Ctrl | A | O | E | U | I | | D | H | T | N | S | / |
104 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| 107 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
105 * | | F7 | F8 | F9 | F10 | F11 | | | F12 | | | | | | 108 * | Shift| ; | Q | J | K | X | [ | ] | B | M | W | V | Z |Enter |
106 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| 109 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
107 * | | | | | | | | | | | Next | Vol- | Vol+ | Play | 110 * |Adjust| Esc | Alt | GUI | EISU |Lower |Space |Space |Raise | KANA | Left | Down | Up |Right |
108 * `-------------------------------------------------------------------------------------------------' 111 * `-------------------------------------------------------------------------------------------------'
109 */ 112 */
110 [_RAISE] = LAYOUT( \ 113 [_DVORAK] = LAYOUT( \
111 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ 114 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \
112 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, \ 115 KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_DEL, \
113 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \ 116 KC_LCTL, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH, \
114 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, _______, _______, KC_F12, _______, _______, _______, _______, _______, \ 117 KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_LBRC, KC_RBRC, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_ENT , \
118 ADJUST, KC_ESC, KC_LALT, KC_LGUI, EISU, LOWER, KC_SPC, KC_SPC, RAISE, KANA, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \
119 ),
120
121 /* Lower
122 * ,-----------------------------------------. ,-----------------------------------------.
123 * | ~ | ! | @ | # | $ | % | | ^ | & | * | ( | ) | |
124 * |------+------+------+------+------+------| |------+------+------+------+------+------|
125 * | ~ | ! | @ | # | $ | % | | ^ | & | * | ( | ) | |
126 * |------+------+------+------+------+------| |------+------+------+------+------+------|
127 * | | F1 | F2 | F3 | F4 | F5 | | F6 | _ | + | { | } | | |
128 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
129 * | | F7 | F8 | F9 | F10 | F11 | ( | ) | F12 | | | Home | End | |
130 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
131 * | | | | | | | | | | | Next | Vol- | Vol+ | Play |
132 * `-------------------------------------------------------------------------------------------------'
133 */
134 [_LOWER] = LAYOUT( \
135 KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, \
136 KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, \
137 _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \
138 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_LPRN, KC_RPRN, KC_F12, _______, _______, KC_HOME, KC_END, _______, \
115 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ 139 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
116 ), 140 ),
117 141
118 /* Func 142 /* Raise
119 * ,-----------------------------------------. ,-----------------------------------------. 143 * ,-----------------------------------------. ,-----------------------------------------.
120 * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Bksp | 144 * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Bksp |
121 * |------+------+------+------+------+------| |------+------+------+------+------+------| 145 * |------+------+------+------+------+------| |------+------+------+------+------+------|
122 * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Del | 146 * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Del |
123 * |------+------+------+------+------+------| |------+------+------+------+------+------| 147 * |------+------+------+------+------+------| |------+------+------+------+------+------|
124 * | | | | | | | | LEFT | DOWN | UP |RIGHT | PGUP | | 148 * | | F1 | F2 | F3 | F4 | F5 | | F6 | - | = | [ | ] | \ |
125 * |------+------+------+------+------+------|------+------|------+------+------+------+------+------| 149 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
126 * | | | | | | | | | HOME | END |Alt+← |Alt+→ | PGDN | | 150 * | | F7 | F8 | F9 | F10 | F11 | | | F12 | | |PageDn|PageUp| |
127 * |------+------+------+------+------+------+-------------+------+------+------+------+------+------| 151 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
128 * | | | | | | | | | | | Next | Vol- | Vol+ | Play | 152 * | | | | | | | | | | | Next | Vol- | Vol+ | Play |
129 * `-------------------------------------------------------------------------------------------------' 153 * `-------------------------------------------------------------------------------------------------'
130 */ 154 */
131 [_FUNC] = LAYOUT( \ 155 [_RAISE] = LAYOUT( \
132 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ 156 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \
133 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, \ 157 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, \
134 _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_PGUP, _______, \ 158 _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \
135 _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_END, LALT(KC_LEFT), LALT(KC_RGHT), KC_PGDN, _______, \ 159 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, _______, _______, KC_F12, _______, _______, KC_PGDN, KC_PGUP, _______, \
136 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ 160 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
137 ), 161 ),
138 162
@@ -140,9 +164,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
140 * ,-----------------------------------------. ,-----------------------------------------. 164 * ,-----------------------------------------. ,-----------------------------------------.
141 * | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | 165 * | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 |
142 * |------+------+------+------+------+------| |------+------+------+------+------+------| 166 * |------+------+------+------+------+------| |------+------+------+------+------+------|
143 * | | Reset| | | | | | | | | | | Del | 167 * | | Reset|RGBRST| | | | | | | | | | Del |
144 * |------+------+------+------+------+------| |------+------+------+------+------+------| 168 * |------+------+------+------+------+------| |------+------+------+------+------+------|
145 * | | | |Aud on|Audoff| Mac | | Win |Qwerty| | | | | 169 * | | | |Aud on|Audoff| Mac | | Win |Qwerty|Colemk|Dvorak| | |
146 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| 170 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
147 * | | | | | | | | | | |RGB ON| HUE+ | SAT+ | VAL+ | 171 * | | | | | | | | | | |RGB ON| HUE+ | SAT+ | VAL+ |
148 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| 172 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
@@ -151,8 +175,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
151 */ 175 */
152 [_ADJUST] = LAYOUT( \ 176 [_ADJUST] = LAYOUT( \
153 KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \ 177 KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \
154 _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \ 178 _______, RESET, RGBRST, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \
155 _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, _______, _______, _______, _______, \ 179 _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, \
156 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, \ 180 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, \
157 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD \ 181 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD \
158 ) 182 )
@@ -164,81 +188,99 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
164 188
165 /* Qwerty 189 /* Qwerty
166 * ,-----------------------------------------. ,-----------------------------------------. 190 * ,-----------------------------------------. ,-----------------------------------------.
167 * | = | Q | W | E | R | T | | Y | U | I | O | P | - | 191 * | Tab | Q | W | E | R | T | | Y | U | I | O | P | Bksp |
168 * |------+------+------+------+------+------| |------+------+------+------+------+------| 192 * |------+------+------+------+------+------| |------+------+------+------+------+------|
169 * | Esc | A | S | D | F | G | | H | J | K | L | ; | ' | 193 * | Ctrl | A | S | D | F | G | | H | J | K | L | ; | ' |
170 * |------+------+------+------+------+------| |------+------+------+------+------+------| 194 * |------+------+------+------+------+------| |------+------+------+------+------+------|
171 * | Shift| Z | X | C | V | B | | N | M | , | . | / |Enter | 195 * | Shift| Z | X | C | V | B | | N | M | , | . | / |Enter |
172 * |------+------+------+------+------+------+-------------+------+------+------+------+------+------| 196 * |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
173 * | EISU | Ctrl | Alt | GUI |ESC/Lower | Func | Bksp |Enter |Space |Raise | GUI | Alt | Ctrl | KANA | 197 * |Adjust| Esc | Alt | GUI | EISU |Lower |Space |Space |Raise | KANA | Left | Down | Up |Right |
174 * `-------------------------------------------------------------------------------------------------' 198 * `-------------------------------------------------------------------------------------------------'
175 */ 199 */
176 [_QWERTY] = LAYOUT( \ 200 [_QWERTY] = LAYOUT( \
177 KC_EQL, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, \ 201 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \
178 KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ 202 KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \
179 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , \ 203 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , \
180 EISU, KC_LCTL, KC_LALT, KC_LGUI, LT(_LOWER, KC_ESC), FUNC, KC_BSPC, KC_ENT, KC_SPC, RAISE, KC_RGUI, KC_RALT, KC_RCTL, KANA \ 204 ADJUST, KC_ESC, KC_LALT, KC_LGUI, EISU, LOWER, KC_SPC, KC_SPC, RAISE, KANA, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \
181 ), 205 ),
182 206
183 /* Lower 207 /* Colemak
184 * ,-----------------------------------------. ,-----------------------------------------. 208 * ,-----------------------------------------. ,-----------------------------------------.
185 * | ~ | ! | @ | # | $ | % | | ^ | & | * | ( | ) | | 209 * | Tab | Q | W | F | P | G | | J | L | U | Y | ; | Bksp |
186 * |------+------+------+------+------+------| |------+------+------+------+------+------| 210 * |------+------+------+------+------+------| |------+------+------+------+------+------|
187 * | Del | F1 | F2 | F3 | F4 | F5 | | F6 | _ | + | { | } | | | 211 * | Ctrl | A | R | S | T | D | | H | N | E | I | O | ' |
188 * |------+------+------+------+------+------| |------+------+------+------+------+------| 212 * |------+------+------+------+------+------| |------+------+------+------+------+------|
189 * | | F7 | F8 | F9 | F10 | F11 | | F12 | | | | | | 213 * | Shift| Z | X | C | V | B | | K | M | , | . | / |Enter |
190 * |------+------+------+------+------+------+-------------+------+------+------+------+------+------| 214 * |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
191 * | | | | | | | | | | | Next | Vol- | Vol+ | Play | 215 * |Adjust| Esc | Alt | GUI | EISU |Lower |Space |Space |Raise | KANA | Left | Down | Up |Right |
192 * `-------------------------------------------------------------------------------------------------' 216 * `-------------------------------------------------------------------------------------------------'
193 */ 217 */
194 [_LOWER] = LAYOUT( \ 218 [_COLEMAK] = LAYOUT( \
195 KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, \ 219 KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, \
196 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \ 220 KC_LCTL, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, \
197 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, \ 221 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , \
198 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ 222 ADJUST, KC_ESC, KC_LALT, KC_LGUI, EISU, LOWER, KC_SPC, KC_SPC, RAISE, KANA, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \
199 ), 223 ),
200 224
201 /* Raise 225 /* Dvorak
226 * ,-----------------------------------------. ,-----------------------------------------.
227 * | Tab | ' | , | . | P | Y | | F | G | C | R | L | Del |
228 * |------+------+------+------+------+------| |------+------+------+------+------+------|
229 * | Ctrl | A | O | E | U | I | | D | H | T | N | S | / |
230 * |------+------+------+------+------+------| |------+------+------+------+------+------|
231 * | Shift| ; | Q | J | K | X | | B | M | W | V | Z |Enter |
232 * |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
233 * |Adjust| Esc | Alt | GUI | EISU |Lower |Space |Space |Raise | KANA | Left | Down | Up |Right |
234 * `-------------------------------------------------------------------------------------------------'
235 */
236 [_DVORAK] = LAYOUT( \
237 KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_DEL, \
238 KC_LCTL, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH, \
239 KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_ENT , \
240 ADJUST, KC_ESC, KC_LALT, KC_LGUI, EISU, LOWER, KC_SPC, KC_SPC, RAISE, KANA, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \
241 ),
242
243 /* Lower
202 * ,-----------------------------------------. ,-----------------------------------------. 244 * ,-----------------------------------------. ,-----------------------------------------.
203 * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | | 245 * | ~ | ! | @ | # | $ | % | | ^ | & | * | ( | ) | |
204 * |------+------+------+------+------+------| |------+------+------+------+------+------| 246 * |------+------+------+------+------+------| |------+------+------+------+------+------|
205 * | Del | F1 | F2 | F3 | F4 | F5 | | F6 | - | = | [ | ] | \ | 247 * | | F1 | F2 | F3 | F4 | F5 | | F6 | _ | + | { | } | | |
206 * |------+------+------+------+------+------| |------+------+------+------+------+------| 248 * |------+------+------+------+------+------| |------+------+------+------+------+------|
207 * | | F7 | F8 | F9 | F10 | F11 | | F12 | | | | | | 249 * | | F7 | F8 | F9 | F10 | F11 | | F12 | | | Home | End | |
208 * |------+------+------+------+------+------+-------------+------+------+------+------+------+------| 250 * |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
209 * | | | | | | | | | | | Next | Vol- | Vol+ | Play | 251 * | | | | | | | | | | | Next | Vol- | Vol+ | Play |
210 * `-------------------------------------------------------------------------------------------------' 252 * `-------------------------------------------------------------------------------------------------'
211 */ 253 */
212 [_RAISE] = LAYOUT( \ 254 [_LOWER] = LAYOUT( \
213 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, \ 255 KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, \
214 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \ 256 _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \
215 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, \ 257 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_HOME, KC_END, _______, \
216 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ 258 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
217 ), 259 ),
218 260
219 /* Func 261 /* Raise
220 * ,-----------------------------------------. ,-----------------------------------------. 262 * ,-----------------------------------------. ,-----------------------------------------.
221 * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Del | 263 * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Del |
222 * |------+------+------+------+------+------| |------+------+------+------+------+------| 264 * |------+------+------+------+------+------| |------+------+------+------+------+------|
223 * | | | | | | | | LEFT | DOWN | UP |RIGHT | PGUP | | 265 * | | F1 | F2 | F3 | F4 | F5 | | F6 | - | = | [ | ] | \ |
224 * |------+------+------+------+------+------| |------+------+------+------+------+------| 266 * |------+------+------+------+------+------| |------+------+------+------+------+------|
225 * | | | | | | | | HOME | END |Alt+← |Alt+→ | PGDN | | 267 * | | F7 | F8 | F9 | F10 | F11 | | F12 | | |PageDn|PageUp| |
226 * |------+------+------+------+------+------+-------------+------+------+------+------+------+------| 268 * |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
227 * | | | | | | | | | | | Next | Vol- | Vol+ | Play | 269 * | | | | | | | | | | | Next | Vol- | Vol+ | Play |
228 * `-------------------------------------------------------------------------------------------------' 270 * `-------------------------------------------------------------------------------------------------'
229 */ 271 */
230 [_FUNC] = LAYOUT( \ 272 [_RAISE] = LAYOUT( \
231 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, \ 273 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, \
232 _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_PGUP, _______, \ 274 _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \
233 _______, _______, _______, _______, _______, _______, KC_HOME, KC_END, LALT(KC_LEFT), LALT(KC_RGHT), KC_PGDN, _______, \ 275 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_PGDN, KC_PGUP, _______, \
234 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ 276 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
235 ), 277 ),
236 278
237 /* Adjust (Lower + Raise) 279 /* Adjust (Lower + Raise)
238 * ,-----------------------------------------. ,-----------------------------------------. 280 * ,-----------------------------------------. ,-----------------------------------------.
239 * | | Reset| | | | | | | | | | | Del | 281 * | | Reset|RGBRST| | | | | | | | | | Del |
240 * |------+------+------+------+------+------| |------+------+------+------+------+------| 282 * |------+------+------+------+------+------| |------+------+------+------+------+------|
241 * | | | |Aud on|Audoff| Mac | | Win |Qwerty| | | | | 283 * | | | |Aud on|Audoff| Mac | | Win |Qwerty|Colemk|Dvorak| | |
242 * |------+------+------+------+------+------| |------+------+------+------+------+------| 284 * |------+------+------+------+------+------| |------+------+------+------+------+------|
243 * | | | | | | | | | |RGB ON| HUE+ | SAT+ | VAL+ | 285 * | | | | | | | | | |RGB ON| HUE+ | SAT+ | VAL+ |
244 * |------+------+------+------+------+------+-------------+------+------+------+------+------+------| 286 * |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
@@ -246,8 +288,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
246 * `-------------------------------------------------------------------------------------------------' 288 * `-------------------------------------------------------------------------------------------------'
247 */ 289 */
248 [_ADJUST] = LAYOUT( \ 290 [_ADJUST] = LAYOUT( \
249 _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \ 291 _______, RESET, RGBRST, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \
250 _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, _______, _______, _______, _______, \ 292 _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, \
251 _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, \ 293 _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, \
252 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD \ 294 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD \
253 ) 295 )
@@ -272,11 +314,6 @@ float music_scale[][2] = SONG(MUSIC_SCALE_SOUND);
272bool TOG_STATUS = false; 314bool TOG_STATUS = false;
273int RGB_current_mode; 315int RGB_current_mode;
274 316
275void persistent_default_layer_set(uint16_t default_layer) {
276 eeconfig_update_default_layer(default_layer);
277 default_layer_set(default_layer);
278}
279
280// Setting ADJUST layer RGB back to default 317// Setting ADJUST layer RGB back to default
281void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) { 318void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
282 if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) { 319 if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) {
@@ -296,7 +333,25 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
296 #ifdef AUDIO_ENABLE 333 #ifdef AUDIO_ENABLE
297 PLAY_SONG(tone_qwerty); 334 PLAY_SONG(tone_qwerty);
298 #endif 335 #endif
299 persistent_default_layer_set(1UL<<_QWERTY); 336 set_single_persistent_default_layer(_QWERTY);
337 }
338 return false;
339 break;
340 case COLEMAK:
341 if (record->event.pressed) {
342 #ifdef AUDIO_ENABLE
343 PLAY_SONG(tone_colemak);
344 #endif
345 set_single_persistent_default_layer(_COLEMAK);
346 }
347 return false;
348 break;
349 case DVORAK:
350 if (record->event.pressed) {
351 #ifdef AUDIO_ENABLE
352 PLAY_SONG(tone_dvorak);
353 #endif
354 set_single_persistent_default_layer(_DVORAK);
300 } 355 }
301 return false; 356 return false;
302 break; 357 break;
@@ -346,14 +401,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
346 } 401 }
347 return false; 402 return false;
348 break; 403 break;
349 case FUNC:
350 if (record->event.pressed) {
351 layer_on(_FUNC);
352 } else {
353 layer_off(_FUNC);
354 }
355 return false;
356 break;
357 case ADJUST: 404 case ADJUST:
358 if (record->event.pressed) { 405 if (record->event.pressed) {
359 layer_on(_ADJUST); 406 layer_on(_ADJUST);
@@ -397,6 +444,15 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
397 } 444 }
398 return false; 445 return false;
399 break; 446 break;
447 case RGBRST:
448 #ifdef RGBLIGHT_ENABLE
449 if (record->event.pressed) {
450 eeconfig_update_rgblight_default();
451 rgblight_enable();
452 RGB_current_mode = rgblight_config.mode;
453 }
454 #endif
455 break;
400 } 456 }
401 return true; 457 return true;
402} 458}
@@ -444,14 +500,7 @@ void music_scale_user(void)
444//SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h 500//SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h
445#ifdef SSD1306OLED 501#ifdef SSD1306OLED
446 502
447// hook point for 'led_test' keymap
448// 'default' keymap's led_test_init() is empty function, do nothing
449// 'led_test' keymap's led_test_init() force rgblight_mode_noeeprom(RGBLIGHT_MODE_RGB_TEST);
450__attribute__ ((weak))
451void led_test_init(void) {}
452
453void matrix_scan_user(void) { 503void matrix_scan_user(void) {
454 led_test_init();
455 iota_gfx_task(); // this is what updates the display continuously 504 iota_gfx_task(); // this is what updates the display continuously
456} 505}
457 506
@@ -467,41 +516,42 @@ void matrix_update(struct CharacterMatrix *dest,
467#define L_BASE 0 516#define L_BASE 0
468#define L_LOWER (1<<_LOWER) 517#define L_LOWER (1<<_LOWER)
469#define L_RAISE (1<<_RAISE) 518#define L_RAISE (1<<_RAISE)
470#define L_FUNC (1<<_FUNC)
471#define L_ADJUST (1<<_ADJUST) 519#define L_ADJUST (1<<_ADJUST)
472#define L_ADJUST_TRI (L_ADJUST|L_RAISE|L_LOWER) 520#define L_ADJUST_TRI (L_ADJUST|L_RAISE|L_LOWER)
473 521
474static void render_logo(struct CharacterMatrix *matrix) { 522static void render_logo(struct CharacterMatrix *matrix) {
475 523
476 static char logo[]={ 524 static const char helix_logo[] PROGMEM ={
477 0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94, 525 0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
478 0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4, 526 0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
479 0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4, 527 0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,
480 0}; 528 0};
481 matrix_write(matrix, logo); 529 matrix_write_P(matrix, helix_logo);
482 //matrix_write_P(&matrix, PSTR(" Split keyboard kit")); 530 //matrix_write_P(&matrix, PSTR(" Split keyboard kit"));
483} 531}
484 532
485 533static void render_rgbled_status(bool full, struct CharacterMatrix *matrix) {
486 534#ifdef RGBLIGHT_ENABLE
487void render_status(struct CharacterMatrix *matrix) { 535 char buf[30];
488 536 if (RGBLIGHT_MODES > 1 && rgblight_config.enable) {
489 // Render to mode icon 537 if (full) {
490 static char logo[][2][3]={{{0x95,0x96,0},{0xb5,0xb6,0}},{{0x97,0x98,0},{0xb7,0xb8,0}}}; 538 snprintf(buf, sizeof(buf), " LED %2d: %d,%d,%d ",
491 if(keymap_config.swap_lalt_lgui==false){ 539 rgblight_config.mode,
492 matrix_write(matrix, logo[0][0]); 540 rgblight_config.hue/RGBLIGHT_HUE_STEP,
493 matrix_write_P(matrix, PSTR("\n")); 541 rgblight_config.sat/RGBLIGHT_SAT_STEP,
494 matrix_write(matrix, logo[0][1]); 542 rgblight_config.val/RGBLIGHT_VAL_STEP);
495 }else{ 543 } else {
496 matrix_write(matrix, logo[1][0]); 544 snprintf(buf, sizeof(buf), "[%2d] ",rgblight_config.mode);
497 matrix_write_P(matrix, PSTR("\n")); 545 }
498 matrix_write(matrix, logo[1][1]); 546 matrix_write(matrix, buf);
499 } 547 }
548#endif
549}
500 550
551static void render_layer_status(struct CharacterMatrix *matrix) {
501 // Define layers here, Have not worked out how to have text displayed for each layer. Copy down the number you see and add a case for it below 552 // Define layers here, Have not worked out how to have text displayed for each layer. Copy down the number you see and add a case for it below
502 char buf[40]; 553 char buf[10];
503 snprintf(buf,sizeof(buf), "Undef-%ld", layer_state); 554 matrix_write_P(matrix, PSTR("Layer: "));
504 matrix_write_P(matrix, PSTR("\nLayer: "));
505 switch (layer_state) { 555 switch (layer_state) {
506 case L_BASE: 556 case L_BASE:
507 matrix_write_P(matrix, PSTR("Default")); 557 matrix_write_P(matrix, PSTR("Default"));
@@ -512,24 +562,44 @@ void render_status(struct CharacterMatrix *matrix) {
512 case L_LOWER: 562 case L_LOWER:
513 matrix_write_P(matrix, PSTR("Lower")); 563 matrix_write_P(matrix, PSTR("Lower"));
514 break; 564 break;
515 case L_FUNC:
516 matrix_write_P(matrix, PSTR("Func"));
517 break;
518 case L_ADJUST: 565 case L_ADJUST:
519 case L_ADJUST_TRI: 566 case L_ADJUST_TRI:
520 matrix_write_P(matrix, PSTR("Adjust")); 567 matrix_write_P(matrix, PSTR("Adjust"));
521 break; 568 break;
522 default: 569 default:
570 matrix_write_P(matrix, PSTR("Undef-"));
571 snprintf(buf,sizeof(buf), "%ld", layer_state);
523 matrix_write(matrix, buf); 572 matrix_write(matrix, buf);
524 } 573 }
574}
575
576void render_status(struct CharacterMatrix *matrix) {
577
578 // Render to mode icon
579 static const char os_logo[][2][3] PROGMEM ={{{0x95,0x96,0},{0xb5,0xb6,0}},{{0x97,0x98,0},{0xb7,0xb8,0}}};
580 if(keymap_config.swap_lalt_lgui==false){
581 matrix_write_P(matrix, os_logo[0][0]);
582 matrix_write_P(matrix, PSTR("\n"));
583 matrix_write_P(matrix, os_logo[0][1]);
584 }else{
585 matrix_write_P(matrix, os_logo[1][0]);
586 matrix_write_P(matrix, PSTR("\n"));
587 matrix_write_P(matrix, os_logo[1][1]);
588 }
589
590 matrix_write_P(matrix, PSTR(" "));
591 render_layer_status(matrix);
592 matrix_write_P(matrix, PSTR("\n"));
525 593
526 // Host Keyboard LED Status 594 // Host Keyboard LED Status
527 char led[40]; 595 matrix_write_P(matrix, (host_keyboard_leds() & (1<<USB_LED_NUM_LOCK)) ?
528 snprintf(led, sizeof(led), "\n%s %s %s", 596 PSTR("NUMLOCK") : PSTR(" "));
529 (host_keyboard_leds() & (1<<USB_LED_NUM_LOCK)) ? "NUMLOCK" : " ", 597 matrix_write_P(matrix, (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) ?
530 (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) ? "CAPS" : " ", 598 PSTR("CAPS") : PSTR(" "));
531 (host_keyboard_leds() & (1<<USB_LED_SCROLL_LOCK)) ? "SCLK" : " "); 599 matrix_write_P(matrix, (host_keyboard_leds() & (1<<USB_LED_SCROLL_LOCK)) ?
532 matrix_write(matrix, led); 600 PSTR("SCLK") : PSTR(" "));
601 matrix_write_P(matrix, PSTR("\n"));
602 render_rgbled_status(true, matrix);
533} 603}
534 604
535 605
@@ -547,6 +617,8 @@ void iota_gfx_task_user(void) {
547 render_status(&matrix); 617 render_status(&matrix);
548 }else{ 618 }else{
549 render_logo(&matrix); 619 render_logo(&matrix);
620 render_rgbled_status(false, &matrix);
621 render_layer_status(&matrix);
550 } 622 }
551 matrix_update(&display, &matrix); 623 matrix_update(&display, &matrix);
552} 624}
diff --git a/keyboards/helix/rev2/keymaps/yshrsmz/rules.mk b/keyboards/helix/rev2/keymaps/yshrsmz/rules.mk
index bc823e5e1..13d809931 100644
--- a/keyboards/helix/rev2/keymaps/yshrsmz/rules.mk
+++ b/keyboards/helix/rev2/keymaps/yshrsmz/rules.mk
@@ -6,12 +6,11 @@
6# See TOP/docs/config_options.md for more information. 6# See TOP/docs/config_options.md for more information.
7# 7#
8LINK_TIME_OPTIMIZATION_ENABLE = no # if firmware size over limit, try this option 8LINK_TIME_OPTIMIZATION_ENABLE = no # if firmware size over limit, try this option
9AUTO_SHIFT_ENABLE = yes
10 9
11# Helix Spacific Build Options 10# Helix Spacific Build Options
12# you can uncomment and edit follows 7 Variables 11# you can uncomment and edit follows 7 Variables
13# jp: 以下の7つの変数を必要に応じて編集し、コメントアウトをはずします。 12# jp: 以下の7つの変数を必要に応じて編集し、コメントアウトをはずします。
14HELIX_ROWS = 4 # Helix Rows is 4 or 5 13# HELIX_ROWS = 5 # Helix Rows is 4 or 5
15OLED_ENABLE = yes # OLED_ENABLE 14OLED_ENABLE = yes # OLED_ENABLE
16# LOCAL_GLCDFONT = no # use each keymaps "helixfont.h" insted of "common/glcdfont.c" 15# LOCAL_GLCDFONT = no # use each keymaps "helixfont.h" insted of "common/glcdfont.c"
17# LED_BACK_ENABLE = no # LED backlight (Enable WS2812 RGB underlight.) 16# LED_BACK_ENABLE = no # LED backlight (Enable WS2812 RGB underlight.)
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-18 09:40:53 +0000