fern/qmk-firmware
1
0
Fork 0
mirror of https://github.com/firewalkwithm3/qmk_firmware.git synced 2024-11-22 11:30:30 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Add audio driver to keyboard.json schema (#23616)

Browse source
This commit is contained in:
Joel Challis 2024-04-26 05:41:22 +01:00 committed by GitHub
parent 42f61611e8
commit d333a25868
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
39 changed files with 59 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
data/mappings/info_rules.hjson
View file

@ -11,6 +11,7 @@
// invalid: Default `false`. Set to `true` to generate errors when a value exists // invalid: Default `false`. Set to `true` to generate errors when a value exists
// replace_with: use with a key marked deprecated or invalid to designate a replacement // replace_with: use with a key marked deprecated or invalid to designate a replacement
"AUDIO_DRIVER": {"info_key": "audio.driver"},
"BACKLIGHT_DRIVER": {"info_key": "backlight.driver"}, "BACKLIGHT_DRIVER": {"info_key": "backlight.driver"},
"BLUETOOTH_DRIVER": {"info_key": "bluetooth.driver"}, "BLUETOOTH_DRIVER": {"info_key": "bluetooth.driver"},
"BOARD": {"info_key": "board"}, "BOARD": {"info_key": "board"},

4
data/schemas/keyboard.jsonschema
View file

@ -133,6 +133,10 @@
"clicky": {"type": "boolean"} "clicky": {"type": "boolean"}
} }
}, },
"driver": {
"type": "string",
"enum": ["dac_additive", "dac_basic", "pwm_software", "pwm_hardware"]
},
"macro_beep": {"type": "boolean"}, "macro_beep": {"type": "boolean"},
"pins": {"$ref": "qmk.definitions.v1#/mcu_pin_array"}, "pins": {"$ref": "qmk.definitions.v1#/mcu_pin_array"},
"power_control": { "power_control": {

2
docs/reference_info_json.md
View file

@ -118,6 +118,8 @@ Configures the [Audio](feature_audio.md) feature.
* `clicky` * `clicky`
* The default audio clicky enabled state. * The default audio clicky enabled state.
* Default: `true` * Default: `true`
* `driver`
* The driver to use. Must be one of `dac_additive`, `dac_basic`, `pwm_software`, `pwm_hardware`.
* `macro_beep` * `macro_beep`
* Play a short beep for `\a` (ASCII `BEL`) characters in Send String macros. * Play a short beep for `\a` (ASCII `BEL`) characters in Send String macros.
* Default: `false` * Default: `false`

1
keyboards/adafruit/macropad/keyboard.json
View file

@ -19,6 +19,7 @@
"oled": true "oled": true
}, },
"audio": { "audio": {
"driver": "pwm_hardware",
"power_control": { "power_control": {
"pin": "GP14" "pin": "GP14"
} }

1
keyboards/adafruit/macropad/rules.mk
View file

@ -1,2 +1 @@
AUDIO_DRIVER = pwm_hardware
OLED_TRANSPORT = spi OLED_TRANSPORT = spi

3
keyboards/arrowmechanics/wings/keyboard.json
View file

@ -17,6 +17,9 @@
"mousekey": true, "mousekey": true,
"rgb_matrix": true "rgb_matrix": true
}, },
"audio": {
"driver": "pwm_hardware"
},
"matrix_pins": { "matrix_pins": {
"cols": ["GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15", "GP16"], "cols": ["GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15", "GP16"],
"rows": ["GP22", "GP21", "GP20", "GP19", "GP18", "GP17"] "rows": ["GP22", "GP21", "GP20", "GP19", "GP18", "GP17"]

1
keyboards/arrowmechanics/wings/rules.mk
View file

@ -1,2 +1 @@
SERIAL_DRIVER = vendor SERIAL_DRIVER = vendor
AUDIO_DRIVER = pwm_hardware

3
keyboards/boardsource/equals/48/keyboard.json
View file

@ -10,6 +10,9 @@
"cols": ["GP0", "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11"], "cols": ["GP0", "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11"],
"rows": ["GP12", "GP13", "GP16", "GP17"] "rows": ["GP12", "GP13", "GP16", "GP17"]
}, },
"audio": {
"driver": "pwm_hardware"
},
"ws2812": { "ws2812": {
"driver": "vendor", "driver": "vendor",
"pin": "GP21" "pin": "GP21"

1
keyboards/boardsource/equals/48/rules.mk
View file

@ -1,2 +1 @@
AUDIO_DRIVER = pwm_hardware
QUANTUM_PAINTER_DRIVERS += st7735_spi QUANTUM_PAINTER_DRIVERS += st7735_spi

3
keyboards/boardsource/equals/60/keyboard.json
View file

@ -10,6 +10,9 @@
"cols": ["GP0", "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11"], "cols": ["GP0", "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11"],
"rows": ["GP12", "GP13", "GP16", "GP17", "GP18"] "rows": ["GP12", "GP13", "GP16", "GP17", "GP18"]
}, },
"audio": {
"driver": "pwm_hardware"
},
"ws2812": { "ws2812": {
"driver": "vendor", "driver": "vendor",
"pin": "GP21" "pin": "GP21"

1
keyboards/boardsource/equals/60/rules.mk
View file

@ -1,2 +1 @@
AUDIO_DRIVER = pwm_hardware
QUANTUM_PAINTER_DRIVERS += st7735_spi QUANTUM_PAINTER_DRIVERS += st7735_spi

3
keyboards/boardsource/unicorne/keyboard.json
View file

@ -32,6 +32,9 @@
"pid": "0x7563", "pid": "0x7563",
"vid": "0x4273" "vid": "0x4273"
}, },
"audio": {
"driver": "pwm_hardware"
},
"ws2812": { "ws2812": {
"driver": "vendor", "driver": "vendor",
"pin": "GP29" "pin": "GP29"

1
keyboards/boardsource/unicorne/rules.mk
View file

@ -1,3 +1,2 @@
SERIAL_DRIVER = vendor SERIAL_DRIVER = vendor
AUDIO_DRIVER = pwm_hardware
POINTING_DEVICE_DRIVER = analog_joystick POINTING_DEVICE_DRIVER = analog_joystick

3
keyboards/custommk/cmk11/keyboard.json
View file

@ -18,6 +18,9 @@
"nkro": true, "nkro": true,
"rgb_matrix": true "rgb_matrix": true
}, },
"audio": {
"driver": "pwm_hardware"
},
"matrix_pins": { "matrix_pins": {
"cols": ["B0", "A1", "A2", "A3", "A6", "B10"], "cols": ["B0", "A1", "A2", "A3", "A6", "B10"],
"rows": ["A5", "A4"] "rows": ["A5", "A4"]

1
keyboards/custommk/cmk11/rules.mk
View file

@ -1 +0,0 @@
AUDIO_DRIVER = pwm_hardware

3
keyboards/custommk/ergostrafer/keyboard.json
View file

@ -17,6 +17,9 @@
"encoder": true, "encoder": true,
"audio": true "audio": true
}, },
"audio": {
"driver": "pwm_hardware"
},
"matrix_pins": { "matrix_pins": {
"cols": ["B0", "A1", "A2", "A3", "A6", "B6", "B10"], "cols": ["B0", "A1", "A2", "A3", "A6", "B6", "B10"],
"rows": ["C13", "C14", "C15", "B1", "A7", "A5"] "rows": ["C13", "C14", "C15", "B1", "A7", "A5"]

1
keyboards/custommk/ergostrafer/rules.mk
View file

@ -1 +0,0 @@
AUDIO_DRIVER = pwm_hardware

3
keyboards/custommk/evo70_r2/keyboard.json
View file

@ -51,6 +51,9 @@
"twinkle": true "twinkle": true
} }
}, },
"audio": {
"driver": "pwm_hardware"
},
"ws2812": { "ws2812": {
"driver": "pwm", "driver": "pwm",
"pin": "A10" "pin": "A10"

2
keyboards/custommk/evo70_r2/rules.mk
View file

@ -1,5 +1,3 @@
AUDIO_DRIVER = pwm_hardware
# project specific files # project specific files
SRC += matrix.c SRC += matrix.c

3
keyboards/handwired/macroboard/f411/keyboard.json
View file

@ -9,6 +9,9 @@
"rows": ["A15", "B3", "B4", "B5", "B7"] "rows": ["A15", "B3", "B4", "B5", "B7"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"audio": {
"driver": "pwm_hardware"
},
"ws2812": { "ws2812": {
"driver": "pwm" "driver": "pwm"
}, },

1
keyboards/handwired/macroboard/f411/rules.mk
View file

@ -1 +0,0 @@
AUDIO_DRIVER = pwm_hardware

3
keyboards/handwired/tractyl_manuform/5x6_right/f303/keyboard.json
View file

@ -12,6 +12,9 @@
"led_count": 20, "led_count": 20,
"split_count": [10, 10] "split_count": [10, 10]
}, },
"audio": {
"driver": "dac_additive"
},
"ws2812": { "ws2812": {
"pin": "A6", "pin": "A6",
"driver": "pwm" "driver": "pwm"

1
keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk
View file

@ -1,4 +1,3 @@
# KEYBOARD_SHARED_EP = yes # KEYBOARD_SHARED_EP = yes
SERIAL_DRIVER = usart SERIAL_DRIVER = usart
AUDIO_DRIVER = dac_additive

3
keyboards/handwired/tractyl_manuform/5x6_right/f411/keyboard.json
View file

@ -15,6 +15,9 @@
"build": { "build": {
"debounce_type": "asym_eager_defer_pk" "debounce_type": "asym_eager_defer_pk"
}, },
"audio": {
"driver": "pwm_hardware"
},
"ws2812": { "ws2812": {
"pin": "A1", "pin": "A1",
"driver": "pwm" "driver": "pwm"

1
keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk
View file

@ -2,4 +2,3 @@ KEYBOARD_SHARED_EP = yes
MOUSE_SHARED_EP = yes MOUSE_SHARED_EP = yes
SERIAL_DRIVER = usart SERIAL_DRIVER = usart
AUDIO_DRIVER = pwm_hardware

3
keyboards/nack/keyboard.json
View file

@ -17,6 +17,9 @@
"rgb_matrix": true, "rgb_matrix": true,
"unicode": true "unicode": true
}, },
"audio": {
"driver": "dac_basic"
},
"ws2812": { "ws2812": {
"pin": "B5", "pin": "B5",
"driver": "spi" "driver": "spi"

1
keyboards/nack/rules.mk
View file

@ -1 +0,0 @@
AUDIO_DRIVER = dac_basic

3
keyboards/planck/ez/info.json
View file

@ -75,6 +75,9 @@
"rows": ["A10", "A9", "A8", "B15", "C13", "C14", "C15", "A2"] "rows": ["A10", "A9", "A8", "B15", "C13", "C14", "C15", "A2"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"audio": {
"driver": "dac_additive"
},
"encoder": { "encoder": {
"rotary": [ "rotary": [
{"pin_a": "B12", "pin_b": "B13"} {"pin_a": "B12", "pin_b": "B13"}

2
keyboards/planck/ez/rules.mk
View file

@ -1,5 +1,3 @@
AUDIO_DRIVER = dac_additive
RGBLIGHT_SUPPORTED = no RGBLIGHT_SUPPORTED = no
BAKCLIGHT_SUPPORTED = no BAKCLIGHT_SUPPORTED = no

3
keyboards/quokka/keyboard.json
View file

@ -13,6 +13,9 @@
"oled": true, "oled": true,
"rgb_matrix": true "rgb_matrix": true
}, },
"audio": {
"driver": "pwm_hardware"
},
"matrix_pins": { "matrix_pins": {
"cols": ["GP8", "GP7", "GP6", "GP5", "GP4"], "cols": ["GP8", "GP7", "GP6", "GP5", "GP4"],
"rows": ["GP10", "GP19", "GP20", "GP18"] "rows": ["GP10", "GP19", "GP20", "GP18"]

1
keyboards/quokka/rules.mk
View file

@ -1,2 +1 @@
AUDIO_DRIVER = pwm_hardware
SERIAL_DRIVER = vendor SERIAL_DRIVER = vendor

3
keyboards/rgbkb/sol3/rev1/keyboard.json
View file

@ -24,6 +24,9 @@
"twinkle": true "twinkle": true
} }
}, },
"audio": {
"driver": "dac_additive"
},
"ws2812": { "ws2812": {
"pin": "B5", "pin": "B5",
"driver": "pwm" "driver": "pwm"

1
keyboards/rgbkb/sol3/rules.mk
View file

@ -14,7 +14,6 @@ CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = yes # Enable N-Key Rollover NKRO_ENABLE = yes # Enable N-Key Rollover
AUDIO_ENABLE = yes # Audio output AUDIO_ENABLE = yes # Audio output
AUDIO_DRIVER = dac_additive
DYNAMIC_MACRO_ENABLE = yes DYNAMIC_MACRO_ENABLE = yes
DIP_SWITCH_ENABLE = yes DIP_SWITCH_ENABLE = yes

3
keyboards/tzarc/djinn/info.json
View file

@ -31,6 +31,9 @@
"rows": ["B13", "B14", "B15", "C6", "C7", "C8"], "rows": ["B13", "B14", "B15", "C6", "C7", "C8"],
"cols": ["C0", "C1", "C2", "C3", "A0", "A1", "A2"] "cols": ["C0", "C1", "C2", "C3", "A0", "A1", "A2"]
}, },
"audio": {
"driver": "pwm_software"
},
"backlight": { "backlight": {
"pin": "A7", "pin": "A7",
"levels": 4 "levels": 4

2
keyboards/tzarc/djinn/rules.mk
View file

@ -4,8 +4,6 @@ SERIAL_DRIVER = usart
CIE1931_CURVE = yes CIE1931_CURVE = yes
AUDIO_DRIVER = pwm_software
QUANTUM_PAINTER_DRIVERS = ili9341_spi QUANTUM_PAINTER_DRIVERS = ili9341_spi
SRC += \ SRC += \

3
keyboards/yanghu/unicorne/info.json
View file

@ -18,6 +18,9 @@
"oled": true, "oled": true,
"rgblight": true "rgblight": true
}, },
"audio": {
"driver": "pwm_hardware"
},
"rgblight": { "rgblight": {
"led_count": 8, "led_count": 8,
"animations": { "animations": {

2
keyboards/yanghu/unicorne/rules.mk
View file

@ -1,3 +1 @@
AUDIO_DRIVER = pwm_hardware
DEFAULT_FOLDER = yanghu/unicorne/f411 DEFAULT_FOLDER = yanghu/unicorne/f411

3
keyboards/zsa/moonlander/keyboard.json
View file

@ -22,6 +22,9 @@
"rgb_matrix": true, "rgb_matrix": true,
"swap_hands": true "swap_hands": true
}, },
"audio": {
"driver": "dac_additive"
},
"dynamic_keymap": { "dynamic_keymap": {
"layer_count": 8 "layer_count": 8
}, },

1
keyboards/zsa/moonlander/rules.mk
View file

@ -1,4 +1,3 @@
AUDIO_DRIVER = dac_additive
CUSTOM_MATRIX = lite CUSTOM_MATRIX = lite
# project specific files # project specific files