diff options
| author | zvecr <git@zvecr.com> | 2023-12-04 13:58:34 +0000 |
|---|---|---|
| committer | zvecr <git@zvecr.com> | 2023-12-04 13:58:34 +0000 |
| commit | daa5afcf1d4a901e628bca8adb4711769b268c85 (patch) | |
| tree | cf1472f9c38bc2991a57989ff59afe8c390bf44a /data | |
| parent | 7f67256047fbc6b475de009d52dec95cb150980a (diff) | |
| parent | c3773587e910f80c063a3edcaaefa76d3d844157 (diff) | |
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 @@ | |||
| 1 | { | 1 | { |
| 2 | "development_board": { | 2 | "development_board": { |
| 3 | "promicro": { | 3 | "bit_c_pro": { |
| 4 | "processor": "atmega32u4", | 4 | "board": "QMK_PM2040", |
| 5 | "bootloader": "caterina", | 5 | "bootloader": "rp2040", |
| 6 | "pin_compatible": "promicro" | 6 | "processor": "RP2040" |
| 7 | }, | ||
| 8 | "blackpill_f401": { | ||
| 9 | "board": "BLACKPILL_STM32_F401", | ||
| 10 | "bootloader": "stm32-dfu", | ||
| 11 | "processor": "STM32F401" | ||
| 12 | }, | ||
| 13 | "blackpill_f411": { | ||
| 14 | "board": "BLACKPILL_STM32_F411", | ||
| 15 | "bootloader": "stm32-dfu", | ||
| 16 | "processor": "STM32F411" | ||
| 17 | }, | ||
| 18 | "blok": { | ||
| 19 | "board": "QMK_BLOK", | ||
| 20 | "bootloader": "rp2040", | ||
| 21 | "processor": "RP2040" | ||
| 22 | }, | ||
| 23 | "bluepill": { | ||
| 24 | "board": "STM32_F103_STM32DUINO", | ||
| 25 | "bootloader": "stm32duino", | ||
| 26 | "processor": "STM32F103" | ||
| 27 | }, | ||
| 28 | "bonsai_c4": { | ||
| 29 | "board": "BONSAI_C4", | ||
| 30 | "bootloader": "stm32-dfu", | ||
| 31 | "processor": "STM32F411" | ||
| 7 | }, | 32 | }, |
| 8 | "elite_c": { | 33 | "elite_c": { |
| 9 | "processor": "atmega32u4", | ||
| 10 | "bootloader": "atmel-dfu", | 34 | "bootloader": "atmel-dfu", |
| 11 | "pin_compatible": "promicro" | 35 | "pin_compatible": "promicro", |
| 36 | "processor": "atmega32u4" | ||
| 12 | }, | 37 | }, |
| 13 | "elite_pi": { | 38 | "elite_pi": { |
| 14 | "processor": "RP2040", | 39 | "board": "QMK_PM2040", |
| 15 | "bootloader": "rp2040", | 40 | "bootloader": "rp2040", |
| 16 | "board": "QMK_PM2040" | 41 | "processor": "RP2040" |
| 17 | }, | 42 | }, |
| 18 | "proton_c": { | 43 | "helios": { |
| 19 | "processor": "STM32F303", | 44 | "board": "QMK_PM2040", |
| 20 | "bootloader": "stm32-dfu", | ||
| 21 | "board": "QMK_PROTON_C" | ||
| 22 | }, | ||
| 23 | "kb2040": { | ||
| 24 | "processor": "RP2040", | ||
| 25 | "bootloader": "rp2040", | 45 | "bootloader": "rp2040", |
| 26 | "board": "QMK_PM2040" | 46 | "processor": "RP2040" |
| 27 | }, | 47 | }, |
| 28 | "promicro_rp2040": { | 48 | "imera": { |
| 29 | "processor": "RP2040", | 49 | "processor": "RP2040", |
| 30 | "bootloader": "rp2040", | 50 | "bootloader": "rp2040", |
| 31 | "board": "QMK_PM2040" | 51 | "board": "QMK_PM2040" |
| 32 | }, | 52 | }, |
| 33 | "blok": { | 53 | "kb2040": { |
| 34 | "processor": "RP2040", | 54 | "board": "QMK_PM2040", |
| 35 | "bootloader": "rp2040", | 55 | "bootloader": "rp2040", |
| 36 | "board": "QMK_BLOK" | 56 | "processor": "RP2040" |
| 37 | }, | 57 | }, |
| 38 | "michi": { | 58 | "liatris": { |
| 39 | "processor": "RP2040", | 59 | "board": "QMK_PM2040", |
| 40 | "bootloader": "rp2040", | 60 | "bootloader": "rp2040", |
| 41 | "board": "QMK_PM2040" | 61 | "processor": "RP2040" |
| 42 | }, | 62 | }, |
| 43 | "bit_c_pro": { | 63 | "michi": { |
| 44 | "processor": "RP2040", | 64 | "board": "QMK_PM2040", |
| 45 | "bootloader": "rp2040", | 65 | "bootloader": "rp2040", |
| 46 | "board": "QMK_PM2040" | 66 | "processor": "RP2040" |
| 47 | }, | 67 | }, |
| 48 | "bluepill": { | 68 | "promicro": { |
| 49 | "processor": "STM32F103", | 69 | "bootloader": "caterina", |
| 50 | "bootloader": "stm32duino", | 70 | "pin_compatible": "promicro", |
| 51 | "board": "STM32_F103_STM32DUINO" | 71 | "processor": "atmega32u4" |
| 52 | }, | 72 | }, |
| 53 | "blackpill_f401": { | 73 | "promicro_rp2040": { |
| 54 | "processor": "STM32F401", | 74 | "board": "QMK_PM2040", |
| 55 | "bootloader": "stm32-dfu", | 75 | "bootloader": "rp2040", |
| 56 | "board": "BLACKPILL_STM32_F401" | 76 | "processor": "RP2040" |
| 57 | }, | 77 | }, |
| 58 | "blackpill_f411": { | 78 | "proton_c": { |
| 59 | "processor": "STM32F411", | 79 | "board": "QMK_PROTON_C", |
| 60 | "bootloader": "stm32-dfu", | 80 | "bootloader": "stm32-dfu", |
| 61 | "board": "BLACKPILL_STM32_F411" | 81 | "processor": "STM32F303" |
| 62 | }, | 82 | }, |
| 63 | "stemcell": { | 83 | "stemcell": { |
| 64 | "processor": "STM32F411", | 84 | "board": "STEMCELL", |
| 65 | "bootloader": "tinyuf2", | 85 | "bootloader": "tinyuf2", |
| 66 | "board": "STEMCELL" | 86 | "processor": "STM32F411" |
| 67 | }, | ||
| 68 | "bonsai_c4": { | ||
| 69 | "processor": "STM32F411", | ||
| 70 | "bootloader": "stm32-dfu", | ||
| 71 | "board": "BONSAI_C4" | ||
| 72 | }, | ||
| 73 | "helios": { | ||
| 74 | "processor": "RP2040", | ||
| 75 | "bootloader": "rp2040", | ||
| 76 | "board": "QMK_PM2040" | ||
| 77 | }, | ||
| 78 | "liatris": { | ||
| 79 | "processor": "RP2040", | ||
| 80 | "bootloader": "rp2040", | ||
| 81 | "board": "QMK_PM2040" | ||
| 82 | }, | ||
| 83 | "imera": { | ||
| 84 | "processor": "RP2040", | ||
| 85 | "bootloader": "rp2040", | ||
| 86 | "board": "QMK_PM2040" | ||
| 87 | } | 87 | } |
| 88 | } | 88 | } |
| 89 | } | 89 | } |
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 @@ | |||
| 3 | "$id": "qmk.definitions.v1", | 3 | "$id": "qmk.definitions.v1", |
| 4 | "title": "Common definitions used across QMK's jsonschemas.", | 4 | "title": "Common definitions used across QMK's jsonschemas.", |
| 5 | "type": "object", | 5 | "type": "object", |
| 6 | "bcd_version": { | ||
| 7 | "type": "string", | ||
| 8 | "pattern": "^[0-9]{1,2}\\.[0-9]\\.[0-9]$" | ||
| 9 | }, | ||
| 10 | "bit": { | ||
| 11 | "type": "integer", | ||
| 12 | "minimum": 0, | ||
| 13 | "maximum": 1 | ||
| 14 | }, | ||
| 6 | "boolean_array": { | 15 | "boolean_array": { |
| 7 | "type": "object", | 16 | "type": "object", |
| 8 | "additionalProperties": {"type": "boolean"} | 17 | "additionalProperties": {"type": "boolean"} |
| 9 | }, | 18 | }, |
| 19 | "build_target": { | ||
| 20 | "oneOf": [ | ||
| 21 | {"$ref": "#/keyboard_keymap_tuple"}, | ||
| 22 | {"$ref": "#/json_file_path"} | ||
| 23 | ] | ||
| 24 | }, | ||
| 10 | "filename": { | 25 | "filename": { |
| 11 | "type": "string", | 26 | "type": "string", |
| 12 | "minLength": 1, | 27 | "minLength": 1, |
| @@ -20,18 +35,56 @@ | |||
| 20 | "type": "string", | 35 | "type": "string", |
| 21 | "pattern": "^0x[0-9A-F]{4}$" | 36 | "pattern": "^0x[0-9A-F]{4}$" |
| 22 | }, | 37 | }, |
| 23 | "bcd_version": { | 38 | "json_file_path": { |
| 24 | "type": "string", | 39 | "type": "string", |
| 25 | "pattern": "^[0-9]{1,2}\\.[0-9]\\.[0-9]$" | 40 | "pattern": "^[0-9a-z_/\\-]+\\.json$" |
| 26 | }, | 41 | }, |
| 27 | "text_identifier": { | 42 | "key_unit": { |
| 43 | "type": "number" | ||
| 44 | }, | ||
| 45 | "keyboard": { | ||
| 28 | "type": "string", | 46 | "type": "string", |
| 29 | "minLength": 1, | 47 | "pattern": "^[0-9a-z][0-9a-z_/]*$" |
| 30 | "maxLength": 250 | ||
| 31 | }, | 48 | }, |
| 32 | "snake_case": { | 49 | "keyboard_keymap_tuple": { |
| 50 | "type": "array", | ||
| 51 | "prefixItems": [ | ||
| 52 | {"$ref": "#/keyboard"}, | ||
| 53 | {"$ref": "#/filename"} | ||
| 54 | ], | ||
| 55 | "unevaluatedItems": false | ||
| 56 | }, | ||
| 57 | "keycode": { | ||
| 33 | "type": "string", | 58 | "type": "string", |
| 34 | "pattern": "^[a-z][a-z0-9_]*$" | 59 | "minLength": 2, |
| 60 | "maxLength": 50, | ||
| 61 | "pattern": "^[A-Z][A-Zs_0-9]*$" | ||
| 62 | }, | ||
| 63 | "keycode_decl": { | ||
| 64 | "type": "object", | ||
| 65 | "required": [ | ||
| 66 | "key" | ||
| 67 | ], | ||
| 68 | "properties": { | ||
| 69 | "key": {"$ref": "#/keycode"}, | ||
| 70 | "label": {"$ref": "#/text_identifier"}, | ||
| 71 | "aliases": { | ||
| 72 | "type": "array", | ||
| 73 | "minItems": 1, | ||
| 74 | "items": {"$ref": "#/keycode_short"} | ||
| 75 | } | ||
| 76 | } | ||
| 77 | }, | ||
| 78 | "keycode_decl_array": { | ||
| 79 | "type": "array", | ||
| 80 | "minItems": 1, | ||
| 81 | "items": {"$ref": "#/keycode_decl"} | ||
| 82 | }, | ||
| 83 | "keycode_short": { | ||
| 84 | "type": "string", | ||
| 85 | "minLength": 2, | ||
| 86 | "maxLength": 7, | ||
| 87 | "pattern": "^[A-Z][A-Zs_0-9]*$" | ||
| 35 | }, | 88 | }, |
| 36 | "layout_macro": { | 89 | "layout_macro": { |
| 37 | "oneOf": [ | 90 | "oneOf": [ |
| @@ -68,49 +121,6 @@ | |||
| 68 | } | 121 | } |
| 69 | ] | 122 | ] |
| 70 | }, | 123 | }, |
| 71 | "key_unit": { | ||
| 72 | "type": "number" | ||
| 73 | }, | ||
| 74 | "keyboard": { | ||
| 75 | "type": "string", | ||
| 76 | "pattern": "^[0-9a-z][0-9a-z_/]*$" | ||
| 77 | }, | ||
| 78 | "keycode": { | ||
| 79 | "type": "string", | ||
| 80 | "minLength": 2, | ||
| 81 | "maxLength": 50, | ||
| 82 | "pattern": "^[A-Z][A-Zs_0-9]*$" | ||
| 83 | }, | ||
| 84 | "keycode_short": { | ||
| 85 | "type": "string", | ||
| 86 | "minLength": 2, | ||
| 87 | "maxLength": 7, | ||
| 88 | "pattern": "^[A-Z][A-Zs_0-9]*$" | ||
| 89 | }, | ||
| 90 | "keycode_decl": { | ||
| 91 | "type": "object", | ||
| 92 | "required": [ | ||
| 93 | "key" | ||
| 94 | ], | ||
| 95 | "properties": { | ||
| 96 | "key": {"$ref": "#/keycode"}, | ||
| 97 | "label": {"$ref": "#/text_identifier"}, | ||
| 98 | "aliases": { | ||
| 99 | "type": "array", | ||
| 100 | "minItems": 1, | ||
| 101 | "items": {"$ref": "#/keycode_short"} | ||
| 102 | } | ||
| 103 | } | ||
| 104 | }, | ||
| 105 | "keycode_decl_array": { | ||
| 106 | "type": "array", | ||
| 107 | "minItems": 1 | ||
| 108 | "items": {"$ref": "#/keycode_decl"} | ||
| 109 | }, | ||
| 110 | "mcu_pin_array": { | ||
| 111 | "type": "array", | ||
| 112 | "items": {"$ref": "#/mcu_pin"} | ||
| 113 | }, | ||
| 114 | "mcu_pin": { | 124 | "mcu_pin": { |
| 115 | "oneOf": [ | 125 | "oneOf": [ |
| 116 | { | 126 | { |
| @@ -129,14 +139,14 @@ | |||
| 129 | "type": "string", | 139 | "type": "string", |
| 130 | "pattern": "^GP\\d{1,2}$" | 140 | "pattern": "^GP\\d{1,2}$" |
| 131 | }, | 141 | }, |
| 132 | { | 142 | {"type": "integer"}, |
| 133 | "type": "integer" | 143 | {"type": "null"} |
| 134 | }, | ||
| 135 | { | ||
| 136 | "type": "null" | ||
| 137 | } | ||
| 138 | ] | 144 | ] |
| 139 | }, | 145 | }, |
| 146 | "mcu_pin_array": { | ||
| 147 | "type": "array", | ||
| 148 | "items": {"$ref": "#/mcu_pin"} | ||
| 149 | }, | ||
| 140 | "signed_decimal": { | 150 | "signed_decimal": { |
| 141 | "type": "number" | 151 | "type": "number" |
| 142 | }, | 152 | }, |
| @@ -148,17 +158,22 @@ | |||
| 148 | "minimum": -127, | 158 | "minimum": -127, |
| 149 | "maximum": 127 | 159 | "maximum": 127 |
| 150 | }, | 160 | }, |
| 161 | "snake_case": { | ||
| 162 | "type": "string", | ||
| 163 | "pattern": "^[a-z][a-z0-9_]*$" | ||
| 164 | }, | ||
| 151 | "string_array": { | 165 | "string_array": { |
| 152 | "type": "array", | 166 | "type": "array", |
| 153 | "items": { | 167 | "items": {"type": "string"} |
| 154 | "type": "string" | ||
| 155 | } | ||
| 156 | }, | 168 | }, |
| 157 | "string_object": { | 169 | "string_object": { |
| 158 | "type": "object", | 170 | "type": "object", |
| 159 | "additionalProperties": { | 171 | "additionalProperties": {"type": "string"} |
| 160 | "type": "string" | 172 | }, |
| 161 | } | 173 | "text_identifier": { |
| 174 | "type": "string", | ||
| 175 | "minLength": 1, | ||
| 176 | "maxLength": 250 | ||
| 162 | }, | 177 | }, |
| 163 | "unsigned_decimal": { | 178 | "unsigned_decimal": { |
| 164 | "type": "number", | 179 | "type": "number", |
| @@ -172,28 +187,5 @@ | |||
| 172 | "type": "integer", | 187 | "type": "integer", |
| 173 | "minimum": 0, | 188 | "minimum": 0, |
| 174 | "maximum": 255 | 189 | "maximum": 255 |
| 175 | }, | ||
| 176 | "bit": { | ||
| 177 | "type": "integer", | ||
| 178 | "minimum": 0, | ||
| 179 | "maximum": 1 | ||
| 180 | }, | ||
| 181 | "keyboard_keymap_tuple": { | ||
| 182 | "type": "array", | ||
| 183 | "prefixItems": [ | ||
| 184 | { "$ref": "#/keyboard" }, | ||
| 185 | { "$ref": "#/filename" } | ||
| 186 | ], | ||
| 187 | "unevaluatedItems": false | ||
| 188 | }, | ||
| 189 | "json_file_path": { | ||
| 190 | "type": "string", | ||
| 191 | "pattern": "^[0-9a-z_/\\-]+\\.json$" | ||
| 192 | }, | ||
| 193 | "build_target": { | ||
| 194 | "oneOf": [ | ||
| 195 | { "$ref": "#/keyboard_keymap_tuple" }, | ||
| 196 | { "$ref": "#/json_file_path" } | ||
| 197 | ] | ||
| 198 | } | 190 | } |
| 199 | } | 191 | } |
