Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
2e0f2025bd
81 changed files with 108 additions and 291 deletions
|
@ -1,6 +1,6 @@
|
|||
#include "quantum.h"
|
||||
#include "serial.h"
|
||||
#include "printf.h"
|
||||
#include "print.h"
|
||||
|
||||
#include <ch.h>
|
||||
#include <hal.h>
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
#include <stdlib.h>
|
||||
#include "util/font5x7.h"
|
||||
#include "util/font8x16.h"
|
||||
#include "string.h"
|
||||
#include <string.h>
|
||||
|
||||
#define TOTALFONTS 2
|
||||
const unsigned char* fonts_pointer[] = {font5x7, font8x16};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue