mirror of
				https://github.com/mfulz/qmk_firmware.git
				synced 2025-11-04 07:12:33 +01:00 
			
		
		
		
	Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						267f392237
					
				@ -59,10 +59,6 @@
 | 
				
			|||||||
 */
 | 
					 */
 | 
				
			||||||
#define LOCKING_RESYNC_ENABLE
 | 
					#define LOCKING_RESYNC_ENABLE
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* prevent stuck modifiers
 | 
					 | 
				
			||||||
 */
 | 
					 | 
				
			||||||
#define PREVENT_STUCK_MODIFIERS
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#define RGB_DI_PIN D2
 | 
					#define RGB_DI_PIN D2
 | 
				
			||||||
#define RGBLIGHT_ANIMATIONS
 | 
					#define RGBLIGHT_ANIMATIONS
 | 
				
			||||||
#define RGBLED_NUM 14
 | 
					#define RGBLED_NUM 14
 | 
				
			||||||
 | 
				
			|||||||
@ -97,7 +97,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
				
			|||||||
//#define NO_ACTION_TAPPING
 | 
					//#define NO_ACTION_TAPPING
 | 
				
			||||||
//#define NO_ACTION_ONESHOT
 | 
					//#define NO_ACTION_ONESHOT
 | 
				
			||||||
 | 
					
 | 
				
			||||||
//#define PREVENT_STUCK_MODIFIERS
 | 
					 | 
				
			||||||
//#define TAPPING_TERM 150
 | 
					//#define TAPPING_TERM 150
 | 
				
			||||||
//#define IGNORE_MOD_TAP_INTERRUPT
 | 
					//#define IGNORE_MOD_TAP_INTERRUPT
 | 
				
			||||||
//#define TAPPING_FORCE_HOLD
 | 
					//#define TAPPING_FORCE_HOLD
 | 
				
			||||||
 | 
				
			|||||||
@ -31,9 +31,6 @@
 | 
				
			|||||||
/* Locking resynchronize hack */
 | 
					/* Locking resynchronize hack */
 | 
				
			||||||
// #define LOCKING_RESYNC_ENABLE
 | 
					// #define LOCKING_RESYNC_ENABLE
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* prevent stuck modifiers */
 | 
					 | 
				
			||||||
// #define PREVENT_STUCK_MODIFIERS
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
/* RGB Underglow */
 | 
					/* RGB Underglow */
 | 
				
			||||||
#ifdef RGBLIGHT_ENABLE
 | 
					#ifdef RGBLIGHT_ENABLE
 | 
				
			||||||
#define RGB_DI_PIN A15
 | 
					#define RGB_DI_PIN A15
 | 
				
			||||||
 | 
				
			|||||||
@ -39,8 +39,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
/* Set 0 if debouncing isn't needed */
 | 
					/* Set 0 if debouncing isn't needed */
 | 
				
			||||||
#define DEBOUNCE 5
 | 
					#define DEBOUNCE 5
 | 
				
			||||||
 | 
					 | 
				
			||||||
/* prevent stuck modifiers */
 | 
					 | 
				
			||||||
#define PREVENT_STUCK_MODIFIERS
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
				
			|||||||
@ -85,7 +85,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
				
			|||||||
// #endif
 | 
					// #endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 | 
					/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 | 
				
			||||||
#define DEBOUNCING_DELAY 5
 | 
					#define DEBOUNCE 5
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* define if matrix has ghost (lacks anti-ghosting diodes) */
 | 
					/* define if matrix has ghost (lacks anti-ghosting diodes) */
 | 
				
			||||||
//#define MATRIX_HAS_GHOST
 | 
					//#define MATRIX_HAS_GHOST
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user