Joel Challis 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4ef8ff458d 
							
						 
					 
					
						
						
							
							Minor tidy up of key overrides ( #13747 )  
						
						... 
						
						
						
						* Minor tidy up of key overrides
* Update quantum/quantum.c
* Update quantum/quantum.c 
						
						
							
						
					 
					
						2021-07-28 12:01:49 +01:00 
						 
				 
			
				
					
						
							
							
								QMK Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							50964ae821 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						
						
						
							
						
					 
					
						2021-07-28 11:01:28 +00:00 
						 
				 
			
				
					
						
							
							
								Joel Challis 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							03d258c222 
							
						 
					 
					
						
						
							
							matrix_scan_x -> x_task ( #13748 )  
						
						
						
						
							
						
					 
					
						2021-07-28 12:01:23 +01:00 
						 
				 
			
				
					
						
							
							
								Shane Celis 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							fcce9f2a4f 
							
						 
					 
					
						
						
							
							fix: Fix typo in documentation for one shot keys. ON_TOGG -> OS_TOGG ( #13754 )  
						
						... 
						
						
						
						`ON_TOGG` doesn't exist in the codebase. 
						
						
							
						
					 
					
						2021-07-28 12:00:55 +01:00 
						 
				 
			
				
					
						
							
							
								Drashna Jaelre 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c52c69d45f 
							
						 
					 
					
						
						
							
							Allow for higher USB Polling rate on ATSAM boards ( #13755 )  
						
						
						
						
							
						
					 
					
						2021-07-28 12:00:16 +01:00 
						 
				 
			
				
					
						
							
							
								QMK Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							2f4361c88f 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						
						
						
							
						
					 
					
						2021-07-28 07:25:28 +00:00 
						 
				 
			
				
					
						
							
							
								Jonavin 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							9088df04c3 
							
						 
					 
					
						
						
							
							[Keyboard] fix short circuit in led_update_kb for quefrency rev3 ( #13752 )  
						
						... 
						
						
						
						Co-authored-by: Jonavin <=> 
						
						
							
						
					 
					
						2021-07-28 00:24:51 -07:00 
						 
				 
			
				
					
						
							
							
								Joel Challis 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7ac7ca96e9 
							
						 
					 
					
						
						
							
							Remove some legacy files ( #13715 )  
						
						
						
						
							
						
					 
					
						2021-07-27 23:57:42 +01:00 
						 
				 
			
				
					
						
							
							
								Joel Challis 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3858a784c7 
							
						 
					 
					
						
						
							
							Align AW20216 driver ( #13712 )  
						
						... 
						
						
						
						* Align AW20216 driver
* Update drivers/awinic/aw20216.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Review comments
* formatting fixes
* stop if start failed?
* review comments
Co-authored-by: Ryan <fauxpark@gmail.com> 
						
						
							
						
					 
					
						2021-07-27 23:55:51 +01:00 
						 
				 
			
				
					
						
							
							
								Ryan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							56443fe3cf 
							
						 
					 
					
						
						
							
							Fix typo in Dactyl Manuform ( #13740 )  
						
						
						
						
							
						
					 
					
						2021-07-27 08:16:41 -07:00 
						 
				 
			
				
					
						
							
							
								Ryan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							468f705455 
							
						 
					 
					
						
						
							
							Dactyl Manuform cleanup ( #13686 )  
						
						
						
						
							
						
					 
					
						2021-07-27 22:00:38 +10:00 
						 
				 
			
				
					
						
							
							
								QMK Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							95de60513d 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						
						
						
							
						
					 
					
						2021-07-27 02:45:36 +00:00 
						 
				 
			
				
					
						
							
							
								ForsakenRei 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ae2c2358ec 
							
						 
					 
					
						
						
							
							[Docs] Add default case in Tap Dance Example 6 ( #13727 )  
						
						... 
						
						
						
						Added a `default` case in `switch(ql_tap_state.state)` at line 493 and 494.
Without it compile firmware with Example 6 code will encounter 2 errors:
`enumeration value 'TD_NONE' not handled in switch`
`enumeration value 'TD_UNKNOWN' not handled in switch` 
						
						
							
						
					 
					
						2021-07-26 19:45:08 -07:00 
						 
				 
			
				
					
						
							
							
								QMK Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							998ac203e4 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						
						
						
							
						
					 
					
						2021-07-27 02:44:18 +00:00 
						 
				 
			
				
					
						
							
							
								James Young 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a617c8b80a 
							
						 
					 
					
						
						
							
							[Keyboard] Ares refactor ( #13730 )  
						
						
						
						
							
						
					 
					
						2021-07-26 19:43:48 -07:00 
						 
				 
			
				
					
						
							
							
								Albert Y 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							be34fdea4b 
							
						 
					 
					
						
						
							
							[Keyboard] Add RGB matrix support for Kyria ( #12789 )  
						
						... 
						
						
						
						Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: filterpaper <filterpaper@localhost> 
						
						
							
						
					 
					
						2021-07-26 19:42:34 -07:00 
						 
				 
			
				
					
						
							
							
								Drashna Jaelre 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3affdcb45b 
							
						 
					 
					
						
						
							
							Reduce firmware size in prep for  #12670  ( #13724 )  
						
						... 
						
						
						
						* Reduce firmware size in pre for #12670 
* Also disable pixel mode, just in case 
						
						
							
						
					 
					
						2021-07-27 12:41:28 +10:00 
						 
				 
			
				
					
						
							
							
								Albert Y 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e032fbe326 
							
						 
					 
					
						
						
							
							[Keyboard] Update kyria make path example ( #13720 )  
						
						... 
						
						
						
						Co-authored-by: filterpaper <filterpaper@localhost> 
						
						
							
						
					 
					
						2021-07-26 18:01:16 -07:00 
						 
				 
			
				
					
						
							
							
								Drashna Jaelre 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							eb46c954dc 
							
						 
					 
					
						
						
							
							[Keymap] Drashna's Defaults cleanup ( #13722 )  
						
						
						
						
							
						
					 
					
						2021-07-26 17:59:49 -07:00 
						 
				 
			
				
					
						
							
							
								Joel Challis 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							368efb5d2b 
							
						 
					 
					
						
						
							
							Remove legacy BACKLIGHT_CUSTOM_DRIVER option ( #13731 )  
						
						
						
						
							
						
					 
					
						2021-07-27 10:17:58 +10:00 
						 
				 
			
				
					
						
							
							
								Nick Brassel 
							
						 
					 
					
						
						
						
						
							
						
						
							394272a266 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master' into develop  
						
						
						
						
							
						
					 
					
						2021-07-27 10:11:52 +10:00 
						 
				 
			
				
					
						
							
							
								datafx 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b1c5a53a68 
							
						 
					 
					
						
						
							
							Add bootloader size ( #13729 )  
						
						... 
						
						
						
						* Add bootloader size
Bootloader size needs to be 6144 to allow QMK to jump to the correct location with bootmagic
* Include dz60rgb v2.1
Add boot loader size to this pcb also 
						
						
							
						
					 
					
						2021-07-27 10:07:29 +10:00 
						 
				 
			
				
					
						
							
							
								James Young 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e6e4ec6267 
							
						 
					 
					
						
						
							
							40percentclub/nein: update info.json layout macro reference ( #13726 )  
						
						... 
						
						
						
						- change LAYOUT to LAYOUT_ortho_3x3 
						
						
							
						
					 
					
						2021-07-26 21:02:44 +01:00 
						 
				 
			
				
					
						
							
							
								Xelus22 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e0375c0b71 
							
						 
					 
					
						
						
							
							[Keyboard Update] Change to L422 ( #13717 )  
						
						... 
						
						
						
						* change to L422
* Add bootloader
Co-authored-by: Ryan <fauxpark@gmail.com>
* add bootloader
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com> 
						
						
							
						
					 
					
						2021-07-26 16:05:13 +10:00 
						 
				 
			
				
					
						
							
							
								Cyril 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a73e0a7b13 
							
						 
					 
					
						
						
							
							Revert "Fixed the ortho60 and ortho48 matrix layout after testing ( #12106 )" ( #13456 )  
						
						... 
						
						
						
						This reverts commit e25f05224f1c06aeed13b2e99e8e755af65ac689. 
						
						
							
						
					 
					
						2021-07-25 22:51:23 -07:00 
						 
				 
			
				
					
						
							
							
								Xelus22 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b9902a3f59 
							
						 
					 
					
						
						
							
							[Keyboard] Valor Rev 2 ( #13551 )  
						
						... 
						
						
						
						Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com> 
						
						
							
						
					 
					
						2021-07-25 22:34:39 -07:00 
						 
				 
			
				
					
						
							
							
								Drashna Jaelre 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							9e782e4f14 
							
						 
					 
					
						
						
							
							[Bug] Include gpio.h in solenoid driver for GPIO Control functions ( #13716 )  
						
						
						
						
							
						
					 
					
						2021-07-25 21:24:47 -07:00 
						 
				 
			
				
					
						
							
							
								bomb 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							2e5cecd704 
							
						 
					 
					
						
						
							
							[Keyboard] Change RGB light defaults for melgeek/mj6xy ( #13657 )  
						
						... 
						
						
						
						Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com> 
						
						
							
						
					 
					
						2021-07-25 21:22:13 -07:00 
						 
				 
			
				
					
						
							
							
								Joel Challis 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							f945c352e7 
							
						 
					 
					
						
						
							
							Haptic: driver-> feature ( #13713 )  
						
						
						
						
							
						
					 
					
						2021-07-25 19:14:58 -07:00 
						 
				 
			
				
					
						
							
							
								Drashna Jaelre 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4bb595f94b 
							
						 
					 
					
						
						
							
							[Keyboard] Fix up SplitKB keyboards ( #13511 )  
						
						
						
						
							
						
					 
					
						2021-07-25 18:18:39 -07:00 
						 
				 
			
				
					
						
							
							
								Drashna Jaelre 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d45da3f0fb 
							
						 
					 
					
						
						
							
							[Keyboard] Update ZSA Keyboard Readmes and keymaps ( #13041 )  
						
						... 
						
						
						
						* [Keyboard] Update ZSA Keyboard Readmes and keymaps
* Apply suggestions from code review
Co-authored-by: Ryan <fauxpark@gmail.com>
* Remove custom rgb code for RGB_M_P
* Fix inevitable typo
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/planck/ez/readme.md
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com> 
						
						
							
						
					 
					
						2021-07-25 18:18:22 -07:00 
						 
				 
			
				
					
						
							
							
								QMK Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							d908970522 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						
						
						
							
						
					 
					
						2021-07-25 16:18:46 +00:00 
						 
				 
			
				
					
						
							
							
								Joel Challis 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							fc9fb2c775 
							
						 
					 
					
						
						
							
							Allow output of logging when running unit tests ( #13556 )  
						
						... 
						
						
						
						* Initial pass at enabling logging for unit tests
* Add to docs
* Bind debug for more test types
* Force everything
* Tidy up slightly 
						
						
							
 
						
					 
					
						2021-07-25 17:18:09 +01:00 
						 
				 
			
				
					
						
							
							
								Drashna Jaelre 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							71e9f8fc11 
							
						 
					 
					
						
						
							
							Update LUFA (18-07-2021) and add QMK-HID Bootloader support ( #13588 )  
						
						... 
						
						
						
						Co-authored-by: Ryan <fauxpark@gmail.com> 
						
						
							
						
					 
					
						2021-07-24 23:00:57 -07:00 
						 
				 
			
				
					
						
							
							
								Drashna Jaelre 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a030950fd6 
							
						 
					 
					
						
						
							
							[Keyboard] Fix compile size for the Vitamins Included via keymap ( #13696 )  
						
						
						
						
							
						
					 
					
						2021-07-25 14:19:38 +10:00 
						 
				 
			
				
					
						
							
							
								Marc Tamsky 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							958483a4ba 
							
						 
					 
					
						
						
							
							docs/cli_commands: fix typo ( #13697 )  
						
						
						
						
							
						
					 
					
						2021-07-25 13:51:40 +10:00 
						 
				 
			
				
					
						
							
							
								Dasky 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a938c54512 
							
						 
					 
					
						
						
							
							dirty fix ( #13695 )  
						
						
						
						
							
						
					 
					
						2021-07-25 12:33:30 +10:00 
						 
				 
			
				
					
						
							
							
								Nick Brassel 
							
						 
					 
					
						
						
						
						
							
						
						
							4ec8764c70 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master' into develop  
						
						
						
						
							
						
					 
					
						2021-07-25 12:17:15 +10:00 
						 
				 
			
				
					
						
							
							
								Drashna Jaelre 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b69e7431aa 
							
						 
					 
					
						
						
							
							[Keyboard] Fix keymaps for clueboard 66_hotswap ( #13694 )  
						
						... 
						
						
						
						* [Keyboard] Fix default keymap for clueboard proto
* Fix keymaps, because they're not actually revision compatible
* Add copyright headers 
						
						
							
						
					 
					
						2021-07-25 12:07:46 +10:00 
						 
				 
			
				
					
						
							
							
								Drashna Jaelre 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							fdf3ce3cd1 
							
						 
					 
					
						
						
							
							[Keyboard] Fix compile size for the Lets Split Sockets via keymap ( #13691 )  
						
						
						
						
							
						
					 
					
						2021-07-25 11:05:48 +10:00 
						 
				 
			
				
					
						
							
							
								Drashna Jaelre 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							210da7b233 
							
						 
					 
					
						
						
							
							[Keyboard] Fix Compile size on ungodly Launch Pad ( #13692 )  
						
						
						
						
							
						
					 
					
						2021-07-25 11:05:19 +10:00 
						 
				 
			
				
					
						
							
							
								Ryan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							8cc568bc29 
							
						 
					 
					
						
						
							
							Fix & clean up tronguylabs/m122_3270 ( #13684 )  
						
						
						
						
							
						
					 
					
						2021-07-25 11:02:36 +10:00 
						 
				 
			
				
					
						
							
							
								Drashna Jaelre 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							95730d4f96 
							
						 
					 
					
						
						
							
							[Keyboard] Fix compile size for the Merge UM70 via keymap ( #13690 )  
						
						
						
						
							
						
					 
					
						2021-07-25 11:01:13 +10:00 
						 
				 
			
				
					
						
							
							
								Drashna Jaelre 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							0b95ac2e4b 
							
						 
					 
					
						
						
							
							Clean up remaining RGB_DISABLE_WHEN_USB_SUSPENDED defines ( #13689 )  
						
						
						
						
							
						
					 
					
						2021-07-24 20:17:04 +01:00 
						 
				 
			
				
					
						
							
							
								Joel Challis 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b5bcd5b0a1 
							
						 
					 
					
						
						
							
							Refactor some platform dependent logic ( #13675 )  
						
						
						
						
							
 
						
					 
					
						2021-07-24 19:56:45 +01:00 
						 
				 
			
				
					
						
							
							
								Dasky 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ab42945c9a 
							
						 
					 
					
						
						
							
							[Keyboard] Fix Q1 change dip switch to bool ( #13687 )  
						
						
						
						
							
						
					 
					
						2021-07-24 10:45:34 -07:00 
						 
				 
			
				
					
						
							
							
								Dasky 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d972919204 
							
						 
					 
					
						
						
							
							[Docs] Fix typo in dip switch example ( #13688 )  
						
						
						
						
							
						
					 
					
						2021-07-24 10:44:31 -07:00 
						 
				 
			
				
					
						
							
							
								QMK Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							93fc2cbc8a 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						
						
						
							
						
					 
					
						2021-07-24 16:37:57 +00:00 
						 
				 
			
				
					
						
							
							
								lokher 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							145d89ab91 
							
						 
					 
					
						
						
							
							[Keyboard] Add Keychron Q1 ( #13397 )  
						
						... 
						
						
						
						Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com> 
						
						
							
						
					 
					
						2021-07-24 09:37:24 -07:00 
						 
				 
			
				
					
						
							
							
								QMK Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							e681c4368b 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						
						
						
							
						
					 
					
						2021-07-24 15:40:38 +00:00