From d18698a8e8d83d47d48b8501932e6a046148f95a Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 29 Aug 2022 06:20:43 +1000 Subject: Remove deprecated USBasp and bootloadHID bootloader types (#18195) --- data/schemas/keyboard.jsonschema | 2 -- 1 file changed, 2 deletions(-) (limited to 'data/schemas') diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index 0308f45116..b534f28c9f 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -89,7 +89,6 @@ "enum": [ "atmel-dfu", "bootloadhid", - "bootloadHID", "caterina", "custom", "gd32v-dfu", @@ -106,7 +105,6 @@ "tinyuf2", "unknown", "usbasploader", - "USBasp", "wb32-dfu" ] }, -- cgit v1.2.3 From ef775d0fc8ae70ac2d7add1a494427010f79049c Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 30 Aug 2022 04:05:05 +1000 Subject: Fix incorrect `bluetooth.driver` rules.mk mapping (#18205) --- data/schemas/keyboard.jsonschema | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'data/schemas') diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index b534f28c9f..e425d13dd8 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -75,8 +75,7 @@ "driver": { "type": "string", "enum": ["BluefruitLE", "RN42"] - }, - "lto": {"type": "boolean"} + } } }, "board": { -- cgit v1.2.3 From 0237ff0c62d4278df3c0c93f5f85f84c1a0ed519 Mon Sep 17 00:00:00 2001 From: Marek Kraus Date: Wed, 31 Aug 2022 09:16:07 +0200 Subject: [Core] Rework PS/2 driver selection (#17892) * [Core] Rework PS/2 driver selection Enabling and selecting PS/2 driver was using old approach, so it was reworked to current approach, inspired by Serial and WS2812 driver selections. * [Keyboard] Update keyboards using PS/2 to use new PS/2 driver selection * [Docs] Update PS/2 documentation to use new PS/2 driver selection * Fix indentation * [Core] Add PS2 to data driver * Fix oversight in property name Co-authored-by: Drashna Jaelre * Add PS/2 pins to data driven mappings Co-authored-by: Drashna Jaelre --- data/schemas/keyboard.jsonschema | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'data/schemas') diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index e425d13dd8..d0375fcdc4 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -390,6 +390,20 @@ } } }, + "ps2": { + "type": "object", + "additionalProperties": false, + "properties": { + "enabled": {"type": "boolean"}, + "mouse_enabled": {"type": "boolean"}, + "clock_pin": {"$ref": "qmk.definitions.v1#/mcu_pin"}, + "data_pin": {"$ref": "qmk.definitions.v1#/mcu_pin"}, + "driver": { + "type": "string", + "enum": ["busywait", "interrupt", "usart", "vendor"] + } + } + }, "split": { "type": "object", "additionalProperties": false, -- cgit v1.2.3 From 3e02b70d28ae3f39ad41c83400dda2eb8e29e6a6 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 5 Sep 2022 06:36:33 +1000 Subject: Rename keyboards with uppercase letters (#18268) --- data/schemas/definitions.jsonschema | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'data/schemas') diff --git a/data/schemas/definitions.jsonschema b/data/schemas/definitions.jsonschema index 8b68a58482..94a94157c0 100644 --- a/data/schemas/definitions.jsonschema +++ b/data/schemas/definitions.jsonschema @@ -68,20 +68,8 @@ "type": "number" }, "keyboard": { - "oneOf": [ - { - "type": "string", - "enum": [ - "converter/numeric_keypad_IIe", - "emptystring/NQG", - "maple_computing/christmas_tree/V2017" - ] - }, - { - "type": "string", - "pattern": "^[0-9a-z][0-9a-z_/]*$" - } - ] + "type": "string", + "pattern": "^[0-9a-z][0-9a-z_/]*$" }, "mcu_pin_array": { "type": "array", -- cgit v1.2.3 From fb6e82154140df1b87f74f80dac911c96163e82e Mon Sep 17 00:00:00 2001 From: Danny Date: Thu, 8 Sep 2022 14:59:27 -0400 Subject: Add Elite-Pi converter (#18236) Co-authored-by: Joel Challis --- data/schemas/keyboard.jsonschema | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/schemas') diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index d0375fcdc4..7e0400d7f7 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -34,7 +34,7 @@ }, "development_board": { "type": "string", - "enum": ["promicro", "elite_c", "proton_c", "kb2040", "promicro_rp2040", "blok", "bit_c_pro", "stemcell", "bluepill", "blackpill_f401", "blackpill_f411", "bonsai_c4"] + "enum": ["promicro", "elite_c", "elite_pi", "proton_c", "kb2040", "promicro_rp2040", "blok", "bit_c_pro", "stemcell", "bluepill", "blackpill_f401", "blackpill_f411", "bonsai_c4"] }, "pin_compatible": { "type": "string", -- cgit v1.2.3 From 11551406317578085bcac124d6857c0aca4133e0 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sun, 18 Sep 2022 20:30:27 +0100 Subject: Add Elite-C to converters (#18309) --- data/schemas/keyboard.jsonschema | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/schemas') diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index 7e0400d7f7..1b62f30eba 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -38,7 +38,7 @@ }, "pin_compatible": { "type": "string", - "enum": ["promicro"] + "enum": ["promicro", "elite_c"] }, "processor": { "type": "string", -- cgit v1.2.3 From 0f5cfc0363b95f61a54bf83135780ac6e51de8ea Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 19 Sep 2022 05:32:47 +1000 Subject: Add DD mapping for LED/RGB Matrix max brightness (#18403) --- data/schemas/keyboard.jsonschema | 2 ++ 1 file changed, 2 insertions(+) (limited to 'data/schemas') diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index 1b62f30eba..bf095aadfd 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -265,6 +265,7 @@ "type": "object", "properties": { "driver": {"type": "string"}, + "max_brightness": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}, "layout": { "type": "array", "items": { @@ -292,6 +293,7 @@ "type": "object", "properties": { "driver": {"type": "string"}, + "max_brightness": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}, "layout": { "type": "array", "items": { -- cgit v1.2.3 From 8beb61b790d215a365298d3aa865ebf1ebf78d8c Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 19 Sep 2022 07:57:50 +1000 Subject: Add DD mapping for LED/RGB Matrix split count (#18408) --- data/schemas/keyboard.jsonschema | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'data/schemas') diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index bf095aadfd..e82dacaac4 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -266,6 +266,12 @@ "properties": { "driver": {"type": "string"}, "max_brightness": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}, + "split_count": { + "type": "array", + "minItems": 2, + "maxItems": 2, + "items": {"$ref": "qmk.definitions.v1#/unsigned_int"} + }, "layout": { "type": "array", "items": { @@ -294,6 +300,12 @@ "properties": { "driver": {"type": "string"}, "max_brightness": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}, + "split_count": { + "type": "array", + "minItems": 2, + "maxItems": 2, + "items": {"$ref": "qmk.definitions.v1#/unsigned_int"} + }, "layout": { "type": "array", "items": { -- cgit v1.2.3 From 8d0fb4ca9e7f791f164fedbd270b2da44f971155 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 20 Sep 2022 04:36:48 +1000 Subject: Add DD mapping for LED/RGB Matrix HSVS steps (#18414) --- data/schemas/keyboard.jsonschema | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'data/schemas') diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index e82dacaac4..60381a21a0 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -266,6 +266,10 @@ "properties": { "driver": {"type": "string"}, "max_brightness": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}, + "hue_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"}, + "sat_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"}, + "val_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"}, + "speed_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"}, "split_count": { "type": "array", "minItems": 2, @@ -300,6 +304,10 @@ "properties": { "driver": {"type": "string"}, "max_brightness": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}, + "hue_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"}, + "sat_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"}, + "val_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"}, + "speed_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"}, "split_count": { "type": "array", "minItems": 2, -- cgit v1.2.3 From 89a1374ef48869505d9185559f588a49b8b0b23b Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 21 Sep 2022 09:45:07 +1000 Subject: Add DD mapping for LED/RGB Matrix center (#18432) --- data/schemas/keyboard.jsonschema | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'data/schemas') diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index 60381a21a0..ff5163e737 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -265,6 +265,12 @@ "type": "object", "properties": { "driver": {"type": "string"}, + "center_point": { + "type": "array", + "minItems": 2, + "maxItems": 2, + "items": {"$ref": "qmk.definitions.v1#/unsigned_int_8"} + }, "max_brightness": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}, "hue_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"}, "sat_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"}, @@ -303,6 +309,12 @@ "type": "object", "properties": { "driver": {"type": "string"}, + "center_point": { + "type": "array", + "minItems": 2, + "maxItems": 2, + "items": {"$ref": "qmk.definitions.v1#/unsigned_int_8"} + }, "max_brightness": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}, "hue_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"}, "sat_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"}, -- cgit v1.2.3 From 675d91b813db6488ccc1ca55555ebbf0d4a45dc0 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 26 Sep 2022 10:04:21 +1000 Subject: Generate DD RGBLight/LED/RGB Matrix animation defines (#18459) --- data/schemas/keyboard.jsonschema | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'data/schemas') diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index ff5163e737..1906ce5f75 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -264,6 +264,12 @@ "led_matrix": { "type": "object", "properties": { + "animations": { + "type": "object", + "additionalProperties": { + "type": "boolean" + } + }, "driver": {"type": "string"}, "center_point": { "type": "array", @@ -308,6 +314,12 @@ "rgb_matrix": { "type": "object", "properties": { + "animations": { + "type": "object", + "additionalProperties": { + "type": "boolean" + } + }, "driver": {"type": "string"}, "center_point": { "type": "array", -- cgit v1.2.3 From ea2819b2c2f1fbb9bf85010602758166530939ce Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 26 Sep 2022 14:40:15 +1000 Subject: Change `{LED,RGB}_DISABLE_TIMEOUT` to `{LED,RGB}_MATRIX_TIMEOUT` (#18415) --- data/schemas/keyboard.jsonschema | 2 ++ 1 file changed, 2 insertions(+) (limited to 'data/schemas') diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index 1906ce5f75..b75465b667 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -278,6 +278,7 @@ "items": {"$ref": "qmk.definitions.v1#/unsigned_int_8"} }, "max_brightness": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}, + "timeout": {"$ref": "qmk.definitions.v1#/unsigned_int"}, "hue_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"}, "sat_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"}, "val_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"}, @@ -328,6 +329,7 @@ "items": {"$ref": "qmk.definitions.v1#/unsigned_int_8"} }, "max_brightness": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}, + "timeout": {"$ref": "qmk.definitions.v1#/unsigned_int"}, "hue_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"}, "sat_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"}, "val_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"}, -- cgit v1.2.3 From c255174cf3e55483f14351a69689e24e849445a0 Mon Sep 17 00:00:00 2001 From: Dasky <32983009+daskygit@users.noreply.github.com> Date: Thu, 6 Oct 2022 10:52:42 +0100 Subject: Implement split comms watchdog (#18599) --- data/schemas/keyboard.jsonschema | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'data/schemas') diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index b75465b667..de23005c1e 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -508,7 +508,9 @@ "enum": ["custom", "i2c", "serial", "serial_usart"] }, "sync_matrix_state": {"type": "boolean"}, - "sync_modifiers": {"type": "boolean"} + "sync_modifiers": {"type": "boolean"}, + "watchdog": {"type": "boolean"}, + "watchdog_timeout": {"$ref": "qmk.definitions.v1#/unsigned_int"} } }, "usb_detect": { -- cgit v1.2.3 From f99b9ba2708ebf5ecbdd62f0c16846789287b24c Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Wed, 19 Oct 2022 17:17:49 +1100 Subject: Widen the ARM Cortex-M family support. Allow USB peripheral change. (#18767) --- data/schemas/keyboard.jsonschema | 53 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) (limited to 'data/schemas') diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index 10eb288350..06ccccc160 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -42,7 +42,58 @@ }, "processor": { "type": "string", - "enum": ["cortex-m0", "cortex-m0plus", "cortex-m3", "cortex-m4", "MKL26Z64", "MK20DX128", "MK20DX256", "MK64FX512", "MK66FX1M0", "RP2040", "STM32F042", "STM32F072", "STM32F103", "STM32F303", "STM32F401", "STM32F405", "STM32F407", "STM32F411", "STM32F446", "STM32G431", "STM32G474", "STM32L412", "STM32L422", "STM32L432", "STM32L433", "STM32L442", "STM32L443", "GD32VF103", "WB32F3G71", "WB32FQ95", "atmega16u2", "atmega32u2", "atmega16u4", "atmega32u4", "at90usb162", "at90usb646", "at90usb647", "at90usb1286", "at90usb1287", "atmega32a", "atmega328p", "atmega328", "attiny85", "unknown"] + "enum": [ + "cortex-m0", + "cortex-m0plus", + "cortex-m3", + "cortex-m4", + "cortex-m7", + "cortex-m23", + "cortex-m33", + "cortex-m35p", + "cortex-m55", + "cortex-m85", + "MKL26Z64", + "MK20DX128", + "MK20DX256", + "MK64FX512", + "MK66FX1M0", + "RP2040", + "STM32F042", + "STM32F072", + "STM32F103", + "STM32F303", + "STM32F401", + "STM32F405", + "STM32F407", + "STM32F411", + "STM32F446", + "STM32G431", + "STM32G474", + "STM32L412", + "STM32L422", + "STM32L432", + "STM32L433", + "STM32L442", + "STM32L443", + "GD32VF103", + "WB32F3G71", + "WB32FQ95", + "atmega16u2", + "atmega32u2", + "atmega16u4", + "atmega32u4", + "at90usb162", + "at90usb646", + "at90usb647", + "at90usb1286", + "at90usb1287", + "atmega32a", + "atmega328p", + "atmega328", + "attiny85", + "unknown" + ] }, "audio": { "type": "object", -- cgit v1.2.3 From 345f19a5d763053cd9cea6698656d4a2a1000b23 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Fri, 21 Oct 2022 02:21:17 +0100 Subject: Add converter support to keymap.json (#18776) --- data/schemas/keymap.jsonschema | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'data/schemas') diff --git a/data/schemas/keymap.jsonschema b/data/schemas/keymap.jsonschema index 0a4fb5d453..1b8d01bcc6 100644 --- a/data/schemas/keymap.jsonschema +++ b/data/schemas/keymap.jsonschema @@ -5,6 +5,10 @@ "type": "object", "properties": { "author": {"type": "string"}, + "converter": { + "type": "string", + "enum": ["elite_pi", "proton_c", "kb2040", "promicro_rp2040", "blok", "bit_c_pro", "stemcell", "bonsai_c4"] + }, "host_language": {"$ref": "qmk.definitions.v1#/text_identifier"}, "keyboard": {"$ref": "qmk.definitions.v1#/text_identifier"}, "keymap": {"$ref": "qmk.definitions.v1#/text_identifier"}, -- cgit v1.2.3 From c012490712b0d09a73769b46bd31b0a5fd434372 Mon Sep 17 00:00:00 2001 From: precondition <57645186+precondition@users.noreply.github.com> Date: Sun, 23 Oct 2022 00:51:24 +0200 Subject: Add unit tests for HOLD_ON_OTHER_KEY_PRESS (#18721) * Add HOLD_ON_OTHER_KEY_PRESS to data/ files * Add unit tests for HOLD_ON_OTHER_KEY_PRESS --- data/schemas/keyboard.jsonschema | 2 ++ 1 file changed, 2 insertions(+) (limited to 'data/schemas') diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index 06ccccc160..bc07eaf5fb 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -586,6 +586,8 @@ "force_hold_per_key": {"type": "boolean"}, "ignore_mod_tap_interrupt": {"type": "boolean"}, "ignore_mod_tap_interrupt_per_key": {"type": "boolean"}, + "hold_on_other_key_press": {"type": "boolean"}, + "hold_on_other_key_press_per_key": {"type": "boolean"}, "permissive_hold": {"type": "boolean"}, "permissive_hold_per_key": {"type": "boolean"}, "retro": {"type": "boolean"}, -- cgit v1.2.3 From a69ab05dd687cb9aa38e0c125e4f64956c7da6c7 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sat, 5 Nov 2022 10:30:09 +0000 Subject: Initial DD keycode migration (#18643) * Initial DD keycode migration * Sort magic keycodes --- data/schemas/keycodes.jsonschema | 57 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 data/schemas/keycodes.jsonschema (limited to 'data/schemas') diff --git a/data/schemas/keycodes.jsonschema b/data/schemas/keycodes.jsonschema new file mode 100644 index 0000000000..77a8347b3b --- /dev/null +++ b/data/schemas/keycodes.jsonschema @@ -0,0 +1,57 @@ +{ + "$schema": "https://json-schema.org/draft/2020-12/schema#", + "$id": "qmk.keycodes.v1", + "title": "Keycode Information", + "type": "object", + "definitions": { + "define": { + "type": "string", + "minLength": 2, + "maxLength": 50, + "pattern": "^[A-Zs_0-9]*$" + }, + "hex_number_4d": { + "type": "string", + "pattern": "^0x[0-9A-F]{4}$" + } + }, + "properties": { + "ranges": { + "type": "object", + "propertyNames": { + "type": "string" + }, + "additionalProperties": { + "type": "object", + "required": [ + "define" + ], + "properties": { + "define": {"$ref": "#/definitions/define"} + } + } + }, + "keycodes": { + "type": "object", + "propertyNames": { + "$ref": "#/definitions/hex_number_4d" + }, + "additionalProperties": { + "type": "object", + "required": [ + "key" + ], + "properties": { + "key": {"$ref": "#/definitions/define"}, + "aliases": { + "type": "array", + "minItems": 1, + "items": { + "type": "string" + } + } + } + } + } + } +} -- cgit v1.2.3 From 479d8de622674b6667295bda344145a69aa042bd Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 8 Nov 2022 12:05:08 +1100 Subject: Format DD mappings and schemas (#18924) --- data/schemas/keyboard.jsonschema | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'data/schemas') diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index bc07eaf5fb..daf54141a8 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -601,7 +601,10 @@ "type": "object", "additionalProperties": false, "properties": { - "device_ver": {"$ref": "qmk.definitions.v1#/hex_number_4d"}, # Deprecated + "device_ver": { + "$ref": "qmk.definitions.v1#/hex_number_4d", + "$comment": "Deprecated: use device_version instead" + }, "device_version": {"$ref": "qmk.definitions.v1#/bcd_version"}, "force_nkro": {"type": "boolean"}, "pid": {"$ref": "qmk.definitions.v1#/hex_number_4d"}, -- cgit v1.2.3 From d3073ef4943c70a3942ac91bb46fdc1a90f9e566 Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Sun, 13 Nov 2022 08:05:46 -0800 Subject: Add pointing device support to data driven config (#18215) Co-authored-by: Joel Challis --- data/schemas/keyboard.jsonschema | 63 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) (limited to 'data/schemas') diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index daf54141a8..d5f4f392d7 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -363,6 +363,48 @@ } } }, + "pointing_device": { + "type": "object", + "properties": { + "enabled": {"type": "boolean"}, + "driver": {"type": "string"}, + "auto_mouse": { + "type": "object", + "properties": { + "enabled": {"type": "boolean"}, + "default_layer": {"type": "qmk.definitions.v1#/unsigned_int_8"}, + "time": {"type": "qmk.definitions.v1#/unsigned_int"}, + "delay": {"type": "qmk.definitions.v1#/unsigned_int"}, + "debounce": {"type": "qmk.definitions.v1#/unsigned_int"} + } + } + "pins": { + "type": "object", + "additionalProperties": false, + "properties": { + "motion": {"$ref": "qmk.definitions.v1#/mcu_pin"}, + "cs": {"$ref": "qmk.definitions.v1#/mcu_pin"}, + "sdio": {"$ref": "qmk.definitions.v1#/mcu_pin"}, + "sclk": {"$ref": "qmk.definitions.v1#/mcu_pin"} + } + }, + "throttle": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}, + "invert_x": {"type": "boolean"}, + "invert_y": {"type": "boolean"}, + "gestures": { + "type": "object", + "properties": { + "cursor_glide": {"type": "boolean"}, + "scroll": {"type": "boolean"} + } + }, + "rotation": { + "type": "integer", + "minimum": 0, + "enum": [0, 90, 180, 270] + } + } + }, "rgb_matrix": { "type": "object", "properties": { @@ -544,6 +586,26 @@ "type": "string", "enum": ["eeprom", "left", "matrix_grid", "pin", "right"] }, + "pointing_device": { + "right": { + "type": "object", + "additionalProperties": false, + "type": "object", + "properties": { + "side": { + "type": "string", + "enum": ["left", "right", "combined"] + }, + "invert_x": {"type": "boolean"}, + "invert_y": {"type": "boolean"}, + "rotation": { + "type": "integer", + "minimum": 0, + "enum": [0, 90, 180, 270] + } + } + } + }, "soft_serial_pin": {"$ref": "qmk.definitions.v1#/mcu_pin"}, "soft_serial_speed": { "type": "integer", @@ -560,6 +622,7 @@ }, "sync_matrix_state": {"type": "boolean"}, "sync_modifiers": {"type": "boolean"}, + "sync_pointing": {"type": "boolean"}, "watchdog": {"type": "boolean"}, "watchdog_timeout": {"$ref": "qmk.definitions.v1#/unsigned_int"} } -- cgit v1.2.3 From e273df8b93b743bce0b25688373d40945e6556fd Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sun, 13 Nov 2022 16:31:29 +0000 Subject: Fix duplicate key in keyboard.jsonschema (#19058) --- data/schemas/keyboard.jsonschema | 1 - 1 file changed, 1 deletion(-) (limited to 'data/schemas') diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index d5f4f392d7..353d9469d1 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -590,7 +590,6 @@ "right": { "type": "object", "additionalProperties": false, - "type": "object", "properties": { "side": { "type": "string", -- cgit v1.2.3 From 1a3f2130d5feeeccada90ebb1d96cde5232459e0 Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Mon, 14 Nov 2022 22:44:09 -0800 Subject: Revert "Add pointing device support to data driven config (#18215)" (#19063) --- data/schemas/keyboard.jsonschema | 62 ---------------------------------------- 1 file changed, 62 deletions(-) (limited to 'data/schemas') diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index 353d9469d1..daf54141a8 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -363,48 +363,6 @@ } } }, - "pointing_device": { - "type": "object", - "properties": { - "enabled": {"type": "boolean"}, - "driver": {"type": "string"}, - "auto_mouse": { - "type": "object", - "properties": { - "enabled": {"type": "boolean"}, - "default_layer": {"type": "qmk.definitions.v1#/unsigned_int_8"}, - "time": {"type": "qmk.definitions.v1#/unsigned_int"}, - "delay": {"type": "qmk.definitions.v1#/unsigned_int"}, - "debounce": {"type": "qmk.definitions.v1#/unsigned_int"} - } - } - "pins": { - "type": "object", - "additionalProperties": false, - "properties": { - "motion": {"$ref": "qmk.definitions.v1#/mcu_pin"}, - "cs": {"$ref": "qmk.definitions.v1#/mcu_pin"}, - "sdio": {"$ref": "qmk.definitions.v1#/mcu_pin"}, - "sclk": {"$ref": "qmk.definitions.v1#/mcu_pin"} - } - }, - "throttle": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}, - "invert_x": {"type": "boolean"}, - "invert_y": {"type": "boolean"}, - "gestures": { - "type": "object", - "properties": { - "cursor_glide": {"type": "boolean"}, - "scroll": {"type": "boolean"} - } - }, - "rotation": { - "type": "integer", - "minimum": 0, - "enum": [0, 90, 180, 270] - } - } - }, "rgb_matrix": { "type": "object", "properties": { @@ -586,25 +544,6 @@ "type": "string", "enum": ["eeprom", "left", "matrix_grid", "pin", "right"] }, - "pointing_device": { - "right": { - "type": "object", - "additionalProperties": false, - "properties": { - "side": { - "type": "string", - "enum": ["left", "right", "combined"] - }, - "invert_x": {"type": "boolean"}, - "invert_y": {"type": "boolean"}, - "rotation": { - "type": "integer", - "minimum": 0, - "enum": [0, 90, 180, 270] - } - } - } - }, "soft_serial_pin": {"$ref": "qmk.definitions.v1#/mcu_pin"}, "soft_serial_speed": { "type": "integer", @@ -621,7 +560,6 @@ }, "sync_matrix_state": {"type": "boolean"}, "sync_modifiers": {"type": "boolean"}, - "sync_pointing": {"type": "boolean"}, "watchdog": {"type": "boolean"}, "watchdog_timeout": {"$ref": "qmk.definitions.v1#/unsigned_int"} } -- cgit v1.2.3 From af6aa225ebfc64caf571601b3e3390614daad54f Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 23 Nov 2022 18:48:22 +0000 Subject: Additional DD backlight config (#19124) * Additional dd backlight config * Update docs --- data/schemas/keyboard.jsonschema | 2 ++ 1 file changed, 2 insertions(+) (limited to 'data/schemas') diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index daf54141a8..91110b06a0 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -115,7 +115,9 @@ "minimum": 1, "maximum": 31 }, + "max_brightness": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}, "pin": {"$ref": "qmk.definitions.v1#/mcu_pin"}, + "pins": {"$ref": "qmk.definitions.v1#/mcu_pin_array"}, "on_state": {"$ref": "qmk.definitions.v1#/bit"} } }, -- cgit v1.2.3