summaryrefslogtreecommitdiff
path: root/keyboards/palette1202
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/palette1202')
-rw-r--r--keyboards/palette1202/config.h2
-rw-r--r--keyboards/palette1202/keymaps/default/keymap.c6
-rw-r--r--keyboards/palette1202/keymaps/key-check/keymap.c6
-rw-r--r--keyboards/palette1202/lib/oled_helper.c2
-rw-r--r--keyboards/palette1202/lib/oled_helper.h6
-rw-r--r--keyboards/palette1202/palette1202.c3
-rw-r--r--keyboards/palette1202/rules.mk3
7 files changed, 14 insertions, 14 deletions
diff --git a/keyboards/palette1202/config.h b/keyboards/palette1202/config.h
index 411e5f9165..e0be3bd6c7 100644
--- a/keyboards/palette1202/config.h
+++ b/keyboards/palette1202/config.h
@@ -48,7 +48,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEBOUNCE 5
/* Register custom font file */
-#ifdef OLED_DRIVER_ENABLE
+#ifdef OLED_ENABLE
#define OLED_FONT_H "lib/glcdfont.c"
#endif
diff --git a/keyboards/palette1202/keymaps/default/keymap.c b/keyboards/palette1202/keymaps/default/keymap.c
index b55b39a40f..fb28dedbe5 100644
--- a/keyboards/palette1202/keymaps/default/keymap.c
+++ b/keyboards/palette1202/keymaps/default/keymap.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
-#ifdef OLED_DRIVER_ENABLE
+#ifdef OLED_ENABLE
#include <string.h>
#include "lib/oled_helper.h"
#endif
@@ -273,7 +273,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}
// OLED Display
-#ifdef OLED_DRIVER_ENABLE
+#ifdef OLED_ENABLE
void oled_task_user(void) {
// get layer Number
uint8_t currentDefault = get_highest_layer(default_layer_state);
@@ -327,4 +327,4 @@ void oled_task_user(void) {
render_row(3, " ");
}
}
-#endif // #ifdef OLED_DRIVER_ENABLE
+#endif // #ifdef OLED_ENABLE
diff --git a/keyboards/palette1202/keymaps/key-check/keymap.c b/keyboards/palette1202/keymaps/key-check/keymap.c
index 207cf1c2b8..6291b5f8a0 100644
--- a/keyboards/palette1202/keymaps/key-check/keymap.c
+++ b/keyboards/palette1202/keymaps/key-check/keymap.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
-#ifdef OLED_DRIVER_ENABLE
+#ifdef OLED_ENABLE
#include <string.h>
#include "lib/oled_helper.h"
#endif
@@ -141,11 +141,11 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
}
// OLED Display
-#ifdef OLED_DRIVER_ENABLE
+#ifdef OLED_ENABLE
void oled_task_user(void) {
render_row(0, "TEST");
render_row(1, "test");
render_row(2, "TEST");
render_row(3, "test");
}
-#endif // #ifdef OLED_DRIVER_ENABLE
+#endif // #ifdef OLED_ENABLE
diff --git a/keyboards/palette1202/lib/oled_helper.c b/keyboards/palette1202/lib/oled_helper.c
index d4a0b2eb5f..5fb3cc7539 100644
--- a/keyboards/palette1202/lib/oled_helper.c
+++ b/keyboards/palette1202/lib/oled_helper.c
@@ -1,4 +1,4 @@
-#ifdef OLED_DRIVER_ENABLE
+#ifdef OLED_ENABLE
#include QMK_KEYBOARD_H
#include <stdio.h>
#include <string.h>
diff --git a/keyboards/palette1202/lib/oled_helper.h b/keyboards/palette1202/lib/oled_helper.h
index 0d1dde461d..c844264c34 100644
--- a/keyboards/palette1202/lib/oled_helper.h
+++ b/keyboards/palette1202/lib/oled_helper.h
@@ -1,7 +1,7 @@
#pragma once
-#ifdef OLED_DRIVER_ENABLE
+#ifdef OLED_ENABLE
void render_row(int row, const char* status);
-#endif /* #ifdef OLED_DRIVER_ENABLE */
-
+#endif /* #ifdef OLED_ENABLE */
+
diff --git a/keyboards/palette1202/palette1202.c b/keyboards/palette1202/palette1202.c
index 74ce08319e..be7fd6443a 100644
--- a/keyboards/palette1202/palette1202.c
+++ b/keyboards/palette1202/palette1202.c
@@ -16,9 +16,8 @@
#include "palette1202.h"
// initialize OLED if OLED is enabled
-#ifdef OLED_DRIVER_ENABLE
+#ifdef OLED_ENABLE
oled_rotation_t oled_init_user(oled_rotation_t rotation) {
return OLED_ROTATION_180;
}
#endif
- \ No newline at end of file
diff --git a/keyboards/palette1202/rules.mk b/keyboards/palette1202/rules.mk
index fc4729194e..ddf248a074 100644
--- a/keyboards/palette1202/rules.mk
+++ b/keyboards/palette1202/rules.mk
@@ -28,7 +28,8 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
AUDIO_ENABLE = no # Audio output on port C6
ENCODER_ENABLE = yes # Enable support for rotary encoders
-OLED_DRIVER_ENABLE = yes # Enable support for OLED display
+OLED_ENABLE = yes
+OLED_DRIVER = SSD1306 # Enable support for OLED display
# Additional code
SRC += lib/oled_helper.c # Adding OLED