Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move Bootmagic config to data driven #19860

Merged
merged 1 commit into from
Feb 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions keyboards/0xcb/tutelpad/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT

/* Bootmagic Lite key configuration */
#define BOOTMAGIC_LITE_ROW 1
#define BOOTMAGIC_LITE_COLUMN 0
3 changes: 3 additions & 0 deletions keyboards/0xcb/tutelpad/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
"pid": "0xF09F",
"device_version": "0.0.1"
},
"bootmagic": {
"matrix": [1, 0]
},
"processor": "atmega32u4",
"bootloader": "caterina",
"matrix_pins": {
Expand Down
7 changes: 0 additions & 7 deletions keyboards/a_dux/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define SOFT_SERIAL_PIN D1

#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
3 changes: 3 additions & 0 deletions keyboards/a_dux/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
]
},
"split": {
"bootmagic": {
"matrix": [4, 4]
},
"matrix_pins": {
"right": {
"direct": [
Expand Down
5 changes: 0 additions & 5 deletions keyboards/adafruit/macropad/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,6 @@
#define ENCODERS_PAD_A { GP18 }
#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 */
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP13
Expand Down
3 changes: 3 additions & 0 deletions keyboards/adafruit/macropad/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
"pid": "0x0108",
"device_version": "0.0.1"
},
"bootmagic": {
"matrix": [1, 2]
},
"processor": "RP2040",
"bootloader": "rp2040",
"matrix_pins": {
Expand Down
3 changes: 0 additions & 3 deletions keyboards/afternoonlabs/breeze/rev0/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,3 @@
#define SOFT_SERIAL_PIN D2

#define DIODE_DIRECTION COL2ROW

#define BOOTMAGIC_LITE_ROW 0
#define BOOTMAGIC_LITE_COLUMN 5
3 changes: 3 additions & 0 deletions keyboards/afternoonlabs/breeze/rev0/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
"pid": "0x0001",
"device_version": "0.0.0"
},
"bootmagic": {
"matrix": [0, 5]
},
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
Expand Down
5 changes: 0 additions & 5 deletions keyboards/afternoonlabs/breeze/rev1/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,3 @@
#define SOFT_SERIAL_PIN D2

#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
3 changes: 3 additions & 0 deletions keyboards/afternoonlabs/breeze/rev1/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
"pid": "0x0001",
"device_version": "0.0.1"
},
"bootmagic": {
"matrix": [0, 5]
},
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
Expand Down
5 changes: 0 additions & 5 deletions keyboards/afternoonlabs/oceanbreeze/rev1/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,3 @@
#define SOFT_SERIAL_PIN D2

#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
3 changes: 3 additions & 0 deletions keyboards/afternoonlabs/oceanbreeze/rev1/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
"pid": "0x0003",
"device_version": "0.0.1"
},
"bootmagic": {
"matrix": [0, 5]
},
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
Expand Down
5 changes: 0 additions & 5 deletions keyboards/afternoonlabs/southern_breeze/rev1/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,3 @@
#define SOFT_SERIAL_PIN D2

#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
3 changes: 3 additions & 0 deletions keyboards/afternoonlabs/southern_breeze/rev1/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
"pid": "0x0005",
"device_version": "0.0.1"
},
"bootmagic": {
"matrix": [0, 5]
},
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
Expand Down
5 changes: 0 additions & 5 deletions keyboards/afternoonlabs/summer_breeze/rev1/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,3 @@
#define SOFT_SERIAL_PIN D2

#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
3 changes: 3 additions & 0 deletions keyboards/afternoonlabs/summer_breeze/rev1/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
"pid": "0x0004",
"device_version": "0.0.1"
},
"bootmagic": {
"matrix": [0, 5]
},
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
Expand Down
4 changes: 0 additions & 4 deletions keyboards/alps64/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE

/* Bootmagic Lite Support*/
#define BOOTMAGIC_LITE_ROW 3
#define BOOTMAGIC_LITE_COLUMN 6

/*
* Feature disable options
* These options are also useful to firmware size reduction.
Expand Down
3 changes: 3 additions & 0 deletions keyboards/alps64/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
"pid": "0x6464",
"device_version": "0.0.1"
},
"bootmagic": {
"matrix": [3, 6]
},
"processor": "atmega32u2",
"bootloader": "atmel-dfu",
"community_layouts": ["60_ansi"],
Expand Down
4 changes: 0 additions & 4 deletions keyboards/ares/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE

/* Bootmagic Lite key configuration */
#define BOOTMAGIC_LITE_ROW 4
#define BOOTMAGIC_LITE_COLUMN 0
3 changes: 3 additions & 0 deletions keyboards/ares/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
"pid": "0x422D",
"device_version": "2.0.0"
},
"bootmagic": {
"matrix": [4, 0]
},
"processor": "atmega32a",
"bootloader": "bootloadhid",
"layout_aliases": {
Expand Down
24 changes: 0 additions & 24 deletions keyboards/argo_works/ishi/80/mk0_avr/config.h

This file was deleted.

3 changes: 3 additions & 0 deletions keyboards/argo_works/ishi/80/mk0_avr/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
"pid": "0x4930",
"vid": "0x4157"
},
"bootmagic": {
"matrix": [1, 0]
},
"features": {
"bootmagic": true,
"command": false,
Expand Down
28 changes: 0 additions & 28 deletions keyboards/argo_works/ishi/80/mk0_avr_extra/config.h

This file was deleted.

3 changes: 3 additions & 0 deletions keyboards/argo_works/ishi/80/mk0_avr_extra/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
"pid": "0x4930",
"vid": "0x4157"
},
"bootmagic": {
"matrix": [1, 0]
},
"features": {
"bootmagic": true,
"command": false,
Expand Down
4 changes: 0 additions & 4 deletions keyboards/ashpil/modelm_usbc/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT

/* Bootmagic Lite key configuration */
#define BOOTMAGIC_LITE_ROW 0
#define BOOTMAGIC_LITE_COLUMN 2
3 changes: 3 additions & 0 deletions keyboards/ashpil/modelm_usbc/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
"bootmagic": {
"matrix": [0, 2]
},
"processor": "at90usb1286",
"bootloader": "atmel-dfu",
"layouts": {
Expand Down
4 changes: 0 additions & 4 deletions keyboards/aves60/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,3 @@
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT

/* Bootmagic Lite key configuration */
#define BOOTMAGIC_LITE_ROW 4
#define BOOTMAGIC_LITE_COLUMN 6
3 changes: 3 additions & 0 deletions keyboards/aves60/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
"pid": "0xD408",
"device_version": "0.0.1"
},
"bootmagic": {
"matrix": [4, 6]
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
Expand Down
4 changes: 0 additions & 4 deletions keyboards/basekeys/trifecta/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,6 @@
/* EEPROM for via */
#define DYNAMIC_KEYMAP_LAYER_COUNT 3

/* bootmagic row col assignment */
#define BOOTMAGIC_LITE_ROW 1
#define BOOTMAGIC_LITE_COLUMN 0

#ifdef RGB_MATRIX_ENABLE
# define RGB_MATRIX_KEYPRESSES // reacts to keypresses
// # define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
Expand Down
3 changes: 3 additions & 0 deletions keyboards/basekeys/trifecta/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
"pid": "0xEAF3",
"device_version": "0.0.1"
},
"bootmagic": {
"matrix": [1, 0]
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
Expand Down
3 changes: 0 additions & 3 deletions keyboards/beekeeb/piantor/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,3 @@
#define SERIAL_USART_FULL_DUPLEX
#define SERIAL_USART_TX_PIN GP0
#define SERIAL_USART_RX_PIN GP1

#define BOOTMAGIC_LITE_ROW 0
#define BOOTMAGIC_LITE_COLUMN 5
3 changes: 3 additions & 0 deletions keyboards/beekeeb/piantor/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
"pid": "0x0001",
"vid": "0xBEEB"
},
"bootmagic": {
"matrix": [0, 5]
},
"matrix_pins": {
"direct": [
["GP5", "GP4", "GP11", "GP15", "GP3", "GP2"],
Expand Down
7 changes: 0 additions & 7 deletions keyboards/cantor/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,6 @@
#define SERIAL_USART_TX_PIN B6 // USART TX 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
* These options are also useful to firmware size reduction.
Expand Down
3 changes: 3 additions & 0 deletions keyboards/cantor/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@
]
},
"split": {
"bootmagic": {
"matrix": [4, 5]
},
"matrix_pins": {
"right": {
"direct": [
Expand Down
7 changes: 0 additions & 7 deletions keyboards/controllerworks/mini42/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,3 @@
/* #define EE_HANDS */
/* #define MASTER_LEFT */
/* #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
11 changes: 0 additions & 11 deletions keyboards/cradio/config.h

This file was deleted.

3 changes: 3 additions & 0 deletions keyboards/cradio/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@
]
},
"split": {
"bootmagic": {
"matrix": [4, 4]
},
"enabled": true,
"matrix_pins": {
"right": {
Expand Down
Loading