summaryrefslogtreecommitdiff
path: root/keyboards/getta25
diff options
context:
space:
mode:
authorXelus22 <17491233+Xelus22@users.noreply.github.com>2021-08-24 16:28:26 +1000
committerGitHub <noreply@github.com>2021-08-24 16:28:26 +1000
commit4e1c5887c5c08ebd2cf7868c8d9292aa728e7bf0 (patch)
tree24ff5bdf570a6a9f5a77a517005bffbb35e46b22 /keyboards/getta25
parent6fd20acf4be76e7a2bd82d3dfd0a9bcca8c507eb (diff)
[Core] Refactor OLED to allow easy addition of other types (#13454)
* add docs * core changes * update keyboards to new OLED * updated users to new OLED * update layouts to new OLED * fixup docs * drashna's suggestion * fix up docs * new keyboards with oled * core split changes * remaining keyboard files * Fix The Helix keyboards oled options * reflect develop Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: mtei <2170248+mtei@users.noreply.github.com>
Diffstat (limited to 'keyboards/getta25')
-rw-r--r--keyboards/getta25/keymaps/oled/keymap.c14
-rw-r--r--keyboards/getta25/keymaps/oled/rules.mk3
-rw-r--r--keyboards/getta25/rules.mk4
3 files changed, 11 insertions, 10 deletions
diff --git a/keyboards/getta25/keymaps/oled/keymap.c b/keyboards/getta25/keymaps/oled/keymap.c
index 44833857d3..4fbaf3ec28 100644
--- a/keyboards/getta25/keymaps/oled/keymap.c
+++ b/keyboards/getta25/keymaps/oled/keymap.c
@@ -1,7 +1,7 @@
#include QMK_KEYBOARD_H
#include "keymap_jp.h"
-#ifdef OLED_DRIVER_ENABLE
+#ifdef OLED_ENABLE
static uint32_t oled_timer = 0;
#endif
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//|--------+--------+--------+--------+--------|
KC_P1, KC_P2, KC_P3, KC_DEL,
//|--------+--------+--------+--------+--------|
-LT(_ARROW, KC_P0),LT(_MACRO, KC_PDOT),KC_PENT,KC_BSPC
+LT(_ARROW, KC_P0),LT(_MACRO, KC_PDOT),KC_PENT,KC_BSPC
//`--------------------------------------------'
),
@@ -54,7 +54,7 @@ LT(_ARROW, KC_P0),LT(_MACRO, KC_PDOT),KC_PENT,KC_BSPC
//|--------+--------+--------+--------+--------|
XXXXXXX, KC_DOWN, XXXXXXX, _______,
//|--------+--------+--------+--------+--------|
- MO(_ARROW), MO(_MACRO), _______, _______
+ MO(_ARROW), MO(_MACRO), _______, _______
//`--------------------------------------------'
),
@@ -70,7 +70,7 @@ LT(_ARROW, KC_P0),LT(_MACRO, KC_PDOT),KC_PENT,KC_BSPC
//|--------+--------+--------+--------+--------|
KC_F11, KC_F12, KC_F3, _______,
//|--------+--------+--------+--------+--------|
- _______, _______, JP_RPRN, _______
+ _______, _______, JP_RPRN, _______
//`--------------------------------------------'
),
@@ -86,7 +86,7 @@ LT(_ARROW, KC_P0),LT(_MACRO, KC_PDOT),KC_PENT,KC_BSPC
//|--------+--------+--------+--------+--------|
RGB_VAD, RGB_VAI, XXXXXXX, _______,
//|--------+--------+--------+--------+--------|
- _______, _______, RGB_MOD, _______
+ _______, _______, RGB_MOD, _______
//`--------------------------------------------'
)
};
@@ -118,7 +118,7 @@ int RGB_current_mode;
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
bool result = false;
if (record->event.pressed) {
- #ifdef OLED_DRIVER_ENABLE
+ #ifdef OLED_ENABLE
oled_timer = timer_read32();
#endif
}
@@ -156,7 +156,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return result;
}
-#ifdef OLED_DRIVER_ENABLE
+#ifdef OLED_ENABLE
oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_270; }
void render_layer_state(void) {
diff --git a/keyboards/getta25/keymaps/oled/rules.mk b/keyboards/getta25/keymaps/oled/rules.mk
index c582662134..d34d066ded 100644
--- a/keyboards/getta25/keymaps/oled/rules.mk
+++ b/keyboards/getta25/keymaps/oled/rules.mk
@@ -1 +1,2 @@
-OLED_DRIVER_ENABLE = yes
+OLED_ENABLE = yes
+OLED_DRIVER = SSD1306
diff --git a/keyboards/getta25/rules.mk b/keyboards/getta25/rules.mk
index c870594a4f..05e4546308 100644
--- a/keyboards/getta25/rules.mk
+++ b/keyboards/getta25/rules.mk
@@ -24,8 +24,8 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
AUDIO_ENABLE = no # Audio output on port C6
UNICODE_ENABLE = no # Unicode
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.
-OLED_DRIVER_ENABLE = no
+RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.
+OLED_ENABLE = no
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend