diff options
author | Joel Challis <[email protected]> | 2024-04-25 08:42:48 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2024-04-25 08:42:48 +0100 |
commit | 3d83b3e7c5dc18b77d82798fdad9d7552487cfe4 (patch) | |
tree | 8c96d1c4fd2fae989b1861e68bc1d3487a25787b /keyboards/matrix | |
parent | b6d5cfe5751f9dba6d06b9fce110ed8c6160576c (diff) | |
download | qmk_firmware-3d83b3e7c5dc18b77d82798fdad9d7552487cfe4.tar.gz qmk_firmware-3d83b3e7c5dc18b77d82798fdad9d7552487cfe4.zip |
Migrate build target markers to keyboard.json - Misc (#23609)
Diffstat (limited to 'keyboards/matrix')
-rw-r--r-- | keyboards/matrix/abelx/keyboard.json (renamed from keyboards/matrix/abelx/info.json) | 2 | ||||
-rw-r--r-- | keyboards/matrix/abelx/rules.mk | 28 | ||||
-rw-r--r-- | keyboards/matrix/m12og/rev1/keyboard.json (renamed from keyboards/matrix/m12og/rev1/info.json) | 2 | ||||
-rw-r--r-- | keyboards/matrix/m12og/rev1/rev1.c | 2 | ||||
-rw-r--r-- | keyboards/matrix/m12og/rev1/rules.mk | 8 | ||||
-rw-r--r-- | keyboards/matrix/m12og/rev2/rev2.c | 4 | ||||
-rw-r--r-- | keyboards/matrix/m20add/keyboard.json (renamed from keyboards/matrix/m20add/info.json) | 2 | ||||
-rw-r--r-- | keyboards/matrix/m20add/rules.mk | 13 | ||||
-rw-r--r-- | keyboards/matrix/noah/keyboard.json (renamed from keyboards/matrix/noah/info.json) | 2 | ||||
-rw-r--r-- | keyboards/matrix/noah/rules.mk | 13 |
10 files changed, 17 insertions, 59 deletions
diff --git a/keyboards/matrix/abelx/info.json b/keyboards/matrix/abelx/keyboard.json index d62ddf53e2..7fcad281da 100644 --- a/keyboards/matrix/abelx/info.json +++ b/keyboards/matrix/abelx/keyboard.json @@ -34,6 +34,8 @@ "extrakey": true, "rgblight": true }, + "processor": "STM32F411", + "bootloader": "custom", "layouts": { "LAYOUT_tkl_ansi": { "layout": [ diff --git a/keyboards/matrix/abelx/rules.mk b/keyboards/matrix/abelx/rules.mk index 00a63f4a27..ee9c23c086 100644 --- a/keyboards/matrix/abelx/rules.mk +++ b/keyboards/matrix/abelx/rules.mk @@ -1,33 +1,7 @@ -# -# - the next two should match the directories in -# <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES) -MCU_FAMILY = STM32 -MCU_SERIES = STM32F4xx - -# Linker script to use -# - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/ -# or <this_dir>/ld/ +# custom bootloader MCU_LDSCRIPT = abelx_boot - -# Startup code to use -# - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/ -MCU_STARTUP = stm32f4xx - -# Board: it should exist either in <chibios>/os/hal/boards/ -# or <this_dir>/boards BOARD = abelx_bd -# Cortex version -MCU = cortex-m4 - -# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 -ARMV = 7 - -USE_FPU = yes - -# Bootloader selection -BOOTLOADER = custom - CUSTOM_MATRIX = lite # project specific files SRC += matrix.c tca6424.c aw9523b.c diff --git a/keyboards/matrix/m12og/rev1/info.json b/keyboards/matrix/m12og/rev1/keyboard.json index d5ee589cc1..c956720a8d 100644 --- a/keyboards/matrix/m12og/rev1/info.json +++ b/keyboards/matrix/m12og/rev1/keyboard.json @@ -40,6 +40,8 @@ "build": { "lto": true }, + "bootloader": "custom", + "processor": "STM32F103", "layout_aliases": { "LAYOUT_all": "LAYOUT_tkl_ansi_tsangan" }, diff --git a/keyboards/matrix/m12og/rev1/rev1.c b/keyboards/matrix/m12og/rev1/rev1.c index 702d3857c4..f517703c60 100644 --- a/keyboards/matrix/m12og/rev1/rev1.c +++ b/keyboards/matrix/m12og/rev1/rev1.c @@ -29,4 +29,6 @@ void keyboard_post_init_kb(void) { rgblight_enable_noeeprom(); rgblight_sethsv_noeeprom(5, 255, 255); rgblight_mode_noeeprom(37); + + keyboard_post_init_user(); } diff --git a/keyboards/matrix/m12og/rev1/rules.mk b/keyboards/matrix/m12og/rev1/rules.mk index bc406d1cba..077011cdc1 100644 --- a/keyboards/matrix/m12og/rev1/rules.mk +++ b/keyboards/matrix/m12og/rev1/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = STM32F103 - +# custom bootloader MCU_LDSCRIPT = m12og_v1 - BOARD = m12og_v1 -# Bootloader selection -BOOTLOADER = custom - CUSTOM_MATRIX = lite SRC += matrix.c diff --git a/keyboards/matrix/m12og/rev2/rev2.c b/keyboards/matrix/m12og/rev2/rev2.c index 1a35dff7a9..fb424b164f 100644 --- a/keyboards/matrix/m12og/rev2/rev2.c +++ b/keyboards/matrix/m12og/rev2/rev2.c @@ -4,10 +4,12 @@ #include "quantum.h" -void matrix_init_user(void) { +void matrix_init_kb(void) { setPinOutput(C6); setPinOutput(B2); setPinOutput(B1); + + matrix_init_user(); } bool led_update_kb(led_t led_state) { diff --git a/keyboards/matrix/m20add/info.json b/keyboards/matrix/m20add/keyboard.json index 5a999bb484..fc58d242e6 100644 --- a/keyboards/matrix/m20add/info.json +++ b/keyboards/matrix/m20add/keyboard.json @@ -34,6 +34,8 @@ "extrakey": true, "rgblight": true }, + "processor": "STM32F411", + "bootloader": "custom", "layouts": { "LAYOUT_tkl_ansi_tsangan": { "layout": [ diff --git a/keyboards/matrix/m20add/rules.mk b/keyboards/matrix/m20add/rules.mk index 150bd24e30..980cf9518b 100644 --- a/keyboards/matrix/m20add/rules.mk +++ b/keyboards/matrix/m20add/rules.mk @@ -1,18 +1,7 @@ -# MCU name -MCU = STM32F411 - -# Linker script to use -# - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/ -# or <this_dir>/ld/ +# custom bootloader MCU_LDSCRIPT = m20add_boot - -# Board: it should exist either in <chibios>/os/hal/boards/ -# or <this_dir>/boards BOARD = ST_NUCLEO64_F411RE -# Bootloader selection -BOOTLOADER = custom - CUSTOM_MATRIX = lite # project specific files SRC += matrix.c tca6424.c rgb_ring.c drivers/led/issi/is31fl3731.c diff --git a/keyboards/matrix/noah/info.json b/keyboards/matrix/noah/keyboard.json index 959c3c8c9c..eb13e16aa2 100644 --- a/keyboards/matrix/noah/info.json +++ b/keyboards/matrix/noah/keyboard.json @@ -83,6 +83,8 @@ "rgblight": true, "rgb_matrix": true }, + "processor": "STM32F411", + "bootloader": "custom", "community_layouts": ["65_iso_blocker"], "layouts": { "LAYOUT_default": { diff --git a/keyboards/matrix/noah/rules.mk b/keyboards/matrix/noah/rules.mk index d1c19f36ff..407c120a52 100644 --- a/keyboards/matrix/noah/rules.mk +++ b/keyboards/matrix/noah/rules.mk @@ -1,18 +1,7 @@ -# MCU name -MCU = STM32F411 - -# Linker script to use -# - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/ -# or <this_dir>/ld/ +# custom bootloader MCU_LDSCRIPT = noah_boot - -# Board: it should exist either in <chibios>/os/hal/boards/ -# or <this_dir>/boards BOARD = ST_NUCLEO64_F411RE -# Bootloader selection -BOOTLOADER = custom - WS2812_DRIVER_REQUIRED = yes CUSTOM_MATRIX = yes |