QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								b827daf13d 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							
							
						 
						
							2021-10-23 22:20:47 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Reibl János Dániel 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ec8c1e05af 
								
							 
						 
						
							
							
								
								[Keymap] Add logo to riblee userspace ( #14875 )  
							
							
							
						 
						
							2021-10-23 15:20:18 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								4721b0eda2 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							
							
						 
						
							2021-10-23 06:31:24 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Reibl János Dániel 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a167a95bd0 
								
							 
						 
						
							
							
								
								[Keymap] Simplify unicode input mode change and CTRL and GUI swapping ( #14874 )  
							
							
							
						 
						
							2021-10-22 23:30:43 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								640a596cca 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							
							
						 
						
							2021-10-23 06:04:24 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									jonavin 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								443d306827 
								
							 
						 
						
							
							
								
								[Keymap] Jonavin userspace keymap updates INVERT_NUMLOCK_INDICATOR  ( #14880 )  
							
							... 
							
							
							
							Co-authored-by: Jonavin <=> 
							
						 
						
							2021-10-22 23:04:08 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joel Challis 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1816006121 
								
							 
						 
						
							
							
								
								Tidy up LCD_ENABLE/visualizer references ( #14855 )  
							
							... 
							
							
							
							* Tidy up LCD_ENABLE/visualizer references
* Fix up my (333fred) ergodox keymap with new LCD driver
Co-authored-by: Fredric Silberberg <fred@silberberg.xyz> 
							
						 
						
							2021-10-20 21:27:46 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								ede6122ac6 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							
							
						 
						
							2021-10-16 05:34:23 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Manna Harbour 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6b299fab6e 
								
							 
						 
						
							
							
								
								[Keymap] Update Miryoku ( #14827 )  
							
							
							
						 
						
							2021-10-15 22:33:45 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Drashna Jael're 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e5662aa53d 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							
							
						 
						
							2021-10-15 22:32:41 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Drashna Jaelre 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9a0addc77e 
								
							 
						 
						
							
							
								
								[Keymap] Drashna Keymap Updates ( #14842 )  
							
							... 
							
							
							
							* Fix issues with user split transport code
* Improve OLED (More font stuff, improved keylogger, etc)
* Add `KEYLOCK` macro to disable USB, borrowed from command feature.
* Convert Kyria fully to proton C (no more AVR kyria)
* Add Work Louder Work Board keymap 
							
						 
						
							2021-10-15 22:30:23 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								a119149513 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							
							
						 
						
							2021-10-16 02:02:07 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergi Meseguer 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								40badc4413 
								
							 
						 
						
							
							
								
								[Keymap] zigotica userspace ( #14670 )  
							
							... 
							
							
							
							Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com> 
							
						 
						
							2021-10-15 19:02:04 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								36fc46ead7 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							
							
						 
						
							2021-10-16 02:00:50 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									stanrc85 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8bb1fd04d4 
								
							 
						 
						
							
							
								
								[Keymap] Userspace updates ( #14832 )  
							
							
							
						 
						
							2021-10-15 19:00:19 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								55695ff929 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							
							
						 
						
							2021-10-14 17:29:17 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Reibl János Dániel 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e8dadf51ad 
								
							 
						 
						
							
							
								
								[Keymap] Display default layer name ( #14819 )  
							
							
							
						 
						
							2021-10-14 10:28:06 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								eca31e7dc0 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							
							
						 
						
							2021-10-12 02:27:24 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Reibl János Dániel 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4b2866dd96 
								
							 
						 
						
							
							
								
								[Keymap] Add workman layout ( #14792 )  
							
							
							
						 
						
							2021-10-11 19:26:47 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								762f9e320f 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							
							
						 
						
							2021-10-12 01:04:30 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									jonavin 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ea2505901e 
								
							 
						 
						
							
							
								
								[Keymap] Jonavin new obe keymap ( #14657 )  
							
							... 
							
							
							
							Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Jonavin <=> 
							
						 
						
							2021-10-11 18:03:58 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Ryan 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d8f0c8783a 
								
							 
						 
						
							
							
								
								Remove sysex API ( #14723 )  
							
							
							
						 
						
							2021-10-06 19:34:46 +11:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								51154f1484 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							
							
						 
						
							2021-10-05 23:50:23 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									MechMerlin 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e8db309613 
								
							 
						 
						
							
							
								
								[Keymap] Some updates to mechmerlin userspace and keymaps ( #14711 )  
							
							
							
						 
						
							2021-10-05 16:49:50 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								81f2d0f4cb 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							
							
						 
						
							2021-09-29 18:16:49 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Drashna Jaelre 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1e54796f0c 
								
							 
						 
						
							
							
								
								[Keymap] Update to Drashna Code ( #14644 )  
							
							
							
						 
						
							2021-09-29 11:16:11 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								4b77a8719a 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							
							
						 
						
							2021-09-29 16:43:34 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									jonavin 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c89f74b929 
								
							 
						 
						
							
							
								
								[Keymap] Jonavin murphpad keymap update ( #14637 )  
							
							... 
							
							
							
							Co-authored-by: Jonavin <=> 
							
						 
						
							2021-09-29 09:42:53 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								bc41d37baf 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							
							
						 
						
							2021-09-28 19:24:40 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									jonavin 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								705cd433c2 
								
							 
						 
						
							
							
								
								[Keymap] fix NKRO - switch to get_mods() and refactor encoder action code ( #14278 )  
							
							... 
							
							
							
							Co-authored-by: Jonavin <=> 
							
						 
						
							2021-09-28 12:24:12 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								52127e7bda 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							
							
						 
						
							2021-09-28 19:21:40 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Kagno 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bc818352a3 
								
							 
						 
						
							
							
								
								[Keymap] arkag userspace/keymap -- new macro and minor preonic keymap change ( #14623 )  
							
							... 
							
							
							
							Co-authored-by: Ryan <fauxpark@gmail.com> 
							
						 
						
							2021-09-28 12:21:10 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								bca7a99e7a 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							
							
						 
						
							2021-09-27 17:03:42 +00: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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									fauxpark 
								
							 
						 
						
							
							
							
							
								
							
							
								c38a730805 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into develop  
							
							
							
						 
						
							2021-09-20 16:58:29 +10:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Konstantin Đorđević 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4348e2ffc1 
								
							 
						 
						
							
							
								
								[Keymap] Updates to existing keymaps and userspace ( #14503 )  
							
							... 
							
							
							
							Co-authored-by: Drashna Jaelre <drashna@live.com> 
							
						 
						
							2021-09-19 11:47:40 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								508db37926 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							
							
						 
						
							2021-09-13 20:15:39 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									stanrc85 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ca626f59a7 
								
							 
						 
						
							
							
								
								[Keymap] Userspace updates ( #14418 )  
							
							
							
						 
						
							2021-09-13 13:15:10 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Ryan 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bcf4551f74 
								
							 
						 
						
							
							
								
								Move Bluetooth config to common_features.mk ( #14404 )  
							
							... 
							
							
							
							* Move Bluetooth config to common_features.mk
* Update common_features.mk
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Drashna Jaelre <drashna@live.com> 
							
						 
						
							2021-09-12 08:22:03 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Zac Moulton 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d7747a2d70 
								
							 
						 
						
							
							
								
								[Keymap] moults31 userspace and keymaps ( #12025 )  
							
							
							
						 
						
							2021-09-10 18:56:50 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Drashna Jaelre 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								37aef4ebe1 
								
							 
						 
						
							
							
								
								[Keymap] Fix Drashna Keymap issues missed before Develop merge ( #14271 )  
							
							
							
						 
						
							2021-09-01 21:08:58 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									hvp 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cb53c4fd41 
								
							 
						 
						
							
							
								
								[Keymap] hvp keymap for Cornelius, updated ut47.2 and userspace ( #14187 )  
							
							
							
						 
						
							2021-09-01 20:44:36 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									jonavin 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b6ca21c65c 
								
							 
						 
						
							
							
								
								[Keymap] Jonavin keymap gmmk pro ( #14220 )  
							
							... 
							
							
							
							add rgb nightmode and optional colemak layer 
Co-authored-by: Jonavin <=> 
							
						 
						
							2021-09-01 20:42:31 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Casey Webster 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c5ec423438 
								
							 
						 
						
							
							
								
								[Keymap] cwebster2 Keymap and userspace updates ( #14258 )  
							
							
							
						 
						
							2021-08-31 17:50:42 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Ibnu Daru Aji 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6f5428687c 
								
							 
						 
						
							
							
								
								[Keymap] reflects current rick's keymap ( #14169 )  
							
							
							
						 
						
							2021-08-31 11:23:02 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Drashna Jaelre 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bc239cd520 
								
							 
						 
						
							
							
								
								[Keymap] Drashna keymap fixups ( #14140 )  
							
							
							
						 
						
							2021-08-24 01:37:14 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Xelus22 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4e1c5887c5 
								
							 
						 
						
							
							
								
								[Core] Refactor OLED to allow easy addition of other types  ( #13454 )  
							
							... 
							
							
							
							* add docs
* core changes
* update keyboards to new OLED
* updated users to new OLED
* update layouts to new OLED
* fixup docs
* drashna's suggestion
* fix up docs
* new keyboards with oled
* core split changes
* remaining keyboard files
* Fix The Helix keyboards oled options
* reflect develop
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: mtei <2170248+mtei@users.noreply.github.com> 
							
						 
						
							2021-08-24 16:28:26 +10:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Drashna Jaelre 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c5f41d42d8 
								
							 
						 
						
							
							
								
								Updated RGB Matrix suspend define part 3 ( #13954 )  
							
							... 
							
							
							
							* Updated RGB Matrix suspend define part 3
* Revert "Update config.h for kbdfans/kbd67/mkiirgb/v3 (#13978 )"
This reverts commit 80015f7fb0 
							
						 
						
							2021-08-22 09:46:35 +10:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Drashna Jaelre 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								58a5030661 
								
							 
						 
						
							
							
								
								[Keymap] Drashna's Improve OLEDs and custom Split code ( #14063 )  
							
							... 
							
							
							
							* Fill the oleds with right mods
* Enable double mods on x32 oleds
* Disable forced NKRO
* Make oleds fancy only on good MCUs
* Overhaul oled display
* Further enhance oled, with kitty!
* Final oled form
* Not working transport
* Transport id of woring
* Add acceleration
* fix button placement for accel macro
* Fix accelartion location and behavior
* Remove OLED sync code
* Fix alignment issue
* Remove audio hack
* Fix up zima keymap
* Add matrix slave scan function and cleanup drashna.h
* Clean up user space
* Allow userspace sync to be disable-able
* Fix weird issue with audio
* Fix alignment issue with user split sync
* Disable second rgb matrix task
* Disable additional animations
* Change dynamic keymap settings
* Hacky fix for borked corne
* Add Blackpill (F411) support to tractyl manuform
* remove manual via eeprom reset
* Remove all references to rgblight twinkle
* Fix issues with config processing 
							
						 
						
							2021-08-21 13:34:44 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									James Young 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4279b14adf 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into develop  
							
							... 
							
							
							
							Conflicts:
	keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk
	keyboards/space_space/rules.mk 
							
						 
						
							2021-08-19 11:32:23 -07:00