summaryrefslogtreecommitdiff
path: root/keyboards/comet46
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2020-03-01 17:56:50 +1100
committerGitHub <noreply@github.com>2020-03-01 17:56:50 +1100
commitc9e3fa6f702d7b814c408f1476e43ce6cdd8f7d8 (patch)
tree14c44c3670da10f6e286ad4e14e6af2bc5cc015f /keyboards/comet46
parentf513a9193cdde47d1da7f647088beec8f280e4f3 (diff)
Clean up includes for glcdfont headers (#7745)
* Clean up includes for glcdfont headers * Remove pragma once, most of these are not headers * Missed these
Diffstat (limited to 'keyboards/comet46')
-rw-r--r--keyboards/comet46/lib/glcdfont.c13
-rw-r--r--keyboards/comet46/lib/keylogger.c8
2 files changed, 2 insertions, 19 deletions
diff --git a/keyboards/comet46/lib/glcdfont.c b/keyboards/comet46/lib/glcdfont.c
index e912d2233c..361d0c3dc6 100644
--- a/keyboards/comet46/lib/glcdfont.c
+++ b/keyboards/comet46/lib/glcdfont.c
@@ -1,17 +1,7 @@
// This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0.
// See gfxfont.h for newer custom bitmap font info.
-#ifndef FONT5X7_H
-#define FONT5X7_H
-
-#ifdef __AVR__
- #include <avr/io.h>
- #include <avr/pgmspace.h>
-#elif defined(ESP8266)
- #include <pgmspace.h>
-#else
- #define PROGMEM
-#endif
+#include "progmem.h"
// Standard ASCII 5x7 font
@@ -145,4 +135,3 @@ const unsigned char font[] PROGMEM = {
0x02, 0x01, 0x02, 0x04, 0x02, 0x00,
0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00
};
-#endif // FONT5X7_H
diff --git a/keyboards/comet46/lib/keylogger.c b/keyboards/comet46/lib/keylogger.c
index 184f601095..a0abdd79ab 100644
--- a/keyboards/comet46/lib/keylogger.c
+++ b/keyboards/comet46/lib/keylogger.c
@@ -1,11 +1,5 @@
#include <stdio.h>
-
-#ifdef __AVR__
- #include <avr/io.h>
- #include <avr/pgmspace.h>
-#else
- #define PROGMEM
-#endif
+#include "progmem.h"
#define NUM_USB_HID_KEYCODES 255
#define LEN_KEYCODE_STR 4