QMK Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							2582992381 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						
						
						
					 
					
						2022-11-25 17:32:45 +00:00 
						 
				 
			
				
					
						
							
							
								Ryan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							8f9b49dc5b 
							
						 
					 
					
						
						
							
							Fix build failures for bastardkb/tbk and jels/boaty ( #19152 )  
						
						
						
						
					 
					
						2022-11-25 17:31:58 +00:00 
						 
				 
			
				
					
						
							
							
								Joel Challis 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							af6aa225eb 
							
						 
					 
					
						
						
							
							Additional DD backlight config ( #19124 )  
						
						... 
						
						
						
						* Additional dd backlight config
* Update docs 
						
						
					 
					
						2022-11-23 18:48:22 +00:00 
						 
				 
			
				
					
						
							
							
								Ryan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							479d8de622 
							
						 
					 
					
						
						
							
							Format DD mappings and schemas ( #18924 )  
						
						
						
						
					 
					
						2022-11-08 01:05:08 +00:00 
						 
				 
			
				
					
						
							
							
								Ryan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							591701cdf9 
							
						 
					 
					
						
						
							
							Fix incorrect g_led_config generation ( #18431 )  
						
						
						
						
					 
					
						2022-09-21 02:41:18 +01:00 
						 
				 
			
				
					
						
							
							
								Ryan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							bc0756f294 
							
						 
					 
					
						
						
							
							Disconnect usb.device_ver ( #18259 )  
						
						
						
						
					 
					
						2022-09-16 12:05:25 +10:00 
						 
				 
			
				
					
						
							
							
								Joshua Diamond 
							
						 
					 
					
						
						
						
						
							
						
						
							23e12497b2 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						
						
						
					 
					
						2022-09-12 18:57:58 -04:00 
						 
				 
			
				
					
						
							
							
								Joel Challis 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							725df1278b 
							
						 
					 
					
						
						
							
							Fix '_RIGHT' matrix pins lint error ( #18320 )  
						
						
						
						
					 
					
						2022-09-09 21:22:55 +01:00 
						 
				 
			
				
					
						
							
							
								Ryan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							bb6f028833 
							
						 
					 
					
						
						
							
							Move bootloader.mk to platforms ( #18228 )  
						
						
						
						
					 
					
						2022-08-31 07:17:24 -07:00 
						 
				 
			
				
					
						
							
							
								Ryan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3adaf6a46a 
							
						 
					 
					
						
						
							
							Handle escaping of manufacturer/product strings ( #18194 )  
						
						
						
						
					 
					
						2022-08-28 19:35:17 +01:00 
						 
				 
			
				
					
						
							
							
								Joel Challis 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3c745caf61 
							
						 
					 
					
						
						
							
							Remove legacy bootmagic cli parsing ( #18099 )  
						
						
						
						
					 
					
						2022-08-19 01:56:48 +01:00 
						 
				 
			
				
					
						
							
							
								Nick Brassel 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							154d35ac14 
							
						 
					 
					
						
						
							
							Remove UNUSED_PINS ( #17931 )  
						
						
						
						
					 
					
						2022-08-06 23:23:35 +10:00 
						 
				 
			
				
					
						
							
							
								QMK Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							820371c31b 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						
						
						
					 
					
						2022-08-06 12:38:13 +00:00 
						 
				 
			
				
					
						
							
							
								Ryan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							37345e2ace 
							
						 
					 
					
						
						
							
							Provide users with replacements for deprecated/invalid functionality where applicable ( #17604 )  
						
						
						
						
					 
					
						2022-08-06 22:37:40 +10:00 
						 
				 
			
				
					
						
							
							
								Joel Challis 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							35d78aa8a4 
							
						 
					 
					
						
						
							
							More DD encoder fixes ( #17615 )  
						
						
						
						
					 
					
						2022-07-11 10:51:39 +01:00 
						 
				 
			
				
					
						
							
							
								QMK Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							30f2556ae9 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						
						
						
					 
					
						2022-07-08 21:50:28 +00:00 
						 
				 
			
				
					
						
							
							
								Dasky 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							06310e81e9 
							
						 
					 
					
						
						
							
							Allow only col or row pins for *_right extraction. ( #17590 )  
						
						
						
						
					 
					
						2022-07-08 22:49:55 +01:00 
						 
				 
			
				
					
						
							
							
								Joel Challis 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							1a400d8644 
							
						 
					 
					
						
						
							
							Allow encoder config from info.json ( #17295 )  
						
						
						
						
					 
					
						2022-06-20 20:15:06 -07:00 
						 
				 
			
				
					
						
							
							
								Joel Challis 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							92665aef33 
							
						 
					 
					
						
						
							
							Promote 'layouts require matrix data' to api error ( #17349 )  
						
						
						
						
					 
					
						2022-06-10 11:44:48 +01:00 
						 
				 
			
				
					
						
							
							
								Joel Challis 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7baf9b3f35 
							
						 
					 
					
						
						
							
							Promote label with newlines to lint error ( #17347 )  
						
						
						
						
					 
					
						2022-06-10 11:44:23 +01:00 
						 
				 
			
				
					
						
							
							
								Joel Challis 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a599550adb 
							
						 
					 
					
						
						
							
							Add support for linting deprecated and removed functionality  ( #17063 )  
						
						... 
						
						
						
						* Add support for more lint warnings/errors
* Develop currently needs extra deps installed
* Lint a few more scenarios
* fix tests 
						
						
					 
					
						2022-06-09 21:02:16 +01:00 
						 
				 
			
				
					
						
							
							
								Joel Challis 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							608fa5154c 
							
						 
					 
					
						
						
							
							Data driven g_led_config ( #16728 )  
						
						
						
						
					 
					
						2022-05-16 07:39:29 +10:00 
						 
				 
			
				
					
						
							
							
								Joel Challis 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							92a61aa0cd 
							
						 
					 
					
						
						
							
							Implement XAP 'secure' core requirements ( #16843 )  
						
						... 
						
						
						
						Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Stefan Kerkmann <karlk90@pm.me> 
						
						
					 
					
						2022-04-16 11:13:05 -07:00 
						 
				 
			
				
					
						
							
							
								Joel Challis 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c0ac3f7372 
							
						 
					 
					
						
						
							
							Add frameworking for development board presets ( #16637 )  
						
						... 
						
						
						
						* Add frameworking for development board presets
* Update lib/python/qmk/info.py
Co-authored-by: Nick Brassel <nick@tzarc.org>
Co-authored-by: Nick Brassel <nick@tzarc.org> 
						
						
					 
					
						2022-04-03 18:45:10 +01:00 
						 
				 
			
				
					
						
							
							
								QMK Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							05ac5727f2 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						
						
						
					 
					
						2022-03-26 19:15:58 +00:00 
						 
				 
			
				
					
						
							
							
								Erovia 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							55e5daa868 
							
						 
					 
					
						
						
							
							Fix bug when 'info.json' lookup escapes keyboard dir ( #16734 )  
						
						
						
						
					 
					
						2022-03-26 19:15:25 +00:00 
						 
				 
			
				
					
						
							
							
								Joel Challis 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							23f365f8bc 
							
						 
					 
					
						
						
							
							Ignore transport defaults if SPLIT_KEYBOARD is unset ( #16706 )  
						
						... 
						
						
						
						* Ignore transport defaults if SPLIT_KEYBOARD is unset
* keep exists check 
						
						
					 
					
						2022-03-22 10:48:13 +00:00 
						 
				 
			
				
					
						
							
							
								Joel Challis 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4f8cc32cf5 
							
						 
					 
					
						
						
							
							Extend 'qmk info' to handle keymap level overrides ( #16702 )  
						
						
						
						
					 
					
						2022-03-21 11:57:41 +01:00 
						 
				 
			
				
					
						
							
							
								Ryan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ace0603f4f 
							
						 
					 
					
						
						
							
							Change data driven "str" type to represent a quoted string literal ( #16516 )  
						
						... 
						
						
						
						* Change data driven "str" type to represent a quoted string literal
* Update docs 
						
						
					 
					
						2022-03-04 13:25:24 +00:00 
						 
				 
			
				
					
						
							
							
								Joel Challis 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							779c7debcf 
							
						 
					 
					
						
						
							
							Fix issues with data driven split keyboards ( #16457 )  
						
						
						
						
					 
					
						2022-02-27 13:39:24 +01:00 
						 
				 
			
				
					
						
							
							
								Joel Challis 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							77cdb20e16 
							
						 
					 
					
						
						
							
							Revert CLI default for manufacturer ( #16467 )  
						
						
						
						
					 
					
						2022-02-27 10:34:26 +00:00 
						 
				 
			
				
					
						
							
							
								Joel Challis 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b0621223bc 
							
						 
					 
					
						
						
							
							Various fixes for new-keyboard ( #16358 )  
						
						
						
						
					 
					
						2022-02-15 01:42:58 +00:00 
						 
				 
			
				
					
						
							
							
								Ryan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c72ed7c024 
							
						 
					 
					
						
						
							
							CLI: Parse USB device version BCD ( #14580 )  
						
						... 
						
						
						
						* CLI: Parse USB device version BCD
* Apply suggestions 
						
						
					 
					
						2022-01-17 08:44:34 +11:00 
						 
				 
			
				
					
						
							
							
								Ryan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5fb93934d0 
							
						 
					 
					
						
						
							
							Fixes for bootloader refactor build failures ( #15638 )  
						
						
						
						
					 
					
						2022-01-06 06:55:46 +11:00 
						 
				 
			
				
					
						
							
							
								Joy Lee 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							68838bb700 
							
						 
					 
					
						
						
							
							Westberrytech pr ( #14422 )  
						
						... 
						
						
						
						* Added support for WB32 MCU
* Modified eeprom_wb32.c
* Remove the eeprom_wb32-related code 
						
						
					 
					
						2021-11-27 09:28:18 +11:00 
						 
				 
			
				
					
						
							
							
								Nick Brassel 
							
						 
					 
					
						
						
						
						
							
						
						
							92e9bbd9b9 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master' into develop  
						
						
						
						
					 
					
						2021-11-05 08:55:55 +11:00 
						 
				 
			
				
					
						
							
							
								Nick Brassel 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c8da63382c 
							
						 
					 
					
						
						
							
							Fixup actions. ( #15057 )  
						
						
						
						
					 
					
						2021-11-04 21:49:09 +00:00 
						 
				 
			
				
					
						
							
							
								QMK Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							b25218ccc1 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						
						
						
					 
					
						2021-10-31 08:21:50 +00:00 
						 
				 
			
				
					
						
							
							
								Mateusz Ż 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							fe0acdd2cb 
							
						 
					 
					
						
						
							
							[CLI] Fix broken layout rendering in qmk info by '\n' ( #14970 )  
						
						
						
						
					 
					
						2021-10-31 01:21:20 -07:00 
						 
				 
			
				
					
						
							
							
								Joel Challis 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							01b702bece 
							
						 
					 
					
						
						
							
							Split out HAPTIC_ENABLE to have separate DRIVER option ( #14854 )  
						
						... 
						
						
						
						* DRIVER -> ENABLE
* Update generic_features.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update common_features.mk
Co-authored-by: Ryan <fauxpark@gmail.com> 
						
						
					 
					
						2021-10-18 12:55:44 +01:00 
						 
				 
			
				
					
						
							
							
								QMK Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							b0c2dd8d50 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						
						
						
					 
					
						2021-10-16 16:45:28 +00:00 
						 
				 
			
				
					
						
							
							
								Ryan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3c0eeec755 
							
						 
					 
					
						
						
							
							Try to clarify "number of elements in info.json does not match" error ( #14844 )  
						
						
						
						
					 
					
						2021-10-16 17:44:56 +01:00 
						 
				 
			
				
					
						
							
							
								Joel Challis 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							dace4d5f0d 
							
						 
					 
					
						
						
							
							Remove QWIIC_DRIVERS ( #14174 )  
						
						
						
						
					 
					
						2021-10-09 14:48:27 +01:00 
						 
				 
			
				
					
						
							
							
								Zach White 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							fce9cb9338 
							
						 
					 
					
						
						
							
							Cleanup issues identified by lgtm ( #14459 )  
						
						... 
						
						
						
						* cleanup issues identified by lgtm
* fix the git_status check 
						
						
					 
					
						2021-09-27 10:02:54 -07:00 
						 
				 
			
				
					
						
							
							
								Zach White 
							
						 
					 
					
						
						
						
						
							
						
						
							1ec6ce8c37 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						... 
						
						
						
						Resolved Conflicts:
	lib/python/qmk/info.py 
						
						
					 
					
						2021-08-20 08:22:41 -07:00 
						 
				 
			
				
					
						
							
							
								Joel Challis 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c1add5d0e2 
							
						 
					 
					
						
						
							
							Restore layout count validation ( #14068 )  
						
						
						
						
					 
					
						2021-08-20 08:16:59 -07:00 
						 
				 
			
				
					
						
							
							
								Zach White 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							8d9bfdc254 
							
						 
					 
					
						
						
							
							Add a lot more data to info.json ( #13366 )  
						
						... 
						
						
						
						* add some split data to info.json
* add tags
* add half of config_options.md to info.json
* add support for designating master split
* sort out split transport and primary
* fix bad data in UNUSED_PINS
* fixup custom transport
* wip
* allow for setting split right half keyboard matrix
* add SPLIT_USB_DETECT
* minor cleanup
* fix an erroneous message
* rework split.usb_detect
* adding missing rgblight vars to info.json
* add mouse_key to info.json
* add all remaining options from docs/config_options.md
* fix audio voices
* qmk info: Change text output to use dotted notation
* tweak layout output
* resolve alias names
* break out some functions to make flake8 happy
* add a field for bootloader instructions
* qmk generate-info-json: add a write-to-file argument
Adds an argument that instructs qmk generate-info-json to write the output to a file instead of just to the terminal.
* -arg_only, +action
Because it was never my intention that one would have to specify a value for the argument that enables writing the file.
* Bring qmk generate-info-json inline with other generate commands
* pytest fixup
* fix esca/getawayvan
* fix data driven errors for bpiphany converters
* features.force_nkro -> usb.force_nkro
* split.primary->split.main
* fix esca/getawayvan_f042
* fix the bpiphany converters for real
* fix bpiphany/tiger_lily
* Apply suggestions from code review
Co-authored-by: Nick Brassel <nick@tzarc.org>
* fix generate-api errors
* fix matrix pin extraction for split boards
* fix ploopyco/trackball_nano/rev1_001
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Nick Brassel <nick@tzarc.org> 
						
						
					 
					
						2021-08-16 23:33:30 +01:00 
						 
				 
			
				
					
						
							
							
								Zach White 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							fd340f8957 
							
						 
					 
					
						
						
							
							Defer the expensive search for layout macros until info.json has been processed ( #14007 )  
						
						... 
						
						
						
						* defer the expensive search for layout macros until info.json has been processed
* fixup names 
						
						
					 
					
						2021-08-16 06:30:58 +10:00 
						 
				 
			
				
					
						
							
							
								Zach White 
							
						 
					 
					
						
						
						
						
							
						
						
							12681bacc4 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						... 
						
						
						
						Conflicts:
	keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c 
						
						
					 
					
						2021-08-09 08:34:14 -07:00 
						 
				 
			
				
					
						
							
							
								Zach White 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e6c171bdd6 
							
						 
					 
					
						
						
							
							Fix generate api ( #13930 )  
						
						... 
						
						
						
						* Add missing returncode to exit()
* fix the aozora/hotswap vendor id 
						
						
					 
					
						2021-08-09 08:28:51 -07:00