forked from mirrors/qmk_userspace
		
	Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
				commit
				
					
						564589a006
					
				
			
		
					 3 changed files with 3 additions and 1 deletions
				
			
		| 
						 | 
					@ -13,6 +13,7 @@
 | 
				
			||||||
    "AUDIO_VOICES": {"info_key": "audio.voices", "value_type": "bool"},
 | 
					    "AUDIO_VOICES": {"info_key": "audio.voices", "value_type": "bool"},
 | 
				
			||||||
    "BACKLIGHT_BREATHING": {"info_key": "backlight.breathing", "value_type": "bool"},
 | 
					    "BACKLIGHT_BREATHING": {"info_key": "backlight.breathing", "value_type": "bool"},
 | 
				
			||||||
    "BREATHING_PERIOD": {"info_key": "backlight.breathing_period", "value_type": "int"},
 | 
					    "BREATHING_PERIOD": {"info_key": "backlight.breathing_period", "value_type": "int"},
 | 
				
			||||||
 | 
					    "BACKLIGHT_LEVELS": {"info_key": "backlight.levels", "value_type": "int"},
 | 
				
			||||||
    "BACKLIGHT_ON_STATE": {"info_key": "backlight.on_state", "value_type": "int"},
 | 
					    "BACKLIGHT_ON_STATE": {"info_key": "backlight.on_state", "value_type": "int"},
 | 
				
			||||||
    "BACKLIGHT_PIN": {"info_key": "backlight.pin"},
 | 
					    "BACKLIGHT_PIN": {"info_key": "backlight.pin"},
 | 
				
			||||||
    "BOTH_SHIFTS_TURNS_ON_CAPS_WORD": {"info_key": "caps_word.both_shifts_turns_on", "value_type": "bool"},
 | 
					    "BOTH_SHIFTS_TURNS_ON_CAPS_WORD": {"info_key": "caps_word.both_shifts_turns_on", "value_type": "bool"},
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -14,6 +14,7 @@
 | 
				
			||||||
    "BOOTLOADER": {"info_key": "bootloader", "warn_duplicate": false},
 | 
					    "BOOTLOADER": {"info_key": "bootloader", "warn_duplicate": false},
 | 
				
			||||||
    "BLUETOOTH_DRIVER": {"info_key": "bluetooth.driver"},
 | 
					    "BLUETOOTH_DRIVER": {"info_key": "bluetooth.driver"},
 | 
				
			||||||
    "CAPS_WORD_ENABLE": {"info_key": "caps_word.enabled", "value_type": "bool"},
 | 
					    "CAPS_WORD_ENABLE": {"info_key": "caps_word.enabled", "value_type": "bool"},
 | 
				
			||||||
 | 
					    "DEBOUNCE_TYPE": {"info_key": "build.debounce_type"},
 | 
				
			||||||
    "ENCODER_ENABLE": {"info_key": "encoder.enabled", "value_type": "bool"},
 | 
					    "ENCODER_ENABLE": {"info_key": "encoder.enabled", "value_type": "bool"},
 | 
				
			||||||
    "FIRMWARE_FORMAT": {"info_key": "build.firmware_format"},
 | 
					    "FIRMWARE_FORMAT": {"info_key": "build.firmware_format"},
 | 
				
			||||||
    "KEYBOARD_SHARED_EP": {"info_key": "usb.shared_endpoint.keyboard", "value_type": "bool"},
 | 
					    "KEYBOARD_SHARED_EP": {"info_key": "usb.shared_endpoint.keyboard", "value_type": "bool"},
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -117,7 +117,7 @@
 | 
				
			||||||
            "properties": {
 | 
					            "properties": {
 | 
				
			||||||
                "debounce_type": {
 | 
					                "debounce_type": {
 | 
				
			||||||
                    "type": "string",
 | 
					                    "type": "string",
 | 
				
			||||||
                    "enum": ["custom", "eager_pk", "eager_pr", "sym_defer_pk", "sym_defer_pr", "sym_eager_pk"]
 | 
					                    "enum": ["asym_eager_defer_pk", "custom", "sym_defer_g", "sym_defer_pk", "sym_defer_pr", "sym_eager_pk", "sym_eager_pr"]
 | 
				
			||||||
                },
 | 
					                },
 | 
				
			||||||
                "firmware_format": {
 | 
					                "firmware_format": {
 | 
				
			||||||
                    "type": "string",
 | 
					                    "type": "string",
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue