mirror of
				https://github.com/mfulz/qmk_firmware.git
				synced 2025-11-03 23:02:34 +01:00 
			
		
		
		
	Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						53ccc1969f
					
				@ -137,7 +137,7 @@ led_config_t g_led_config = {
 | 
				
			|||||||
        {128, 48},{160, 48},{176, 48},{192, 48},{160, 64},{180, 64},{200, 64},{224, 64}
 | 
					        {128, 48},{160, 48},{176, 48},{192, 48},{160, 64},{180, 64},{200, 64},{224, 64}
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        4, 4, 4, 4, 4, 4, 4, 1,
 | 
					        4, 4, 4, 4, 4, 4, 4, 4,
 | 
				
			||||||
        1, 1,    4, 1, 1, 1, 1,
 | 
					        1, 1,    4, 1, 1, 1, 1,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        1, 4, 4, 4, 4, 4, 4, 4,
 | 
					        1, 4, 4, 4, 4, 4, 4, 4,
 | 
				
			||||||
@ -152,6 +152,13 @@ led_config_t g_led_config = {
 | 
				
			|||||||
    }
 | 
					    }
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					__attribute__ ((weak))
 | 
				
			||||||
 | 
					void rgb_matrix_indicators_user(void) {
 | 
				
			||||||
 | 
					    if (host_keyboard_led_state().caps_lock) {
 | 
				
			||||||
 | 
					        rgb_matrix_set_color(8, 0xFF, 0x0, 0x0);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#endif  //RGB_MATRIX_ENABLE
 | 
					#endif  //RGB_MATRIX_ENABLE
 | 
				
			||||||
 | 
					
 | 
				
			||||||
bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
 | 
					bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
 | 
				
			||||||
 | 
				
			|||||||
@ -155,6 +155,14 @@ led_config_t g_led_config = {
 | 
				
			|||||||
        4, 4, 4, 4, 1, 1, 1, 1,
 | 
					        4, 4, 4, 4, 1, 1, 1, 1,
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					__attribute__ ((weak))
 | 
				
			||||||
 | 
					void rgb_matrix_indicators_user(void) {
 | 
				
			||||||
 | 
					    if (host_keyboard_led_state().caps_lock) {
 | 
				
			||||||
 | 
					        rgb_matrix_set_color(8, 0xFF, 0x0, 0x0);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#endif  //RGB_MATRIX_ENABLE
 | 
					#endif  //RGB_MATRIX_ENABLE
 | 
				
			||||||
 | 
					
 | 
				
			||||||
bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
 | 
					bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user