Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						403c7eeb5c
					
				
					 2 changed files with 3 additions and 1 deletions
				
			
		| 
						 | 
					@ -6,6 +6,6 @@
 | 
				
			||||||
        "rows": ["GP5"]
 | 
					        "rows": ["GP5"]
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    "rgblight": {
 | 
					    "rgblight": {
 | 
				
			||||||
        "pin": "A1"
 | 
					        "pin": "GP17"
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,4 +1,6 @@
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					OLED_DRIVER = SSD1306
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					WS2812_DRIVER = vendor
 | 
				
			||||||
 | 
					
 | 
				
			||||||
OPT_DEFS += -DHAL_USE_I2C=TRUE
 | 
					OPT_DEFS += -DHAL_USE_I2C=TRUE
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue