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
						51bc051172
					
				@ -303,7 +303,7 @@ void suspend_power_down_user() {
 | 
				
			|||||||
bool oled_task_user(void) {
 | 
					bool oled_task_user(void) {
 | 
				
			||||||
    if (timer_elapsed32(oled_timer) > 30000) {
 | 
					    if (timer_elapsed32(oled_timer) > 30000) {
 | 
				
			||||||
        oled_off();
 | 
					        oled_off();
 | 
				
			||||||
        return;
 | 
					        return false;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
#ifndef SPLIT_KEYBOARD
 | 
					#ifndef SPLIT_KEYBOARD
 | 
				
			||||||
    else { oled_on(); }
 | 
					    else { oled_on(); }
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user