Skip to content

Commit

Permalink
Migrate build target markers to keyboard.json - Misc (#23609)
Browse files Browse the repository at this point in the history
  • Loading branch information
zvecr committed Apr 25, 2024
1 parent b6d5cfe commit 3d83b3e
Show file tree
Hide file tree
Showing 43 changed files with 69 additions and 157 deletions.
File renamed without changes.
1 change: 0 additions & 1 deletion keyboards/epomaker/tide65/rules.mk

This file was deleted.

File renamed without changes.
Empty file removed keyboards/keyten/lisa/rules.mk
Empty file.
24 changes: 0 additions & 24 deletions keyboards/maple_computing/jnao/config.h

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@
"command": true,
"backlight": true
},
"qmk": {
"locking": {
"enabled": true,
"resync": true
}
},
"community_layouts": ["ortho_5x12", "ortho_4x12"],
"layouts": {
"LAYOUT_ortho_5x12": {
Expand Down
Empty file.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
"extrakey": true,
"rgblight": true
},
"processor": "STM32F411",
"bootloader": "custom",
"layouts": {
"LAYOUT_tkl_ansi": {
"layout": [
Expand Down
28 changes: 1 addition & 27 deletions keyboards/matrix/abelx/rules.mk
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@
"build": {
"lto": true
},
"bootloader": "custom",
"processor": "STM32F103",
"layout_aliases": {
"LAYOUT_all": "LAYOUT_tkl_ansi_tsangan"
},
Expand Down
2 changes: 2 additions & 0 deletions keyboards/matrix/m12og/rev1/rev1.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
8 changes: 1 addition & 7 deletions keyboards/matrix/m12og/rev1/rules.mk
Original file line number Diff line number Diff line change
@@ -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
4 changes: 3 additions & 1 deletion keyboards/matrix/m12og/rev2/rev2.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
"extrakey": true,
"rgblight": true
},
"processor": "STM32F411",
"bootloader": "custom",
"layouts": {
"LAYOUT_tkl_ansi_tsangan": {
"layout": [
Expand Down
13 changes: 1 addition & 12 deletions keyboards/matrix/m20add/rules.mk
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@
"rgblight": true,
"rgb_matrix": true
},
"processor": "STM32F411",
"bootloader": "custom",
"community_layouts": ["65_iso_blocker"],
"layouts": {
"LAYOUT_default": {
Expand Down
13 changes: 1 addition & 12 deletions keyboards/matrix/noah/rules.mk
Original file line number Diff line number Diff line change
@@ -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
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
9 changes: 9 additions & 0 deletions keyboards/splitkb/kyria/rev1/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,15 @@
"pid": "0x9D9D",
"device_version": "0.0.1"
},
"features": {
"bootmagic": false,
"encoder": true,
"extrakey": true,
"mousekey": false,
"nkro": false,
"oled": true,
"rgblight": true
},
"rgblight": {
"led_count": 20,
"split_count": [10, 10]
Expand Down
14 changes: 1 addition & 13 deletions keyboards/splitkb/kyria/rev1/rules.mk
Original file line number Diff line number Diff line change
@@ -1,13 +1 @@
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = no # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
AUDIO_ENABLE = no # Audio output

OLED_ENABLE = yes # Enables the use of OLED displays
ENCODER_ENABLE = yes # Enables the use of one or more encoders
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
RGB_MATRIX_ENABLE = no # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
DEFAULT_FOLDER = splitkb/kyria/rev1/base
9 changes: 9 additions & 0 deletions keyboards/splitkb/kyria/rev2/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,15 @@
"pid": "0x9D9D",
"device_version": "0.0.2"
},
"features": {
"bootmagic": false,
"encoder": true,
"extrakey": true,
"mousekey": false,
"nkro": false,
"oled": true,
"rgblight": true
},
"rgblight": {
"led_count": 20,
"split_count": [10, 10]
Expand Down
14 changes: 1 addition & 13 deletions keyboards/splitkb/kyria/rev2/rules.mk
Original file line number Diff line number Diff line change
@@ -1,13 +1 @@
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = no # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
AUDIO_ENABLE = no # Audio output

OLED_ENABLE = yes # Enables the use of OLED displays
ENCODER_ENABLE = yes # Enables the use of one or more encoders
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
RGB_MATRIX_ENABLE = no # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
DEFAULT_FOLDER = splitkb/kyria/rev2/base
File renamed without changes.
1 change: 0 additions & 1 deletion keyboards/suikagiken/suika85ergo/rules.mk

This file was deleted.

8 changes: 8 additions & 0 deletions keyboards/yushakobo/navpad/10/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@
"vid": "0x3265",
"pid": "0x0008"
},
"features": {
"bootmagic": true,
"encoder": true,
"extrakey": true,
"mousekey": true,
"nkro": false,
"rgblight": true
},
"encoder": {
"rotary": [
{"pin_a": "B5", "pin_b": "B6"}
Expand Down
1 change: 1 addition & 0 deletions keyboards/yushakobo/navpad/10/rev0/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SRC += navpad_prefs.c
1 change: 1 addition & 0 deletions keyboards/yushakobo/navpad/10/rev1/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SRC += navpad_prefs.c
16 changes: 0 additions & 16 deletions keyboards/yushakobo/navpad/10/rules.mk
Original file line number Diff line number Diff line change
@@ -1,17 +1 @@
# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = no # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output

ENCODER_ENABLE = yes

SRC += navpad_prefs.c
DEFAULT_FOLDER = yushakobo/navpad/10/rev1
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@
"pid": "0x0008",
"device_version": "0.0.1"
},
"features": {
"bootmagic": true,
"encoder": true,
"extrakey": true,
"mousekey": true,
"nkro": false,
"rgblight": true
},
"matrix_pins": {
"cols": ["F5", "F6", "B2", "B3", "B1", "F7", null],
"rows": ["D4", "C6", "D7", "E6", "B4", "F4"]
Expand Down
15 changes: 0 additions & 15 deletions keyboards/yushakobo/navpad/10_helix_r/rules.mk
Original file line number Diff line number Diff line change
@@ -1,16 +1 @@
# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = no # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output

ENCODER_ENABLE = yes

SRC += navpad_prefs.c
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@
"pid": "0x0006",
"device_version": "0.0.1"
},
"features": {
"bootmagic": true,
"encoder": true,
"extrakey": true,
"mousekey": true,
"nkro": false,
"rgb_matrix": true
},
"rgb_matrix": {
"driver": "ws2812",
"max_brightness": 150,
Expand Down
15 changes: 0 additions & 15 deletions keyboards/yushakobo/quick17/rules.mk
Original file line number Diff line number Diff line change
@@ -1,18 +1,3 @@
# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = no # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
ENCODER_ENABLE = yes

RGB_MATRIX_ENABLE = yes
RGB_MATRIX_CUSTOM_KB = yes

SRC += quick17_prefs.c
File renamed without changes.

0 comments on commit 3d83b3e

Please sign in to comment.