QMK Bot 
							
						 
					 
					
						
						
							
						
						9087e6ee28 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						
						
						
					 
					
						2022-08-07 12:57:41 +00:00 
						 
				 
			
				
					
						
							
							
								Joel Challis 
							
						 
					 
					
						
						
							
						
						a6ea760c94 
					 
					
						
						
							
							rgbkb/zen - Resolve CONVERT_TO_PROTON_C warnings ( #17619 )  
						
						
						
						
					 
					
						2022-08-07 13:57:12 +01:00 
						 
				 
			
				
					
						
							
							
								Drashna Jaelre 
							
						 
					 
					
						
						
							
						
						0da6562c4d 
					 
					
						
						
							
							Make default layer size 16-bit ( #15286 )  
						
						... 
						
						
						
						Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com > 
						
						
					 
					
						2022-06-19 07:37:51 +10:00 
						 
				 
			
				
					
						
							
							
								Joel Challis 
							
						 
					 
					
						
						
							
						
						b7771ec25b 
					 
					
						
						
							
							RESET -> QK_BOOT default keymaps ( #17037 )  
						
						
						
						
					 
					
						2022-05-15 20:26:27 +01:00 
						 
				 
			
				
					
						
							
							
								Ryan 
							
						 
					 
					
						
						
							
						
						764dc18a81 
					 
					
						
						
							
							Remove NO_ACTION_MACRO and NO_ACTION_FUNCTION from keyboard config.h ( #16655 )  
						
						
						
						
					 
					
						2022-03-15 13:56:58 +00:00 
						 
				 
			
				
					
						
							
							
								Ryan 
							
						 
					 
					
						
						
							
						
						99b35940bc 
					 
					
						
						
							
							Remove unnecessary backslash-escapes in default keymaps ( #15472 )  
						
						... 
						
						
						
						* Remove unnecessary backslash-escapes in default keymaps
* Remove unnecessary backslash-escapes in via keymaps
* Remove unnecessary backslash-escapes in default-ish keymaps 
						
						
					 
					
						2021-12-14 12:41:16 +00:00 
						 
				 
			
				
					
						
							
							
								Drashna Jaelre 
							
						 
					 
					
						
						
							
						
						9d235d4fc5 
					 
					
						
						
							
							[Core] Change OLED task function to be boolean ( #14864 )  
						
						... 
						
						
						
						* [Core] Add kb level callbacks to OLED driver
* Update keyboards and keymaps
* Update docs
* Update userspace configs
* Add fix for my keymap ...
* update lefty 
						
						
					 
					
						2021-11-02 09:42:50 +11:00 
						 
				 
			
				
					
						
							
							
								fauxpark 
							
						 
					 
					
						
						
							
						
						1895151a9c 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master' into develop  
						
						
						
						
					 
					
						2021-09-12 14:10:26 +10:00 
						 
				 
			
				
					
						
							
							
								Ryan 
							
						 
					 
					
						
						
							
						
						4791cfae1a 
					 
					
						
						
							
							Remove width, height and key_count from info.json ( #14274 )  
						
						
						
						
					 
					
						2021-09-12 14:04:56 +10:00 
						 
				 
			
				
					
						
							
							
								Zach White 
							
						 
					 
					
						
						
							
						
						c94cc1effa 
					 
					
						
						
							
							Move non-assignment code to post_rules.mk ( #14207 )  
						
						... 
						
						
						
						* 40percentclub/ut47: move non-assignment code to post_rules.mk
* converter/palm_usb: move non-assignment code to post_rules.mk
* converter/sun_usb: move non-assignment code to post_rules.mk
* dm9records/ergoinu: move non-assignment code to post_rules.mk
* ergotaco: move non-assignment code to post_rules.mk
* handwired/symmetric70_proto: move non-assignment code to post_rules.mk
* hhkb/ansi: move non-assignment code to post_rules.mk
* hhkb/jp: move non-assignment code to post_rules.mk
* lfkeyboards/lfk78: move non-assignment code to post_rules.mk
* lfkeyboards/lfk87: move non-assignment code to post_rules.mk
* lfkeyboards/lfkpad: move non-assignment code to post_rules.mk
* lfkeyboards/mini1800: move non-assignment code to post_rules.mk
* manta60: move non-assignment code to post_rules.mk
* mschwingen/modelm: move non-assignment code to post_rules.mk
* newgame40: move non-assignment code to post_rules.mk
* numatreus: move non-assignment code to post_rules.mk
* rgbkb/zen: move non-assignment code to post_rules.mk
* rgbkb/zen/rev2: move non-assignment code to post_rules.mk
* Revert "handwired/symmetric70_proto: move non-assignment code to post_rules.mk"
This reverts commit cffaf0075c3c9b2473a660ba4af8835a9162311b. 
						
						
					 
					
						2021-09-09 21:37:31 -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 
							
						 
					 
					
						
						
							
						
						a0fed0ea17 
					 
					
						
						
							
							Convert Encoder callbacks to be boolean functions ( #12805 )  
						
						... 
						
						
						
						Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com > 
						
						
					 
					
						2021-05-21 23:17:32 -07:00 
						 
				 
			
				
					
						
							
							
								Ryan 
							
						 
					 
					
						
						
							
						
						e0ed2c950d 
					 
					
						
						
							
							Remove DESCRIPTION, R-V ( #11632 )  
						
						
						
						
					 
					
						2021-01-20 12:40:35 +11:00 
						 
				 
			
				
					
						
							
							
								Drashna Jaelre 
							
						 
					 
					
						
						
							
						
						e6b9980bd4 
					 
					
						
						
							
							Remove keymap_config extern from default keymaps ( #7399 )  
						
						... 
						
						
						
						* Remove keymap_config extern from default keymaps
* Revert unicode
Apparently VSCode does not like unicode, I didn't actually edit these lines, so it must have been automatic... :(
Co-Authored-By: fauxpark <fauxpark@gmail.com > 
						
						
					 
					
						2019-11-20 22:31:36 +00:00 
						 
				 
			
				
					
						
							
							
								fauxpark 
							
						 
					 
					
						
						
							
						
						9bb4e63a11 
					 
					
						
						
							
							Remove old promicro_bootloader_jmp() declarations ( #6444 )  
						
						
						
						
					 
					
						2019-08-21 02:05:08 +01:00 
						 
				 
			
				
					
						
							
							
								Drashna Jaelre 
							
						 
					 
					
						
						
							
						
						f6c7e11426 
					 
					
						
						
							
							Remove the need to specify NUM_OF_ENCODERS for the Encoder feature ( #6328 )  
						
						... 
						
						
						
						* Remove the need to set NUM_OF_ENCODERS
Instead, calculate the size of the array, and use that instead
* Add hack for split common support
* Remove NUM_OF_ENCODERS from keyboard config
Can be reverted, if needed 
						
						
					 
					
						2019-07-16 01:40:54 -07:00 
						 
				 
			
				
					
						
							
							
								Drashna Jaelre 
							
						 
					 
					
						
						
							
						
						faaaa134fd 
					 
					
						
						
							
							Replace DEBOUNCING_DELAY (deprecated) with DEBOUNCE ( #5997 )  
						
						
						
						
					 
					
						2019-06-06 12:09:56 -07:00 
						 
				 
			
				
					
						
							
							
								XScorpion2 
							
						 
					 
					
						
						
							
						
						3220b24819 
					 
					
						
						
							
							Update Zen rev2 info.json file with option positions ( #5872 )  
						
						
						
						
					 
					
						2019-05-14 15:25:26 -07:00 
						 
				 
			
				
					
						
							
							
								XScorpion2 
							
						 
					 
					
						
						
							
						
						4cdb86c730 
					 
					
						
						
							
							[Keyboard] Create RGBKB Folder ( #5858 )  
						
						... 
						
						
						
						* Move Sol, Zen, & Zygomorph keyboards to RGBKB folder
* Updated default keymaps
* Fixing more areas due too folder moves
* Fixing Zen layer numbers
* Fixing zygomorph layer comments
* Fixing Colmak comments
* Fixing Sol Colmak readme
* Macro alignment
* Zen rev2 configuration json
* Fixing sol ifdef
* Fixing Sol info.json 
						
						
					 
					
						2019-05-14 11:58:56 -07:00