Skip to content

Commit d579d82

Browse files
fauxparkfauxpark
authored
Helix rev2: remove 4 rows option (#20667)
1 parent 13e1397 commit d579d82

File tree

28 files changed

+124
-584
lines changed

28 files changed

+124
-584
lines changed

‎keyboards/helix/rev2/config.h

+3-39
Original file line numberDiff line numberDiff line change
@@ -32,38 +32,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
3232

3333
#define OLED_UPDATE_INTERVAL 50
3434

35-
/* Select rows configuration */
36-
// Rows are 4 or 5
37-
// #define HELIX_ROWS 5 see ./rules.mk
38-
39-
/* key matrix size */
40-
// Rows are doubled-up
41-
#if HELIX_ROWS == 4
42-
#define MATRIX_ROWS 8
43-
#define MATRIX_ROW_PINS { D4, C6, D7, E6 }
44-
#else
45-
#define MATRIX_ROWS 10
46-
#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
47-
#endif
48-
49-
// wiring of each half
50-
#define MATRIX_COLS 7
51-
#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
52-
// #define MATRIX_COL_PINS { B2, B3, B1, F7, F6, F5, F4 } //uncomment this line and comment line above if you need to reverse left-to-right key order
53-
54-
/* COL2ROW, ROW2COL*/
55-
#define DIODE_DIRECTION COL2ROW
56-
57-
//#define RGBLED_NUM 12 // Number of LEDs. see ./keymaps/default/config.h
58-
5935
// Helix keyboard RGB LED support
6036
// see ./rules.mk: LED_BACK_ENABLE or LED_UNDERGLOW_ENABLE set yes
6137
#ifdef RGBLED_BACK
62-
#if MATRIX_ROWS == 8 // HELIX_ROWS == 4
63-
#define RGBLED_NUM 25
64-
#else
65-
#define RGBLED_NUM 32
66-
#endif
38+
#define RGBLED_NUM 32
6739
#else
6840
#define RGBLED_NUM 6
6941
#endif
@@ -72,22 +44,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
7244
#if RGBLED_NUM <= 6
7345
#define RGBLIGHT_LIMIT_VAL 255
7446
#else
75-
#if MATRIX_ROWS == 8 // HELIX_ROWS == 4
76-
#define RGBLIGHT_LIMIT_VAL 130
77-
#else
78-
#define RGBLIGHT_LIMIT_VAL 120
79-
#endif
47+
#define RGBLIGHT_LIMIT_VAL 120
8048
#endif
8149
#define RGBLIGHT_VAL_STEP 17
8250
#else
8351
#if RGBLED_NUM <= 6
8452
#define RGBLIGHT_LIMIT_VAL 90
8553
#else
86-
#if MATRIX_ROWS == 8 // HELIX_ROWS == 4
87-
#define RGBLIGHT_LIMIT_VAL 45
88-
#else
89-
#define RGBLIGHT_LIMIT_VAL 35
90-
#endif
54+
#define RGBLIGHT_LIMIT_VAL 35
9155
#endif
9256
#define RGBLIGHT_VAL_STEP 4
9357
#endif

‎keyboards/helix/rev2/info.json

+69-64
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
"pid": "0x0000",
99
"device_version": "0.0.1"
1010
},
11+
"matrix_pins": {
12+
"cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
13+
"rows": ["D4", "C6", "D7", "E6", "B4"]
14+
},
15+
"diode_direction": "COL2ROW",
1116
"split": {
1217
"soft_serial_pin": "D2"
1318
},
@@ -19,79 +24,79 @@
1924
"layouts": {
2025
"LAYOUT": {
2126
"layout": [
22-
{"x": 0, "y": 0},
23-
{"x": 1, "y": 0},
24-
{"x": 2, "y": 0},
25-
{"x": 3, "y": 0},
26-
{"x": 4, "y": 0},
27-
{"x": 5, "y": 0},
27+
{"matrix": [0, 0], "x": 0, "y": 0},
28+
{"matrix": [0, 1], "x": 1, "y": 0},
29+
{"matrix": [0, 2], "x": 2, "y": 0},
30+
{"matrix": [0, 3], "x": 3, "y": 0},
31+
{"matrix": [0, 4], "x": 4, "y": 0},
32+
{"matrix": [0, 5], "x": 5, "y": 0},
2833

29-
{"x": 9, "y": 0},
30-
{"x": 10, "y": 0},
31-
{"x": 11, "y": 0},
32-
{"x": 12, "y": 0},
33-
{"x": 13, "y": 0},
34-
{"x": 14, "y": 0},
34+
{"matrix": [5, 5], "x": 9, "y": 0},
35+
{"matrix": [5, 4], "x": 10, "y": 0},
36+
{"matrix": [5, 3], "x": 11, "y": 0},
37+
{"matrix": [5, 2], "x": 12, "y": 0},
38+
{"matrix": [5, 1], "x": 13, "y": 0},
39+
{"matrix": [5, 0], "x": 14, "y": 0},
3540

36-
{"x": 0, "y": 1},
37-
{"x": 1, "y": 1},
38-
{"x": 2, "y": 1},
39-
{"x": 3, "y": 1},
40-
{"x": 4, "y": 1},
41-
{"x": 5, "y": 1},
41+
{"matrix": [1, 0], "x": 0, "y": 1},
42+
{"matrix": [1, 1], "x": 1, "y": 1},
43+
{"matrix": [1, 2], "x": 2, "y": 1},
44+
{"matrix": [1, 3], "x": 3, "y": 1},
45+
{"matrix": [1, 4], "x": 4, "y": 1},
46+
{"matrix": [1, 5], "x": 5, "y": 1},
4247

43-
{"x": 9, "y": 1},
44-
{"x": 10, "y": 1},
45-
{"x": 11, "y": 1},
46-
{"x": 12, "y": 1},
47-
{"x": 13, "y": 1},
48-
{"x": 14, "y": 1},
48+
{"matrix": [6, 5], "x": 9, "y": 1},
49+
{"matrix": [6, 4], "x": 10, "y": 1},
50+
{"matrix": [6, 3], "x": 11, "y": 1},
51+
{"matrix": [6, 2], "x": 12, "y": 1},
52+
{"matrix": [6, 1], "x": 13, "y": 1},
53+
{"matrix": [6, 0], "x": 14, "y": 1},
4954

50-
{"x": 0, "y": 2},
51-
{"x": 1, "y": 2},
52-
{"x": 2, "y": 2},
53-
{"x": 3, "y": 2},
54-
{"x": 4, "y": 2},
55-
{"x": 5, "y": 2},
55+
{"matrix": [2, 0], "x": 0, "y": 2},
56+
{"matrix": [2, 1], "x": 1, "y": 2},
57+
{"matrix": [2, 2], "x": 2, "y": 2},
58+
{"matrix": [2, 3], "x": 3, "y": 2},
59+
{"matrix": [2, 4], "x": 4, "y": 2},
60+
{"matrix": [2, 5], "x": 5, "y": 2},
5661

57-
{"x": 9, "y": 2},
58-
{"x": 10, "y": 2},
59-
{"x": 11, "y": 2},
60-
{"x": 12, "y": 2},
61-
{"x": 13, "y": 2},
62-
{"x": 14, "y": 2},
62+
{"matrix": [7, 5], "x": 9, "y": 2},
63+
{"matrix": [7, 4], "x": 10, "y": 2},
64+
{"matrix": [7, 3], "x": 11, "y": 2},
65+
{"matrix": [7, 2], "x": 12, "y": 2},
66+
{"matrix": [7, 1], "x": 13, "y": 2},
67+
{"matrix": [7, 0], "x": 14, "y": 2},
6368

64-
{"x": 0, "y": 3},
65-
{"x": 1, "y": 3},
66-
{"x": 2, "y": 3},
67-
{"x": 3, "y": 3},
68-
{"x": 4, "y": 3},
69-
{"x": 5, "y": 3},
70-
{"x": 6, "y": 3},
69+
{"matrix": [3, 0], "x": 0, "y": 3},
70+
{"matrix": [3, 1], "x": 1, "y": 3},
71+
{"matrix": [3, 2], "x": 2, "y": 3},
72+
{"matrix": [3, 3], "x": 3, "y": 3},
73+
{"matrix": [3, 4], "x": 4, "y": 3},
74+
{"matrix": [3, 5], "x": 5, "y": 3},
75+
{"matrix": [3, 6], "x": 6, "y": 3},
7176

72-
{"x": 8, "y": 3},
73-
{"x": 9, "y": 3},
74-
{"x": 10, "y": 3},
75-
{"x": 11, "y": 3},
76-
{"x": 12, "y": 3},
77-
{"x": 13, "y": 3},
78-
{"x": 14, "y": 3},
77+
{"matrix": [8, 6], "x": 8, "y": 3},
78+
{"matrix": [8, 5], "x": 9, "y": 3},
79+
{"matrix": [8, 4], "x": 10, "y": 3},
80+
{"matrix": [8, 3], "x": 11, "y": 3},
81+
{"matrix": [8, 2], "x": 12, "y": 3},
82+
{"matrix": [8, 1], "x": 13, "y": 3},
83+
{"matrix": [8, 0], "x": 14, "y": 3},
7984

80-
{"x": 0, "y": 4},
81-
{"x": 1, "y": 4},
82-
{"x": 2, "y": 4},
83-
{"x": 3, "y": 4},
84-
{"x": 4, "y": 4},
85-
{"x": 5, "y": 4},
86-
{"x": 6, "y": 4},
85+
{"matrix": [4, 0], "x": 0, "y": 4},
86+
{"matrix": [4, 1], "x": 1, "y": 4},
87+
{"matrix": [4, 2], "x": 2, "y": 4},
88+
{"matrix": [4, 3], "x": 3, "y": 4},
89+
{"matrix": [4, 4], "x": 4, "y": 4},
90+
{"matrix": [4, 5], "x": 5, "y": 4},
91+
{"matrix": [4, 6], "x": 6, "y": 4},
8792

88-
{"x": 8, "y": 4},
89-
{"x": 9, "y": 4},
90-
{"x": 10, "y": 4},
91-
{"x": 11, "y": 4},
92-
{"x": 12, "y": 4},
93-
{"x": 13, "y": 4},
94-
{"x": 14, "y": 4}
93+
{"matrix": [9, 6], "x": 8, "y": 4},
94+
{"matrix": [9, 5], "x": 9, "y": 4},
95+
{"matrix": [9, 4], "x": 10, "y": 4},
96+
{"matrix": [9, 3], "x": 11, "y": 4},
97+
{"matrix": [9, 2], "x": 12, "y": 4},
98+
{"matrix": [9, 1], "x": 13, "y": 4},
99+
{"matrix": [9, 0], "x": 14, "y": 4}
95100
]
96101
}
97102
}

‎keyboards/helix/rev2/keymaps/default/keymap.c

-119
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ enum macro_keycodes {
4949
//Macros
5050
#define M_SAMPLE M(KC_SAMPLEMACRO)
5151

52-
#if MATRIX_ROWS == 10 // HELIX_ROWS == 5
5352
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
5453

5554
/* Qwerty
@@ -179,124 +178,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
179178
)
180179
};
181180

182-
#elif MATRIX_ROWS == 8 // HELIX_ROWS == 4
183-
184-
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
185-
186-
/* Qwerty
187-
* ,-----------------------------------------. ,-----------------------------------------.
188-
* | Tab | Q | W | E | R | T | | Y | U | I | O | P | Bksp |
189-
* |------+------+------+------+------+------| |------+------+------+------+------+------|
190-
* | Ctrl | A | S | D | F | G | | H | J | K | L | ; | ' |
191-
* |------+------+------+------+------+------| |------+------+------+------+------+------|
192-
* | Shift| Z | X | C | V | B | | N | M | , | . | / |Enter |
193-
* |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
194-
* |Adjust| Esc | Alt | GUI | EISU |Lower |Space |Space |Raise | KANA | Left | Down | Up |Right |
195-
* `-------------------------------------------------------------------------------------------------'
196-
*/
197-
[_QWERTY] = LAYOUT(
198-
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
199-
KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
200-
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT ,
201-
ADJUST, KC_ESC, KC_LALT, KC_LGUI, EISU, LOWER, KC_SPC, KC_SPC, RAISE, KANA, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
202-
),
203-
204-
/* Colemak
205-
* ,-----------------------------------------. ,-----------------------------------------.
206-
* | Tab | Q | W | F | P | G | | J | L | U | Y | ; | Bksp |
207-
* |------+------+------+------+------+------| |------+------+------+------+------+------|
208-
* | Ctrl | A | R | S | T | D | | H | N | E | I | O | ' |
209-
* |------+------+------+------+------+------| |------+------+------+------+------+------|
210-
* | Shift| Z | X | C | V | B | | K | M | , | . | / |Enter |
211-
* |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
212-
* |Adjust| Esc | Alt | GUI | EISU |Lower |Space |Space |Raise | KANA | Left | Down | Up |Right |
213-
* `-------------------------------------------------------------------------------------------------'
214-
*/
215-
[_COLEMAK] = LAYOUT(
216-
KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC,
217-
KC_LCTL, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT,
218-
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT ,
219-
ADJUST, KC_ESC, KC_LALT, KC_LGUI, EISU, LOWER, KC_SPC, KC_SPC, RAISE, KANA, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
220-
),
221-
222-
/* Dvorak
223-
* ,-----------------------------------------. ,-----------------------------------------.
224-
* | Tab | ' | , | . | P | Y | | F | G | C | R | L | Del |
225-
* |------+------+------+------+------+------| |------+------+------+------+------+------|
226-
* | Ctrl | A | O | E | U | I | | D | H | T | N | S | / |
227-
* |------+------+------+------+------+------| |------+------+------+------+------+------|
228-
* | Shift| ; | Q | J | K | X | | B | M | W | V | Z |Enter |
229-
* |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
230-
* |Adjust| Esc | Alt | GUI | EISU |Lower |Space |Space |Raise | KANA | Left | Down | Up |Right |
231-
* `-------------------------------------------------------------------------------------------------'
232-
*/
233-
[_DVORAK] = LAYOUT(
234-
KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_DEL,
235-
KC_LCTL, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH,
236-
KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_ENT ,
237-
ADJUST, KC_ESC, KC_LALT, KC_LGUI, EISU, LOWER, KC_SPC, KC_SPC, RAISE, KANA, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
238-
),
239-
240-
/* Lower
241-
* ,-----------------------------------------. ,-----------------------------------------.
242-
* | ~ | ! | @ | # | $ | % | | ^ | & | * | ( | ) | |
243-
* |------+------+------+------+------+------| |------+------+------+------+------+------|
244-
* | | F1 | F2 | F3 | F4 | F5 | | F6 | _ | + | { | } | | |
245-
* |------+------+------+------+------+------| |------+------+------+------+------+------|
246-
* | | F7 | F8 | F9 | F10 | F11 | | F12 | | | Home | End | |
247-
* |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
248-
* | | | | | | | | | | | Next | Vol- | Vol+ | Play |
249-
* `-------------------------------------------------------------------------------------------------'
250-
*/
251-
[_LOWER] = LAYOUT(
252-
KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
253-
_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
254-
_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_HOME, KC_END, _______,
255-
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
256-
),
257-
258-
/* Raise
259-
* ,-----------------------------------------. ,-----------------------------------------.
260-
* | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Del |
261-
* |------+------+------+------+------+------| |------+------+------+------+------+------|
262-
* | | F1 | F2 | F3 | F4 | F5 | | F6 | - | = | [ | ] | \ |
263-
* |------+------+------+------+------+------| |------+------+------+------+------+------|
264-
* | | F7 | F8 | F9 | F10 | F11 | | F12 | | |PageDn|PageUp| |
265-
* |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
266-
* | | | | | | | | | | | Next | Vol- | Vol+ | Play |
267-
* `-------------------------------------------------------------------------------------------------'
268-
*/
269-
[_RAISE] = LAYOUT(
270-
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL,
271-
_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
272-
_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_PGDN, KC_PGUP, _______,
273-
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
274-
),
275-
276-
/* Adjust (Lower + Raise)
277-
* ,-----------------------------------------. ,-----------------------------------------.
278-
* | | Reset|RGBRST| | | | | | | | | | Del |
279-
* |------+------+------+------+------+------| |------+------+------+------+------+------|
280-
* | | | |Aud on|Audoff| Mac | | Win |Qwerty|Colemk|Dvorak| | |
281-
* |------+------+------+------+------+------| |------+------+------+------+------+------|
282-
* | | | | | | | | | |RGB ON| HUE+ | SAT+ | VAL+ |
283-
* |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
284-
* | | | | | | | | | | | MODE | HUE- | SAT- | VAL- |
285-
* `-------------------------------------------------------------------------------------------------'
286-
*/
287-
[_ADJUST] = LAYOUT(
288-
_______, QK_BOOT, RGBRST, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
289-
_______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______,
290-
_______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI,
291-
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD
292-
)
293-
};
294-
295-
#else
296-
#error "undefined keymaps"
297-
#endif
298-
299-
300181
#ifdef AUDIO_ENABLE
301182

302183
float tone_qwerty[][2] = SONG(QWERTY_SOUND);

‎keyboards/helix/rev2/keymaps/default/readme.md

-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ see `qmk_firmware/keyboards/helix/rev2/keymaps/default/rules.mk`
111111
# Helix Spacific Build Options
112112
# you can uncomment and edit follows 7 Variables
113113
# jp: 以下の7つの変数を必要に応じて編集し、コメントアウトをはずします。
114-
# HELIX_ROWS = 5 # Helix Rows is 4 or 5
115114
# OLED_ENABLE = yes # OLED_ENABLE
116115
# LOCAL_GLCDFONT = no # use each keymaps "helixfont.h" insted of "common/glcdfont.c"
117116
# LED_BACK_ENABLE = no # LED backlight (Enable WS2812 RGB underlight.)

‎keyboards/helix/rev2/keymaps/default/readme_jp.md

-9
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ RGB バックライトまたは、RGB Underglow をつけた場合は、
2929
# Helix Spacific Build Options
3030
# you can uncomment and edit follows 7 Variables
3131
# jp: 以下の7つの変数を必要に応じて編集し、コメントアウトをはずします。
32-
# HELIX_ROWS = 5 # Helix Rows is 4 or 5
3332
# OLED_ENABLE = yes # OLED_ENABLE
3433
# LOCAL_GLCDFONT = no # use each keymaps "helixfont.h" insted of "common/glcdfont.c"
3534
# LED_BACK_ENABLE = no # LED backlight (Enable WS2812 RGB underlight.)
@@ -38,14 +37,6 @@ RGB バックライトまたは、RGB Underglow をつけた場合は、
3837
# IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone)
3938
```
4039

41-
## 4行版Helix に対応する
42-
43-
rules.mk の下記の部分を編集して 5 を 4 に変更してください。
44-
45-
```
46-
HELIX_ROWS = 4 # Helix Rows is 4 or 5
47-
```
48-
4940
## RGB バックライトを有効にする
5041

5142
rules.mk の下記の部分を編集して no を yes に変更してください。

‎keyboards/helix/rev2/keymaps/default/rules.mk

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ LTO_ENABLE = yes # if firmware size over limit, try this option
55
# Helix Spacific Build Options
66
# you can uncomment and edit follows 7 Variables
77
# jp: 以下の7つの変数を必要に応じて編集し、コメントアウトをはずします。
8-
# HELIX_ROWS = 5 # Helix Rows is 4 or 5
98
# OLED_ENABLE = no # OLED_ENABLE
109
# LOCAL_GLCDFONT = no # use each keymaps "helixfont.h" insted of "common/glcdfont.c"
1110
# LED_BACK_ENABLE = no # LED backlight (Enable WS2812 RGB underlight.)

0 commit comments

Comments
 (0)