mirror of
				https://github.com/mfulz/qmk_firmware.git
				synced 2025-11-04 07:12:33 +01:00 
			
		
		
		
	Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						21c396a3aa
					
				@ -29,6 +29,10 @@
 | 
				
			|||||||
        "minLength": 1,
 | 
					        "minLength": 1,
 | 
				
			||||||
        "maxLength": 250
 | 
					        "maxLength": 250
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
 | 
					    "snake_case": {
 | 
				
			||||||
 | 
					        "type": "string",
 | 
				
			||||||
 | 
					        "pattern": "^[a-z][a-z0-9_]*$"
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
    "layout_macro": {
 | 
					    "layout_macro": {
 | 
				
			||||||
        "oneOf": [
 | 
					        "oneOf": [
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
 | 
				
			|||||||
@ -268,7 +268,11 @@
 | 
				
			|||||||
                "enabled": {"type": "boolean"}
 | 
					                "enabled": {"type": "boolean"}
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
        "features": {"$ref": "qmk.definitions.v1#/boolean_array"},
 | 
					        "features": {
 | 
				
			||||||
 | 
					            "$ref": "qmk.definitions.v1#/boolean_array",
 | 
				
			||||||
 | 
					            "propertyNames": { "$ref": "qmk.definitions.v1#/snake_case" }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        },
 | 
				
			||||||
        "indicators": {
 | 
					        "indicators": {
 | 
				
			||||||
            "type": "object",
 | 
					            "type": "object",
 | 
				
			||||||
            "properties": {
 | 
					            "properties": {
 | 
				
			||||||
@ -382,6 +386,7 @@
 | 
				
			|||||||
            "properties": {
 | 
					            "properties": {
 | 
				
			||||||
                "animations": {
 | 
					                "animations": {
 | 
				
			||||||
                    "type": "object",
 | 
					                    "type": "object",
 | 
				
			||||||
 | 
					                    "propertyNames": { "$ref": "qmk.definitions.v1#/snake_case" }
 | 
				
			||||||
                    "additionalProperties": {
 | 
					                    "additionalProperties": {
 | 
				
			||||||
                        "type": "boolean"
 | 
					                        "type": "boolean"
 | 
				
			||||||
                    }
 | 
					                    }
 | 
				
			||||||
@ -431,6 +436,7 @@
 | 
				
			|||||||
            "properties": {
 | 
					            "properties": {
 | 
				
			||||||
                "animations": {
 | 
					                "animations": {
 | 
				
			||||||
                    "type": "object",
 | 
					                    "type": "object",
 | 
				
			||||||
 | 
					                    "propertyNames": { "$ref": "qmk.definitions.v1#/snake_case" }
 | 
				
			||||||
                    "additionalProperties": {
 | 
					                    "additionalProperties": {
 | 
				
			||||||
                        "type": "boolean"
 | 
					                        "type": "boolean"
 | 
				
			||||||
                    }
 | 
					                    }
 | 
				
			||||||
@ -483,6 +489,7 @@
 | 
				
			|||||||
            "properties": {
 | 
					            "properties": {
 | 
				
			||||||
                "animations": {
 | 
					                "animations": {
 | 
				
			||||||
                    "type": "object",
 | 
					                    "type": "object",
 | 
				
			||||||
 | 
					                    "propertyNames": { "$ref": "qmk.definitions.v1#/snake_case" }
 | 
				
			||||||
                    "additionalProperties": {
 | 
					                    "additionalProperties": {
 | 
				
			||||||
                        "type": "boolean"
 | 
					                        "type": "boolean"
 | 
				
			||||||
                    }
 | 
					                    }
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user