Move Bootmagic config to data driven (#19860)
This commit is contained in:
		
							parent
							
								
									7fad94ba2d
								
							
						
					
					
						commit
						d784f78bd0
					
				| @ -55,7 +55,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | |||||||
| //#define NO_ACTION_LAYER
 | //#define NO_ACTION_LAYER
 | ||||||
| //#define NO_ACTION_TAPPING
 | //#define NO_ACTION_TAPPING
 | ||||||
| //#define NO_ACTION_ONESHOT
 | //#define NO_ACTION_ONESHOT
 | ||||||
| 
 |  | ||||||
| /* Bootmagic Lite key configuration */ |  | ||||||
| #define BOOTMAGIC_LITE_ROW 1 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN 0 |  | ||||||
|  | |||||||
| @ -8,6 +8,9 @@ | |||||||
|         "pid": "0xF09F", |         "pid": "0xF09F", | ||||||
|         "device_version": "0.0.1" |         "device_version": "0.0.1" | ||||||
|     }, |     }, | ||||||
|  |     "bootmagic": { | ||||||
|  |         "matrix": [1, 0] | ||||||
|  |     }, | ||||||
|     "processor": "atmega32u4", |     "processor": "atmega32u4", | ||||||
|     "bootloader": "caterina", |     "bootloader": "caterina", | ||||||
|     "matrix_pins": { |     "matrix_pins": { | ||||||
|  | |||||||
| @ -26,10 +26,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | |||||||
| #define SOFT_SERIAL_PIN D1 | #define SOFT_SERIAL_PIN D1 | ||||||
| 
 | 
 | ||||||
| #define EE_HANDS | #define EE_HANDS | ||||||
| 
 |  | ||||||
| /* Top left key on left half */ |  | ||||||
| #define BOOTMAGIC_LITE_ROW 0 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN 0 |  | ||||||
| /* Top right key on right half */ |  | ||||||
| #define BOOTMAGIC_LITE_ROW_RIGHT 4 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN_RIGHT 4 |  | ||||||
|  | |||||||
| @ -19,6 +19,9 @@ | |||||||
|         ] |         ] | ||||||
|     }, |     }, | ||||||
|     "split": { |     "split": { | ||||||
|  |         "bootmagic": { | ||||||
|  |             "matrix": [4, 4] | ||||||
|  |         }, | ||||||
|         "matrix_pins": { |         "matrix_pins": { | ||||||
|             "right": { |             "right": { | ||||||
|                 "direct": [ |                 "direct": [ | ||||||
|  | |||||||
| @ -41,11 +41,6 @@ | |||||||
| #define ENCODERS_PAD_A { GP18 } | #define ENCODERS_PAD_A { GP18 } | ||||||
| #define ENCODERS_PAD_B { GP17 } | #define ENCODERS_PAD_B { GP17 } | ||||||
| 
 | 
 | ||||||
| /* Bootmagic lite */ |  | ||||||
| /* (Press the key below the encoder button while plugging the keyboard to enter the bootloader and clear flash) */ |  | ||||||
| #define BOOTMAGIC_LITE_ROW 1 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN 2 |  | ||||||
| 
 |  | ||||||
| /* Double tap the side button to enter bootloader */ | /* Double tap the side button to enter bootloader */ | ||||||
| #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET | #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET | ||||||
| #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP13 | #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP13 | ||||||
|  | |||||||
| @ -8,6 +8,9 @@ | |||||||
|         "pid": "0x0108", |         "pid": "0x0108", | ||||||
|         "device_version": "0.0.1" |         "device_version": "0.0.1" | ||||||
|     }, |     }, | ||||||
|  |     "bootmagic": { | ||||||
|  |         "matrix": [1, 2] | ||||||
|  |     }, | ||||||
|     "processor": "RP2040", |     "processor": "RP2040", | ||||||
|     "bootloader": "rp2040", |     "bootloader": "rp2040", | ||||||
|     "matrix_pins": { |     "matrix_pins": { | ||||||
|  | |||||||
| @ -32,6 +32,3 @@ | |||||||
| #define SOFT_SERIAL_PIN D2 | #define SOFT_SERIAL_PIN D2 | ||||||
| 
 | 
 | ||||||
| #define DIODE_DIRECTION COL2ROW | #define DIODE_DIRECTION COL2ROW | ||||||
| 
 |  | ||||||
| #define BOOTMAGIC_LITE_ROW 0 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN 5 |  | ||||||
|  | |||||||
| @ -8,6 +8,9 @@ | |||||||
|         "pid": "0x0001", |         "pid": "0x0001", | ||||||
|         "device_version": "0.0.0" |         "device_version": "0.0.0" | ||||||
|     }, |     }, | ||||||
|  |     "bootmagic": { | ||||||
|  |         "matrix": [0, 5] | ||||||
|  |     }, | ||||||
|     "processor": "atmega32u4", |     "processor": "atmega32u4", | ||||||
|     "bootloader": "caterina", |     "bootloader": "caterina", | ||||||
|     "layouts": { |     "layouts": { | ||||||
|  | |||||||
| @ -32,8 +32,3 @@ | |||||||
| #define SOFT_SERIAL_PIN D2 | #define SOFT_SERIAL_PIN D2 | ||||||
| 
 | 
 | ||||||
| #define DIODE_DIRECTION COL2ROW | #define DIODE_DIRECTION COL2ROW | ||||||
| 
 |  | ||||||
| #define BOOTMAGIC_LITE_ROW_RIGHT 0 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN_RIGHT 5 |  | ||||||
| #define BOOTMAGIC_LITE_ROW_LEFT 0 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN_LEFT 5 |  | ||||||
|  | |||||||
| @ -8,6 +8,9 @@ | |||||||
|         "pid": "0x0001", |         "pid": "0x0001", | ||||||
|         "device_version": "0.0.1" |         "device_version": "0.0.1" | ||||||
|     }, |     }, | ||||||
|  |     "bootmagic": { | ||||||
|  |         "matrix": [0, 5] | ||||||
|  |     }, | ||||||
|     "processor": "atmega32u4", |     "processor": "atmega32u4", | ||||||
|     "bootloader": "caterina", |     "bootloader": "caterina", | ||||||
|     "layouts": { |     "layouts": { | ||||||
|  | |||||||
| @ -32,8 +32,3 @@ | |||||||
| #define SOFT_SERIAL_PIN D2 | #define SOFT_SERIAL_PIN D2 | ||||||
| 
 | 
 | ||||||
| #define DIODE_DIRECTION COL2ROW | #define DIODE_DIRECTION COL2ROW | ||||||
| 
 |  | ||||||
| #define BOOTMAGIC_LITE_ROW_RIGHT 0 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN_RIGHT 5 |  | ||||||
| #define BOOTMAGIC_LITE_ROW_LEFT 0 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN_LEFT 5 |  | ||||||
|  | |||||||
| @ -8,6 +8,9 @@ | |||||||
|         "pid": "0x0003", |         "pid": "0x0003", | ||||||
|         "device_version": "0.0.1" |         "device_version": "0.0.1" | ||||||
|     }, |     }, | ||||||
|  |     "bootmagic": { | ||||||
|  |         "matrix": [0, 5] | ||||||
|  |     }, | ||||||
|     "processor": "atmega32u4", |     "processor": "atmega32u4", | ||||||
|     "bootloader": "caterina", |     "bootloader": "caterina", | ||||||
|     "layouts": { |     "layouts": { | ||||||
|  | |||||||
| @ -32,8 +32,3 @@ | |||||||
| #define SOFT_SERIAL_PIN D2 | #define SOFT_SERIAL_PIN D2 | ||||||
| 
 | 
 | ||||||
| #define DIODE_DIRECTION COL2ROW | #define DIODE_DIRECTION COL2ROW | ||||||
| 
 |  | ||||||
| #define BOOTMAGIC_LITE_ROW_RIGHT 0 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN_RIGHT 5 |  | ||||||
| #define BOOTMAGIC_LITE_ROW_LEFT 0 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN_LEFT 5 |  | ||||||
|  | |||||||
| @ -8,6 +8,9 @@ | |||||||
|         "pid": "0x0005", |         "pid": "0x0005", | ||||||
|         "device_version": "0.0.1" |         "device_version": "0.0.1" | ||||||
|     }, |     }, | ||||||
|  |     "bootmagic": { | ||||||
|  |         "matrix": [0, 5] | ||||||
|  |     }, | ||||||
|     "processor": "atmega32u4", |     "processor": "atmega32u4", | ||||||
|     "bootloader": "caterina", |     "bootloader": "caterina", | ||||||
|     "layouts": { |     "layouts": { | ||||||
|  | |||||||
| @ -32,8 +32,3 @@ | |||||||
| #define SOFT_SERIAL_PIN D2 | #define SOFT_SERIAL_PIN D2 | ||||||
| 
 | 
 | ||||||
| #define DIODE_DIRECTION COL2ROW | #define DIODE_DIRECTION COL2ROW | ||||||
| 
 |  | ||||||
| #define BOOTMAGIC_LITE_ROW_RIGHT 0 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN_RIGHT 5 |  | ||||||
| #define BOOTMAGIC_LITE_ROW_LEFT 0 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN_LEFT 5 |  | ||||||
|  | |||||||
| @ -8,6 +8,9 @@ | |||||||
|         "pid": "0x0004", |         "pid": "0x0004", | ||||||
|         "device_version": "0.0.1" |         "device_version": "0.0.1" | ||||||
|     }, |     }, | ||||||
|  |     "bootmagic": { | ||||||
|  |         "matrix": [0, 5] | ||||||
|  |     }, | ||||||
|     "processor": "atmega32u4", |     "processor": "atmega32u4", | ||||||
|     "bootloader": "caterina", |     "bootloader": "caterina", | ||||||
|     "layouts": { |     "layouts": { | ||||||
|  | |||||||
| @ -34,10 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | |||||||
| /* Locking resynchronize hack */ | /* Locking resynchronize hack */ | ||||||
| #define LOCKING_RESYNC_ENABLE | #define LOCKING_RESYNC_ENABLE | ||||||
| 
 | 
 | ||||||
| /* Bootmagic Lite Support*/ |  | ||||||
| #define BOOTMAGIC_LITE_ROW 3 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN 6 |  | ||||||
| 
 |  | ||||||
| /*
 | /*
 | ||||||
|  * Feature disable options |  * Feature disable options | ||||||
|  *  These options are also useful to firmware size reduction. |  *  These options are also useful to firmware size reduction. | ||||||
|  | |||||||
| @ -8,6 +8,9 @@ | |||||||
|         "pid": "0x6464", |         "pid": "0x6464", | ||||||
|         "device_version": "0.0.1" |         "device_version": "0.0.1" | ||||||
|     }, |     }, | ||||||
|  |   "bootmagic": { | ||||||
|  |       "matrix": [3, 6] | ||||||
|  |   }, | ||||||
|   "processor": "atmega32u2", |   "processor": "atmega32u2", | ||||||
|   "bootloader": "atmel-dfu", |   "bootloader": "atmel-dfu", | ||||||
|   "community_layouts": ["60_ansi"], |   "community_layouts": ["60_ansi"], | ||||||
|  | |||||||
| @ -43,7 +43,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | |||||||
| #define RGBLIGHT_EFFECT_RGB_TEST | #define RGBLIGHT_EFFECT_RGB_TEST | ||||||
| #define RGBLIGHT_EFFECT_ALTERNATING | #define RGBLIGHT_EFFECT_ALTERNATING | ||||||
| #define RGBLIGHT_EFFECT_TWINKLE | #define RGBLIGHT_EFFECT_TWINKLE | ||||||
| 
 |  | ||||||
| /* Bootmagic Lite key configuration */ |  | ||||||
| #define BOOTMAGIC_LITE_ROW 4 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN 0 |  | ||||||
|  | |||||||
| @ -8,6 +8,9 @@ | |||||||
|         "pid": "0x422D", |         "pid": "0x422D", | ||||||
|         "device_version": "2.0.0" |         "device_version": "2.0.0" | ||||||
|     }, |     }, | ||||||
|  |     "bootmagic": { | ||||||
|  |         "matrix": [4, 0] | ||||||
|  |     }, | ||||||
|     "processor": "atmega32a", |     "processor": "atmega32a", | ||||||
|     "bootloader": "bootloadhid", |     "bootloader": "bootloadhid", | ||||||
|     "layout_aliases": { |     "layout_aliases": { | ||||||
|  | |||||||
| @ -1,24 +0,0 @@ | |||||||
| // Copyright 2022 Jason Devadoss (@jasonj2232)
 |  | ||||||
| // SPDX-License-Identifier: GPL-2.0-or-later
 |  | ||||||
| 
 |  | ||||||
| #pragma once |  | ||||||
| 
 |  | ||||||
| 
 |  | ||||||
| #define BOOTMAGIC_LITE_ROW 1 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN 0 |  | ||||||
| 
 |  | ||||||
| /*
 |  | ||||||
|  * Feature disable options |  | ||||||
|  *  These options are also useful to firmware size reduction. |  | ||||||
|  */ |  | ||||||
| 
 |  | ||||||
| /* disable debug print */ |  | ||||||
| //#define NO_DEBUG
 |  | ||||||
| 
 |  | ||||||
| /* disable print */ |  | ||||||
| //#define NO_PRINT
 |  | ||||||
| 
 |  | ||||||
| /* disable action features */ |  | ||||||
| //#define NO_ACTION_LAYER
 |  | ||||||
| //#define NO_ACTION_TAPPING
 |  | ||||||
| //#define NO_ACTION_ONESHOT
 |  | ||||||
| @ -10,6 +10,9 @@ | |||||||
|         "pid": "0x4930", |         "pid": "0x4930", | ||||||
|         "vid": "0x4157" |         "vid": "0x4157" | ||||||
|     }, |     }, | ||||||
|  |     "bootmagic": { | ||||||
|  |         "matrix": [1, 0] | ||||||
|  |     }, | ||||||
|     "features": { |     "features": { | ||||||
|         "bootmagic": true, |         "bootmagic": true, | ||||||
|         "command": false, |         "command": false, | ||||||
|  | |||||||
| @ -1,28 +0,0 @@ | |||||||
| // Copyright 2022 Jason Devadoss (@jasonj2232)
 |  | ||||||
| // SPDX-License-Identifier: GPL-2.0-or-later
 |  | ||||||
| 
 |  | ||||||
| #pragma once |  | ||||||
| 
 |  | ||||||
| 
 |  | ||||||
| #define BOOTMAGIC_LITE_ROW 1 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN 0 |  | ||||||
| 
 |  | ||||||
| //Uncomment the below if the encoder direction is flipped/opposite to what is expected
 |  | ||||||
| 
 |  | ||||||
| //#define ENCODER_DIRECTION_FLIP
 |  | ||||||
| 
 |  | ||||||
| /*
 |  | ||||||
|  * Feature disable options |  | ||||||
|  *  These options are also useful to firmware size reduction. |  | ||||||
|  */ |  | ||||||
| 
 |  | ||||||
| /* disable debug print */ |  | ||||||
| //#define NO_DEBUG
 |  | ||||||
| 
 |  | ||||||
| /* disable print */ |  | ||||||
| //#define NO_PRINT
 |  | ||||||
| 
 |  | ||||||
| /* disable action features */ |  | ||||||
| //#define NO_ACTION_LAYER
 |  | ||||||
| //#define NO_ACTION_TAPPING
 |  | ||||||
| //#define NO_ACTION_ONESHOT
 |  | ||||||
| @ -11,6 +11,9 @@ | |||||||
|         "pid": "0x4930", |         "pid": "0x4930", | ||||||
|         "vid": "0x4157" |         "vid": "0x4157" | ||||||
|     }, |     }, | ||||||
|  |     "bootmagic": { | ||||||
|  |         "matrix": [1, 0] | ||||||
|  |     }, | ||||||
|     "features": { |     "features": { | ||||||
|         "bootmagic": true, |         "bootmagic": true, | ||||||
|         "command": false, |         "command": false, | ||||||
|  | |||||||
| @ -53,7 +53,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | |||||||
| //#define NO_ACTION_LAYER
 | //#define NO_ACTION_LAYER
 | ||||||
| //#define NO_ACTION_TAPPING
 | //#define NO_ACTION_TAPPING
 | ||||||
| //#define NO_ACTION_ONESHOT
 | //#define NO_ACTION_ONESHOT
 | ||||||
| 
 |  | ||||||
| /* Bootmagic Lite key configuration */ |  | ||||||
| #define BOOTMAGIC_LITE_ROW 0 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN 2 |  | ||||||
|  | |||||||
| @ -8,6 +8,9 @@ | |||||||
|         "pid": "0x0000", |         "pid": "0x0000", | ||||||
|         "device_version": "0.0.1" |         "device_version": "0.0.1" | ||||||
|     }, |     }, | ||||||
|  |     "bootmagic": { | ||||||
|  |         "matrix": [0, 2] | ||||||
|  |     }, | ||||||
|     "processor": "at90usb1286", |     "processor": "at90usb1286", | ||||||
|     "bootloader": "atmel-dfu", |     "bootloader": "atmel-dfu", | ||||||
|     "layouts": { |     "layouts": { | ||||||
|  | |||||||
| @ -71,7 +71,3 @@ | |||||||
| //#define NO_ACTION_LAYER
 | //#define NO_ACTION_LAYER
 | ||||||
| //#define NO_ACTION_TAPPING
 | //#define NO_ACTION_TAPPING
 | ||||||
| //#define NO_ACTION_ONESHOT
 | //#define NO_ACTION_ONESHOT
 | ||||||
| 
 |  | ||||||
| /* Bootmagic Lite key configuration */ |  | ||||||
| #define BOOTMAGIC_LITE_ROW 4 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN 6 |  | ||||||
|  | |||||||
| @ -8,6 +8,9 @@ | |||||||
|         "pid": "0xD408", |         "pid": "0xD408", | ||||||
|         "device_version": "0.0.1" |         "device_version": "0.0.1" | ||||||
|     }, |     }, | ||||||
|  |     "bootmagic": { | ||||||
|  |         "matrix": [4, 6] | ||||||
|  |     }, | ||||||
|     "processor": "atmega32u4", |     "processor": "atmega32u4", | ||||||
|     "bootloader": "atmel-dfu", |     "bootloader": "atmel-dfu", | ||||||
|     "layouts": { |     "layouts": { | ||||||
|  | |||||||
| @ -68,10 +68,6 @@ | |||||||
| /* EEPROM for via */ | /* EEPROM for via */ | ||||||
| #define DYNAMIC_KEYMAP_LAYER_COUNT 3 | #define DYNAMIC_KEYMAP_LAYER_COUNT 3 | ||||||
| 
 | 
 | ||||||
| /* bootmagic row col assignment */ |  | ||||||
| #define BOOTMAGIC_LITE_ROW 1 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN 0 |  | ||||||
| 
 |  | ||||||
| #ifdef RGB_MATRIX_ENABLE | #ifdef RGB_MATRIX_ENABLE | ||||||
| #   define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 | #   define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 | ||||||
| // #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
 | // #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
 | ||||||
|  | |||||||
| @ -8,6 +8,9 @@ | |||||||
|         "pid": "0xEAF3", |         "pid": "0xEAF3", | ||||||
|         "device_version": "0.0.1" |         "device_version": "0.0.1" | ||||||
|     }, |     }, | ||||||
|  |     "bootmagic": { | ||||||
|  |         "matrix": [1, 0] | ||||||
|  |     }, | ||||||
|     "processor": "atmega32u4", |     "processor": "atmega32u4", | ||||||
|     "bootloader": "atmel-dfu", |     "bootloader": "atmel-dfu", | ||||||
|     "layouts": { |     "layouts": { | ||||||
|  | |||||||
| @ -10,6 +10,3 @@ | |||||||
| #define SERIAL_USART_FULL_DUPLEX | #define SERIAL_USART_FULL_DUPLEX | ||||||
| #define SERIAL_USART_TX_PIN GP0 | #define SERIAL_USART_TX_PIN GP0 | ||||||
| #define SERIAL_USART_RX_PIN GP1 | #define SERIAL_USART_RX_PIN GP1 | ||||||
| 
 |  | ||||||
| #define BOOTMAGIC_LITE_ROW    0 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN 5 |  | ||||||
|  | |||||||
| @ -18,6 +18,9 @@ | |||||||
|         "pid": "0x0001", |         "pid": "0x0001", | ||||||
|         "vid": "0xBEEB" |         "vid": "0xBEEB" | ||||||
|     }, |     }, | ||||||
|  |     "bootmagic": { | ||||||
|  |         "matrix": [0, 5] | ||||||
|  |     }, | ||||||
|     "matrix_pins": { |     "matrix_pins": { | ||||||
|         "direct": [ |         "direct": [ | ||||||
|             ["GP5", "GP4", "GP11", "GP15", "GP3", "GP2"], |             ["GP5", "GP4", "GP11", "GP15", "GP3", "GP2"], | ||||||
|  | |||||||
| @ -7,13 +7,6 @@ | |||||||
| #define SERIAL_USART_TX_PIN B6     // USART TX pin
 | #define SERIAL_USART_TX_PIN B6     // USART TX pin
 | ||||||
| #define SERIAL_USART_RX_PIN B7     // USART RX pin
 | #define SERIAL_USART_RX_PIN B7     // USART RX pin
 | ||||||
| 
 | 
 | ||||||
| /* Top left key on left half */ |  | ||||||
| #define BOOTMAGIC_LITE_ROW    0 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN 0 |  | ||||||
| /* Top right key on right half */ |  | ||||||
| #define BOOTMAGIC_LITE_ROW_RIGHT    4 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN_RIGHT 5 |  | ||||||
| 
 |  | ||||||
| /*
 | /*
 | ||||||
|  * Feature disable options |  * Feature disable options | ||||||
|  *  These options are also useful to firmware size reduction. |  *  These options are also useful to firmware size reduction. | ||||||
|  | |||||||
| @ -28,6 +28,9 @@ | |||||||
|         ] |         ] | ||||||
|     }, |     }, | ||||||
|     "split": { |     "split": { | ||||||
|  |         "bootmagic": { | ||||||
|  |             "matrix": [4, 5] | ||||||
|  |         }, | ||||||
|         "matrix_pins": { |         "matrix_pins": { | ||||||
|             "right": { |             "right": { | ||||||
|                 "direct": [ |                 "direct": [ | ||||||
|  | |||||||
| @ -36,10 +36,3 @@ | |||||||
| /* #define EE_HANDS  */ | /* #define EE_HANDS  */ | ||||||
| /* #define MASTER_LEFT */ | /* #define MASTER_LEFT */ | ||||||
| /* #define MASTER_RIGHT */ | /* #define MASTER_RIGHT */ | ||||||
| 
 |  | ||||||
| /* Top left key on left half */ |  | ||||||
| #define BOOTMAGIC_LITE_ROW    0 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN 0 |  | ||||||
| /* Top right key on right half */ |  | ||||||
| #define BOOTMAGIC_LITE_ROW_RIGHT    0 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN_RIGHT 0 |  | ||||||
|  | |||||||
| @ -1,11 +0,0 @@ | |||||||
| // Copyright 2018-2021
 |  | ||||||
| // ENDO Katsuhiro <ka2hiro@curlybracket.co.jp>
 |  | ||||||
| // David Philip Barr <@davidphilipbarr>
 |  | ||||||
| // Pierre Chevalier <pierrechevalier83@gmail.com>
 |  | ||||||
| // SPDX-License-Identifier: GPL-2.0+
 |  | ||||||
| 
 |  | ||||||
| #define BOOTMAGIC_LITE_ROW    0 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN 0 |  | ||||||
| /* Top right key on right half */ |  | ||||||
| #define BOOTMAGIC_LITE_ROW_RIGHT    4 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN_RIGHT 4 |  | ||||||
| @ -29,6 +29,9 @@ | |||||||
|         ] |         ] | ||||||
|     }, |     }, | ||||||
|     "split": { |     "split": { | ||||||
|  |         "bootmagic": { | ||||||
|  |             "matrix": [4, 4] | ||||||
|  |         }, | ||||||
|         "enabled": true, |         "enabled": true, | ||||||
|         "matrix_pins": { |         "matrix_pins": { | ||||||
|             "right": { |             "right": { | ||||||
|  | |||||||
| @ -85,7 +85,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | |||||||
| //#define NO_ACTION_LAYER
 | //#define NO_ACTION_LAYER
 | ||||||
| //#define NO_ACTION_TAPPING
 | //#define NO_ACTION_TAPPING
 | ||||||
| //#define NO_ACTION_ONESHOT
 | //#define NO_ACTION_ONESHOT
 | ||||||
| 
 |  | ||||||
| /* Bootmagic Lite key configuration */ |  | ||||||
| #define BOOTMAGIC_LITE_ROW 6 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN 0 |  | ||||||
|  | |||||||
| @ -8,6 +8,9 @@ | |||||||
|         "pid": "0x0012", |         "pid": "0x0012", | ||||||
|         "device_version": "0.0.3" |         "device_version": "0.0.3" | ||||||
|     }, |     }, | ||||||
|  |     "bootmagic": { | ||||||
|  |         "matrix": [6, 0] | ||||||
|  |     }, | ||||||
|     "layouts": { |     "layouts": { | ||||||
|         "LAYOUT_ortho_5x16": { |         "LAYOUT_ortho_5x16": { | ||||||
|             "layout": |             "layout": | ||||||
|  | |||||||
| @ -41,6 +41,3 @@ | |||||||
| #ifdef RGBLIGHT_ENABLE | #ifdef RGBLIGHT_ENABLE | ||||||
| #define RGBLED_NUM 8    // Number of LEDs
 | #define RGBLED_NUM 8    // Number of LEDs
 | ||||||
| #endif | #endif | ||||||
| 
 |  | ||||||
| #define BOOTMAGIC_LITE_ROW 0 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN 1 |  | ||||||
|  | |||||||
| @ -8,6 +8,9 @@ | |||||||
|         "pid": "0x6462", |         "pid": "0x6462", | ||||||
|         "device_version": "0.0.1" |         "device_version": "0.0.1" | ||||||
|     }, |     }, | ||||||
|  |     "bootmagic": { | ||||||
|  |         "matrix": [0, 1] | ||||||
|  |     }, | ||||||
|     "processor": "atmega32u4", |     "processor": "atmega32u4", | ||||||
|     "bootloader": "caterina", |     "bootloader": "caterina", | ||||||
|     "layouts": { |     "layouts": { | ||||||
|  | |||||||
| @ -74,7 +74,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | |||||||
| //#define NO_ACTION_LAYER
 | //#define NO_ACTION_LAYER
 | ||||||
| //#define NO_ACTION_TAPPING
 | //#define NO_ACTION_TAPPING
 | ||||||
| //#define NO_ACTION_ONESHOT
 | //#define NO_ACTION_ONESHOT
 | ||||||
| 
 |  | ||||||
| /* Bootmagic Lite key configuration */ |  | ||||||
| #define BOOTMAGIC_LITE_ROW 0 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN 2 |  | ||||||
|  | |||||||
| @ -8,6 +8,9 @@ | |||||||
|         "pid": "0x4447", |         "pid": "0x4447", | ||||||
|         "device_version": "0.0.1" |         "device_version": "0.0.1" | ||||||
|     }, |     }, | ||||||
|  |     "bootmagic": { | ||||||
|  |         "matrix": [0, 2] | ||||||
|  |     }, | ||||||
|     "processor": "atmega32u4", |     "processor": "atmega32u4", | ||||||
|     "bootloader": "atmel-dfu", |     "bootloader": "atmel-dfu", | ||||||
|     "layouts": { |     "layouts": { | ||||||
|  | |||||||
| @ -39,8 +39,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | |||||||
| #define RGB_DI_PIN D6 | #define RGB_DI_PIN D6 | ||||||
| #define RGBLED_NUM 17 | #define RGBLED_NUM 17 | ||||||
| 
 | 
 | ||||||
| /* Set to top left most key */ |  | ||||||
| #define BOOTMAGIC_LITE_ROW 4 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN 10 |  | ||||||
| 
 |  | ||||||
| #define TAPPING_TERM 200 | #define TAPPING_TERM 200 | ||||||
|  | |||||||
| @ -6,6 +6,9 @@ | |||||||
|         "pid": "0x4556", |         "pid": "0x4556", | ||||||
|         "device_version": "0.0.2" |         "device_version": "0.0.2" | ||||||
|     }, |     }, | ||||||
|  |     "bootmagic": { | ||||||
|  |         "matrix": [4, 10] | ||||||
|  |     }, | ||||||
|     "processor": "atmega32u4", |     "processor": "atmega32u4", | ||||||
|     "bootloader": "atmel-dfu", |     "bootloader": "atmel-dfu", | ||||||
|     "layout_aliases": { |     "layout_aliases": { | ||||||
|  | |||||||
| @ -40,10 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | |||||||
| #define RGBLIGHT_EFFECT_TWINKLE | #define RGBLIGHT_EFFECT_TWINKLE | ||||||
| #define RGBLED_NUM 23 | #define RGBLED_NUM 23 | ||||||
| 
 | 
 | ||||||
| /* Set to top left most key */ |  | ||||||
| #define BOOTMAGIC_LITE_ROW 5 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN 10 |  | ||||||
| 
 |  | ||||||
| /*
 | /*
 | ||||||
|  * Feature disable options |  * Feature disable options | ||||||
|  *  These options are also useful to firmware size reduction. |  *  These options are also useful to firmware size reduction. | ||||||
|  | |||||||
| @ -8,6 +8,9 @@ | |||||||
|         "pid": "0x4A46", |         "pid": "0x4A46", | ||||||
|         "device_version": "0.0.1" |         "device_version": "0.0.1" | ||||||
|     }, |     }, | ||||||
|  |     "bootmagic": { | ||||||
|  |         "matrix": [5, 10] | ||||||
|  |     }, | ||||||
|     "processor": "atmega32u4", |     "processor": "atmega32u4", | ||||||
|     "bootloader": "atmel-dfu", |     "bootloader": "atmel-dfu", | ||||||
|     "layouts": { |     "layouts": { | ||||||
|  | |||||||
| @ -39,8 +39,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | |||||||
| #define RGB_DI_PIN D6 | #define RGB_DI_PIN D6 | ||||||
| #define RGBLED_NUM 17 | #define RGBLED_NUM 17 | ||||||
| 
 | 
 | ||||||
| /* Set to top left most key */ |  | ||||||
| #define BOOTMAGIC_LITE_ROW 5 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN 10 |  | ||||||
| 
 |  | ||||||
| #define TAPPING_TERM 200 | #define TAPPING_TERM 200 | ||||||
|  | |||||||
| @ -8,6 +8,9 @@ | |||||||
|     "pid": "0x4C53", |     "pid": "0x4C53", | ||||||
|     "device_version": "0.0.3" |     "device_version": "0.0.3" | ||||||
|   }, |   }, | ||||||
|  |   "bootmagic": { | ||||||
|  |     "matrix": [5, 10] | ||||||
|  |   }, | ||||||
|   "processor": "atmega32u4", |   "processor": "atmega32u4", | ||||||
|   "bootloader": "atmel-dfu", |   "bootloader": "atmel-dfu", | ||||||
|   "layouts": { |   "layouts": { | ||||||
|  | |||||||
| @ -39,8 +39,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | |||||||
| #define RGB_DI_PIN D6 | #define RGB_DI_PIN D6 | ||||||
| #define RGBLED_NUM 17 | #define RGBLED_NUM 17 | ||||||
| 
 | 
 | ||||||
| /* Set to top left most key */ |  | ||||||
| #define BOOTMAGIC_LITE_ROW 5 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN 10 |  | ||||||
| 
 |  | ||||||
| #define TAPPING_TERM 200 | #define TAPPING_TERM 200 | ||||||
|  | |||||||
| @ -8,6 +8,9 @@ | |||||||
|         "pid": "0x4F31", |         "pid": "0x4F31", | ||||||
|         "device_version": "0.0.1" |         "device_version": "0.0.1" | ||||||
|     }, |     }, | ||||||
|  |     "bootmagic": { | ||||||
|  |         "matrix": [5, 10] | ||||||
|  |     }, | ||||||
|     "processor": "atmega32u4", |     "processor": "atmega32u4", | ||||||
|     "bootloader": "atmel-dfu", |     "bootloader": "atmel-dfu", | ||||||
|     "community_layouts": ["75_ansi"], |     "community_layouts": ["75_ansi"], | ||||||
|  | |||||||
| @ -39,8 +39,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | |||||||
| #define RGB_DI_PIN D6 | #define RGB_DI_PIN D6 | ||||||
| #define RGBLED_NUM 17 | #define RGBLED_NUM 17 | ||||||
| 
 | 
 | ||||||
| /* Set to top left most key */ |  | ||||||
| #define BOOTMAGIC_LITE_ROW 5 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN 10 |  | ||||||
| 
 |  | ||||||
| #define TAPPING_TERM 200 | #define TAPPING_TERM 200 | ||||||
|  | |||||||
| @ -8,6 +8,9 @@ | |||||||
|         "pid": "0x4F32", |         "pid": "0x4F32", | ||||||
|         "device_version": "0.0.2" |         "device_version": "0.0.2" | ||||||
|     }, |     }, | ||||||
|  |     "bootmagic": { | ||||||
|  |         "matrix": [5, 10] | ||||||
|  |     }, | ||||||
|     "processor": "atmega32u4", |     "processor": "atmega32u4", | ||||||
|     "bootloader": "atmel-dfu", |     "bootloader": "atmel-dfu", | ||||||
|     "community_layouts": ["75_ansi"], |     "community_layouts": ["75_ansi"], | ||||||
|  | |||||||
| @ -42,8 +42,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | |||||||
| #define RGB_DI_PIN D6 | #define RGB_DI_PIN D6 | ||||||
| #define RGBLED_NUM 18 | #define RGBLED_NUM 18 | ||||||
| 
 | 
 | ||||||
| /* Set to top left most key */ |  | ||||||
| #define BOOTMAGIC_LITE_ROW 4 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN 10 |  | ||||||
| 
 |  | ||||||
| #define TAPPING_TERM 200 | #define TAPPING_TERM 200 | ||||||
|  | |||||||
| @ -8,6 +8,9 @@ | |||||||
|         "pid": "0x4F52", |         "pid": "0x4F52", | ||||||
|         "device_version": "0.0.2" |         "device_version": "0.0.2" | ||||||
|     }, |     }, | ||||||
|  |     "bootmagic": { | ||||||
|  |         "matrix": [4, 10] | ||||||
|  |     }, | ||||||
|     "processor": "atmega32u4", |     "processor": "atmega32u4", | ||||||
|     "bootloader": "atmel-dfu", |     "bootloader": "atmel-dfu", | ||||||
|     "community_layouts": ["tkl_ansi"], |     "community_layouts": ["tkl_ansi"], | ||||||
|  | |||||||
| @ -36,7 +36,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | |||||||
| #define RGBLIGHT_EFFECT_TWINKLE | #define RGBLIGHT_EFFECT_TWINKLE | ||||||
| #define RGB_DI_PIN D6 | #define RGB_DI_PIN D6 | ||||||
| #define RGBLED_NUM 17 | #define RGBLED_NUM 17 | ||||||
| 
 |  | ||||||
| /* Set to top left most key */ |  | ||||||
| #define BOOTMAGIC_LITE_ROW 5 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN 10 |  | ||||||
|  | |||||||
| @ -8,6 +8,9 @@ | |||||||
|         "pid": "0x5443", |         "pid": "0x5443", | ||||||
|         "device_version": "0.0.1" |         "device_version": "0.0.1" | ||||||
|     }, |     }, | ||||||
|  |     "bootmagic": { | ||||||
|  |         "matrix": [5, 10] | ||||||
|  |     }, | ||||||
|     "processor": "atmega32u4", |     "processor": "atmega32u4", | ||||||
|     "bootloader": "atmel-dfu", |     "bootloader": "atmel-dfu", | ||||||
|     "layouts": { |     "layouts": { | ||||||
|  | |||||||
| @ -30,7 +30,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | |||||||
| /* Onboard LEDs */ | /* Onboard LEDs */ | ||||||
| #define LED_00 B3 | #define LED_00 B3 | ||||||
| #define LED_01 B1 | #define LED_01 B1 | ||||||
| 
 |  | ||||||
| /* Bootmagic - hold down rotary encoder pushbutton while plugging in to enter bootloader */ |  | ||||||
| #define BOOTMAGIC_LITE_ROW 3 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN 0 |  | ||||||
|  | |||||||
| @ -2,6 +2,9 @@ | |||||||
|     "usb": { |     "usb": { | ||||||
|         "device_version": "0.0.7" |         "device_version": "0.0.7" | ||||||
|     }, |     }, | ||||||
|  |     "bootmagic": { | ||||||
|  |         "matrix": [3, 0] | ||||||
|  |     }, | ||||||
|     "processor": "atmega32u4", |     "processor": "atmega32u4", | ||||||
|     "bootloader": "caterina", |     "bootloader": "caterina", | ||||||
|     "layouts": { |     "layouts": { | ||||||
|  | |||||||
| @ -30,7 +30,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | |||||||
| /* Onboard LEDs */ | /* Onboard LEDs */ | ||||||
| #define LED_00 B3 | #define LED_00 B3 | ||||||
| #define LED_01 B1 | #define LED_01 B1 | ||||||
| 
 |  | ||||||
| /* Bootmagic - hold down rotary encoder pushbutton while plugging in to enter bootloader */ |  | ||||||
| #define BOOTMAGIC_LITE_ROW 3 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN 0 |  | ||||||
|  | |||||||
| @ -2,6 +2,9 @@ | |||||||
|     "usb": { |     "usb": { | ||||||
|         "device_version": "0.0.6" |         "device_version": "0.0.6" | ||||||
|     }, |     }, | ||||||
|  |     "bootmagic": { | ||||||
|  |         "matrix": [3, 0] | ||||||
|  |     }, | ||||||
|     "processor": "atmega32u4", |     "processor": "atmega32u4", | ||||||
|     "bootloader": "caterina", |     "bootloader": "caterina", | ||||||
|     "layouts": { |     "layouts": { | ||||||
|  | |||||||
| @ -29,7 +29,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | |||||||
| /* Onboard LEDs */ | /* Onboard LEDs */ | ||||||
| #define LED_00 B1 | #define LED_00 B1 | ||||||
| #define LED_01 B3 | #define LED_01 B3 | ||||||
| 
 |  | ||||||
| /* Bootmagic - hold down rotary encoder pushbutton while plugging in to enter bootloader */ |  | ||||||
| #define BOOTMAGIC_LITE_ROW 3 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN 4 |  | ||||||
|  | |||||||
| @ -2,6 +2,9 @@ | |||||||
|     "usb": { |     "usb": { | ||||||
|         "device_version": "0.0.7" |         "device_version": "0.0.7" | ||||||
|     }, |     }, | ||||||
|  |     "bootmagic": { | ||||||
|  |         "matrix": [3, 4] | ||||||
|  |     }, | ||||||
|     "processor": "atmega32u4", |     "processor": "atmega32u4", | ||||||
|     "bootloader": "caterina", |     "bootloader": "caterina", | ||||||
|     "layouts": { |     "layouts": { | ||||||
|  | |||||||
| @ -31,7 +31,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | |||||||
| #define LED_00 B6 | #define LED_00 B6 | ||||||
| #define LED_01 B1 | #define LED_01 B1 | ||||||
| #define LED_02 B3 | #define LED_02 B3 | ||||||
| 
 |  | ||||||
| /* Bootmagic - hold down rotary encoder pushbutton while plugging in to enter bootloader */ |  | ||||||
| #define BOOTMAGIC_LITE_ROW 3 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN 0 |  | ||||||
|  | |||||||
| @ -2,6 +2,9 @@ | |||||||
|     "usb": { |     "usb": { | ||||||
|         "device_version": "0.1.0" |         "device_version": "0.1.0" | ||||||
|     }, |     }, | ||||||
|  |     "bootmagic": { | ||||||
|  |         "matrix": [3, 0] | ||||||
|  |     }, | ||||||
|     "processor": "atmega32u4", |     "processor": "atmega32u4", | ||||||
|     "bootloader": "caterina", |     "bootloader": "caterina", | ||||||
|     "layouts": { |     "layouts": { | ||||||
|  | |||||||
| @ -31,7 +31,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | |||||||
| #define LED_00 B6 | #define LED_00 B6 | ||||||
| #define LED_01 B1 | #define LED_01 B1 | ||||||
| #define LED_02 B3 | #define LED_02 B3 | ||||||
| 
 |  | ||||||
| /* Bootmagic - hold down rotary encoder pushbutton while plugging in to enter bootloader */ |  | ||||||
| #define BOOTMAGIC_LITE_ROW 3 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN 0 |  | ||||||
|  | |||||||
| @ -2,6 +2,9 @@ | |||||||
|     "usb": { |     "usb": { | ||||||
|         "device_version": "0.1.0" |         "device_version": "0.1.0" | ||||||
|     }, |     }, | ||||||
|  |     "bootmagic": { | ||||||
|  |         "matrix": [3, 0] | ||||||
|  |     }, | ||||||
|     "processor": "atmega32u4", |     "processor": "atmega32u4", | ||||||
|     "bootloader": "caterina", |     "bootloader": "caterina", | ||||||
|     "layouts": { |     "layouts": { | ||||||
|  | |||||||
| @ -31,7 +31,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | |||||||
| #define LED_00 B3 | #define LED_00 B3 | ||||||
| #define LED_01 B1 | #define LED_01 B1 | ||||||
| #define LED_02 B6 | #define LED_02 B6 | ||||||
| 
 |  | ||||||
| /* Bootmagic - hold down rotary encoder pushbutton while plugging in to enter bootloader */ |  | ||||||
| #define BOOTMAGIC_LITE_ROW 3 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN 4 |  | ||||||
|  | |||||||
| @ -2,6 +2,9 @@ | |||||||
|     "usb": { |     "usb": { | ||||||
|         "device_version": "0.1.0" |         "device_version": "0.1.0" | ||||||
|     }, |     }, | ||||||
|  |     "bootmagic": { | ||||||
|  |         "matrix": [3, 4] | ||||||
|  |     }, | ||||||
|     "processor": "atmega32u4", |     "processor": "atmega32u4", | ||||||
|     "bootloader": "caterina", |     "bootloader": "caterina", | ||||||
|     "layouts": { |     "layouts": { | ||||||
|  | |||||||
| @ -31,10 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | |||||||
| #define LED_01 B3 | #define LED_01 B3 | ||||||
| #define LED_02 B6 | #define LED_02 B6 | ||||||
| 
 | 
 | ||||||
| /* Bootmagic - hold down rotary encoder pushbutton while plugging in to enter bootloader */ |  | ||||||
| #define BOOTMAGIC_LITE_ROW 3 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN 0 |  | ||||||
| 
 |  | ||||||
| #define RGB_DI_PIN D1 | #define RGB_DI_PIN D1 | ||||||
| #define RGB_MATRIX_LED_COUNT 16 | #define RGB_MATRIX_LED_COUNT 16 | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -5,6 +5,9 @@ | |||||||
|     "usb": { |     "usb": { | ||||||
|         "device_version": "0.1.0" |         "device_version": "0.1.0" | ||||||
|     }, |     }, | ||||||
|  |     "bootmagic": { | ||||||
|  |         "matrix": [3, 0] | ||||||
|  |     }, | ||||||
|     "processor": "atmega32u4", |     "processor": "atmega32u4", | ||||||
|     "bootloader": "caterina", |     "bootloader": "caterina", | ||||||
|     "layouts": { |     "layouts": { | ||||||
|  | |||||||
| @ -78,7 +78,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | |||||||
| //#define NO_ACTION_LAYER
 | //#define NO_ACTION_LAYER
 | ||||||
| //#define NO_ACTION_TAPPING
 | //#define NO_ACTION_TAPPING
 | ||||||
| //#define NO_ACTION_ONESHOT
 | //#define NO_ACTION_ONESHOT
 | ||||||
| 
 |  | ||||||
| /* Bootmagic Lite key configuration */ |  | ||||||
| #define BOOTMAGIC_LITE_ROW 0 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN 1 |  | ||||||
|  | |||||||
| @ -8,6 +8,9 @@ | |||||||
|         "pid": "0xDB00", |         "pid": "0xDB00", | ||||||
|         "device_version": "0.0.1" |         "device_version": "0.0.1" | ||||||
|     }, |     }, | ||||||
|  |     "bootmagic": { | ||||||
|  |         "matrix": [0, 1] | ||||||
|  |     }, | ||||||
|     "processor": "atmega32u4", |     "processor": "atmega32u4", | ||||||
|     "bootloader": "atmel-dfu", |     "bootloader": "atmel-dfu", | ||||||
|     "layouts": { |     "layouts": { | ||||||
|  | |||||||
| @ -63,8 +63,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | |||||||
| //#define NO_ACTION_TAPPING
 | //#define NO_ACTION_TAPPING
 | ||||||
| //#define NO_ACTION_ONESHOT
 | //#define NO_ACTION_ONESHOT
 | ||||||
| 
 | 
 | ||||||
| /* Bootmagic Lite key configuration */ |  | ||||||
| #define BOOTMAGIC_LITE_ROW 6 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN 5 |  | ||||||
| 
 |  | ||||||
| #define DYNAMIC_KEYMAP_LAYER_COUNT 3 | #define DYNAMIC_KEYMAP_LAYER_COUNT 3 | ||||||
|  | |||||||
| @ -8,6 +8,9 @@ | |||||||
|         "pid": "0x87C9", |         "pid": "0x87C9", | ||||||
|         "device_version": "0.0.1" |         "device_version": "0.0.1" | ||||||
|     }, |     }, | ||||||
|  |     "bootmagic": { | ||||||
|  |         "matrix": [6, 5] | ||||||
|  |     }, | ||||||
|     "processor": "atmega32u4", |     "processor": "atmega32u4", | ||||||
|     "bootloader": "qmk-dfu", |     "bootloader": "qmk-dfu", | ||||||
|     "community_layouts": ["tkl_ansi", "tkl_iso"], |     "community_layouts": ["tkl_ansi", "tkl_iso"], | ||||||
|  | |||||||
| @ -55,8 +55,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | |||||||
| //#define NO_ACTION_TAPPING
 | //#define NO_ACTION_TAPPING
 | ||||||
| //#define NO_ACTION_ONESHOT
 | //#define NO_ACTION_ONESHOT
 | ||||||
| 
 | 
 | ||||||
| /* Bootmagic Lite key configuration */ |  | ||||||
| #define BOOTMAGIC_LITE_ROW 0 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN 5 |  | ||||||
| 
 |  | ||||||
| #define DYNAMIC_KEYMAP_LAYER_COUNT 3 | #define DYNAMIC_KEYMAP_LAYER_COUNT 3 | ||||||
|  | |||||||
| @ -10,6 +10,9 @@ | |||||||
|         "pid": "0xC474", |         "pid": "0xC474", | ||||||
|         "device_version": "0.0.1" |         "device_version": "0.0.1" | ||||||
|     }, |     }, | ||||||
|  |     "bootmagic": { | ||||||
|  |         "matrix": [0, 5] | ||||||
|  |     }, | ||||||
|     "qmk_lufa_bootloader": { |     "qmk_lufa_bootloader": { | ||||||
|         "esc_output": "D6", |         "esc_output": "D6", | ||||||
|         "esc_input": "D7", |         "esc_input": "D7", | ||||||
|  | |||||||
| @ -73,8 +73,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | |||||||
| //#define NO_ACTION_TAPPING
 | //#define NO_ACTION_TAPPING
 | ||||||
| //#define NO_ACTION_ONESHOT
 | //#define NO_ACTION_ONESHOT
 | ||||||
| 
 | 
 | ||||||
| /* Bootmagic Lite key configuration */ |  | ||||||
| #define BOOTMAGIC_LITE_ROW 2 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN 3 |  | ||||||
| 
 |  | ||||||
| #define DYNAMIC_KEYMAP_LAYER_COUNT 3 | #define DYNAMIC_KEYMAP_LAYER_COUNT 3 | ||||||
|  | |||||||
| @ -8,6 +8,9 @@ | |||||||
|         "pid": "0xB00E", |         "pid": "0xB00E", | ||||||
|         "device_version": "0.0.1" |         "device_version": "0.0.1" | ||||||
|     }, |     }, | ||||||
|  |     "bootmagic": { | ||||||
|  |         "matrix": [2, 3] | ||||||
|  |     }, | ||||||
|     "processor": "atmega32u4", |     "processor": "atmega32u4", | ||||||
|     "bootloader": "qmk-dfu", |     "bootloader": "qmk-dfu", | ||||||
|     "community_layouts": ["fullsize_ansi", "fullsize_iso", "tkl_ansi", "tkl_iso"], |     "community_layouts": ["fullsize_ansi", "fullsize_iso", "tkl_ansi", "tkl_iso"], | ||||||
|  | |||||||
| @ -23,10 +23,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | |||||||
| #define SOFT_SERIAL_PIN D2 | #define SOFT_SERIAL_PIN D2 | ||||||
| 
 | 
 | ||||||
| #define EE_HANDS | #define EE_HANDS | ||||||
| 
 |  | ||||||
| /* Top left key on left half */ |  | ||||||
| #define BOOTMAGIC_LITE_ROW    0 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN 0 |  | ||||||
| /* Top right key on right half */ |  | ||||||
| #define BOOTMAGIC_LITE_ROW_RIGHT    4 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN_RIGHT 4 |  | ||||||
|  | |||||||
| @ -17,6 +17,9 @@ | |||||||
|         ] |         ] | ||||||
|     }, |     }, | ||||||
|     "split": { |     "split": { | ||||||
|  |         "bootmagic": { | ||||||
|  |             "matrix": [4, 4] | ||||||
|  |         }, | ||||||
|         "matrix_pins": { |         "matrix_pins": { | ||||||
|             "right": { |             "right": { | ||||||
|                 "direct": [ |                 "direct": [ | ||||||
|  | |||||||
| @ -21,9 +21,6 @@ | |||||||
| #define MATRIX_ROWS 2 | #define MATRIX_ROWS 2 | ||||||
| #define MATRIX_COLS 2 | #define MATRIX_COLS 2 | ||||||
| 
 | 
 | ||||||
| #define BOOTMAGIC_LITE_ROW 1 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN 1 |  | ||||||
| 
 |  | ||||||
| #define RGB_DI_PIN B4 | #define RGB_DI_PIN B4 | ||||||
| #define RGBLED_NUM 8 | #define RGBLED_NUM 8 | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -39,6 +39,9 @@ | |||||||
|         "pid": "0x6F21", |         "pid": "0x6F21", | ||||||
|         "device_version": "0.0.1" |         "device_version": "0.0.1" | ||||||
|     }, |     }, | ||||||
|  |     "bootmagic": { | ||||||
|  |         "matrix": [1, 1] | ||||||
|  |     }, | ||||||
|     "processor": "atmega32u2", |     "processor": "atmega32u2", | ||||||
|     "bootloader": "atmel-dfu" |     "bootloader": "atmel-dfu" | ||||||
| } | } | ||||||
|  | |||||||
| @ -20,9 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | |||||||
| 
 | 
 | ||||||
| #pragma once | #pragma once | ||||||
| 
 | 
 | ||||||
| #define BOOTMAGIC_LITE_ROW 13 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN 2 |  | ||||||
| 
 |  | ||||||
| /* Defaults */ | /* Defaults */ | ||||||
| #ifndef BALLSTEP | #ifndef BALLSTEP | ||||||
| #define BALLSTEP 20 | #define BALLSTEP 20 | ||||||
|  | |||||||
| @ -8,6 +8,9 @@ | |||||||
|         "pid": "0x1307", |         "pid": "0x1307", | ||||||
|         "device_version": "0.0.1" |         "device_version": "0.0.1" | ||||||
|     }, |     }, | ||||||
|  |     "bootmagic": { | ||||||
|  |         "matrix": [13, 2] | ||||||
|  |     }, | ||||||
|     "processor": "atmega32u4", |     "processor": "atmega32u4", | ||||||
|     "bootloader": "atmel-dfu", |     "bootloader": "atmel-dfu", | ||||||
|     "layout_aliases": { |     "layout_aliases": { | ||||||
|  | |||||||
| @ -21,9 +21,6 @@ | |||||||
| 
 | 
 | ||||||
| #define MATRIX_MASKED | #define MATRIX_MASKED | ||||||
| 
 | 
 | ||||||
| #define BOOTMAGIC_LITE_ROW 0 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN 1 |  | ||||||
| 
 |  | ||||||
| #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET | #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET | ||||||
| #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U | #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U | ||||||
| #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED_MASK 0U | #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED_MASK 0U | ||||||
|  | |||||||
| @ -23,6 +23,9 @@ | |||||||
|         "pid": "0x0001", |         "pid": "0x0001", | ||||||
|         "vid": "0x8686" |         "vid": "0x8686" | ||||||
|     }, |     }, | ||||||
|  |     "bootmagic": { | ||||||
|  |         "matrix": [0, 1] | ||||||
|  |     }, | ||||||
|     "layouts": { |     "layouts": { | ||||||
|         "LAYOUT_63_ansi": { |         "LAYOUT_63_ansi": { | ||||||
|             "layout": [ |             "layout": [ | ||||||
|  | |||||||
| @ -8,6 +8,9 @@ | |||||||
|         "pid": "0x5045", |         "pid": "0x5045", | ||||||
|         "device_version": "0.0.1" |         "device_version": "0.0.1" | ||||||
|     }, |     }, | ||||||
|  |     "bootmagic": { | ||||||
|  |         "matrix": [1, 3] | ||||||
|  |     }, | ||||||
|     "processor": "WB32F3G71", |     "processor": "WB32F3G71", | ||||||
|     "bootloader": "wb32-dfu", |     "bootloader": "wb32-dfu", | ||||||
|     "layouts": { |     "layouts": { | ||||||
|  | |||||||
| @ -29,10 +29,6 @@ | |||||||
| /* COL2ROW or ROW2COL */ | /* COL2ROW or ROW2COL */ | ||||||
| #define DIODE_DIRECTION COL2ROW | #define DIODE_DIRECTION COL2ROW | ||||||
| 
 | 
 | ||||||
| /* Hold ESC on start up to clear EEPROM and boot into bootloader mode */ |  | ||||||
| #define BOOTMAGIC_LITE_ROW 1 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN 3 |  | ||||||
| 
 |  | ||||||
| #define TAP_CODE_DELAY 10 | #define TAP_CODE_DELAY 10 | ||||||
| 
 | 
 | ||||||
| /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ | /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ | ||||||
|  | |||||||
| @ -8,6 +8,9 @@ | |||||||
|         "pid": "0x504A", |         "pid": "0x504A", | ||||||
|         "device_version": "0.0.1" |         "device_version": "0.0.1" | ||||||
|     }, |     }, | ||||||
|  |     "bootmagic": { | ||||||
|  |         "matrix": [1, 3] | ||||||
|  |     }, | ||||||
|     "processor": "WB32F3G71", |     "processor": "WB32F3G71", | ||||||
|     "bootloader": "wb32-dfu", |     "bootloader": "wb32-dfu", | ||||||
|     "layouts": { |     "layouts": { | ||||||
|  | |||||||
| @ -29,10 +29,6 @@ | |||||||
| /* COL2ROW or ROW2COL */ | /* COL2ROW or ROW2COL */ | ||||||
| #define DIODE_DIRECTION COL2ROW | #define DIODE_DIRECTION COL2ROW | ||||||
| 
 | 
 | ||||||
| /* Hold ESC on start up to clear EEPROM and boot into bootloader mode */ |  | ||||||
| #define BOOTMAGIC_LITE_ROW 1 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN 3 |  | ||||||
| 
 |  | ||||||
| #define TAP_CODE_DELAY 10 | #define TAP_CODE_DELAY 10 | ||||||
| #define ENCODERS_PAD_A \ | #define ENCODERS_PAD_A \ | ||||||
|     { C15 } |     { C15 } | ||||||
|  | |||||||
| @ -8,6 +8,9 @@ | |||||||
|         "pid": "0x5044", |         "pid": "0x5044", | ||||||
|         "device_version": "0.0.1" |         "device_version": "0.0.1" | ||||||
|     }, |     }, | ||||||
|  |     "bootmagic": { | ||||||
|  |         "matrix": [1, 3] | ||||||
|  |     }, | ||||||
|     "processor": "STM32F303", |     "processor": "STM32F303", | ||||||
|     "bootloader": "stm32-dfu", |     "bootloader": "stm32-dfu", | ||||||
|     "layouts": { |     "layouts": { | ||||||
|  | |||||||
| @ -8,6 +8,9 @@ | |||||||
|         "pid": "0x5044", |         "pid": "0x5044", | ||||||
|         "device_version": "0.0.1" |         "device_version": "0.0.1" | ||||||
|     }, |     }, | ||||||
|  |     "bootmagic": { | ||||||
|  |         "matrix": [1, 3] | ||||||
|  |     }, | ||||||
|     "processor": "STM32F303", |     "processor": "STM32F303", | ||||||
|     "bootloader": "stm32-dfu", |     "bootloader": "stm32-dfu", | ||||||
|     "layouts": { |     "layouts": { | ||||||
|  | |||||||
| @ -8,6 +8,9 @@ | |||||||
|        "pid": "0x5044", |        "pid": "0x5044", | ||||||
|        "device_version": "0.0.2" |        "device_version": "0.0.2" | ||||||
|     }, |     }, | ||||||
|  |     "bootmagic": { | ||||||
|  |         "matrix": [1, 3] | ||||||
|  |     }, | ||||||
|     "processor": "WB32F3G71", |     "processor": "WB32F3G71", | ||||||
|     "bootloader": "wb32-dfu", |     "bootloader": "wb32-dfu", | ||||||
|     "layouts": { |     "layouts": { | ||||||
|  | |||||||
| @ -8,6 +8,9 @@ | |||||||
|        "pid": "0x5044", |        "pid": "0x5044", | ||||||
|        "device_version": "0.0.2" |        "device_version": "0.0.2" | ||||||
|     }, |     }, | ||||||
|  |     "bootmagic": { | ||||||
|  |         "matrix": [1, 3] | ||||||
|  |     }, | ||||||
|     "processor": "WB32F3G71", |     "processor": "WB32F3G71", | ||||||
|     "bootloader": "wb32-dfu", |     "bootloader": "wb32-dfu", | ||||||
|     "layouts": { |     "layouts": { | ||||||
|  | |||||||
| @ -20,7 +20,3 @@ | |||||||
| #define LOCKING_SUPPORT_ENABLE | #define LOCKING_SUPPORT_ENABLE | ||||||
| /* Locking resynchronize hack */ | /* Locking resynchronize hack */ | ||||||
| #define LOCKING_RESYNC_ENABLE | #define LOCKING_RESYNC_ENABLE | ||||||
| 
 |  | ||||||
| /* ROW and COL for ESC key */ |  | ||||||
| #define BOOTMAGIC_LITE_ROW 8 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN 0 |  | ||||||
|  | |||||||
| @ -8,6 +8,9 @@ | |||||||
|         "pid": "0x3630", |         "pid": "0x3630", | ||||||
|         "device_version": "0.0.1" |         "device_version": "0.0.1" | ||||||
|     }, |     }, | ||||||
|  |     "bootmagic": { | ||||||
|  |         "matrix": [8, 0] | ||||||
|  |     }, | ||||||
|     "processor": "atmega32u4", |     "processor": "atmega32u4", | ||||||
|     "bootloader": "atmel-dfu", |     "bootloader": "atmel-dfu", | ||||||
|     "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_iso", "60_iso_split_bs_rshift"], |     "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_iso", "60_iso_split_bs_rshift"], | ||||||
|  | |||||||
| @ -13,9 +13,6 @@ | |||||||
| #define MATRIX_ROW_PINS { B4, E2, F4, F7, F1, F6, C6, F5, D7, C7 } | #define MATRIX_ROW_PINS { B4, E2, F4, F7, F1, F6, C6, F5, D7, C7 } | ||||||
| #define MATRIX_COL_PINS { E6, B0, B1, B2, B3, F0, D0, D5, D1 } | #define MATRIX_COL_PINS { E6, B0, B1, B2, B3, F0, D0, D5, D1 } | ||||||
| 
 | 
 | ||||||
| #define BOOTMAGIC_LITE_ROW 8 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN 0 |  | ||||||
| 
 |  | ||||||
| /* COL2ROW or ROW2COL */ | /* COL2ROW or ROW2COL */ | ||||||
| #define DIODE_DIRECTION COL2ROW | #define DIODE_DIRECTION COL2ROW | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -8,6 +8,9 @@ | |||||||
|         "pid": "0x5244", |         "pid": "0x5244", | ||||||
|         "device_version": "0.0.1" |         "device_version": "0.0.1" | ||||||
|     }, |     }, | ||||||
|  |     "bootmagic": { | ||||||
|  |         "matrix": [8, 0] | ||||||
|  |     }, | ||||||
|     "processor": "atmega32u4", |     "processor": "atmega32u4", | ||||||
|     "bootloader": "atmel-dfu", |     "bootloader": "atmel-dfu", | ||||||
|     "layouts": { |     "layouts": { | ||||||
|  | |||||||
| @ -93,8 +93,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | |||||||
| //#define TAPPING_TERM 150
 | //#define TAPPING_TERM 150
 | ||||||
| //#define IGNORE_MOD_TAP_INTERRUPT
 | //#define IGNORE_MOD_TAP_INTERRUPT
 | ||||||
| //#define QUICK_TAP_TERM 0
 | //#define QUICK_TAP_TERM 0
 | ||||||
| 
 |  | ||||||
| #define BOOTMAGIC_LITE_ROW 0 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN 6 |  | ||||||
| #define BOOTMAGIC_LITE_ROW_RIGHT 5 |  | ||||||
| #define BOOTMAGIC_LITE_COLUMN_RIGHT 0 |  | ||||||
|  | |||||||
Some files were not shown because too many files have changed in this diff Show More
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user