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 | |
| parent | 3d7e9425c7c8eea3da7e96f6d56eb8ab60abeaf4 (diff) | |
| download | qmk_firmware-955b17189ac9c744ebdda01988e20a54b2b00d91.tar.gz qmk_firmware-955b17189ac9c744ebdda01988e20a54b2b00d91.zip | |
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
| -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 42878d5c0..590562776 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/>. | |||
| 29 | #define PRODUCT Helix Beta | 29 | #define PRODUCT Helix Beta |
| 30 | #define DESCRIPTION A split keyboard for the cheap makers | 30 | #define DESCRIPTION A split keyboard for the cheap makers |
| 31 | 31 | ||
| 32 | #define HELIX_ROWS 5 | ||
| 33 | |||
| 34 | /* key matrix size */ | ||
| 35 | // Rows are doubled-up | ||
| 36 | #if HELIX_ROWS == 4 | ||
| 37 | #define MATRIX_ROWS 8 | ||
| 38 | #define MATRIX_COLS 7 | ||
| 39 | #define MATRIX_ROW_PINS { D4, C6, D7, E6 } | ||
| 40 | #elif HELIX_ROWS == 5 | ||
| 41 | #define MATRIX_ROWS 10 | ||
| 42 | #define MATRIX_COLS 7 | ||
| 43 | #define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 } | ||
| 44 | #else | ||
| 45 | #error "expected HELIX_ROWS 4 or 5" | ||
| 46 | #endif | ||
| 47 | 32 | ||
| 48 | // wiring of each half | 33 | // wiring of each half |
| 49 | #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 } | 34 | #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 1b3875fcd..5d8e37f64 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/>. | |||
| 37 | 37 | ||
| 38 | //#define SSD1306OLED | 38 | //#define SSD1306OLED |
| 39 | 39 | ||
| 40 | /* Select rows configuration */ | ||
| 41 | // Rows are 4 or 5 | ||
| 42 | #define HELIX_ROWS 5 | ||
| 43 | |||
| 44 | /* key matrix size */ | ||
| 45 | // Rows are doubled-up | ||
| 46 | #if HELIX_ROWS == 4 | ||
| 47 | #define MATRIX_ROWS 8 | ||
| 48 | #define MATRIX_COLS 7 | ||
| 49 | #define MATRIX_ROW_PINS { D4, C6, D7, E6 } | ||
| 50 | #elif HELIX_ROWS == 5 | ||
| 51 | #define MATRIX_ROWS 10 | ||
| 52 | #define MATRIX_COLS 7 | ||
| 53 | #define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 } | ||
| 54 | #else | ||
| 55 | #error "expected HELIX_ROWS 4 or 5" | ||
| 56 | #endif | ||
| 57 | |||
| 40 | #define USE_SERIAL_PD2 | 58 | #define USE_SERIAL_PD2 |
| 41 | 59 | ||
| 42 | #define PREVENT_STUCK_MODIFIERS | 60 | #define PREVENT_STUCK_MODIFIERS |
