summaryrefslogtreecommitdiff
path: root/keyboards/helix
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/helix')
-rw-r--r--keyboards/helix/common/glcdfont.c13
-rw-r--r--keyboards/helix/rev2/keymaps/froggy/helixfont.h13
2 files changed, 3 insertions, 23 deletions
diff --git a/keyboards/helix/common/glcdfont.c b/keyboards/helix/common/glcdfont.c
index 89665ba074..697d58886e 100644
--- a/keyboards/helix/common/glcdfont.c
+++ b/keyboards/helix/common/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
@@ -241,4 +231,3 @@ static const unsigned char font[] PROGMEM = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00
};
-#endif // FONT5X7_H
diff --git a/keyboards/helix/rev2/keymaps/froggy/helixfont.h b/keyboards/helix/rev2/keymaps/froggy/helixfont.h
index 7f54748151..5360eace95 100644
--- a/keyboards/helix/rev2/keymaps/froggy/helixfont.h
+++ b/keyboards/helix/rev2/keymaps/froggy/helixfont.h
@@ -1,17 +1,9 @@
// 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
+#pragma once
-#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
@@ -241,4 +233,3 @@ static const unsigned char font[] PROGMEM = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00
};
-#endif // FONT5X7_H