diff options
| author | MakotoKurauchi <pluis@me.com> | 2018-03-08 07:34:42 +0900 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2018-03-07 17:34:42 -0500 |
| commit | 955b17189ac9c744ebdda01988e20a54b2b00d91 (patch) | |
| tree | a8cc9b5887db5dece8343077ea16806b5e274a5a /keyboards/helix | |
| parent | 3d7e9425c7c8eea3da7e96f6d56eb8ab60abeaf4 (diff) | |
Move rows config to keymap (#2464)
* Fork from Let's Split
* Organizing files
* Delete some keymaps
* I2C and serial enabled at the same time
* Change readme
* add #define HELIX_ROWS for multiple rows
* Delete avrdude flashing script
* Delete makefiles
* Subproject elimination
* Fix lufa path
* Remove PLAY_NOTE_ARRAY usages to get rid of warning.
Fix conflicting function name
* Mousekey change default to off
* Fix to oled display adjust
* make rev2
change pin assign
change keymap
* use master_buffer
* Timing adjustment
* Organizing files
* Change Keymap
* Change Keymap
Add EISU and KANA
Correct 4rows
* NKRO default to disable
* EXTRAKEY_ENABLE default to disable
* add rgb reset key
* rgb custom function enable
* Extend font
* add RGBLED_POWER
default folder to helix/rev2
RGB_ENABLE to no
* renamed directory
* Disable RGBLIGHT_CUSTOM_DRIVER
* Disable LOCKING_SUPPORT_ENABLE
* Update bootloader setting
* Change readme
* Fixed argument error
* Move rows config to keymap
Diffstat (limited to 'keyboards/helix')
| -rw-r--r-- | keyboards/helix/rev2/config.h | 15 | ||||
| -rw-r--r-- | keyboards/helix/rev2/keymaps/default/config.h | 18 |
2 files changed, 18 insertions, 15 deletions
diff --git a/keyboards/helix/rev2/config.h b/keyboards/helix/rev2/config.h index 42878d5c0c..5905627760 100644 --- a/keyboards/helix/rev2/config.h +++ b/keyboards/helix/rev2/config.h @@ -29,21 +29,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define PRODUCT Helix Beta #define DESCRIPTION A split keyboard for the cheap makers -#define HELIX_ROWS 5 - -/* key matrix size */ -// Rows are doubled-up -#if HELIX_ROWS == 4 - #define MATRIX_ROWS 8 - #define MATRIX_COLS 7 - #define MATRIX_ROW_PINS { D4, C6, D7, E6 } -#elif HELIX_ROWS == 5 - #define MATRIX_ROWS 10 - #define MATRIX_COLS 7 - #define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 } -#else - #error "expected HELIX_ROWS 4 or 5" -#endif // wiring of each half #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 } diff --git a/keyboards/helix/rev2/keymaps/default/config.h b/keyboards/helix/rev2/keymaps/default/config.h index 1b3875fcd6..5d8e37f645 100644 --- a/keyboards/helix/rev2/keymaps/default/config.h +++ b/keyboards/helix/rev2/keymaps/default/config.h @@ -37,6 +37,24 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. //#define SSD1306OLED +/* Select rows configuration */ +// Rows are 4 or 5 +#define HELIX_ROWS 5 + +/* key matrix size */ +// Rows are doubled-up +#if HELIX_ROWS == 4 + #define MATRIX_ROWS 8 + #define MATRIX_COLS 7 + #define MATRIX_ROW_PINS { D4, C6, D7, E6 } +#elif HELIX_ROWS == 5 + #define MATRIX_ROWS 10 + #define MATRIX_COLS 7 + #define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 } +#else + #error "expected HELIX_ROWS 4 or 5" +#endif + #define USE_SERIAL_PD2 #define PREVENT_STUCK_MODIFIERS |