diff options
Diffstat (limited to 'data')
-rw-r--r-- | data/constants/module_hooks/1.1.0.hjson | 55 | ||||
-rw-r--r-- | data/constants/module_hooks/1.1.1.hjson | 3 | ||||
-rw-r--r-- | data/mappings/info_config.hjson | 7 | ||||
-rw-r--r-- | data/mappings/info_defaults.hjson | 74 | ||||
-rw-r--r-- | data/mappings/info_rules.hjson | 2 | ||||
-rw-r--r-- | data/mappings/keyboard_aliases.hjson | 63 | ||||
-rw-r--r-- | data/schemas/api_keyboard.jsonschema | 6 | ||||
-rw-r--r-- | data/schemas/community_module.jsonschema | 10 | ||||
-rw-r--r-- | data/schemas/keyboard.jsonschema | 322 | ||||
-rw-r--r-- | data/schemas/keycodes.jsonschema | 4 | ||||
-rw-r--r-- | data/schemas/keymap.jsonschema | 16 | ||||
-rw-r--r-- | data/schemas/user_repo_v0.jsonschema | 4 | ||||
-rw-r--r-- | data/schemas/user_repo_v1.jsonschema | 6 | ||||
-rw-r--r-- | data/schemas/user_repo_v1_1.jsonschema | 8 | ||||
-rw-r--r-- | data/templates/keyboard/keyboard.json | 2 |
15 files changed, 395 insertions, 187 deletions
diff --git a/data/constants/module_hooks/1.1.0.hjson b/data/constants/module_hooks/1.1.0.hjson new file mode 100644 index 0000000000..b50dad6a66 --- /dev/null +++ b/data/constants/module_hooks/1.1.0.hjson @@ -0,0 +1,55 @@ +{ + pointing_device_init: { + ret_type: void + args: void + guard: defined(POINTING_DEVICE_ENABLE) + } + pointing_device_task: { + ret_type: report_mouse_t + args: report_mouse_t mouse_report + call_params: mouse_report + guard: defined(POINTING_DEVICE_ENABLE) + header: report.h + } + rgb_matrix_indicators: { + ret_type: bool + args: void + guard: defined(RGB_MATRIX_ENABLE) + header: rgb_matrix.h + } + rgb_matrix_indicators_advanced: { + ret_type: bool + args: uint8_t led_min, uint8_t led_max + call_params: led_min, led_max + guard: defined(RGB_MATRIX_ENABLE) + header: rgb_matrix.h + } + led_matrix_indicators: { + ret_type: bool + args: void + guard: defined(LED_MATRIX_ENABLE) + header: led_matrix.h + } + led_matrix_indicators_advanced: { + ret_type: bool + args: uint8_t led_min, uint8_t led_max + call_params: led_min, led_max + guard: defined(LED_MATRIX_ENABLE) + header: led_matrix.h + } + default_layer_state_set: { + ret_type: layer_state_t + args: layer_state_t state + call_params: state + guard: !defined(NO_ACTION_LAYER) + header: action_layer.h + } + layer_state_set: { + ret_type: layer_state_t + args: layer_state_t state + call_params: state + guard: !defined(NO_ACTION_LAYER) + header: action_layer.h + } + +} diff --git a/data/constants/module_hooks/1.1.1.hjson b/data/constants/module_hooks/1.1.1.hjson new file mode 100644 index 0000000000..49f5d0d5d0 --- /dev/null +++ b/data/constants/module_hooks/1.1.1.hjson @@ -0,0 +1,3 @@ +{ + // This version exists to signify addition of LED/RGB effect support. +} diff --git a/data/mappings/info_config.hjson b/data/mappings/info_config.hjson index b643553b52..356dd6ba52 100644 --- a/data/mappings/info_config.hjson +++ b/data/mappings/info_config.hjson @@ -64,6 +64,9 @@ "WEAR_LEVELING_BACKING_SIZE": {"info_key": "eeprom.wear_leveling.backing_size", "value_type": "int", "to_json": false}, "WEAR_LEVELING_LOGICAL_SIZE": {"info_key": "eeprom.wear_leveling.logical_size", "value_type": "int", "to_json": false}, + // host + "NKRO_DEFAULT_ON": {"info_key": "host.default.nkro", "value_type": "bool"}, + // Layer locking "LAYER_LOCK_IDLE_TIMEOUT": {"info_key": "layer_lock.timeout", "value_type": "int"}, @@ -117,6 +120,7 @@ "MATRIX_HAS_GHOST": {"info_key": "matrix_pins.ghost", "value_type": "flag"}, "MATRIX_INPUT_PRESSED_STATE": {"info_key": "matrix_pins.input_pressed_state", "value_type": "int"}, "MATRIX_IO_DELAY": {"info_key": "matrix_pins.io_delay", "value_type": "int"}, + "MATRIX_MASKED": {"info_key": "matrix_pins.masked", "value_type": "flag"}, // Mouse Keys "MOUSEKEY_DELAY": {"info_key": "mousekey.delay", "value_type": "int"}, @@ -201,6 +205,7 @@ // Tapping "CHORDAL_HOLD": {"info_key": "tapping.chordal_hold", "value_type": "flag"}, + "FLOW_TAP_TERM": {"info_key": "tapping.flow_tap_term", "value_type": "int"}, "HOLD_ON_OTHER_KEY_PRESS": {"info_key": "tapping.hold_on_other_key_press", "value_type": "flag"}, "HOLD_ON_OTHER_KEY_PRESS_PER_KEY": {"info_key": "tapping.hold_on_other_key_press_per_key", "value_type": "flag"}, "PERMISSIVE_HOLD": {"info_key": "tapping.permissive_hold", "value_type": "flag"}, @@ -214,7 +219,6 @@ "TAPPING_TOGGLE": {"info_key": "tapping.toggle", "value_type": "int"}, // USB - "FORCE_NKRO": {"info_key": "usb.force_nkro", "value_type": "flag"}, "USB_MAX_POWER_CONSUMPTION": {"info_key": "usb.max_power", "value_type": "int"}, "USB_POLLING_INTERVAL_MS": {"info_key": "usb.polling_interval", "value_type": "int"}, "USB_SUSPEND_WAKEUP_DELAY": {"info_key": "usb.suspend_wakeup_delay", "value_type": "int"}, @@ -252,6 +256,7 @@ "PRODUCT": {"info_key": "keyboard_name", "warn_duplicate": false, "value_type": "str", "deprecated": true, "replace_with": "`keyboard_name` in info.json"}, "PRODUCT_ID": {"info_key": "usb.pid", "value_type": "hex", "deprecated": true, "replace_with": "`usb.pid` in info.json"}, "VENDOR_ID": {"info_key": "usb.vid", "value_type": "hex", "deprecated": true, "replace_with": "`usb.vid` in info.json"}, + "FORCE_NKRO": {"info_key": "usb.force_nkro", "value_type": "flag", "deprecated": true, "replace_with": "`host.default.nkro` in info.json"}, // Items we want flagged in lint "VIAL_KEYBOARD_UID": {"info_key": "_invalid.vial_uid", "invalid": true}, diff --git a/data/mappings/info_defaults.hjson b/data/mappings/info_defaults.hjson new file mode 100644 index 0000000000..b33cb4fa1f --- /dev/null +++ b/data/mappings/info_defaults.hjson @@ -0,0 +1,74 @@ +{ + "bootmagic": { + "matrix": [0, 0] + }, + "backlight": { + "default": { + "on": true + }, + "breathing_period": 6, + "levels": 3, + "on_state": 1 + }, + "debounce": 5, + "features": { + "command": false, + "console": false + }, + "indicators": { + "on_state": 1 + }, + "led_matrix": { + "default": { + "animation": "solid", + "on": true, + "val": 255, + "speed": 128 + }, + "led_flush_limit": 16, + "max_brightness": 255, + "sleep": false, + "speed_steps": 16, + "val_steps": 16 + }, + "rgblight": { + "default": { + "animation": "static_light", + "on": true, + "hue": 0, + "sat": 255, + "val": 255, + "speed": 0 + }, + "brightness_steps": 17, + "hue_steps": 8, + "max_brightness": 255, + "saturation_steps": 17, + "sleep": false + }, + "rgb_matrix": { + "default": { + "animation": "cycle_left_right", + "on": true, + "hue": 0, + "sat": 255, + "val": 255, + "speed": 128 + }, + "hue_steps": 8, + "led_flush_limit": 16, + "max_brightness": 255, + "sat_steps": 16, + "sleep": false, + "speed_steps": 16, + "val_steps": 16 + }, + "split": { + "serial": { + "driver": "bitbang" + } + }, + "ws2812": { + "driver": "bitbang" + } +} diff --git a/data/mappings/info_rules.hjson b/data/mappings/info_rules.hjson index 238957f170..d43d83c3ea 100644 --- a/data/mappings/info_rules.hjson +++ b/data/mappings/info_rules.hjson @@ -53,8 +53,8 @@ "WS2812_DRIVER": {"info_key": "ws2812.driver"}, // Items we want flagged in lint - "DEFAULT_FOLDER": {"info_key": "_deprecated.default_folder", "deprecated": true}, "CTPC": {"info_key": "_invalid.ctpc", "invalid": true, "replace_with": "CONVERT_TO=proton_c"}, "CONVERT_TO_PROTON_C": {"info_key": "_invalid.ctpc", "invalid": true, "replace_with": "CONVERT_TO=proton_c"}, + "DEFAULT_FOLDER": {"info_key": "_invalid.default_folder", "invalid": true}, "VIAL_ENABLE": {"info_key": "_invalid.vial", "invalid": true} } diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson index 0a640fd3e0..13c3b81305 100644 --- a/data/mappings/keyboard_aliases.hjson +++ b/data/mappings/keyboard_aliases.hjson @@ -1042,7 +1042,7 @@ "target": "kprepublic/bm68hsrgb/rev1" }, "late9/rev1": { - "target": "rookiebwoy/late9/rev1" + "target": "ivndbt/late9/rev1" }, "latin17rgb": { "target": "latincompass/latin17rgb" @@ -1207,7 +1207,7 @@ "target": "spaceholdings/nebula68b" }, "neopad/rev1": { - "target": "rookiebwoy/neopad/rev1" + "target": "ivndbt/neopad/rev1" }, "niu_mini": { "target": "kbdfans/niu_mini" @@ -2104,10 +2104,16 @@ "target": "rmi_kb/wete/v2" }, "rookiebwoy/late9": { - "target": "rookiebwoy/late9/rev1" + "target": "ivndbt/late9/rev1" }, "rookiebwoy/neopad": { - "target": "rookiebwoy/neopad/rev1" + "target": "ivndbt/neopad/rev1" + }, + "ivndbt/late9": { + "target": "ivndbt/late9/rev1" + }, + "ivndbt/neopad": { + "target": "ivndbt/neopad/rev1" }, "rura66": { "target": "rura66/rev1" @@ -2252,5 +2258,54 @@ }, "zsa/planck_ez": { "target": "zsa/planck_ez/base" + }, + // DEFAULT_FOLDER removed during 2025 Q3 cycle + "cannonkeys/satisfaction75": { + "target": "cannonkeys/satisfaction75/rev1" + }, + "converter/adb_usb": { + "target": "converter/adb_usb/rev1" + }, + "converter/sun_usb": { + "target": "converter/sun_usb/type5" + }, + "converter/usb_usb": { + "target": "converter/usb_usb/hasu" + }, + "durgod/dgk6x": { + "target": "durgod/dgk6x/hades_ansi" + }, + "ergodox_ez": { + "target": "ergodox_ez/base" + }, + "ferris/0_2": { + "target": "ferris/0_2/base" + }, + "handwired/dygma/raise": { + "target": "handwired/dygma/raise/ansi" + }, + "helix/pico": { + "target": "helix/pico/base" + }, + "helix": { + "target": "helix/rev2/base" + }, + "helix/rev2": { + "target": "helix/rev2/base" + }, + "ibm/model_m/mschwingen": { + "target": "ibm/model_m/mschwingen/led_wired" + }, + "mechwild/sugarglider": { + "target": "mechwild/sugarglider/wide_oled/f401" + }, + "mechwild/sugarglider/wide_oled": { + "target": "mechwild/sugarglider/wide_oled/f401" + }, + "novelkeys/nk65": { + "target": "novelkeys/nk65/base" + }, + "sirius/uni660/rev2": { + "target": "sirius/uni660/rev2/ansi" } } diff --git a/data/schemas/api_keyboard.jsonschema b/data/schemas/api_keyboard.jsonschema index 6a30b5d990..a3b7872ee0 100644 --- a/data/schemas/api_keyboard.jsonschema +++ b/data/schemas/api_keyboard.jsonschema @@ -1,7 +1,7 @@ { "$id": "qmk.api.keyboard.v1", "allOf": [ - {"$ref": "qmk.keyboard.v1"}, + {"$ref": "./keyboard.jsonschema#"}, { "properties": { "keymaps": { @@ -10,8 +10,8 @@ "url": {"type": "string"} } }, - "parse_errors": {"$ref": "qmk.definitions.v1#/string_array"}, - "parse_warnings": {"$ref": "qmk.definitions.v1#/string_array"}, + "parse_errors": {"$ref": "./definitions.jsonschema#/string_array"}, + "parse_warnings": {"$ref": "./definitions.jsonschema#/string_array"}, "processor_type": {"type": "string"}, "protocol": {"type": "string"}, "keyboard_folder": {"type": "string"}, diff --git a/data/schemas/community_module.jsonschema b/data/schemas/community_module.jsonschema index a237e210ce..92981ceb5c 100644 --- a/data/schemas/community_module.jsonschema +++ b/data/schemas/community_module.jsonschema @@ -3,16 +3,16 @@ "$id": "qmk.community_module.v1", "title": "Community Module Information", "type": "object", - "required": ["module_name", "maintainer"] + "required": ["module_name", "maintainer"], "properties": { - "module_name": {"$ref": "qmk.definitions.v1#/text_identifier"}, - "maintainer": {"$ref": "qmk.definitions.v1#/text_identifier"}, + "module_name": {"$ref": "./definitions.jsonschema#/text_identifier"}, + "maintainer": {"$ref": "./definitions.jsonschema#/text_identifier"}, "license": {"type": "string"}, "url": { "type": "string", "format": "uri" }, - "keycodes": {"$ref": "qmk.definitions.v1#/keycode_decl_array"}, - "features": {"$ref": "qmk.keyboard.v1#/definitions/features_config"}, + "keycodes": {"$ref": "./definitions.jsonschema#/keycode_decl_array"}, + "features": {"$ref": "./keyboard.jsonschema#/definitions/features_config"} } } diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index eee2915fcb..13ceec5afa 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -17,9 +17,9 @@ "additionalProperties": false, "required": ["pin_a", "pin_b"], "properties": { - "pin_a": {"$ref": "qmk.definitions.v1#/mcu_pin"}, - "pin_b": {"$ref": "qmk.definitions.v1#/mcu_pin"}, - "resolution": {"$ref": "qmk.definitions.v1#/unsigned_int"} + "pin_a": {"$ref": "./definitions.jsonschema#/mcu_pin"}, + "pin_b": {"$ref": "./definitions.jsonschema#/mcu_pin"}, + "resolution": {"$ref": "./definitions.jsonschema#/unsigned_int"} } } } @@ -28,22 +28,22 @@ "dip_switch_config": { "type": "object", "properties": { - "pins": {"$ref": "qmk.definitions.v1#/mcu_pin_array"} + "pins": {"$ref": "./definitions.jsonschema#/mcu_pin_array"} } - } + }, "features_config": { - "$ref": "qmk.definitions.v1#/boolean_array", - "propertyNames": {"$ref": "qmk.definitions.v1#/snake_case"}, + "$ref": "./definitions.jsonschema#/boolean_array", + "propertyNames": {"$ref": "./definitions.jsonschema#/snake_case"}, "not": {"required": ["lto"]} - }, + } }, "type": "object", "not": {"required": ["vendorId", "productId"]}, // reject via keys... "properties": { - "keyboard_name": {"$ref": "qmk.definitions.v1#/text_identifier"}, - "keyboard_folder": {"$ref": "qmk.definitions.v1#/keyboard"}, - "maintainer": {"$ref": "qmk.definitions.v1#/text_identifier"}, - "manufacturer": {"$ref": "qmk.definitions.v1#/text_identifier"}, + "keyboard_name": {"$ref": "./definitions.jsonschema#/text_identifier"}, + "keyboard_folder": {"$ref": "./definitions.jsonschema#/keyboard"}, + "maintainer": {"$ref": "./definitions.jsonschema#/text_identifier"}, + "manufacturer": {"$ref": "./definitions.jsonschema#/text_identifier"}, "url": { "type": "string", "format": "uri" @@ -84,6 +84,7 @@ "STM32F407", "STM32F411", "STM32F446", + "STM32G0B1", "STM32G431", "STM32G474", "STM32H723", @@ -118,8 +119,8 @@ "type": "object", "additionalProperties": false, "properties": { - "data_pin": {"$ref": "qmk.definitions.v1#/mcu_pin"}, - "clock_pin": {"$ref": "qmk.definitions.v1#/mcu_pin"}, + "data_pin": {"$ref": "./definitions.jsonschema#/mcu_pin"}, + "clock_pin": {"$ref": "./definitions.jsonschema#/mcu_pin"}, "default_brightness": { "type": "integer", "minimum": 0, @@ -144,13 +145,13 @@ "enum": ["dac_additive", "dac_basic", "pwm_software", "pwm_hardware"] }, "macro_beep": {"type": "boolean"}, - "pins": {"$ref": "qmk.definitions.v1#/mcu_pin_array"}, + "pins": {"$ref": "./definitions.jsonschema#/mcu_pin_array"}, "power_control": { "type": "object", "additionalProperties": false, "properties": { - "on_state": {"$ref": "qmk.definitions.v1#/bit"}, - "pin": {"$ref": "qmk.definitions.v1#/mcu_pin"} + "on_state": {"$ref": "./definitions.jsonschema#/bit"}, + "pin": {"$ref": "./definitions.jsonschema#/mcu_pin"} } }, "voices": {"type": "boolean"} @@ -170,20 +171,20 @@ "properties": { "on": {"type": "boolean"}, "breathing": {"type": "boolean"}, - "brightness": {"$ref": "qmk.definitions.v1#/unsigned_int_8"} + "brightness": {"$ref": "./definitions.jsonschema#/unsigned_int_8"} } }, "breathing": {"type": "boolean"}, - "breathing_period": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}, + "breathing_period": {"$ref": "./definitions.jsonschema#/unsigned_int_8"}, "levels": { "type": "integer", "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"}, + "max_brightness": {"$ref": "./definitions.jsonschema#/unsigned_int_8"}, + "pin": {"$ref": "./definitions.jsonschema#/mcu_pin"}, + "pins": {"$ref": "./definitions.jsonschema#/mcu_pin_array"}, + "on_state": {"$ref": "./definitions.jsonschema#/bit"}, "as_caps_lock": {"type": "boolean"} } }, @@ -268,7 +269,7 @@ "type": "string", "enum": ["COL2ROW", "ROW2COL"] }, - "debounce": {"$ref": "qmk.definitions.v1#/unsigned_int"}, + "debounce": {"$ref": "./definitions.jsonschema#/unsigned_int"}, "caps_word": { "type": "object", "additionalProperties": false, @@ -276,20 +277,20 @@ "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": "./definitions.jsonschema#/unsigned_int"}, "invert_on_shift": {"type": "boolean"} } }, "combo": { "type": "object", "properties": { - "count": {"$ref": "qmk.definitions.v1#/unsigned_int"}, - "term": {"$ref": "qmk.definitions.v1#/unsigned_int"} + "count": {"$ref": "./definitions.jsonschema#/unsigned_int"}, + "term": {"$ref": "./definitions.jsonschema#/unsigned_int"} } }, "community_layouts": { "type": "array", - "items": {"$ref": "qmk.definitions.v1#/filename"} + "items": {"$ref": "./definitions.jsonschema#/filename"} }, "dip_switch": { "$ref": "#/definitions/dip_switch_config", @@ -319,10 +320,10 @@ "properties": { "driver": { "type": "string", - "enum": ["custom", "embedded_flash", "legacy", "rp2040_flash", "spi_flash"] + "enum": ["none", "custom", "embedded_flash", "legacy", "rp2040_flash", "spi_flash"] }, - "backing_size": {"$ref": "qmk.definitions.v1#/unsigned_int"}, - "logical_size": {"$ref": "qmk.definitions.v1#/unsigned_int"} + "backing_size": {"$ref": "./definitions.jsonschema#/unsigned_int"}, + "logical_size": {"$ref": "./definitions.jsonschema#/unsigned_int"} } } } @@ -337,12 +338,12 @@ "indicators": { "type": "object", "properties": { - "caps_lock": {"$ref": "qmk.definitions.v1#/mcu_pin"}, - "num_lock": {"$ref": "qmk.definitions.v1#/mcu_pin"}, - "scroll_lock": {"$ref": "qmk.definitions.v1#/mcu_pin"}, - "compose": {"$ref": "qmk.definitions.v1#/mcu_pin"}, - "kana": {"$ref": "qmk.definitions.v1#/mcu_pin"}, - "on_state": {"$ref": "qmk.definitions.v1#/bit"} + "caps_lock": {"$ref": "./definitions.jsonschema#/mcu_pin"}, + "num_lock": {"$ref": "./definitions.jsonschema#/mcu_pin"}, + "scroll_lock": {"$ref": "./definitions.jsonschema#/mcu_pin"}, + "compose": {"$ref": "./definitions.jsonschema#/mcu_pin"}, + "kana": {"$ref": "./definitions.jsonschema#/mcu_pin"}, + "on_state": {"$ref": "./definitions.jsonschema#/bit"} } }, "joystick": { @@ -350,20 +351,20 @@ "properties": { "enabled": {"type": "boolean"}, "driver": {"type": "string"}, - "button_count": {"$ref": "qmk.definitions.v1#/unsigned_int"}, - "axis_resolution": {"$ref": "qmk.definitions.v1#/unsigned_int"}, + "button_count": {"$ref": "./definitions.jsonschema#/unsigned_int"}, + "axis_resolution": {"$ref": "./definitions.jsonschema#/unsigned_int"}, "axes": { "type": "object", - "propertyNames": {"enum": ["x", "y", "z", "rx", "ry", "rz"]} + "propertyNames": {"enum": ["x", "y", "z", "rx", "ry", "rz"]}, "additionalProperties": { "oneOf": [ { "type": "object", "properties": { - "input_pin": {"$ref": "qmk.definitions.v1#/mcu_pin"}, - "low": {"$ref": "qmk.definitions.v1#/unsigned_int"}, - "rest": {"$ref": "qmk.definitions.v1#/unsigned_int"}, - "high": {"$ref": "qmk.definitions.v1#/unsigned_int"} + "input_pin": {"$ref": "./definitions.jsonschema#/mcu_pin"}, + "low": {"$ref": "./definitions.jsonschema#/unsigned_int"}, + "rest": {"$ref": "./definitions.jsonschema#/unsigned_int"}, + "high": {"$ref": "./definitions.jsonschema#/unsigned_int"} } }, { @@ -375,20 +376,20 @@ } } }, - "keycodes": {"$ref": "qmk.definitions.v1#/keycode_decl_array"}, + "keycodes": {"$ref": "./definitions.jsonschema#/keycode_decl_array"}, "layer_lock": { "type": "object", "properties": { - "timeout": {"$ref": "qmk.definitions.v1#/unsigned_int"} + "timeout": {"$ref": "./definitions.jsonschema#/unsigned_int"} } }, "layout_aliases": { "type": "object", - "additionalProperties": {"$ref": "qmk.definitions.v1#/layout_macro"} + "additionalProperties": {"$ref": "./definitions.jsonschema#/layout_macro"} }, "layouts": { "type": "object", - "propertyNames": {"$ref": "qmk.definitions.v1#/layout_macro"}, + "propertyNames": {"$ref": "./definitions.jsonschema#/layout_macro"}, "additionalProperties": { "type": "object", "additionalProperties": false, @@ -403,7 +404,7 @@ "additionalProperties": false, "required": ["x", "y"], "properties": { - "encoder": {"$ref": "qmk.definitions.v1#/unsigned_int"}, + "encoder": {"$ref": "./definitions.jsonschema#/unsigned_int"}, "label": { "type": "string", "pattern": "^[^\\n]*$" @@ -417,13 +418,13 @@ "minimum": 0 } }, - "r": {"$ref": "qmk.definitions.v1#/signed_decimal"}, - "rx": {"$ref": "qmk.definitions.v1#/unsigned_decimal"}, - "ry": {"$ref": "qmk.definitions.v1#/unsigned_decimal"}, - "h": {"$ref": "qmk.definitions.v1#/key_unit"}, - "w": {"$ref": "qmk.definitions.v1#/key_unit"}, - "x": {"$ref": "qmk.definitions.v1#/key_unit"}, - "y": {"$ref": "qmk.definitions.v1#/key_unit"}, + "r": {"$ref": "./definitions.jsonschema#/signed_decimal"}, + "rx": {"$ref": "./definitions.jsonschema#/unsigned_decimal"}, + "ry": {"$ref": "./definitions.jsonschema#/unsigned_decimal"}, + "h": {"$ref": "./definitions.jsonschema#/key_unit"}, + "w": {"$ref": "./definitions.jsonschema#/key_unit"}, + "x": {"$ref": "./definitions.jsonschema#/key_unit"}, + "y": {"$ref": "./definitions.jsonschema#/key_unit"}, "hand": { "type": "string", "enum": ["L", "R", "*"] @@ -443,12 +444,24 @@ } } }, + "host": { + "type": "object", + "properties": { + "default": { + "type": "object", + "additionalProperties": false, + "properties": { + "nkro": {"type": "boolean"} + } + } + } + }, "leader_key": { "type": "object", "properties": { "timing": {"type": "boolean"}, "strict_processing": {"type": "boolean"}, - "timeout": {"$ref": "qmk.definitions.v1#/unsigned_int"} + "timeout": {"$ref": "./definitions.jsonschema#/unsigned_int"} } }, "matrix_pins": { @@ -458,14 +471,15 @@ "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"}, + "input_pressed_state": {"$ref": "./definitions.jsonschema#/unsigned_int"}, + "io_delay": {"$ref": "./definitions.jsonschema#/unsigned_int"}, + "masked": {"type": "boolean"}, "direct": { "type": "array", - "items": {"$ref": "qmk.definitions.v1#/mcu_pin_array"} + "items": {"$ref": "./definitions.jsonschema#/mcu_pin_array"} }, - "cols": {"$ref": "qmk.definitions.v1#/mcu_pin_array"}, - "rows": {"$ref": "qmk.definitions.v1#/mcu_pin_array"} + "cols": {"$ref": "./definitions.jsonschema#/mcu_pin_array"}, + "rows": {"$ref": "./definitions.jsonschema#/mcu_pin_array"} } }, "modules": { @@ -478,18 +492,18 @@ "type": "object", "properties": { "enabled": {"type": "boolean"}, - "delay": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}, - "interval": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}, - "max_speed": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}, - "time_to_max": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}, - "wheel_delay": {"$ref": "qmk.definitions.v1#/unsigned_int_8"} + "delay": {"$ref": "./definitions.jsonschema#/unsigned_int_8"}, + "interval": {"$ref": "./definitions.jsonschema#/unsigned_int_8"}, + "max_speed": {"$ref": "./definitions.jsonschema#/unsigned_int_8"}, + "time_to_max": {"$ref": "./definitions.jsonschema#/unsigned_int_8"}, + "wheel_delay": {"$ref": "./definitions.jsonschema#/unsigned_int_8"} } }, "oneshot": { "type": "object", "properties": { - "tap_toggle": {"$ref": "qmk.definitions.v1#/unsigned_int"}, - "timeout": {"$ref": "qmk.definitions.v1#/unsigned_int"} + "tap_toggle": {"$ref": "./definitions.jsonschema#/unsigned_int"}, + "timeout": {"$ref": "./definitions.jsonschema#/unsigned_int"} } }, "led_matrix": { @@ -497,7 +511,7 @@ "properties": { "animations": { "type": "object", - "propertyNames": {"$ref": "qmk.definitions.v1#/snake_case"}, + "propertyNames": {"$ref": "./definitions.jsonschema#/snake_case"}, "additionalProperties": {"type": "boolean"} }, "default": { @@ -506,8 +520,8 @@ "properties": { "on": {"type": "boolean"}, "animation": {"type": "string"}, - "val": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}, - "speed": {"$ref": "qmk.definitions.v1#/unsigned_int_8"} + "val": {"$ref": "./definitions.jsonschema#/unsigned_int_8"}, + "speed": {"$ref": "./definitions.jsonschema#/unsigned_int_8"} } }, "driver": { @@ -533,21 +547,21 @@ "type": "array", "minItems": 2, "maxItems": 2, - "items": {"$ref": "qmk.definitions.v1#/unsigned_int_8"} - }, - "max_brightness": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}, - "timeout": {"$ref": "qmk.definitions.v1#/unsigned_int"}, - "val_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"}, - "speed_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"}, - "led_flush_limit": {"$ref": "qmk.definitions.v1#/unsigned_int"}, - "led_process_limit": {"$ref": "qmk.definitions.v1#/unsigned_int"}, + "items": {"$ref": "./definitions.jsonschema#/unsigned_int_8"} + }, + "max_brightness": {"$ref": "./definitions.jsonschema#/unsigned_int_8"}, + "timeout": {"$ref": "./definitions.jsonschema#/unsigned_int"}, + "val_steps": {"$ref": "./definitions.jsonschema#/unsigned_int"}, + "speed_steps": {"$ref": "./definitions.jsonschema#/unsigned_int"}, + "led_flush_limit": {"$ref": "./definitions.jsonschema#/unsigned_int"}, + "led_process_limit": {"$ref": "./definitions.jsonschema#/unsigned_int"}, "react_on_keyup": {"type": "boolean"}, "sleep": {"type": "boolean"}, "split_count": { "type": "array", "minItems": 2, "maxItems": 2, - "items": {"$ref": "qmk.definitions.v1#/unsigned_int"} + "items": {"$ref": "./definitions.jsonschema#/unsigned_int"} }, "layout": { "type": "array", @@ -565,9 +579,9 @@ "minimum": 0 } }, - "x": {"$ref": "qmk.definitions.v1#/unsigned_int"}, - "y": {"$ref": "qmk.definitions.v1#/unsigned_int"}, - "flags": {"$ref": "qmk.definitions.v1#/unsigned_int_8"} + "x": {"$ref": "./definitions.jsonschema#/unsigned_int"}, + "y": {"$ref": "./definitions.jsonschema#/unsigned_int"}, + "flags": {"$ref": "./definitions.jsonschema#/unsigned_int_8"} } } } @@ -578,7 +592,7 @@ "properties": { "animations": { "type": "object", - "propertyNames": {"$ref": "qmk.definitions.v1#/snake_case"}, + "propertyNames": {"$ref": "./definitions.jsonschema#/snake_case"}, "additionalProperties": {"type": "boolean"} }, "default": { @@ -587,10 +601,10 @@ "properties": { "on": {"type": "boolean"}, "animation": {"type": "string"}, - "hue": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}, - "sat": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}, - "val": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}, - "speed": {"$ref": "qmk.definitions.v1#/unsigned_int_8"} + "hue": {"$ref": "./definitions.jsonschema#/unsigned_int_8"}, + "sat": {"$ref": "./definitions.jsonschema#/unsigned_int_8"}, + "val": {"$ref": "./definitions.jsonschema#/unsigned_int_8"}, + "speed": {"$ref": "./definitions.jsonschema#/unsigned_int_8"} } }, "driver": { @@ -618,23 +632,23 @@ "type": "array", "minItems": 2, "maxItems": 2, - "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"}, - "speed_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"}, - "led_flush_limit": {"$ref": "qmk.definitions.v1#/unsigned_int"}, - "led_process_limit": {"$ref": "qmk.definitions.v1#/unsigned_int"}, + "items": {"$ref": "./definitions.jsonschema#/unsigned_int_8"} + }, + "max_brightness": {"$ref": "./definitions.jsonschema#/unsigned_int_8"}, + "timeout": {"$ref": "./definitions.jsonschema#/unsigned_int"}, + "hue_steps": {"$ref": "./definitions.jsonschema#/unsigned_int"}, + "sat_steps": {"$ref": "./definitions.jsonschema#/unsigned_int"}, + "val_steps": {"$ref": "./definitions.jsonschema#/unsigned_int"}, + "speed_steps": {"$ref": "./definitions.jsonschema#/unsigned_int"}, + "led_flush_limit": {"$ref": "./definitions.jsonschema#/unsigned_int"}, + "led_process_limit": {"$ref": "./definitions.jsonschema#/unsigned_int"}, "react_on_keyup": {"type": "boolean"}, "sleep": {"type": "boolean"}, "split_count": { "type": "array", "minItems": 2, "maxItems": 2, - "items": {"$ref": "qmk.definitions.v1#/unsigned_int"} + "items": {"$ref": "./definitions.jsonschema#/unsigned_int"} }, "layout": { "type": "array", @@ -652,9 +666,9 @@ "minimum": 0 } }, - "x": {"$ref": "qmk.definitions.v1#/unsigned_int"}, - "y": {"$ref": "qmk.definitions.v1#/unsigned_int"}, - "flags": {"$ref": "qmk.definitions.v1#/unsigned_int_8"} + "x": {"$ref": "./definitions.jsonschema#/unsigned_int"}, + "y": {"$ref": "./definitions.jsonschema#/unsigned_int"}, + "flags": {"$ref": "./definitions.jsonschema#/unsigned_int_8"} } } } @@ -666,27 +680,27 @@ "properties": { "animations": { "type": "object", - "propertyNames": {"$ref": "qmk.definitions.v1#/snake_case"}, + "propertyNames": {"$ref": "./definitions.jsonschema#/snake_case"}, "additionalProperties": {"type": "boolean"} }, - "brightness_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"}, + "brightness_steps": {"$ref": "./definitions.jsonschema#/unsigned_int"}, "default": { "type": "object", "additionalProperties": false, "properties": { "on": {"type": "boolean"}, "animation": {"type": "string"}, - "hue": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}, - "sat": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}, - "val": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}, - "speed": {"$ref": "qmk.definitions.v1#/unsigned_int_8"} + "hue": {"$ref": "./definitions.jsonschema#/unsigned_int_8"}, + "sat": {"$ref": "./definitions.jsonschema#/unsigned_int_8"}, + "val": {"$ref": "./definitions.jsonschema#/unsigned_int_8"}, + "speed": {"$ref": "./definitions.jsonschema#/unsigned_int_8"} } }, "driver": { "type": "string", "enum": ["apa102", "custom", "ws2812"] }, - "hue_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"}, + "hue_steps": {"$ref": "./definitions.jsonschema#/unsigned_int"}, "layers": { "type": "object", "additionalProperties": false, @@ -701,29 +715,29 @@ "override_rgb": {"type": "boolean"} } }, - "led_count": {"$ref": "qmk.definitions.v1#/unsigned_int"}, + "led_count": {"$ref": "./definitions.jsonschema#/unsigned_int"}, "led_map": { "type": "array", "minItems": 2, - "items": {"$ref": "qmk.definitions.v1#/unsigned_int"} + "items": {"$ref": "./definitions.jsonschema#/unsigned_int"} }, - "max_brightness": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}, + "max_brightness": {"$ref": "./definitions.jsonschema#/unsigned_int_8"}, "pin": { - "$ref": "qmk.definitions.v1#/mcu_pin", + "$ref": "./definitions.jsonschema#/mcu_pin", "$comment": "Deprecated: use ws2812.pin instead" }, "rgbw": { "type": "boolean", "$comment": "Deprecated: use ws2812.rgbw instead" }, - "saturation_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"}, + "saturation_steps": {"$ref": "./definitions.jsonschema#/unsigned_int"}, "sleep": {"type": "boolean"}, "split": {"type": "boolean"}, "split_count": { "type": "array", "minItems": 2, "maxItems": 2, - "items": {"$ref": "qmk.definitions.v1#/unsigned_int"} + "items": {"$ref": "./definitions.jsonschema#/unsigned_int"} } } }, @@ -732,8 +746,8 @@ "additionalProperties": false, "properties": { "enabled": {"type": "boolean"}, - "unlock_timeout": {"$ref": "qmk.definitions.v1#/unsigned_int"}, - "idle_timeout": {"$ref": "qmk.definitions.v1#/unsigned_int"}, + "unlock_timeout": {"$ref": "./definitions.jsonschema#/unsigned_int"}, + "idle_timeout": {"$ref": "./definitions.jsonschema#/unsigned_int"}, "unlock_sequence": { "type": "array", "minItems": 1, @@ -767,8 +781,8 @@ "properties": { "enabled": {"type": "boolean"}, "mouse_enabled": {"type": "boolean"}, - "clock_pin": {"$ref": "qmk.definitions.v1#/mcu_pin"}, - "data_pin": {"$ref": "qmk.definitions.v1#/mcu_pin"}, + "clock_pin": {"$ref": "./definitions.jsonschema#/mcu_pin"}, + "data_pin": {"$ref": "./definitions.jsonschema#/mcu_pin"}, "driver": { "type": "string", "enum": ["busywait", "interrupt", "usart", "vendor"] @@ -805,11 +819,11 @@ "properties": { "direct": { "type": "array", - "items": {"$ref": "qmk.definitions.v1#/mcu_pin_array"} + "items": {"$ref": "./definitions.jsonschema#/mcu_pin_array"} }, - "cols": {"$ref": "qmk.definitions.v1#/mcu_pin_array"}, - "rows": {"$ref": "qmk.definitions.v1#/mcu_pin_array"}, - "unused": {"$ref": "qmk.definitions.v1#/mcu_pin_array"} + "cols": {"$ref": "./definitions.jsonschema#/mcu_pin_array"}, + "rows": {"$ref": "./definitions.jsonschema#/mcu_pin_array"}, + "unused": {"$ref": "./definitions.jsonschema#/mcu_pin_array"} } } } @@ -836,16 +850,16 @@ "type": "object", "additionalProperties": false, "properties": { - "pin": {"$ref": "qmk.definitions.v1#/mcu_pin"}, + "pin": {"$ref": "./definitions.jsonschema#/mcu_pin"}, "matrix_grid": { - "$ref": "qmk.definitions.v1#/mcu_pin_array", + "$ref": "./definitions.jsonschema#/mcu_pin_array", "minItems": 2, "maxItems": 2 } } }, "soft_serial_pin": { - "$ref": "qmk.definitions.v1#/mcu_pin", + "$ref": "./definitions.jsonschema#/mcu_pin", "$comment": "Deprecated: use split.serial.pin instead" }, "soft_serial_speed": { @@ -861,7 +875,7 @@ "type": "string", "enum": ["bitbang", "usart", "vendor"] }, - "pin": {"$ref": "qmk.definitions.v1#/mcu_pin"} + "pin": {"$ref": "./definitions.jsonschema#/mcu_pin"} } }, "transport": { @@ -889,7 +903,7 @@ } }, "watchdog": {"type": "boolean"}, - "watchdog_timeout": {"$ref": "qmk.definitions.v1#/unsigned_int"}, + "watchdog_timeout": {"$ref": "./definitions.jsonschema#/unsigned_int"}, "sync_matrix_state": { "type": "boolean", "$comment": "Deprecated: use sync.matrix_state instead" @@ -905,8 +919,8 @@ "additionalProperties": false, "properties": { "enabled": {"type": "boolean"}, - "polling_interval": {"$ref": "qmk.definitions.v1#/unsigned_int"}, - "timeout": {"$ref": "qmk.definitions.v1#/unsigned_int"} + "polling_interval": {"$ref": "./definitions.jsonschema#/unsigned_int"}, + "timeout": {"$ref": "./definitions.jsonschema#/unsigned_int"} } }, "main": { @@ -916,7 +930,7 @@ }, "matrix_grid": { "type": "array", - "items": {"$ref": "qmk.definitions.v1#/mcu_pin"}, + "items": {"$ref": "./definitions.jsonschema#/mcu_pin"}, "$comment": "Deprecated: use split.handedness.matrix_grid instead" } } @@ -938,9 +952,9 @@ "permissive_hold_per_key": {"type": "boolean"}, "retro": {"type": "boolean"}, "retro_per_key": {"type": "boolean"}, - "term": {"$ref": "qmk.definitions.v1#/unsigned_int"}, + "term": {"$ref": "./definitions.jsonschema#/unsigned_int"}, "term_per_key": {"type": "boolean"}, - "toggle": {"$ref": "qmk.definitions.v1#/unsigned_int"} + "toggle": {"$ref": "./definitions.jsonschema#/unsigned_int"} } }, "usb": { @@ -948,16 +962,20 @@ "additionalProperties": false, "properties": { "device_ver": { - "$ref": "qmk.definitions.v1#/hex_number_4d", + "$ref": "./definitions.jsonschema#/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"}, - "vid": {"$ref": "qmk.definitions.v1#/hex_number_4d"}, - "max_power": {"$ref": "qmk.definitions.v1#/unsigned_int"}, + "device_version": {"$ref": "./definitions.jsonschema#/bcd_version"}, + "force_nkro": { + "type": "boolean", + "$comment": "Deprecated: use host.default.nkro instead" + + }, + "pid": {"$ref": "./definitions.jsonschema#/hex_number_4d"}, + "vid": {"$ref": "./definitions.jsonschema#/hex_number_4d"}, + "max_power": {"$ref": "./definitions.jsonschema#/unsigned_int"}, "no_startup_check": {"type": "boolean"}, - "polling_interval": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}, + "polling_interval": {"$ref": "./definitions.jsonschema#/unsigned_int_8"}, "shared_endpoint": { "type": "object", "additionalProperties": false, @@ -966,7 +984,7 @@ "mouse": {"type": "boolean"} } }, - "suspend_wakeup_delay": {"$ref": "qmk.definitions.v1#/unsigned_int"}, + "suspend_wakeup_delay": {"$ref": "./definitions.jsonschema#/unsigned_int"}, "wait_for_enumeration": {"type": "boolean"} } }, @@ -974,9 +992,9 @@ "type": "object", "additionalProperties": false, "properties": { - "keys_per_scan": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}, - "tap_keycode_delay": {"$ref": "qmk.definitions.v1#/unsigned_int"}, - "tap_capslock_delay": {"$ref": "qmk.definitions.v1#/unsigned_int"}, + "keys_per_scan": {"$ref": "./definitions.jsonschema#/unsigned_int_8"}, + "tap_keycode_delay": {"$ref": "./definitions.jsonschema#/unsigned_int"}, + "tap_capslock_delay": {"$ref": "./definitions.jsonschema#/unsigned_int"}, "locking": { "type": "object", "additionalProperties": false, @@ -991,10 +1009,10 @@ "type": "object", "additionalProperties": false, "properties": { - "esc_output": {"$ref": "qmk.definitions.v1#/mcu_pin"}, - "esc_input": {"$ref": "qmk.definitions.v1#/mcu_pin"}, - "led": {"$ref": "qmk.definitions.v1#/mcu_pin"}, - "speaker": {"$ref": "qmk.definitions.v1#/mcu_pin"} + "esc_output": {"$ref": "./definitions.jsonschema#/mcu_pin"}, + "esc_input": {"$ref": "./definitions.jsonschema#/mcu_pin"}, + "led": {"$ref": "./definitions.jsonschema#/mcu_pin"}, + "speaker": {"$ref": "./definitions.jsonschema#/mcu_pin"} } }, "ws2812": { @@ -1005,10 +1023,10 @@ "type": "string", "enum": ["bitbang", "custom", "i2c", "pwm", "spi", "vendor"] }, - "pin": {"$ref": "qmk.definitions.v1#/mcu_pin"}, + "pin": {"$ref": "./definitions.jsonschema#/mcu_pin"}, "rgbw": {"type": "boolean"}, - "i2c_address": {"$ref": "qmk.definitions.v1#/hex_number_2d"}, - "i2c_timeout": {"$ref": "qmk.definitions.v1#/unsigned_int"} + "i2c_address": {"$ref": "./definitions.jsonschema#/hex_number_2d"}, + "i2c_timeout": {"$ref": "./definitions.jsonschema#/unsigned_int"} } } } diff --git a/data/schemas/keycodes.jsonschema b/data/schemas/keycodes.jsonschema index df6ce95a83..0f9dfc763e 100644 --- a/data/schemas/keycodes.jsonschema +++ b/data/schemas/keycodes.jsonschema @@ -30,10 +30,10 @@ "keycodes": { "type": "object", "propertyNames": { - "$ref": "qmk.definitions.v1#/hex_number_4d" + "$ref": "./definitions.jsonschema#/hex_number_4d" }, "additionalProperties": { - "type": "object", // use 'qmk.definitions.v1#/keycode_decl' when problem keycodes are removed + "type": "object", // use './definitions.jsonschema#/keycode_decl' when problem keycodes are removed "required": [ "key" ], diff --git a/data/schemas/keymap.jsonschema b/data/schemas/keymap.jsonschema index b92a536c2c..99aeaa6b6c 100644 --- a/data/schemas/keymap.jsonschema +++ b/data/schemas/keymap.jsonschema @@ -10,10 +10,10 @@ "minLength": 1, "pattern": "^[a-z][0-9a-z_]*$" }, - "host_language": {"$ref": "qmk.definitions.v1#/text_identifier"}, - "keyboard": {"$ref": "qmk.definitions.v1#/text_identifier"}, - "keymap": {"$ref": "qmk.definitions.v1#/text_identifier"}, - "layout": {"$ref": "qmk.definitions.v1#/layout_macro"}, + "host_language": {"$ref": "./definitions.jsonschema#/text_identifier"}, + "keyboard": {"$ref": "./definitions.jsonschema#/text_identifier"}, + "keymap": {"$ref": "./definitions.jsonschema#/text_identifier"}, + "layout": {"$ref": "./definitions.jsonschema#/layout_macro"}, "layers": { "type": "array", "items": { @@ -55,11 +55,11 @@ "keycodes": { "type": "array", "items": { - "$ref": "qmk.definitions.v1#/text_identifier" + "$ref": "./definitions.jsonschema#/text_identifier" } }, "duration": { - "$ref": "qmk.definitions.v1#/unsigned_int" + "$ref": "./definitions.jsonschema#/unsigned_int" } } } @@ -67,8 +67,8 @@ } } }, - "keycodes": {"$ref": "qmk.definitions.v1#/keycode_decl_array"}, - "config": {"$ref": "qmk.keyboard.v1"}, + "keycodes": {"$ref": "./definitions.jsonschema#/keycode_decl_array"}, + "config": {"$ref": "./keyboard.jsonschema#"}, "notes": { "type": "string" }, diff --git a/data/schemas/user_repo_v0.jsonschema b/data/schemas/user_repo_v0.jsonschema index b18ac50428..58d955abe2 100644 --- a/data/schemas/user_repo_v0.jsonschema +++ b/data/schemas/user_repo_v0.jsonschema @@ -8,7 +8,7 @@ ], "properties": { "userspace_version": { - "type": "string", - }, + "type": "string" + } } } diff --git a/data/schemas/user_repo_v1.jsonschema b/data/schemas/user_repo_v1.jsonschema index 69a59bce00..07c61d0fea 100644 --- a/data/schemas/user_repo_v1.jsonschema +++ b/data/schemas/user_repo_v1.jsonschema @@ -6,10 +6,10 @@ "definitions": { "build_target": { "oneOf": [ - {"$ref": "qmk.definitions.v1#/keyboard_keymap_tuple"}, - {"$ref": "qmk.definitions.v1#/json_file_path"} + {"$ref": "./definitions.jsonschema#/keyboard_keymap_tuple"}, + {"$ref": "./definitions.jsonschema#/json_file_path"} ] - }, + } }, "required": [ "userspace_version", diff --git a/data/schemas/user_repo_v1_1.jsonschema b/data/schemas/user_repo_v1_1.jsonschema index 5a7ccce063..cd6d89ad81 100644 --- a/data/schemas/user_repo_v1_1.jsonschema +++ b/data/schemas/user_repo_v1_1.jsonschema @@ -6,11 +6,11 @@ "definitions": { "build_target": { "oneOf": [ - {"$ref": "qmk.definitions.v1#/keyboard_keymap_tuple"}, - {"$ref": "qmk.definitions.v1#/keyboard_keymap_env"}, - {"$ref": "qmk.definitions.v1#/json_file_path"} + {"$ref": "./definitions.jsonschema#/keyboard_keymap_tuple"}, + {"$ref": "./definitions.jsonschema#/keyboard_keymap_env"}, + {"$ref": "./definitions.jsonschema#/json_file_path"} ] - }, + } }, "required": [ "userspace_version", diff --git a/data/templates/keyboard/keyboard.json b/data/templates/keyboard/keyboard.json index 94085d7f5a..87aa853cbb 100644 --- a/data/templates/keyboard/keyboard.json +++ b/data/templates/keyboard/keyboard.json @@ -14,8 +14,6 @@ }, "features": { "bootmagic": true, - "command": false, - "console": false, "extrakey": true, "mousekey": true, "nkro": true |