From c952458c780baf425d3717e29f8004486b5637e8 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 30 Nov 2022 04:27:21 +0000 Subject: DD bootmagic config (#19201) * DD bootmagic config * Also enable * docs --- data/schemas/keyboard.jsonschema | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'data/schemas') diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index 91110b06a0..8c0db6ee92 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -131,6 +131,22 @@ } } }, + "bootmagic":{ + "type": "object", + "additionalProperties": false, + "properties": { + "enabled": {"type": "boolean"}, + "matrix": { + "type": "array", + "minItems": 2, + "maxItems": 2, + "items": { + "type": "integer", + "minimum": 0 + } + } + } + }, "board": { "type": "string", "minLength": 2, @@ -510,6 +526,21 @@ "additionalProperties": false, "properties": { "enabled": {"type": "boolean"}, + "bootmagic":{ + "type": "object", + "additionalProperties": false, + "properties": { + "matrix": { + "type": "array", + "minItems": 2, + "maxItems": 2, + "items": { + "type": "integer", + "minimum": 0 + } + } + } + }, "matrix_grid": { "type": "array", "items": {"$ref": "qmk.definitions.v1#/mcu_pin"} -- cgit v1.2.3 From f2a8a13dbad220cfb0dfbd72a90492a15a2e58bb Mon Sep 17 00:00:00 2001 From: dexter93 Date: Thu, 8 Dec 2022 18:09:01 +0200 Subject: Core: Support inverted scan logic for optical switches (#19053) --- data/schemas/keyboard.jsonschema | 1 + 1 file changed, 1 insertion(+) (limited to 'data/schemas') diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index 5c0c23c2b1..7844bfd579 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -304,6 +304,7 @@ "custom": {"type": "boolean"}, "custom_lite": {"type": "boolean"}, "ghost": {"type": "boolean"}, + "input_pressed_state": {"$ref": "qmk.definitions.v1#/unsigned_int"}, "io_delay": {"$ref": "qmk.definitions.v1#/unsigned_int"}, "direct": { "type": "array", -- cgit v1.2.3 From 515dd18c2801663bbac0e59f683c2a93e4bd9b1a Mon Sep 17 00:00:00 2001 From: precondition <57645186+precondition@users.noreply.github.com> Date: Tue, 13 Dec 2022 12:20:07 +0100 Subject: Remove IGNORE_MOD_TAP_INTERRUPT_PER_KEY in favour of HOLD_ON_OTHER_KEY_PRESS_PER_KEY (#15741) --- 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 7844bfd579..513564a643 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -620,7 +620,6 @@ "force_hold": {"type": "boolean"}, "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"}, -- cgit v1.2.3 From a3ed1b0c8d51b0a11eb358d06041d4edb1dba6be Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Mon, 9 Jan 2023 09:23:02 +0000 Subject: Relax converter within keymap schema (#19544) --- data/schemas/keymap.jsonschema | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'data/schemas') diff --git a/data/schemas/keymap.jsonschema b/data/schemas/keymap.jsonschema index 1b8d01bcc6..2fcd5f8a51 100644 --- a/data/schemas/keymap.jsonschema +++ b/data/schemas/keymap.jsonschema @@ -7,7 +7,8 @@ "author": {"type": "string"}, "converter": { "type": "string", - "enum": ["elite_pi", "proton_c", "kb2040", "promicro_rp2040", "blok", "bit_c_pro", "stemcell", "bonsai_c4"] + "minLength": 1, + "pattern": "^[a-z][0-9a-z_]*$" }, "host_language": {"$ref": "qmk.definitions.v1#/text_identifier"}, "keyboard": {"$ref": "qmk.definitions.v1#/text_identifier"}, -- cgit v1.2.3 From 0730740add19d3afe3d96ead50ba7d29e5dcb109 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sun, 15 Jan 2023 15:04:32 +0000 Subject: Add mmoskal/uf2-stm32f103 bootloader support (#19594) --- data/schemas/keyboard.jsonschema | 1 + 1 file changed, 1 insertion(+) (limited to 'data/schemas') diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index 513564a643..0002898327 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -171,6 +171,7 @@ "stm32-dfu", "stm32duino", "tinyuf2", + "uf2boot", "unknown", "usbasploader", "wb32-dfu" -- cgit v1.2.3 From 0b25528b6bc433e8609d4e12fb108b4ee7865197 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Thu, 19 Jan 2023 00:27:11 +0000 Subject: Fix 'No LAYOUTs defined' check (#19537) --- data/schemas/keyboard.jsonschema | 3 +++ 1 file changed, 3 insertions(+) (limited to 'data/schemas') diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index 0002898327..f1a1bb87c0 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -257,6 +257,9 @@ "c_macro": { "type": "boolean" }, + "json_layout": { + "type": "boolean" + }, "layout": { "type": "array", "items": { -- cgit v1.2.3 From e24f9b2c0af33ec0df0fb341546102e8f14b9be8 Mon Sep 17 00:00:00 2001 From: miguelelinventor Date: Thu, 9 Feb 2023 20:27:37 +0100 Subject: Add Michi MCU Converter support (#19163) --- 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 f1a1bb87c0..1f89bfeaa7 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -34,7 +34,7 @@ }, "development_board": { "type": "string", - "enum": ["promicro", "elite_c", "elite_pi", "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", "michi", "bit_c_pro", "stemcell", "bluepill", "blackpill_f401", "blackpill_f411", "bonsai_c4"] }, "pin_compatible": { "type": "string", -- cgit v1.2.3 From 99918945149f98cf73f9365b0ad49a2fc07d1152 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Sat, 11 Feb 2023 13:45:51 +1100 Subject: Generate encodermap output from keymap.json. (#18915) Co-authored-by: Joel Challis --- data/schemas/keymap.jsonschema | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'data/schemas') diff --git a/data/schemas/keymap.jsonschema b/data/schemas/keymap.jsonschema index 2fcd5f8a51..73aa7c5c22 100644 --- a/data/schemas/keymap.jsonschema +++ b/data/schemas/keymap.jsonschema @@ -21,6 +21,20 @@ "items": {"type": "string"} } }, + "encoders": { + "type": "array", + "items": { + "type": "array", + "items": { + "type": "object", + "required": ["ccw", "cw"], + "properties": { + "ccw": {"type": "string"}, + "cw": {"type": "string"} + } + } + } + }, "macros": { "type": "array", "items": { -- cgit v1.2.3 From 896d9aa98cfec0f2b1010be7e0db289b8b809311 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sun, 12 Feb 2023 23:02:05 +0000 Subject: Add rp2040_ce and add elite-pi and helios as alias (#19830) * add rp2040_ce and add elite-pi and helios as alias (#19628) * fix git mishap * Update platforms/chibios/converters/promicro_to_rp2040_ce/_pin_defs.h Co-authored-by: Joel Challis --------- Co-authored-by: Joel Challis * Tidy docs --------- Co-authored-by: Conor Burns --- 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 1f89bfeaa7..95387ba367 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -34,7 +34,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"] + "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"] }, "pin_compatible": { "type": "string", -- cgit v1.2.3 From 314f6c1ddba09851b33e4f3b4bd43bdbc55f9628 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 26 Feb 2023 08:37:57 +1100 Subject: Move backlight config to data driven (#19910) --- data/schemas/keyboard.jsonschema | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'data/schemas') diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index 95387ba367..6f4f9c82ac 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -108,6 +108,10 @@ "type": "object", "additionalProperties": false, "properties": { + "driver": { + "type": "string", + "enum": ["pwm", "software", "timer", "custom"] + }, "breathing": {"type": "boolean"}, "breathing_period": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}, "levels": { @@ -118,7 +122,8 @@ "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"} + "on_state": {"$ref": "qmk.definitions.v1#/bit"}, + "as_caps_lock": {"type": "boolean"} } }, "bluetooth": { -- cgit v1.2.3