From 46bbb81dd2aeee48ed571e78d8315bf94cc3cce8 Mon Sep 17 00:00:00 2001 From: leah-splitkb <103112489+leah-splitkb@users.noreply.github.com> Date: Fri, 10 Mar 2023 21:47:10 +0100 Subject: Add RP2040 Community Edition alias for Liatris (#19966) --- 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 2afc1ed516..2845af14f3 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -35,7 +35,7 @@ }, "development_board": { "type": "string", - "enum": ["promicro", "elite_c", "elite_pi", "proton_c", "kb2040", "promicro_rp2040", "blok", "michi", "bit_c_pro", "stemcell", "bluepill", "blackpill_f401", "blackpill_f411", "bonsai_c4", "helios"] + "enum": ["promicro", "elite_c", "elite_pi", "proton_c", "kb2040", "promicro_rp2040", "blok", "michi", "bit_c_pro", "stemcell", "bluepill", "blackpill_f401", "blackpill_f411", "bonsai_c4", "helios", "liatris"] }, "pin_compatible": { "type": "string", -- cgit v1.2.3 From 65a80f411f03be466d0b74c5b1d44f161e19ac7e Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 20 Mar 2023 08:12:19 +1100 Subject: Clean up APA102 config and add DD mapping (#20159) --- data/schemas/keyboard.jsonschema | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'data/schemas') diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index 2845af14f3..4d180712dc 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -96,6 +96,19 @@ "unknown" ] }, + "apa102": { + "type": "object", + "additionalProperties": false, + "properties": { + "data_pin": {"$ref": "qmk.definitions.v1#/mcu_pin"}, + "clock_pin": {"$ref": "qmk.definitions.v1#/mcu_pin"}, + "default_brightness": { + "type": "integer", + "minimum": 0, + "maximum": 31 + } + } + }, "audio": { "type": "object", "additionalProperties": false, -- cgit v1.2.3 From 36ce81df592ca8e9f9fed498e513437aa1cae54f Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 26 Mar 2023 18:22:12 +1100 Subject: Move `WS2812_DRIVER` to data driven (#20248) --- data/schemas/keyboard.jsonschema | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'data/schemas') diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index 4d180712dc..aa1be6efa7 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -699,6 +699,16 @@ "led": {"$ref": "qmk.definitions.v1#/mcu_pin"}, "speaker": {"$ref": "qmk.definitions.v1#/mcu_pin"} } + }, + "ws2812": { + "type": "object", + "additionalProperties": false, + "properties": { + "driver": { + "type": "string", + "enum": ["bitbang", "i2c", "pwm", "spi", "vendor"] + } + } } } } -- cgit v1.2.3 From 79b0f9168eafef1642f3223500197bf630a2433f Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Mon, 27 Mar 2023 20:01:07 +0100 Subject: Custom keycodes in JSON (#19925) --- data/schemas/definitions.jsonschema | 32 ++++++++++++++++++++++++++++++++ data/schemas/keyboard.jsonschema | 1 + data/schemas/keycodes.jsonschema | 10 +++------- data/schemas/keymap.jsonschema | 1 + 4 files changed, 37 insertions(+), 7 deletions(-) (limited to 'data/schemas') diff --git a/data/schemas/definitions.jsonschema b/data/schemas/definitions.jsonschema index 94a94157c0..b9c64a55ec 100644 --- a/data/schemas/definitions.jsonschema +++ b/data/schemas/definitions.jsonschema @@ -71,6 +71,38 @@ "type": "string", "pattern": "^[0-9a-z][0-9a-z_/]*$" }, + "keycode": { + "type": "string", + "minLength": 2, + "maxLength": 50, + "pattern": "^[A-Z][A-Zs_0-9]*$" + }, + "keycode_short": { + "type": "string", + "minLength": 2, + "maxLength": 7, + "pattern": "^[A-Z][A-Zs_0-9]*$" + }, + "keycode_decl": { + "type": "object", + "required": [ + "key" + ], + "properties": { + "key": {"$ref": "#/keycode"}, + "label": {"$ref": "#/text_identifier"}, + "aliases": { + "type": "array", + "minItems": 1, + "items": {"$ref": "#/keycode_short"} + } + } + }, + "keycode_decl_array": { + "type": "array", + "minItems": 1 + "items": {"$ref": "#/keycode_decl"} + }, "mcu_pin_array": { "type": "array", "items": {"$ref": "#/mcu_pin"} diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index aa1be6efa7..18b3514aa5 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -259,6 +259,7 @@ "on_state": {"$ref": "qmk.definitions.v1#/bit"} } }, + "keycodes": {"$ref": "qmk.definitions.v1#/keycode_decl_array"}, "layout_aliases": { "type": "object", "additionalProperties": {"$ref": "qmk.definitions.v1#/layout_macro"} diff --git a/data/schemas/keycodes.jsonschema b/data/schemas/keycodes.jsonschema index 77a8347b3b..df6ce95a83 100644 --- a/data/schemas/keycodes.jsonschema +++ b/data/schemas/keycodes.jsonschema @@ -8,11 +8,7 @@ "type": "string", "minLength": 2, "maxLength": 50, - "pattern": "^[A-Zs_0-9]*$" - }, - "hex_number_4d": { - "type": "string", - "pattern": "^0x[0-9A-F]{4}$" + "pattern": "^[A-Z][A-Zs_0-9]*$" } }, "properties": { @@ -34,10 +30,10 @@ "keycodes": { "type": "object", "propertyNames": { - "$ref": "#/definitions/hex_number_4d" + "$ref": "qmk.definitions.v1#/hex_number_4d" }, "additionalProperties": { - "type": "object", + "type": "object", // use 'qmk.definitions.v1#/keycode_decl' when problem keycodes are removed "required": [ "key" ], diff --git a/data/schemas/keymap.jsonschema b/data/schemas/keymap.jsonschema index 73aa7c5c22..7233e896e9 100644 --- a/data/schemas/keymap.jsonschema +++ b/data/schemas/keymap.jsonschema @@ -67,6 +67,7 @@ } } }, + "keycodes": {"$ref": "qmk.definitions.v1#/keycode_decl_array"}, "config": {"$ref": "qmk.keyboard.v1"}, "notes": { "type": "string" -- cgit v1.2.3 From 647c2835e65995339fb9380830c53725a62f6299 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 30 Mar 2023 12:21:02 +1100 Subject: WS2812 driver improvements (#20262) --- data/schemas/keyboard.jsonschema | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'data/schemas') diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index 18b3514aa5..47decf1a15 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -707,8 +707,10 @@ "properties": { "driver": { "type": "string", - "enum": ["bitbang", "i2c", "pwm", "spi", "vendor"] - } + "enum": ["bitbang", "custom", "i2c", "pwm", "spi", "vendor"] + }, + "i2c_address": {"$ref": "qmk.definitions.v1#/hex_number_2d"}, + "i2c_timeout": {"$ref": "qmk.definitions.v1#/unsigned_int"} } } } -- cgit v1.2.3 From 1b8c7c39d7ec58da415aae8c8ca607013a26f4f8 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sun, 2 Apr 2023 04:03:22 +0100 Subject: Allow EEPROM_DRIVER from info.json (#20313) --- data/schemas/keyboard.jsonschema | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'data/schemas') diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index 47decf1a15..ee6ecf28e4 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -241,6 +241,11 @@ "type": "array", "items": {"$ref": "qmk.definitions.v1#/filename"} }, + "eeprom": { + "properties": { + "driver": {"type": "string"} + } + }, "encoder": { "$ref": "#/definitions/encoder_config", "properties": { -- cgit v1.2.3 From ae63c0f509fae71270fb5885d504ee26cbad95ff Mon Sep 17 00:00:00 2001 From: Pascal Getreuer <50221757+getreuer@users.noreply.github.com> Date: Mon, 3 Apr 2023 16:11:26 -0700 Subject: [Core] Caps Word "Invert on shift" option: pressing Shift inverts the shift state. (#20092) Co-authored-by: Nick Brassel --- data/schemas/keyboard.jsonschema | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'data/schemas') diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index ee6ecf28e4..6c4ff49855 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -227,7 +227,8 @@ "enabled": {"type": "boolean"}, "both_shifts_turns_on": {"type": "boolean"}, "double_tap_shift_turns_on": {"type": "boolean"}, - "idle_timeout": {"$ref": "qmk.definitions.v1#/unsigned_int"} + "idle_timeout": {"$ref": "qmk.definitions.v1#/unsigned_int"}, + "invert_on_shift": {"type": "boolean"} } }, "combo": { -- cgit v1.2.3 From 47966dc2a65c88ac90fcd64d12243d72f3f6753b Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 6 Apr 2023 18:00:54 +1000 Subject: Migrate `rgblight.pin` and `RGB_DI_PIN` to `ws2812.pin` (#20303) --- data/schemas/keyboard.jsonschema | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'data/schemas') diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index 6c4ff49855..d608e8f796 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -492,7 +492,10 @@ }, "led_count": {"$ref": "qmk.definitions.v1#/unsigned_int"}, "max_brightness": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}, - "pin": {"$ref": "qmk.definitions.v1#/mcu_pin"}, + "pin": { + "$ref": "qmk.definitions.v1#/mcu_pin", + "$comment": "Deprecated: use ws2812.pin instead" + }, "rgbw": {"type": "boolean"}, "saturation_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"}, "sleep": {"type": "boolean"}, @@ -715,6 +718,7 @@ "type": "string", "enum": ["bitbang", "custom", "i2c", "pwm", "spi", "vendor"] }, + "pin": {"$ref": "qmk.definitions.v1#/mcu_pin"}, "i2c_address": {"$ref": "qmk.definitions.v1#/hex_number_2d"}, "i2c_timeout": {"$ref": "qmk.definitions.v1#/unsigned_int"} } -- cgit v1.2.3 From ab8c5013c856bfa23289d7892be1c2bee808b542 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 20 May 2023 22:12:59 +1000 Subject: BIOI G60/Morgan65: use custom Bluetooth driver (#20897) --- 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 d608e8f796..ba4a7eec55 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -146,7 +146,7 @@ "properties": { "driver": { "type": "string", - "enum": ["BluefruitLE", "RN42"] + "enum": ["BluefruitLE", "RN42", "custom"] } } }, -- cgit v1.2.3