diff options
author | zvecr <[email protected]> | 2023-12-04 13:58:34 +0000 |
---|---|---|
committer | zvecr <[email protected]> | 2023-12-04 13:58:34 +0000 |
commit | daa5afcf1d4a901e628bca8adb4711769b268c85 (patch) | |
tree | cf1472f9c38bc2991a57989ff59afe8c390bf44a /data | |
parent | 7f67256047fbc6b475de009d52dec95cb150980a (diff) | |
parent | c3773587e910f80c063a3edcaaefa76d3d844157 (diff) | |
download | qmk_firmware-daa5afcf1d4a901e628bca8adb4711769b268c85.tar.gz qmk_firmware-daa5afcf1d4a901e628bca8adb4711769b268c85.zip |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'data')
-rw-r--r-- | data/mappings/defaults.hjson | 118 | ||||
-rw-r--r-- | data/schemas/definitions.jsonschema | 162 |
2 files changed, 136 insertions, 144 deletions
diff --git a/data/mappings/defaults.hjson b/data/mappings/defaults.hjson index 8bf5b8ebcb..71902c92d6 100644 --- a/data/mappings/defaults.hjson +++ b/data/mappings/defaults.hjson @@ -1,89 +1,89 @@ { "development_board": { - "promicro": { - "processor": "atmega32u4", - "bootloader": "caterina", - "pin_compatible": "promicro" + "bit_c_pro": { + "board": "QMK_PM2040", + "bootloader": "rp2040", + "processor": "RP2040" + }, + "blackpill_f401": { + "board": "BLACKPILL_STM32_F401", + "bootloader": "stm32-dfu", + "processor": "STM32F401" + }, + "blackpill_f411": { + "board": "BLACKPILL_STM32_F411", + "bootloader": "stm32-dfu", + "processor": "STM32F411" + }, + "blok": { + "board": "QMK_BLOK", + "bootloader": "rp2040", + "processor": "RP2040" + }, + "bluepill": { + "board": "STM32_F103_STM32DUINO", + "bootloader": "stm32duino", + "processor": "STM32F103" + }, + "bonsai_c4": { + "board": "BONSAI_C4", + "bootloader": "stm32-dfu", + "processor": "STM32F411" }, "elite_c": { - "processor": "atmega32u4", "bootloader": "atmel-dfu", - "pin_compatible": "promicro" + "pin_compatible": "promicro", + "processor": "atmega32u4" }, "elite_pi": { - "processor": "RP2040", + "board": "QMK_PM2040", "bootloader": "rp2040", - "board": "QMK_PM2040" + "processor": "RP2040" }, - "proton_c": { - "processor": "STM32F303", - "bootloader": "stm32-dfu", - "board": "QMK_PROTON_C" - }, - "kb2040": { - "processor": "RP2040", + "helios": { + "board": "QMK_PM2040", "bootloader": "rp2040", - "board": "QMK_PM2040" + "processor": "RP2040" }, - "promicro_rp2040": { + "imera": { "processor": "RP2040", "bootloader": "rp2040", "board": "QMK_PM2040" }, - "blok": { - "processor": "RP2040", + "kb2040": { + "board": "QMK_PM2040", "bootloader": "rp2040", - "board": "QMK_BLOK" + "processor": "RP2040" }, - "michi": { - "processor": "RP2040", + "liatris": { + "board": "QMK_PM2040", "bootloader": "rp2040", - "board": "QMK_PM2040" + "processor": "RP2040" }, - "bit_c_pro": { - "processor": "RP2040", + "michi": { + "board": "QMK_PM2040", "bootloader": "rp2040", - "board": "QMK_PM2040" + "processor": "RP2040" }, - "bluepill": { - "processor": "STM32F103", - "bootloader": "stm32duino", - "board": "STM32_F103_STM32DUINO" + "promicro": { + "bootloader": "caterina", + "pin_compatible": "promicro", + "processor": "atmega32u4" }, - "blackpill_f401": { - "processor": "STM32F401", - "bootloader": "stm32-dfu", - "board": "BLACKPILL_STM32_F401" + "promicro_rp2040": { + "board": "QMK_PM2040", + "bootloader": "rp2040", + "processor": "RP2040" }, - "blackpill_f411": { - "processor": "STM32F411", + "proton_c": { + "board": "QMK_PROTON_C", "bootloader": "stm32-dfu", - "board": "BLACKPILL_STM32_F411" + "processor": "STM32F303" }, "stemcell": { - "processor": "STM32F411", + "board": "STEMCELL", "bootloader": "tinyuf2", - "board": "STEMCELL" - }, - "bonsai_c4": { - "processor": "STM32F411", - "bootloader": "stm32-dfu", - "board": "BONSAI_C4" - }, - "helios": { - "processor": "RP2040", - "bootloader": "rp2040", - "board": "QMK_PM2040" - }, - "liatris": { - "processor": "RP2040", - "bootloader": "rp2040", - "board": "QMK_PM2040" - }, - "imera": { - "processor": "RP2040", - "bootloader": "rp2040", - "board": "QMK_PM2040" + "processor": "STM32F411" } } } diff --git a/data/schemas/definitions.jsonschema b/data/schemas/definitions.jsonschema index ea29343d0a..a1fdd2dcc6 100644 --- a/data/schemas/definitions.jsonschema +++ b/data/schemas/definitions.jsonschema @@ -3,10 +3,25 @@ "$id": "qmk.definitions.v1", "title": "Common definitions used across QMK's jsonschemas.", "type": "object", + "bcd_version": { + "type": "string", + "pattern": "^[0-9]{1,2}\\.[0-9]\\.[0-9]$" + }, + "bit": { + "type": "integer", + "minimum": 0, + "maximum": 1 + }, "boolean_array": { "type": "object", "additionalProperties": {"type": "boolean"} }, + "build_target": { + "oneOf": [ + {"$ref": "#/keyboard_keymap_tuple"}, + {"$ref": "#/json_file_path"} + ] + }, "filename": { "type": "string", "minLength": 1, @@ -20,18 +35,56 @@ "type": "string", "pattern": "^0x[0-9A-F]{4}$" }, - "bcd_version": { + "json_file_path": { "type": "string", - "pattern": "^[0-9]{1,2}\\.[0-9]\\.[0-9]$" + "pattern": "^[0-9a-z_/\\-]+\\.json$" }, - "text_identifier": { + "key_unit": { + "type": "number" + }, + "keyboard": { "type": "string", - "minLength": 1, - "maxLength": 250 + "pattern": "^[0-9a-z][0-9a-z_/]*$" }, - "snake_case": { + "keyboard_keymap_tuple": { + "type": "array", + "prefixItems": [ + {"$ref": "#/keyboard"}, + {"$ref": "#/filename"} + ], + "unevaluatedItems": false + }, + "keycode": { "type": "string", - "pattern": "^[a-z][a-z0-9_]*$" + "minLength": 2, + "maxLength": 50, + "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"} + }, + "keycode_short": { + "type": "string", + "minLength": 2, + "maxLength": 7, + "pattern": "^[A-Z][A-Zs_0-9]*$" }, "layout_macro": { "oneOf": [ @@ -68,49 +121,6 @@ } ] }, - "key_unit": { - "type": "number" - }, - "keyboard": { - "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"} - }, "mcu_pin": { "oneOf": [ { @@ -129,14 +139,14 @@ "type": "string", "pattern": "^GP\\d{1,2}$" }, - { - "type": "integer" - }, - { - "type": "null" - } + {"type": "integer"}, + {"type": "null"} ] }, + "mcu_pin_array": { + "type": "array", + "items": {"$ref": "#/mcu_pin"} + }, "signed_decimal": { "type": "number" }, @@ -148,17 +158,22 @@ "minimum": -127, "maximum": 127 }, + "snake_case": { + "type": "string", + "pattern": "^[a-z][a-z0-9_]*$" + }, "string_array": { "type": "array", - "items": { - "type": "string" - } + "items": {"type": "string"} }, "string_object": { "type": "object", - "additionalProperties": { - "type": "string" - } + "additionalProperties": {"type": "string"} + }, + "text_identifier": { + "type": "string", + "minLength": 1, + "maxLength": 250 }, "unsigned_decimal": { "type": "number", @@ -172,28 +187,5 @@ "type": "integer", "minimum": 0, "maximum": 255 - }, - "bit": { - "type": "integer", - "minimum": 0, - "maximum": 1 - }, - "keyboard_keymap_tuple": { - "type": "array", - "prefixItems": [ - { "$ref": "#/keyboard" }, - { "$ref": "#/filename" } - ], - "unevaluatedItems": false - }, - "json_file_path": { - "type": "string", - "pattern": "^[0-9a-z_/\\-]+\\.json$" - }, - "build_target": { - "oneOf": [ - { "$ref": "#/keyboard_keymap_tuple" }, - { "$ref": "#/json_file_path" } - ] } } |