Migrate build target markers to keyboard.json - Misc (#23609)

master
Joel Challis 2024-04-25 08:42:48 +01:00 committed by GitHub
parent b6d5cfe575
commit 3d83b3e7c5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
43 changed files with 69 additions and 157 deletions

View File

@ -1 +0,0 @@
# This file intentionally left blank

View File

@ -1,24 +0,0 @@
/*
Copyright 2012 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE

View File

@ -27,6 +27,12 @@
"command": true, "command": true,
"backlight": true "backlight": true
}, },
"qmk": {
"locking": {
"enabled": true,
"resync": true
}
},
"community_layouts": ["ortho_5x12", "ortho_4x12"], "community_layouts": ["ortho_5x12", "ortho_4x12"],
"layouts": { "layouts": {
"LAYOUT_ortho_5x12": { "LAYOUT_ortho_5x12": {

View File

@ -34,6 +34,8 @@
"extrakey": true, "extrakey": true,
"rgblight": true "rgblight": true
}, },
"processor": "STM32F411",
"bootloader": "custom",
"layouts": { "layouts": {
"LAYOUT_tkl_ansi": { "LAYOUT_tkl_ansi": {
"layout": [ "layout": [

View File

@ -1,33 +1,7 @@
# # custom bootloader
# - 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/
MCU_LDSCRIPT = abelx_boot 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 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 CUSTOM_MATRIX = lite
# project specific files # project specific files
SRC += matrix.c tca6424.c aw9523b.c SRC += matrix.c tca6424.c aw9523b.c

View File

@ -40,6 +40,8 @@
"build": { "build": {
"lto": true "lto": true
}, },
"bootloader": "custom",
"processor": "STM32F103",
"layout_aliases": { "layout_aliases": {
"LAYOUT_all": "LAYOUT_tkl_ansi_tsangan" "LAYOUT_all": "LAYOUT_tkl_ansi_tsangan"
}, },

View File

@ -29,4 +29,6 @@ void keyboard_post_init_kb(void) {
rgblight_enable_noeeprom(); rgblight_enable_noeeprom();
rgblight_sethsv_noeeprom(5, 255, 255); rgblight_sethsv_noeeprom(5, 255, 255);
rgblight_mode_noeeprom(37); rgblight_mode_noeeprom(37);
keyboard_post_init_user();
} }

View File

@ -1,12 +1,6 @@
# MCU name # custom bootloader
MCU = STM32F103
MCU_LDSCRIPT = m12og_v1 MCU_LDSCRIPT = m12og_v1
BOARD = m12og_v1 BOARD = m12og_v1
# Bootloader selection
BOOTLOADER = custom
CUSTOM_MATRIX = lite CUSTOM_MATRIX = lite
SRC += matrix.c SRC += matrix.c

View File

@ -4,10 +4,12 @@
#include "quantum.h" #include "quantum.h"
void matrix_init_user(void) { void matrix_init_kb(void) {
setPinOutput(C6); setPinOutput(C6);
setPinOutput(B2); setPinOutput(B2);
setPinOutput(B1); setPinOutput(B1);
matrix_init_user();
} }
bool led_update_kb(led_t led_state) { bool led_update_kb(led_t led_state) {

View File

@ -34,6 +34,8 @@
"extrakey": true, "extrakey": true,
"rgblight": true "rgblight": true
}, },
"processor": "STM32F411",
"bootloader": "custom",
"layouts": { "layouts": {
"LAYOUT_tkl_ansi_tsangan": { "LAYOUT_tkl_ansi_tsangan": {
"layout": [ "layout": [

View File

@ -1,18 +1,7 @@
# MCU name # custom bootloader
MCU = STM32F411
# Linker script to use
# - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
# or <this_dir>/ld/
MCU_LDSCRIPT = m20add_boot MCU_LDSCRIPT = m20add_boot
# Board: it should exist either in <chibios>/os/hal/boards/
# or <this_dir>/boards
BOARD = ST_NUCLEO64_F411RE BOARD = ST_NUCLEO64_F411RE
# Bootloader selection
BOOTLOADER = custom
CUSTOM_MATRIX = lite CUSTOM_MATRIX = lite
# project specific files # project specific files
SRC += matrix.c tca6424.c rgb_ring.c drivers/led/issi/is31fl3731.c SRC += matrix.c tca6424.c rgb_ring.c drivers/led/issi/is31fl3731.c

View File

@ -83,6 +83,8 @@
"rgblight": true, "rgblight": true,
"rgb_matrix": true "rgb_matrix": true
}, },
"processor": "STM32F411",
"bootloader": "custom",
"community_layouts": ["65_iso_blocker"], "community_layouts": ["65_iso_blocker"],
"layouts": { "layouts": {
"LAYOUT_default": { "LAYOUT_default": {

View File

@ -1,18 +1,7 @@
# MCU name # custom bootloader
MCU = STM32F411
# Linker script to use
# - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
# or <this_dir>/ld/
MCU_LDSCRIPT = noah_boot MCU_LDSCRIPT = noah_boot
# Board: it should exist either in <chibios>/os/hal/boards/
# or <this_dir>/boards
BOARD = ST_NUCLEO64_F411RE BOARD = ST_NUCLEO64_F411RE
# Bootloader selection
BOOTLOADER = custom
WS2812_DRIVER_REQUIRED = yes WS2812_DRIVER_REQUIRED = yes
CUSTOM_MATRIX = yes CUSTOM_MATRIX = yes

View File

@ -4,6 +4,15 @@
"pid": "0x9D9D", "pid": "0x9D9D",
"device_version": "0.0.1" "device_version": "0.0.1"
}, },
"features": {
"bootmagic": false,
"encoder": true,
"extrakey": true,
"mousekey": false,
"nkro": false,
"oled": true,
"rgblight": true
},
"rgblight": { "rgblight": {
"led_count": 20, "led_count": 20,
"split_count": [10, 10] "split_count": [10, 10]

View File

@ -1,13 +1 @@
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite DEFAULT_FOLDER = splitkb/kyria/rev1/base
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)

View File

@ -4,6 +4,15 @@
"pid": "0x9D9D", "pid": "0x9D9D",
"device_version": "0.0.2" "device_version": "0.0.2"
}, },
"features": {
"bootmagic": false,
"encoder": true,
"extrakey": true,
"mousekey": false,
"nkro": false,
"oled": true,
"rgblight": true
},
"rgblight": { "rgblight": {
"led_count": 20, "led_count": 20,
"split_count": [10, 10] "split_count": [10, 10]

View File

@ -1,13 +1 @@
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite DEFAULT_FOLDER = splitkb/kyria/rev2/base
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)

View File

@ -1 +0,0 @@
# This file intentionally left blank

View File

@ -7,6 +7,14 @@
"vid": "0x3265", "vid": "0x3265",
"pid": "0x0008" "pid": "0x0008"
}, },
"features": {
"bootmagic": true,
"encoder": true,
"extrakey": true,
"mousekey": true,
"nkro": false,
"rgblight": true
},
"encoder": { "encoder": {
"rotary": [ "rotary": [
{"pin_a": "B5", "pin_b": "B6"} {"pin_a": "B5", "pin_b": "B6"}

View File

@ -0,0 +1 @@
SRC += navpad_prefs.c

View File

@ -0,0 +1 @@
SRC += navpad_prefs.c

View File

@ -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 DEFAULT_FOLDER = yushakobo/navpad/10/rev1

View File

@ -8,6 +8,14 @@
"pid": "0x0008", "pid": "0x0008",
"device_version": "0.0.1" "device_version": "0.0.1"
}, },
"features": {
"bootmagic": true,
"encoder": true,
"extrakey": true,
"mousekey": true,
"nkro": false,
"rgblight": true
},
"matrix_pins": { "matrix_pins": {
"cols": ["F5", "F6", "B2", "B3", "B1", "F7", null], "cols": ["F5", "F6", "B2", "B3", "B1", "F7", null],
"rows": ["D4", "C6", "D7", "E6", "B4", "F4"] "rows": ["D4", "C6", "D7", "E6", "B4", "F4"]

View File

@ -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 SRC += navpad_prefs.c

View File

@ -8,6 +8,14 @@
"pid": "0x0006", "pid": "0x0006",
"device_version": "0.0.1" "device_version": "0.0.1"
}, },
"features": {
"bootmagic": true,
"encoder": true,
"extrakey": true,
"mousekey": true,
"nkro": false,
"rgb_matrix": true
},
"rgb_matrix": { "rgb_matrix": {
"driver": "ws2812", "driver": "ws2812",
"max_brightness": 150, "max_brightness": 150,

View File

@ -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 RGB_MATRIX_CUSTOM_KB = yes
SRC += quick17_prefs.c SRC += quick17_prefs.c