From d579d82cacd9c69634790d9a9de5edeeaa19226f Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Thu, 4 May 2023 10:14:08 +1000
Subject: [PATCH] Helix rev2: remove 4 rows option (#20667)
---
keyboards/helix/rev2/config.h | 42 +-----
keyboards/helix/rev2/info.json | 133 +++++++++---------
keyboards/helix/rev2/keymaps/default/keymap.c | 119 ----------------
.../helix/rev2/keymaps/default/readme.md | 1 -
.../helix/rev2/keymaps/default/readme_jp.md | 9 --
keyboards/helix/rev2/keymaps/default/rules.mk | 1 -
.../helix/rev2/keymaps/edvorakjp/keymap.c | 53 ++++++-
.../rev2/keymaps/edvorakjp/keymap_4rows.c | 42 ------
.../rev2/keymaps/edvorakjp/keymap_5rows.c | 48 -------
.../rev2/keymaps/edvorakjp/keymap_xrows.h | 8 --
.../helix/rev2/keymaps/edvorakjp/rules.mk | 7 -
.../helix/rev2/keymaps/five_rows/keymap.c | 6 -
.../helix/rev2/keymaps/five_rows/rules.mk | 1 -
.../helix/rev2/keymaps/five_rows_jis/keymap.c | 5 -
.../helix/rev2/keymaps/five_rows_jis/rules.mk | 1 -
.../helix/rev2/keymaps/fraanrosi/keymap.c | 1 -
.../helix/rev2/keymaps/fraanrosi/rules.mk | 1 -
keyboards/helix/rev2/keymaps/froggy/keymap.c | 5 -
keyboards/helix/rev2/keymaps/froggy/rules.mk | 1 -
.../helix/rev2/keymaps/froggy_106/keymap.c | 4 -
.../helix/rev2/keymaps/froggy_106/rules.mk | 1 -
.../helix/rev2/keymaps/led_test/rules.mk | 1 -
keyboards/helix/rev2/keymaps/yshrsmz/keymap.c | 119 ----------------
keyboards/helix/rev2/keymaps/yshrsmz/rules.mk | 1 -
keyboards/helix/rev2/local_features.mk | 7 -
keyboards/helix/rev2/rev2.h | 84 -----------
keyboards/helix/rev2/rules.mk | 1 -
.../rev3_5rows/keymaps/five_rows/keymap.c | 6 -
28 files changed, 124 insertions(+), 584 deletions(-)
delete mode 100644 keyboards/helix/rev2/keymaps/edvorakjp/keymap_4rows.c
delete mode 100644 keyboards/helix/rev2/keymaps/edvorakjp/keymap_5rows.c
delete mode 100644 keyboards/helix/rev2/keymaps/edvorakjp/keymap_xrows.h
diff --git a/keyboards/helix/rev2/config.h b/keyboards/helix/rev2/config.h
index 491675d45d..1d71636757 100644
--- a/keyboards/helix/rev2/config.h
+++ b/keyboards/helix/rev2/config.h
@@ -32,38 +32,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define OLED_UPDATE_INTERVAL 50
-/* Select rows configuration */
-// Rows are 4 or 5
-// #define HELIX_ROWS 5 see ./rules.mk
-
-/* key matrix size */
-// Rows are doubled-up
-#if HELIX_ROWS == 4
- #define MATRIX_ROWS 8
- #define MATRIX_ROW_PINS { D4, C6, D7, E6 }
-#else
- #define MATRIX_ROWS 10
- #define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
-#endif
-
-// wiring of each half
-#define MATRIX_COLS 7
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
-// #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
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-//#define RGBLED_NUM 12 // Number of LEDs. see ./keymaps/default/config.h
-
// Helix keyboard RGB LED support
// see ./rules.mk: LED_BACK_ENABLE or LED_UNDERGLOW_ENABLE set yes
#ifdef RGBLED_BACK
- #if MATRIX_ROWS == 8 // HELIX_ROWS == 4
- #define RGBLED_NUM 25
- #else
- #define RGBLED_NUM 32
- #endif
+ #define RGBLED_NUM 32
#else
#define RGBLED_NUM 6
#endif
@@ -72,22 +44,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#if RGBLED_NUM <= 6
#define RGBLIGHT_LIMIT_VAL 255
#else
- #if MATRIX_ROWS == 8 // HELIX_ROWS == 4
- #define RGBLIGHT_LIMIT_VAL 130
- #else
- #define RGBLIGHT_LIMIT_VAL 120
- #endif
+ #define RGBLIGHT_LIMIT_VAL 120
#endif
#define RGBLIGHT_VAL_STEP 17
#else
#if RGBLED_NUM <= 6
#define RGBLIGHT_LIMIT_VAL 90
#else
- #if MATRIX_ROWS == 8 // HELIX_ROWS == 4
- #define RGBLIGHT_LIMIT_VAL 45
- #else
- #define RGBLIGHT_LIMIT_VAL 35
- #endif
+ #define RGBLIGHT_LIMIT_VAL 35
#endif
#define RGBLIGHT_VAL_STEP 4
#endif
diff --git a/keyboards/helix/rev2/info.json b/keyboards/helix/rev2/info.json
index 3924af33aa..105b05e6e3 100644
--- a/keyboards/helix/rev2/info.json
+++ b/keyboards/helix/rev2/info.json
@@ -8,6 +8,11 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+ "rows": ["D4", "C6", "D7", "E6", "B4"]
+ },
+ "diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D2"
},
@@ -19,79 +24,79 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x": 0, "y": 0},
- {"x": 1, "y": 0},
- {"x": 2, "y": 0},
- {"x": 3, "y": 0},
- {"x": 4, "y": 0},
- {"x": 5, "y": 0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
- {"x": 9, "y": 0},
- {"x": 10, "y": 0},
- {"x": 11, "y": 0},
- {"x": 12, "y": 0},
- {"x": 13, "y": 0},
- {"x": 14, "y": 0},
+ {"matrix": [5, 5], "x": 9, "y": 0},
+ {"matrix": [5, 4], "x": 10, "y": 0},
+ {"matrix": [5, 3], "x": 11, "y": 0},
+ {"matrix": [5, 2], "x": 12, "y": 0},
+ {"matrix": [5, 1], "x": 13, "y": 0},
+ {"matrix": [5, 0], "x": 14, "y": 0},
- {"x": 0, "y": 1},
- {"x": 1, "y": 1},
- {"x": 2, "y": 1},
- {"x": 3, "y": 1},
- {"x": 4, "y": 1},
- {"x": 5, "y": 1},
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
- {"x": 9, "y": 1},
- {"x": 10, "y": 1},
- {"x": 11, "y": 1},
- {"x": 12, "y": 1},
- {"x": 13, "y": 1},
- {"x": 14, "y": 1},
+ {"matrix": [6, 5], "x": 9, "y": 1},
+ {"matrix": [6, 4], "x": 10, "y": 1},
+ {"matrix": [6, 3], "x": 11, "y": 1},
+ {"matrix": [6, 2], "x": 12, "y": 1},
+ {"matrix": [6, 1], "x": 13, "y": 1},
+ {"matrix": [6, 0], "x": 14, "y": 1},
- {"x": 0, "y": 2},
- {"x": 1, "y": 2},
- {"x": 2, "y": 2},
- {"x": 3, "y": 2},
- {"x": 4, "y": 2},
- {"x": 5, "y": 2},
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
- {"x": 9, "y": 2},
- {"x": 10, "y": 2},
- {"x": 11, "y": 2},
- {"x": 12, "y": 2},
- {"x": 13, "y": 2},
- {"x": 14, "y": 2},
+ {"matrix": [7, 5], "x": 9, "y": 2},
+ {"matrix": [7, 4], "x": 10, "y": 2},
+ {"matrix": [7, 3], "x": 11, "y": 2},
+ {"matrix": [7, 2], "x": 12, "y": 2},
+ {"matrix": [7, 1], "x": 13, "y": 2},
+ {"matrix": [7, 0], "x": 14, "y": 2},
- {"x": 0, "y": 3},
- {"x": 1, "y": 3},
- {"x": 2, "y": 3},
- {"x": 3, "y": 3},
- {"x": 4, "y": 3},
- {"x": 5, "y": 3},
- {"x": 6, "y": 3},
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3},
- {"x": 8, "y": 3},
- {"x": 9, "y": 3},
- {"x": 10, "y": 3},
- {"x": 11, "y": 3},
- {"x": 12, "y": 3},
- {"x": 13, "y": 3},
- {"x": 14, "y": 3},
+ {"matrix": [8, 6], "x": 8, "y": 3},
+ {"matrix": [8, 5], "x": 9, "y": 3},
+ {"matrix": [8, 4], "x": 10, "y": 3},
+ {"matrix": [8, 3], "x": 11, "y": 3},
+ {"matrix": [8, 2], "x": 12, "y": 3},
+ {"matrix": [8, 1], "x": 13, "y": 3},
+ {"matrix": [8, 0], "x": 14, "y": 3},
- {"x": 0, "y": 4},
- {"x": 1, "y": 4},
- {"x": 2, "y": 4},
- {"x": 3, "y": 4},
- {"x": 4, "y": 4},
- {"x": 5, "y": 4},
- {"x": 6, "y": 4},
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4},
+ {"matrix": [4, 5], "x": 5, "y": 4},
+ {"matrix": [4, 6], "x": 6, "y": 4},
- {"x": 8, "y": 4},
- {"x": 9, "y": 4},
- {"x": 10, "y": 4},
- {"x": 11, "y": 4},
- {"x": 12, "y": 4},
- {"x": 13, "y": 4},
- {"x": 14, "y": 4}
+ {"matrix": [9, 6], "x": 8, "y": 4},
+ {"matrix": [9, 5], "x": 9, "y": 4},
+ {"matrix": [9, 4], "x": 10, "y": 4},
+ {"matrix": [9, 3], "x": 11, "y": 4},
+ {"matrix": [9, 2], "x": 12, "y": 4},
+ {"matrix": [9, 1], "x": 13, "y": 4},
+ {"matrix": [9, 0], "x": 14, "y": 4}
]
}
}
diff --git a/keyboards/helix/rev2/keymaps/default/keymap.c b/keyboards/helix/rev2/keymaps/default/keymap.c
index 464b8bbd80..25b0c3dff8 100644
--- a/keyboards/helix/rev2/keymaps/default/keymap.c
+++ b/keyboards/helix/rev2/keymaps/default/keymap.c
@@ -49,7 +49,6 @@ enum macro_keycodes {
//Macros
#define M_SAMPLE M(KC_SAMPLEMACRO)
-#if MATRIX_ROWS == 10 // HELIX_ROWS == 5
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Qwerty
@@ -179,124 +178,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
)
};
-#elif MATRIX_ROWS == 8 // HELIX_ROWS == 4
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
- /* Qwerty
- * ,-----------------------------------------. ,-----------------------------------------.
- * | Tab | Q | W | E | R | T | | Y | U | I | O | P | Bksp |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Ctrl | A | S | D | F | G | | H | J | K | L | ; | ' |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Shift| Z | X | C | V | B | | N | M | , | . | / |Enter |
- * |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
- * |Adjust| Esc | Alt | GUI | EISU |Lower |Space |Space |Raise | KANA | Left | Down | Up |Right |
- * `-------------------------------------------------------------------------------------------------'
- */
- [_QWERTY] = LAYOUT(
- KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
- KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT ,
- ADJUST, KC_ESC, KC_LALT, KC_LGUI, EISU, LOWER, KC_SPC, KC_SPC, RAISE, KANA, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
- ),
-
- /* Colemak
- * ,-----------------------------------------. ,-----------------------------------------.
- * | Tab | Q | W | F | P | G | | J | L | U | Y | ; | Bksp |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Ctrl | A | R | S | T | D | | H | N | E | I | O | ' |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Shift| Z | X | C | V | B | | K | M | , | . | / |Enter |
- * |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
- * |Adjust| Esc | Alt | GUI | EISU |Lower |Space |Space |Raise | KANA | Left | Down | Up |Right |
- * `-------------------------------------------------------------------------------------------------'
- */
- [_COLEMAK] = LAYOUT(
- KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC,
- KC_LCTL, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT ,
- ADJUST, KC_ESC, KC_LALT, KC_LGUI, EISU, LOWER, KC_SPC, KC_SPC, RAISE, KANA, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
- ),
-
- /* Dvorak
- * ,-----------------------------------------. ,-----------------------------------------.
- * | Tab | ' | , | . | P | Y | | F | G | C | R | L | Del |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Ctrl | A | O | E | U | I | | D | H | T | N | S | / |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Shift| ; | Q | J | K | X | | B | M | W | V | Z |Enter |
- * |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
- * |Adjust| Esc | Alt | GUI | EISU |Lower |Space |Space |Raise | KANA | Left | Down | Up |Right |
- * `-------------------------------------------------------------------------------------------------'
- */
- [_DVORAK] = LAYOUT(
- KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_DEL,
- KC_LCTL, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH,
- KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_ENT ,
- ADJUST, KC_ESC, KC_LALT, KC_LGUI, EISU, LOWER, KC_SPC, KC_SPC, RAISE, KANA, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
- ),
-
- /* Lower
- * ,-----------------------------------------. ,-----------------------------------------.
- * | ~ | ! | @ | # | $ | % | | ^ | & | * | ( | ) | |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | | F1 | F2 | F3 | F4 | F5 | | F6 | _ | + | { | } | | |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | | F7 | F8 | F9 | F10 | F11 | | F12 | | | Home | End | |
- * |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
- * | | | | | | | | | | | Next | Vol- | Vol+ | Play |
- * `-------------------------------------------------------------------------------------------------'
- */
- [_LOWER] = LAYOUT(
- KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
- _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
- _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_HOME, KC_END, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
- ),
-
- /* Raise
- * ,-----------------------------------------. ,-----------------------------------------.
- * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Del |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | | F1 | F2 | F3 | F4 | F5 | | F6 | - | = | [ | ] | \ |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | | F7 | F8 | F9 | F10 | F11 | | F12 | | |PageDn|PageUp| |
- * |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
- * | | | | | | | | | | | Next | Vol- | Vol+ | Play |
- * `-------------------------------------------------------------------------------------------------'
- */
- [_RAISE] = LAYOUT(
- KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL,
- _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
- _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_PGDN, KC_PGUP, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
- ),
-
- /* Adjust (Lower + Raise)
- * ,-----------------------------------------. ,-----------------------------------------.
- * | | Reset|RGBRST| | | | | | | | | | Del |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | | | |Aud on|Audoff| Mac | | Win |Qwerty|Colemk|Dvorak| | |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | | | | | | | | | |RGB ON| HUE+ | SAT+ | VAL+ |
- * |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
- * | | | | | | | | | | | MODE | HUE- | SAT- | VAL- |
- * `-------------------------------------------------------------------------------------------------'
- */
- [_ADJUST] = LAYOUT(
- _______, QK_BOOT, RGBRST, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
- _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD
- )
-};
-
-#else
-#error "undefined keymaps"
-#endif
-
-
#ifdef AUDIO_ENABLE
float tone_qwerty[][2] = SONG(QWERTY_SOUND);
diff --git a/keyboards/helix/rev2/keymaps/default/readme.md b/keyboards/helix/rev2/keymaps/default/readme.md
index 8614fce53d..f1917a100a 100644
--- a/keyboards/helix/rev2/keymaps/default/readme.md
+++ b/keyboards/helix/rev2/keymaps/default/readme.md
@@ -111,7 +111,6 @@ see `qmk_firmware/keyboards/helix/rev2/keymaps/default/rules.mk`
# Helix Spacific Build Options
# you can uncomment and edit follows 7 Variables
# jp: 以下の7つの変数を必要に応じて編集し、コメントアウトをはずします。
-# HELIX_ROWS = 5 # Helix Rows is 4 or 5
# OLED_ENABLE = yes # OLED_ENABLE
# LOCAL_GLCDFONT = no # use each keymaps "helixfont.h" insted of "common/glcdfont.c"
# LED_BACK_ENABLE = no # LED backlight (Enable WS2812 RGB underlight.)
diff --git a/keyboards/helix/rev2/keymaps/default/readme_jp.md b/keyboards/helix/rev2/keymaps/default/readme_jp.md
index 5f0295f8f3..6ecac8f25d 100644
--- a/keyboards/helix/rev2/keymaps/default/readme_jp.md
+++ b/keyboards/helix/rev2/keymaps/default/readme_jp.md
@@ -29,7 +29,6 @@ RGB バックライトまたは、RGB Underglow をつけた場合は、
# Helix Spacific Build Options
# you can uncomment and edit follows 7 Variables
# jp: 以下の7つの変数を必要に応じて編集し、コメントアウトをはずします。
-# HELIX_ROWS = 5 # Helix Rows is 4 or 5
# OLED_ENABLE = yes # OLED_ENABLE
# LOCAL_GLCDFONT = no # use each keymaps "helixfont.h" insted of "common/glcdfont.c"
# LED_BACK_ENABLE = no # LED backlight (Enable WS2812 RGB underlight.)
@@ -38,14 +37,6 @@ RGB バックライトまたは、RGB Underglow をつけた場合は、
# IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone)
```
-## 4行版Helix に対応する
-
-rules.mk の下記の部分を編集して 5 を 4 に変更してください。
-
-```
-HELIX_ROWS = 4 # Helix Rows is 4 or 5
-```
-
## RGB バックライトを有効にする
rules.mk の下記の部分を編集して no を yes に変更してください。
diff --git a/keyboards/helix/rev2/keymaps/default/rules.mk b/keyboards/helix/rev2/keymaps/default/rules.mk
index 508c4ba40e..7897a5b1e6 100644
--- a/keyboards/helix/rev2/keymaps/default/rules.mk
+++ b/keyboards/helix/rev2/keymaps/default/rules.mk
@@ -5,7 +5,6 @@ LTO_ENABLE = yes # if firmware size over limit, try this option
# Helix Spacific Build Options
# you can uncomment and edit follows 7 Variables
# jp: 以下の7つの変数を必要に応じて編集し、コメントアウトをはずします。
-# HELIX_ROWS = 5 # Helix Rows is 4 or 5
# OLED_ENABLE = no # OLED_ENABLE
# LOCAL_GLCDFONT = no # use each keymaps "helixfont.h" insted of "common/glcdfont.c"
# LED_BACK_ENABLE = no # LED backlight (Enable WS2812 RGB underlight.)
diff --git a/keyboards/helix/rev2/keymaps/edvorakjp/keymap.c b/keyboards/helix/rev2/keymaps/edvorakjp/keymap.c
index 5cb34887c0..6910bef535 100644
--- a/keyboards/helix/rev2/keymaps/edvorakjp/keymap.c
+++ b/keyboards/helix/rev2/keymaps/edvorakjp/keymap.c
@@ -1,6 +1,57 @@
#include QMK_KEYBOARD_H
#include "split_util.h"
-#include "keymap_xrows.h"
+#include "edvorakjp.h"
+
+#define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__)
+
+#define __KC_TRNS_x4__ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+#define __KC_TRNS_x6__ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [L_EDVORAKJP_BASE] = LAYOUT_wrapper(
+ //,-----------------------------------------------------. ,-----------------------------------------------------.
+ KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24,
+ //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
+ KC_GRV, __EDVORAKJP_BASE_L1__ , __EDVORAKJP_BASE_R1__ , KC_BSLS,
+ //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
+ KC_EQL, __EDVORAKJP_BASE_L2__ , __EDVORAKJP_BASE_R2__ , KC_MINS,
+ //|--------+--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------+--------|
+ KC_ESC, __EDVORAKJP_BASE_L3__ , XXXXXXX, XXXXXXX, __EDVORAKJP_BASE_R3__ , KC_SLSH,
+ //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
+ __EDVORAKJP_PAGE__ , LA_TAB, LS_SPC,LOWER_TD, RAISE_TD, RC_BSPC, RG_ENT, __EDVORAKJP_CURSOR__
+ //`--------------------------------------------------------------' `--------------------------------------------------------------'
+ ),
+
+ [L_EDVORAKJP_LOWER] = LAYOUT_wrapper(
+ //,-----------------------------------------------------. ,-----------------------------------------------------.
+ __KC_TRNS_x6__ , __KC_TRNS_x6__ ,
+ //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
+ XXXXXXX, XXXXXXX, __EDVORAKJP_BRACKET_L__ , XXXXXXX, XXXXXXX, __EDVORAKJP_BRACKET_R__ , XXXXXXX, XXXXXXX,
+ //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
+ __EDVORAKJP_FUNCTION_L__ , __EDVORAKJP_FUNCTION_R__ ,
+ //|--------+--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------+--------|
+ KC_PSCR, XXXXXXX, __EDVORAKJP_PAGE__ , KC_TRNS, KC_TRNS, __EDVORAKJP_CURSOR__ , XXXXXXX, XXXXXXX,
+ //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
+ __KC_TRNS_x4__ , KC_TRNS, KC_TRNS, XXXXXXX, KC_MAC, RC_DEL, KC_TRNS, __KC_TRNS_x4__
+ //`--------------------------------------------------------------' `--------------------------------------------------------------'
+ ),
+
+ [L_EDVORAKJP_RAISE] = LAYOUT_wrapper(
+ //,-----------------------------------------------------. ,-----------------------------------------------------.
+ __KC_TRNS_x6__ , __KC_TRNS_x6__ ,
+ //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
+ XXXXXXX, XXXXXXX, __EDVORAKJP_SYMBOL_L__ , __EDVORAKJP_SYMBOL_R__ , XXXXXXX, XXXXXXX,
+ //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
+ XXXXXXX, __EDVORAKJP_NUMBER_L__ , __EDVORAKJP_NUMBER_R__ , XXXXXXX,
+ //|--------+--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------+--------|
+ KC_PSCR, XXXXXXX, __EDVORAKJP_PAGE__ , KC_TRNS, KC_TRNS, __EDVORAKJP_CURSOR__ , XXXXXXX, XXXXXXX,
+ //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
+ __KC_TRNS_x4__ , KC_TRNS, KC_TRNS, KC_WIN, XXXXXXX, KC_TRNS, KC_TRNS, __KC_TRNS_x4__
+ //`--------------------------------------------------------------' `--------------------------------------------------------------'
+ )
+};
+// clang-format on
// keymaps definitions are moved to keymap_Xrows.c.
diff --git a/keyboards/helix/rev2/keymaps/edvorakjp/keymap_4rows.c b/keyboards/helix/rev2/keymaps/edvorakjp/keymap_4rows.c
deleted file mode 100644
index 246c2a9fd2..0000000000
--- a/keyboards/helix/rev2/keymaps/edvorakjp/keymap_4rows.c
+++ /dev/null
@@ -1,42 +0,0 @@
-#include "helix.h"
-#include "keymap_xrows.h"
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [L_EDVORAKJP_BASE] = LAYOUT_wrapper(
- //,-----------------------------------------------------. ,-----------------------------------------------------.
- KC_GRV, __EDVORAKJP_BASE_L1__ , __EDVORAKJP_BASE_R1__ , KC_BSLS,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- KC_EQL, __EDVORAKJP_BASE_L2__ , __EDVORAKJP_BASE_R2__ , KC_MINS,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- KC_ESC, __EDVORAKJP_BASE_L3__ , __EDVORAKJP_BASE_R3__ , KC_SLSH,
- //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
- __EDVORAKJP_PAGE__ , LA_TAB, LS_SPC,LOWER_TD, RAISE_TD, RC_BSPC, RG_ENT, __EDVORAKJP_CURSOR__
- //`--------------------------------------------------------------' `--------------------------------------------------------------'
- ),
-
- [L_EDVORAKJP_LOWER] = LAYOUT_wrapper(
- //,-----------------------------------------------------. ,-----------------------------------------------------.
- XXXXXXX, XXXXXXX, __EDVORAKJP_BRACKET_L__ , XXXXXXX, XXXXXXX, __EDVORAKJP_BRACKET_R__ , XXXXXXX, XXXXXXX,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- __EDVORAKJP_FUNCTION_L__ , __EDVORAKJP_FUNCTION_R__ ,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- KC_PSCR, XXXXXXX, __EDVORAKJP_PAGE__ , __EDVORAKJP_CURSOR__ , XXXXXXX, XXXXXXX,
- //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
- __KC_TRNS_x4__ , KC_TRNS, KC_TRNS, XXXXXXX, KC_MAC, RC_DEL, KC_TRNS, __KC_TRNS_x4__
- //`--------------------------------------------------------------' `--------------------------------------------------------------'
- ),
-
- [L_EDVORAKJP_RAISE] = LAYOUT_wrapper(
- //,-----------------------------------------------------. ,-----------------------------------------------------.
- XXXXXXX, XXXXXXX, __EDVORAKJP_SYMBOL_L__ , __EDVORAKJP_SYMBOL_R__ , XXXXXXX, XXXXXXX,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- XXXXXXX, __EDVORAKJP_NUMBER_L__ , __EDVORAKJP_NUMBER_R__ , XXXXXXX,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- KC_PSCR, XXXXXXX, __EDVORAKJP_PAGE__ , __EDVORAKJP_CURSOR__ , XXXXXXX, XXXXXXX,
- //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
- __KC_TRNS_x4__ , KC_TRNS, KC_TRNS, KC_WIN, XXXXXXX, KC_TRNS, KC_TRNS, __KC_TRNS_x4__
- //`--------------------------------------------------------------' `--------------------------------------------------------------'
- )
-};
-// clang-format on
diff --git a/keyboards/helix/rev2/keymaps/edvorakjp/keymap_5rows.c b/keyboards/helix/rev2/keymaps/edvorakjp/keymap_5rows.c
deleted file mode 100644
index 6f2a4d371a..0000000000
--- a/keyboards/helix/rev2/keymaps/edvorakjp/keymap_5rows.c
+++ /dev/null
@@ -1,48 +0,0 @@
-#include "helix.h"
-#include "keymap_xrows.h"
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [L_EDVORAKJP_BASE] = LAYOUT_wrapper(
- //,-----------------------------------------------------. ,-----------------------------------------------------.
- KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- KC_GRV, __EDVORAKJP_BASE_L1__ , __EDVORAKJP_BASE_R1__ , KC_BSLS,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- KC_EQL, __EDVORAKJP_BASE_L2__ , __EDVORAKJP_BASE_R2__ , KC_MINS,
- //|--------+--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------+--------|
- KC_ESC, __EDVORAKJP_BASE_L3__ , XXXXXXX, XXXXXXX, __EDVORAKJP_BASE_R3__ , KC_SLSH,
- //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
- __EDVORAKJP_PAGE__ , LA_TAB, LS_SPC,LOWER_TD, RAISE_TD, RC_BSPC, RG_ENT, __EDVORAKJP_CURSOR__
- //`--------------------------------------------------------------' `--------------------------------------------------------------'
- ),
-
- [L_EDVORAKJP_LOWER] = LAYOUT_wrapper(
- //,-----------------------------------------------------. ,-----------------------------------------------------.
- __KC_TRNS_x6__ , __KC_TRNS_x6__ ,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- XXXXXXX, XXXXXXX, __EDVORAKJP_BRACKET_L__ , XXXXXXX, XXXXXXX, __EDVORAKJP_BRACKET_R__ , XXXXXXX, XXXXXXX,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- __EDVORAKJP_FUNCTION_L__ , __EDVORAKJP_FUNCTION_R__ ,
- //|--------+--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------+--------|
- KC_PSCR, XXXXXXX, __EDVORAKJP_PAGE__ , KC_TRNS, KC_TRNS, __EDVORAKJP_CURSOR__ , XXXXXXX, XXXXXXX,
- //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
- __KC_TRNS_x4__ , KC_TRNS, KC_TRNS, XXXXXXX, KC_MAC, RC_DEL, KC_TRNS, __KC_TRNS_x4__
- //`--------------------------------------------------------------' `--------------------------------------------------------------'
- ),
-
- [L_EDVORAKJP_RAISE] = LAYOUT_wrapper(
- //,-----------------------------------------------------. ,-----------------------------------------------------.
- __KC_TRNS_x6__ , __KC_TRNS_x6__ ,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- XXXXXXX, XXXXXXX, __EDVORAKJP_SYMBOL_L__ , __EDVORAKJP_SYMBOL_R__ , XXXXXXX, XXXXXXX,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- XXXXXXX, __EDVORAKJP_NUMBER_L__ , __EDVORAKJP_NUMBER_R__ , XXXXXXX,
- //|--------+--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------+--------|
- KC_PSCR, XXXXXXX, __EDVORAKJP_PAGE__ , KC_TRNS, KC_TRNS, __EDVORAKJP_CURSOR__ , XXXXXXX, XXXXXXX,
- //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
- __KC_TRNS_x4__ , KC_TRNS, KC_TRNS, KC_WIN, XXXXXXX, KC_TRNS, KC_TRNS, __KC_TRNS_x4__
- //`--------------------------------------------------------------' `--------------------------------------------------------------'
- )
-};
-// clang-format on
diff --git a/keyboards/helix/rev2/keymaps/edvorakjp/keymap_xrows.h b/keyboards/helix/rev2/keymaps/edvorakjp/keymap_xrows.h
deleted file mode 100644
index 3ff95a3c6e..0000000000
--- a/keyboards/helix/rev2/keymaps/edvorakjp/keymap_xrows.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma once
-
-#include "edvorakjp.h"
-
-#define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__)
-
-#define __KC_TRNS_x4__ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-#define __KC_TRNS_x6__ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/helix/rev2/keymaps/edvorakjp/rules.mk b/keyboards/helix/rev2/keymaps/edvorakjp/rules.mk
index 6b2d147514..66d33e5e46 100644
--- a/keyboards/helix/rev2/keymaps/edvorakjp/rules.mk
+++ b/keyboards/helix/rev2/keymaps/edvorakjp/rules.mk
@@ -12,7 +12,6 @@ TAP_DANCE_ENABLE = yes
# Helix Spacific Build Options
# you can uncomment and edit follows 7 Variables
# jp: 以下の7つの変数を必要に応じて編集し、コメントアウトをはずします。
-# HELIX_ROWS = 5 # Helix Rows is 4 or 5
# OLED_ENABLE = no # OLED_ENABLE
# LOCAL_GLCDFONT = no # use each keymaps "helixfont.h" instead of "common/glcdfont.c"
# LED_BACK_ENABLE = no # LED backlight (Enable WS2812 RGB underlight.)
@@ -25,12 +24,6 @@ OLED_SELECT = core
# into QMK standard options.
include $(strip $(KEYBOARD_LOCAL_FEATURES_MK))
-ifeq ($(strip $(HELIX_ROWS)), 4)
- SRC += keymap_4rows.c
-else ifeq ($(strip $(HELIX_ROWS)), 5)
- SRC += keymap_5rows.c
-endif
-
ifeq ($(strip $(LED_UNDERGLOW_ENABLE)), yes)
OPT_DEFS += -DRGBLED_BACK
endif
diff --git a/keyboards/helix/rev2/keymaps/five_rows/keymap.c b/keyboards/helix/rev2/keymaps/five_rows/keymap.c
index 09c7ab127b..dc2759d5b6 100644
--- a/keyboards/helix/rev2/keymaps/five_rows/keymap.c
+++ b/keyboards/helix/rev2/keymaps/five_rows/keymap.c
@@ -97,7 +97,6 @@ enum custom_keycodes {
LT(_RAISE,KC_ENT), KC_SPC, KC_RGUI, KC_RALT, KC_APP, KC_LOWER, KC_LOWER
#define GRV__QUOT KC_GRV, KC_QUOT
-#if MATRIX_ROWS == 10 // HELIX_ROWS == 5
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Qwerty */
@@ -372,11 +371,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
)
};
-#else
-#error "undefined keymaps"
-#endif
-
-
int current_default_layer;
layer_state_t default_layer_state_set_user(layer_state_t state) {
diff --git a/keyboards/helix/rev2/keymaps/five_rows/rules.mk b/keyboards/helix/rev2/keymaps/five_rows/rules.mk
index 8f31c0bd06..3097316fba 100644
--- a/keyboards/helix/rev2/keymaps/five_rows/rules.mk
+++ b/keyboards/helix/rev2/keymaps/five_rows/rules.mk
@@ -13,7 +13,6 @@ LED_ANIMATIONS = yes
# Helix Spacific Build Options
# you can uncomment and edit follows 7 Variables
# jp: 以下の7つの変数を必要に応じて編集し、コメントアウトをはずします。
-HELIX_ROWS = 5 # Helix Rows is 4 or 5
# OLED_ENABLE = no # OLED_ENABLE
# LOCAL_GLCDFONT = no # use each keymaps "helixfont.h" insted of "common/glcdfont.c"
# LED_BACK_ENABLE = no # LED backlight (Enable WS2812 RGB underlight.)
diff --git a/keyboards/helix/rev2/keymaps/five_rows_jis/keymap.c b/keyboards/helix/rev2/keymaps/five_rows_jis/keymap.c
index 718c466809..32b446c498 100644
--- a/keyboards/helix/rev2/keymaps/five_rows_jis/keymap.c
+++ b/keyboards/helix/rev2/keymaps/five_rows_jis/keymap.c
@@ -43,7 +43,6 @@ enum custom_keycodes {
#define ML_RAIE MO(_RAI_E)
#define ML_ADJ MO(_ADJUST)
-#if MATRIX_ROWS == 10 // HELIX_ROWS == 5
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Qwerty JIS Normal
* ,-----------------------------------------. ,-----------------------------------------.
@@ -193,10 +192,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
};
-#else
-#error "undefined keymaps"
-#endif
-
#if defined(SSD1306OLED) || defined(OLED_ENABLE)
char keylog[24] = {};
const char code_to_name[60] = {
diff --git a/keyboards/helix/rev2/keymaps/five_rows_jis/rules.mk b/keyboards/helix/rev2/keymaps/five_rows_jis/rules.mk
index 6300137fd6..4ca86c4f99 100644
--- a/keyboards/helix/rev2/keymaps/five_rows_jis/rules.mk
+++ b/keyboards/helix/rev2/keymaps/five_rows_jis/rules.mk
@@ -4,7 +4,6 @@ SPLIT_KEYBOARD = yes
# Helix Spacific Build Options
# you can uncomment and edit follows 7 Variables
# jp: 以下の7つの変数を必要に応じて編集し、コメントアウトをはずします。
-HELIX_ROWS = 5 # Helix Rows is 4 or 5
# OLED_ENABLE = no # OLED_ENABLE
# LOCAL_GLCDFONT = no # use each keymaps "helixfont.h" insted of "common/glcdfont.c"
# LED_BACK_ENABLE = no # LED backlight (Enable WS2812 RGB underlight.)
diff --git a/keyboards/helix/rev2/keymaps/fraanrosi/keymap.c b/keyboards/helix/rev2/keymaps/fraanrosi/keymap.c
index fca6fa256d..1bd43ab24a 100644
--- a/keyboards/helix/rev2/keymaps/fraanrosi/keymap.c
+++ b/keyboards/helix/rev2/keymaps/fraanrosi/keymap.c
@@ -67,7 +67,6 @@ enum custom_keycodes {
#define RAISE MO(2)
-// HELIX_ROWS == 5
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Qwerty
diff --git a/keyboards/helix/rev2/keymaps/fraanrosi/rules.mk b/keyboards/helix/rev2/keymaps/fraanrosi/rules.mk
index dd0d2eba07..688813ce39 100644
--- a/keyboards/helix/rev2/keymaps/fraanrosi/rules.mk
+++ b/keyboards/helix/rev2/keymaps/fraanrosi/rules.mk
@@ -13,7 +13,6 @@ EXTRAKEY_ENABLE = yes # Audio control and System control
# Helix Spacific Build Options
# you can uncomment and edit follows 7 Variables
# jp: 以下の7つの変数を必要に応じて編集し、コメントアウトをはずします。
-# HELIX_ROWS = 5 # Helix Rows is 4 or 5
# OLED_ENABLE = no # OLED_ENABLE
# LOCAL_GLCDFONT = no # use each keymaps "helixfont.h" insted of "common/glcdfont.c"
# LED_BACK_ENABLE = no # LED backlight (Enable WS2812 RGB underlight.)
diff --git a/keyboards/helix/rev2/keymaps/froggy/keymap.c b/keyboards/helix/rev2/keymaps/froggy/keymap.c
index ae96f576af..8463365f59 100644
--- a/keyboards/helix/rev2/keymaps/froggy/keymap.c
+++ b/keyboards/helix/rev2/keymaps/froggy/keymap.c
@@ -71,7 +71,6 @@ enum macro_keycodes {
//Macros
#define M_SAMPLE M(KC_SAMPLEMACRO)
-#if MATRIX_ROWS == 10 // HELIX_ROWS == 5
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Base
@@ -178,10 +177,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, KC_PDOT, KC_COMM, _______, _______, _______
)
};
-#else
-#error "undefined keymaps"
-#endif
-
#ifdef AUDIO_ENABLE
diff --git a/keyboards/helix/rev2/keymaps/froggy/rules.mk b/keyboards/helix/rev2/keymaps/froggy/rules.mk
index 044e29443c..048ecefff3 100644
--- a/keyboards/helix/rev2/keymaps/froggy/rules.mk
+++ b/keyboards/helix/rev2/keymaps/froggy/rules.mk
@@ -11,7 +11,6 @@ SPLIT_KEYBOARD = yes
# Helix Spacific Build Options
# you can uncomment and edit follows 7 Variables
# jp: 以下の7つの変数を必要に応じて編集し、コメントアウトをはずします。
-HELIX_ROWS = 5 # Helix Rows is 4 or 5
OLED_ENABLE = yes # OLED_ENABLE
LOCAL_GLCDFONT = yes # use each keymaps "helixfont.h" insted of "common/glcdfont.c"
LED_BACK_ENABLE = yes # LED backlight (Enable WS2812 RGB underlight.)
diff --git a/keyboards/helix/rev2/keymaps/froggy_106/keymap.c b/keyboards/helix/rev2/keymaps/froggy_106/keymap.c
index 03a00235ac..a370c21ea2 100644
--- a/keyboards/helix/rev2/keymaps/froggy_106/keymap.c
+++ b/keyboards/helix/rev2/keymaps/froggy_106/keymap.c
@@ -96,7 +96,6 @@ enum macro_keycodes {
//Macros
#define M_SAMPLE M(KC_SAMPLEMACRO)
-#if MATRIX_ROWS == 10 // HELIX_ROWS == 5
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Base
@@ -232,9 +231,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
RGBOFF,_______, _______, _______, _______, _______, _______
)
};
-#else
-#error "undefined keymaps"
-#endif
void set_mac_mode(bool enable) {
if(enable){
diff --git a/keyboards/helix/rev2/keymaps/froggy_106/rules.mk b/keyboards/helix/rev2/keymaps/froggy_106/rules.mk
index ba6a1670ea..b77e8af4f2 100644
--- a/keyboards/helix/rev2/keymaps/froggy_106/rules.mk
+++ b/keyboards/helix/rev2/keymaps/froggy_106/rules.mk
@@ -11,7 +11,6 @@ SPLIT_KEYBOARD = yes
# Helix Spacific Build Options
# you can uncomment and edit follows 7 Variables
# jp: 以下の7つの変数を必要に応じて編集し、コメントアウトをはずします。
-HELIX_ROWS = 5 # Helix Rows is 4 or 5
OLED_ENABLE = yes # OLED_ENABLE
LOCAL_GLCDFONT = yes # use each keymaps "helixfont.h" insted of "common/glcdfont.c"
LED_BACK_ENABLE = yes # LED backlight (Enable WS2812 RGB underlight.)
diff --git a/keyboards/helix/rev2/keymaps/led_test/rules.mk b/keyboards/helix/rev2/keymaps/led_test/rules.mk
index 1dc12bb1cb..98df1f45e8 100644
--- a/keyboards/helix/rev2/keymaps/led_test/rules.mk
+++ b/keyboards/helix/rev2/keymaps/led_test/rules.mk
@@ -12,7 +12,6 @@ LTO_ENABLE = no # if firmware size over limit, try this option
# Helix Spacific Build Options
# you can uncomment and edit follows 7 Variables
# jp: 以下の7つの変数を必要に応じて編集し、コメントアウトをはずします。
-# HELIX_ROWS = 5 # Helix Rows is 4 or 5
OLED_ENABLE = yes # OLED_ENABLE
# LOCAL_GLCDFONT = no # use each keymaps "helixfont.h" insted of "common/glcdfont.c"
LED_BACK_ENABLE = yes # LED backlight (Enable WS2812 RGB underlight.)
diff --git a/keyboards/helix/rev2/keymaps/yshrsmz/keymap.c b/keyboards/helix/rev2/keymaps/yshrsmz/keymap.c
index 5f22ed2741..b3ae8a3d25 100644
--- a/keyboards/helix/rev2/keymaps/yshrsmz/keymap.c
+++ b/keyboards/helix/rev2/keymaps/yshrsmz/keymap.c
@@ -38,7 +38,6 @@ enum macro_keycodes {
//Macros
#define M_SAMPLE M(KC_SAMPLEMACRO)
-#if MATRIX_ROWS == 10 // HELIX_ROWS == 5
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Qwerty
@@ -168,124 +167,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
)
};
-#elif MATRIX_ROWS == 8 // HELIX_ROWS == 4
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
- /* Qwerty
- * ,-----------------------------------------. ,-----------------------------------------.
- * | Tab | Q | W | E | R | T | | Y | U | I | O | P | Bksp |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Ctrl | A | S | D | F | G | | H | J | K | L | ; | ' |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Shift| Z | X | C | V | B | | N | M | , | . | / |Enter |
- * |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
- * |Adjust| Esc | Alt | GUI | EISU |Lower |Space |Space |Raise | KANA | Left | Down | Up |Right |
- * `-------------------------------------------------------------------------------------------------'
- */
- [_QWERTY] = LAYOUT(
- KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
- KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT ,
- ADJUST, KC_ESC, KC_LALT, KC_LGUI, EISU, LOWER, KC_SPC, KC_SPC, RAISE, KANA, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
- ),
-
- /* Colemak
- * ,-----------------------------------------. ,-----------------------------------------.
- * | Tab | Q | W | F | P | G | | J | L | U | Y | ; | Bksp |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Ctrl | A | R | S | T | D | | H | N | E | I | O | ' |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Shift| Z | X | C | V | B | | K | M | , | . | / |Enter |
- * |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
- * |Adjust| Esc | Alt | GUI | EISU |Lower |Space |Space |Raise | KANA | Left | Down | Up |Right |
- * `-------------------------------------------------------------------------------------------------'
- */
- [_COLEMAK] = LAYOUT(
- KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC,
- KC_LCTL, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT ,
- ADJUST, KC_ESC, KC_LALT, KC_LGUI, EISU, LOWER, KC_SPC, KC_SPC, RAISE, KANA, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
- ),
-
- /* Dvorak
- * ,-----------------------------------------. ,-----------------------------------------.
- * | Tab | ' | , | . | P | Y | | F | G | C | R | L | Del |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Ctrl | A | O | E | U | I | | D | H | T | N | S | / |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Shift| ; | Q | J | K | X | | B | M | W | V | Z |Enter |
- * |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
- * |Adjust| Esc | Alt | GUI | EISU |Lower |Space |Space |Raise | KANA | Left | Down | Up |Right |
- * `-------------------------------------------------------------------------------------------------'
- */
- [_DVORAK] = LAYOUT(
- KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_DEL,
- KC_LCTL, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH,
- KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_ENT ,
- ADJUST, KC_ESC, KC_LALT, KC_LGUI, EISU, LOWER, KC_SPC, KC_SPC, RAISE, KANA, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
- ),
-
- /* Lower
- * ,-----------------------------------------. ,-----------------------------------------.
- * | ~ | ! | @ | # | $ | % | | ^ | & | * | ( | ) | |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | | F1 | F2 | F3 | F4 | F5 | | F6 | _ | + | { | } | | |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | | F7 | F8 | F9 | F10 | F11 | | F12 | | | Home | End | |
- * |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
- * | | | | | | | | | | | Next | Vol- | Vol+ | Play |
- * `-------------------------------------------------------------------------------------------------'
- */
- [_LOWER] = LAYOUT(
- KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
- _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
- _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_HOME, KC_END, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
- ),
-
- /* Raise
- * ,-----------------------------------------. ,-----------------------------------------.
- * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Del |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | | F1 | F2 | F3 | F4 | F5 | | F6 | - | = | [ | ] | \ |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | | F7 | F8 | F9 | F10 | F11 | | F12 | | |PageDn|PageUp| |
- * |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
- * | | | | | | | | | | | Next | Vol- | Vol+ | Play |
- * `-------------------------------------------------------------------------------------------------'
- */
- [_RAISE] = LAYOUT(
- KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL,
- _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
- _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_PGDN, KC_PGUP, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
- ),
-
- /* Adjust (Lower + Raise)
- * ,-----------------------------------------. ,-----------------------------------------.
- * | | Reset|RGBRST| | | | | | | | | | Del |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | | | |Aud on|Audoff| Mac | | Win |Qwerty|Colemk|Dvorak| | |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | | | | | | | | | |RGB ON| HUE+ | SAT+ | VAL+ |
- * |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
- * | | | | | | | | | | | MODE | HUE- | SAT- | VAL- |
- * `-------------------------------------------------------------------------------------------------'
- */
- [_ADJUST] = LAYOUT(
- _______, QK_BOOT, RGBRST, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
- _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD
- )
-};
-
-#else
-#error "undefined keymaps"
-#endif
-
-
#ifdef AUDIO_ENABLE
float tone_qwerty[][2] = SONG(QWERTY_SOUND);
diff --git a/keyboards/helix/rev2/keymaps/yshrsmz/rules.mk b/keyboards/helix/rev2/keymaps/yshrsmz/rules.mk
index bc5190c706..a2cf28f3bf 100644
--- a/keyboards/helix/rev2/keymaps/yshrsmz/rules.mk
+++ b/keyboards/helix/rev2/keymaps/yshrsmz/rules.mk
@@ -11,7 +11,6 @@ SPLIT_KEYBOARD = yes
# Helix Spacific Build Options
# you can uncomment and edit follows 7 Variables
# jp: 以下の7つの変数を必要に応じて編集し、コメントアウトをはずします。
-# HELIX_ROWS = 5 # Helix Rows is 4 or 5
OLED_ENABLE = yes # OLED_ENABLE
# LOCAL_GLCDFONT = no # use each keymaps "helixfont.h" insted of "common/glcdfont.c"
# LED_BACK_ENABLE = no # LED backlight (Enable WS2812 RGB underlight.)
diff --git a/keyboards/helix/rev2/local_features.mk b/keyboards/helix/rev2/local_features.mk
index 34fd699a65..6e63cc7172 100644
--- a/keyboards/helix/rev2/local_features.mk
+++ b/keyboards/helix/rev2/local_features.mk
@@ -44,13 +44,6 @@ endif
# convert Helix-specific options (that represent combinations of standard options)
# into QMK standard options.
-ifneq ($(strip $(HELIX_ROWS)), 4)
- ifneq ($(strip $(HELIX_ROWS)), 5)
- $(error HELIX_ROWS = $(strip $(HELIX_ROWS)) is unexpected value)
- endif
-endif
-OPT_DEFS += -DHELIX_ROWS=$(strip $(HELIX_ROWS))
-
ifeq ($(strip $(LED_BACK_ENABLE)), yes)
RGBLIGHT_ENABLE = yes
OPT_DEFS += -DRGBLED_BACK
diff --git a/keyboards/helix/rev2/rev2.h b/keyboards/helix/rev2/rev2.h
index dd1d74a298..dad08c267e 100644
--- a/keyboards/helix/rev2/rev2.h
+++ b/keyboards/helix/rev2/rev2.h
@@ -34,87 +34,3 @@ void render_helix_logo(void);
// for the old keymap.c.
extern uint8_t is_master; // 'is_master' will be obsolete, it is recommended to use 'is_keyboard_master ()' instead.
#define has_usb() is_keyboard_master()
-
-#if MATRIX_ROWS == 8 // HELIX_ROWS == 4
- #ifndef FLIP_HALF
- // Standard Keymap
- // (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left)
- #define LAYOUT( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
- L30, L31, L32, L33, L34, L35, L36, R36, R30, R31, R32, R33, R34, R35 \
- ) { \
- { L00, L01, L02, L03, L04, L05, KC_NO }, \
- { L10, L11, L12, L13, L14, L15, KC_NO }, \
- { L20, L21, L22, L23, L24, L25, KC_NO }, \
- { L30, L31, L32, L33, L34, L35, L36 }, \
- { R05, R04, R03, R02, R01, R00, KC_NO }, \
- { R15, R14, R13, R12, R11, R10, KC_NO }, \
- { R25, R24, R23, R22, R21, R20, KC_NO }, \
- { R35, R34, R33, R32, R31, R30, R36 } \
- }
- #else
- // Keymap with right side flipped
- // (TRRS jack on both halves are to the right)
- #define LAYOUT( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
- L30, L31, L32, L33, L34, L35, L36, R36, R30, R31, R32, R33, R34, R35 \
- ) { \
- { L00, L01, L02, L03, L04, L05, KC_NO }, \
- { L10, L11, L12, L13, L14, L15, KC_NO }, \
- { L20, L21, L22, L23, L24, L25, KC_NO }, \
- { L30, L31, L32, L33, L34, L35, L36 }, \
- { KC_NO, R00, R01, R02, R03, R04, R05 }, \
- { KC_NO, R10, R11, R12, R13, R14, R15 }, \
- { KC_NO, R20, R21, R22, R23, R24, R25 }, \
- { R36, R30, R31, R32, R33, R34, R35 } \
- }
- #endif
-#else // HELIX_ROWS == 5
- #ifndef FLIP_HALF
- // Standard Keymap
- // (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left)
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
- L30, L31, L32, L33, L34, L35, L36, R36, R30, R31, R32, R33, R34, R35, \
- L40, L41, L42, L43, L44, L45, L46, R46, R40, R41, R42, R43, R44, R45 \
-) { \
- { L00, L01, L02, L03, L04, L05, KC_NO }, \
- { L10, L11, L12, L13, L14, L15, KC_NO }, \
- { L20, L21, L22, L23, L24, L25, KC_NO }, \
- { L30, L31, L32, L33, L34, L35, L36 }, \
- { L40, L41, L42, L43, L44, L45, L46 }, \
- { R05, R04, R03, R02, R01, R00, KC_NO }, \
- { R15, R14, R13, R12, R11, R10, KC_NO }, \
- { R25, R24, R23, R22, R21, R20, KC_NO }, \
- { R35, R34, R33, R32, R31, R30, R36 }, \
- { R45, R44, R43, R42, R41, R40, R46 } \
-}
- #else
- // Keymap with right side flipped
- // (TRRS jack on both halves are to the right)
- #define LAYOUT( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
- L30, L31, L32, L33, L34, L35, L36, R36, R30, R31, R32, R33, R34, R35, \
- L40, L41, L42, L43, L44, L45, L46, R46, R40, R41, R42, R43, R44, R45 \
- ) { \
- { L00, L01, L02, L03, L04, L05, KC_NO }, \
- { L10, L11, L12, L13, L14, L15, KC_NO }, \
- { L20, L21, L22, L23, L24, L25, KC_NO }, \
- { L30, L31, L32, L33, L34, L35, L36 }, \
- { L40, L41, L42, L43, L44, L45, L46 }, \
- { KC_NO, R00, R01, R02, R03, R04, R05 }, \
- { KC_NO, R10, R11, R12, R13, R14, R15 }, \
- { KC_NO, R20, R21, R22, R23, R24, R25 }, \
- { R36, R30, R31, R32, R33, R34, R35 }, \
- { R46, R40, R41, R42, R43, R44, R45 } \
- }
- #endif
-#endif
diff --git a/keyboards/helix/rev2/rules.mk b/keyboards/helix/rev2/rules.mk
index dce8b9d3ea..03396029a3 100644
--- a/keyboards/helix/rev2/rules.mk
+++ b/keyboards/helix/rev2/rules.mk
@@ -3,7 +3,6 @@ KEYBOARD_LOCAL_FEATURES_MK := $(dir $(lastword $(MAKEFILE_LIST)))local_features.
SPLIT_KEYBOARD = yes
# Helix Spacific Build Options default values
-HELIX_ROWS = 5 # Helix Rows is 4 or 5
OLED_ENABLE = yes # OLED_ENABLE
LOCAL_GLCDFONT = no # use each keymaps "helixfont.h" insted of "common/glcdfont.c"
LED_BACK_ENABLE = no # LED backlight (Enable WS2812 RGB underlight.)
diff --git a/keyboards/helix/rev3_5rows/keymaps/five_rows/keymap.c b/keyboards/helix/rev3_5rows/keymaps/five_rows/keymap.c
index 09c7ab127b..dc2759d5b6 100644
--- a/keyboards/helix/rev3_5rows/keymaps/five_rows/keymap.c
+++ b/keyboards/helix/rev3_5rows/keymaps/five_rows/keymap.c
@@ -97,7 +97,6 @@ enum custom_keycodes {
LT(_RAISE,KC_ENT), KC_SPC, KC_RGUI, KC_RALT, KC_APP, KC_LOWER, KC_LOWER
#define GRV__QUOT KC_GRV, KC_QUOT
-#if MATRIX_ROWS == 10 // HELIX_ROWS == 5
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Qwerty */
@@ -372,11 +371,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
)
};
-#else
-#error "undefined keymaps"
-#endif
-
-
int current_default_layer;
layer_state_t default_layer_state_set_user(layer_state_t state) {