Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						988d81581d
					
				
					 5 changed files with 9 additions and 9 deletions
				
			
		| 
						 | 
				
			
			@ -3,7 +3,7 @@
 | 
			
		|||
    "$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"},
 | 
			
		||||
| 
						 | 
				
			
			@ -13,6 +13,6 @@
 | 
			
		|||
            "format": "uri"
 | 
			
		||||
        },
 | 
			
		||||
        "keycodes": {"$ref": "qmk.definitions.v1#/keycode_decl_array"},
 | 
			
		||||
        "features": {"$ref": "qmk.keyboard.v1#/definitions/features_config"},
 | 
			
		||||
        "features": {"$ref": "qmk.keyboard.v1#/definitions/features_config"}
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -30,12 +30,12 @@
 | 
			
		|||
            "properties": {
 | 
			
		||||
                "pins": {"$ref": "qmk.definitions.v1#/mcu_pin_array"}
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
        },
 | 
			
		||||
        "features_config": {
 | 
			
		||||
            "$ref": "qmk.definitions.v1#/boolean_array",
 | 
			
		||||
            "propertyNames": {"$ref": "qmk.definitions.v1#/snake_case"},
 | 
			
		||||
            "not": {"required": ["lto"]}
 | 
			
		||||
        },
 | 
			
		||||
        }
 | 
			
		||||
    },
 | 
			
		||||
    "type": "object",
 | 
			
		||||
    "not": {"required": ["vendorId", "productId"]}, // reject via keys...
 | 
			
		||||
| 
						 | 
				
			
			@ -354,7 +354,7 @@
 | 
			
		|||
                "axis_resolution": {"$ref": "qmk.definitions.v1#/unsigned_int"},
 | 
			
		||||
                "axes": {
 | 
			
		||||
                    "type": "object",
 | 
			
		||||
                    "propertyNames": {"enum": ["x", "y", "z", "rx", "ry", "rz"]}
 | 
			
		||||
                    "propertyNames": {"enum": ["x", "y", "z", "rx", "ry", "rz"]},
 | 
			
		||||
                    "additionalProperties": {
 | 
			
		||||
                        "oneOf": [
 | 
			
		||||
                            {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -8,7 +8,7 @@
 | 
			
		|||
    ],
 | 
			
		||||
    "properties": {
 | 
			
		||||
        "userspace_version": {
 | 
			
		||||
            "type": "string",
 | 
			
		||||
        },
 | 
			
		||||
            "type": "string"
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -9,7 +9,7 @@
 | 
			
		|||
                {"$ref": "qmk.definitions.v1#/keyboard_keymap_tuple"},
 | 
			
		||||
                {"$ref": "qmk.definitions.v1#/json_file_path"}
 | 
			
		||||
            ]
 | 
			
		||||
        },
 | 
			
		||||
        }
 | 
			
		||||
    },
 | 
			
		||||
    "required": [
 | 
			
		||||
        "userspace_version",
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -10,7 +10,7 @@
 | 
			
		|||
                {"$ref": "qmk.definitions.v1#/keyboard_keymap_env"},
 | 
			
		||||
                {"$ref": "qmk.definitions.v1#/json_file_path"}
 | 
			
		||||
            ]
 | 
			
		||||
        },
 | 
			
		||||
        }
 | 
			
		||||
    },
 | 
			
		||||
    "required": [
 | 
			
		||||
        "userspace_version",
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue