diff options
| author | QMK Bot <hello@qmk.fm> | 2020-12-16 03:27:52 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2020-12-16 03:27:52 +0000 |
| commit | 2e0f2025bd9f400dd8f5b0cad8ba80667193408d (patch) | |
| tree | 2e3d0fb98b20bdd4e39b4719abdffe4e29e242e9 /drivers | |
| parent | 416dea2c54c885a1d58d6924be6b346c8eb87f47 (diff) | |
| parent | 9366ed728280f4875ebbba9c0ef1eade03c96d35 (diff) | |
| download | qmk_firmware-2e0f2025bd9f400dd8f5b0cad8ba80667193408d.tar.gz qmk_firmware-2e0f2025bd9f400dd8f5b0cad8ba80667193408d.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/chibios/serial_usart.c | 2 | ||||
| -rw-r--r-- | drivers/qwiic/micro_oled.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/chibios/serial_usart.c b/drivers/chibios/serial_usart.c index 827471761..7c81b1646 100644 --- a/drivers/chibios/serial_usart.c +++ b/drivers/chibios/serial_usart.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | #include "quantum.h" | 1 | #include "quantum.h" |
| 2 | #include "serial.h" | 2 | #include "serial.h" |
| 3 | #include "printf.h" | 3 | #include "print.h" |
| 4 | 4 | ||
| 5 | #include <ch.h> | 5 | #include <ch.h> |
| 6 | #include <hal.h> | 6 | #include <hal.h> |
diff --git a/drivers/qwiic/micro_oled.c b/drivers/qwiic/micro_oled.c index f63cf2e64..c7a4ee081 100644 --- a/drivers/qwiic/micro_oled.c +++ b/drivers/qwiic/micro_oled.c | |||
| @@ -32,7 +32,7 @@ | |||
| 32 | #include <stdlib.h> | 32 | #include <stdlib.h> |
| 33 | #include "util/font5x7.h" | 33 | #include "util/font5x7.h" |
| 34 | #include "util/font8x16.h" | 34 | #include "util/font8x16.h" |
| 35 | #include "string.h" | 35 | #include <string.h> |
| 36 | 36 | ||
| 37 | #define TOTALFONTS 2 | 37 | #define TOTALFONTS 2 |
| 38 | const unsigned char* fonts_pointer[] = {font5x7, font8x16}; | 38 | const unsigned char* fonts_pointer[] = {font5x7, font8x16}; |