Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						98823ff8fc
					
				
					 2 changed files with 2 additions and 2 deletions
				
			
		| 
						 | 
				
			
			@ -215,7 +215,7 @@ void draw_sat_icon(int key_position, int row) {
 | 
			
		|||
    oled_write_P(ICON_SAT_1, false);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void oled_task_user(void) {
 | 
			
		||||
bool oled_task_user(void) {
 | 
			
		||||
    // Host Keyboard Layer Status
 | 
			
		||||
    static const char PROGMEM ICON_LAYER[] = {0x80, 0x81, 0x82, 0x83, 0};
 | 
			
		||||
    static const char PROGMEM ICON_ENCODER[] = {0x84, 0x85, 0x86, 0x87, 0};
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -215,7 +215,7 @@ void draw_sat_icon(int key_position, int row) {
 | 
			
		|||
    oled_write_P(ICON_SAT_1, false);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void oled_task_user(void) {
 | 
			
		||||
bool oled_task_user(void) {
 | 
			
		||||
    // Host Keyboard Layer Status
 | 
			
		||||
    static const char PROGMEM ICON_LAYER[] = {0x80, 0x81, 0x82, 0x83, 0};
 | 
			
		||||
    static const char PROGMEM ICON_ENCODER[] = {0x84, 0x85, 0x86, 0x87, 0};
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue