Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
7850f0d8c6
1 changed files with 3 additions and 0 deletions
|
@ -19,6 +19,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
# include "spi_master.h"
|
# include "spi_master.h"
|
||||||
#elif defined(OLED_TRANSPORT_I2C)
|
#elif defined(OLED_TRANSPORT_I2C)
|
||||||
# include "i2c_master.h"
|
# include "i2c_master.h"
|
||||||
|
# if defined(USE_I2C) && defined(SPLIT_KEYBOARD)
|
||||||
|
# include "keyboard.h"
|
||||||
|
# endif
|
||||||
#endif
|
#endif
|
||||||
#include "oled_driver.h"
|
#include "oled_driver.h"
|
||||||
#include OLED_FONT_H
|
#include OLED_FONT_H
|
||||||
|
|
Loading…
Reference in a new issue