summaryrefslogtreecommitdiff
path: root/keyboards/rart
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/rart
parent6fd20acf4be76e7a2bd82d3dfd0a9bcca8c507eb (diff)
downloadqmk_firmware-4e1c5887c5c08ebd2cf7868c8d9292aa728e7bf0.tar.gz
qmk_firmware-4e1c5887c5c08ebd2cf7868c8d9292aa728e7bf0.zip
[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/rart')
-rw-r--r--keyboards/rart/rart75m/rart75m.c4
-rw-r--r--keyboards/rart/rart75m/rules.mk5
-rw-r--r--keyboards/rart/rartand/keymaps/default/keymap.c6
-rw-r--r--keyboards/rart/rartand/keymaps/via/keymap.c6
-rw-r--r--keyboards/rart/rartand/rules.mk3
-rw-r--r--keyboards/rart/rartland/rartland.c2
-rw-r--r--keyboards/rart/rartland/rules.mk3
-rw-r--r--keyboards/rart/rartlice/keymaps/default/keymap.c4
-rw-r--r--keyboards/rart/rartlice/keymaps/via/keymap.c4
-rw-r--r--keyboards/rart/rartlice/rules.mk3
10 files changed, 22 insertions, 18 deletions
diff --git a/keyboards/rart/rart75m/rart75m.c b/keyboards/rart/rart75m/rart75m.c
index c874e01ff8..73e37d2d1a 100644
--- a/keyboards/rart/rart75m/rart75m.c
+++ b/keyboards/rart/rart75m/rart75m.c
@@ -30,7 +30,7 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
}
#endif
-#ifdef OLED_DRIVER_ENABLE
+#ifdef OLED_ENABLE
__attribute__((weak)) void oled_task_user(void) {
// Host Keyboard Layer Status
oled_write_P(PSTR("R A R T 7 5 M\nLayer: "), false);
@@ -54,4 +54,4 @@ __attribute__((weak)) void oled_task_user(void) {
oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false);
}
-#endif \ No newline at end of file
+#endif
diff --git a/keyboards/rart/rart75m/rules.mk b/keyboards/rart/rart75m/rules.mk
index c6b786b35d..2a6f81099d 100644
--- a/keyboards/rart/rart75m/rules.mk
+++ b/keyboards/rart/rart75m/rules.mk
@@ -21,5 +21,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
BLUETOOTH_ENABLE = no # Enable Bluetooth
AUDIO_ENABLE = no # Audio output
UNICODE_ENABLE = yes
-OLED_DRIVER_ENABLE = yes
-ENCODER_ENABLE = yes \ No newline at end of file
+OLED_ENABLE = yes
+OLED_DRIVER = SSD1306
+ENCODER_ENABLE = yes
diff --git a/keyboards/rart/rartand/keymaps/default/keymap.c b/keyboards/rart/rartand/keymaps/default/keymap.c
index 1b3c7c6af4..2dd9378b0d 100644
--- a/keyboards/rart/rartand/keymaps/default/keymap.c
+++ b/keyboards/rart/rartand/keymaps/default/keymap.c
@@ -16,11 +16,11 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = LAYOUT_all(
+ [0] = LAYOUT_all(
KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
KC_LSFT, KC_SLSH, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, KC_UP, KC_BSLS,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_SPC, MO(2), KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_SPC, MO(2), KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT
),
[1] = LAYOUT_all(
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
-#ifdef OLED_DRIVER_ENABLE
+#ifdef OLED_ENABLE
void oled_task_user(void) {
// Host Keyboard Layer Status
oled_write_P(PSTR("* R A R T A N D *\n Powered by QMK\nLayer: "), false);
diff --git a/keyboards/rart/rartand/keymaps/via/keymap.c b/keyboards/rart/rartand/keymaps/via/keymap.c
index 1b3c7c6af4..2dd9378b0d 100644
--- a/keyboards/rart/rartand/keymaps/via/keymap.c
+++ b/keyboards/rart/rartand/keymaps/via/keymap.c
@@ -16,11 +16,11 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = LAYOUT_all(
+ [0] = LAYOUT_all(
KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
KC_LSFT, KC_SLSH, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, KC_UP, KC_BSLS,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_SPC, MO(2), KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_SPC, MO(2), KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT
),
[1] = LAYOUT_all(
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
-#ifdef OLED_DRIVER_ENABLE
+#ifdef OLED_ENABLE
void oled_task_user(void) {
// Host Keyboard Layer Status
oled_write_P(PSTR("* R A R T A N D *\n Powered by QMK\nLayer: "), false);
diff --git a/keyboards/rart/rartand/rules.mk b/keyboards/rart/rartand/rules.mk
index 048be8e5fb..47e285cebc 100644
--- a/keyboards/rart/rartand/rules.mk
+++ b/keyboards/rart/rartand/rules.mk
@@ -20,4 +20,5 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
BLUETOOTH_ENABLE = no # Enable Bluetooth
AUDIO_ENABLE = no # Audio output
-OLED_DRIVER_ENABLE = yes
+OLED_ENABLE = yes
+OLED_DRIVER = SSD1306
diff --git a/keyboards/rart/rartland/rartland.c b/keyboards/rart/rartland/rartland.c
index fc35361f8c..089ba9295c 100644
--- a/keyboards/rart/rartland/rartland.c
+++ b/keyboards/rart/rartland/rartland.c
@@ -30,7 +30,7 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
}
#endif
-#ifdef OLED_DRIVER_ENABLE
+#ifdef OLED_ENABLE
__attribute__((weak)) void oled_task_user(void) {
// Host Keyboard Layer Status
oled_write_P(PSTR("R A R T L A N D\nLayer: "), false);
diff --git a/keyboards/rart/rartland/rules.mk b/keyboards/rart/rartland/rules.mk
index ba0f41d901..3e5261ec4f 100644
--- a/keyboards/rart/rartland/rules.mk
+++ b/keyboards/rart/rartland/rules.mk
@@ -24,7 +24,8 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
BLUETOOTH_ENABLE = no # Enable Bluetooth
AUDIO_ENABLE = no # Audio output
UNICODE_ENABLE = yes
-OLED_DRIVER_ENABLE = yes
+OLED_ENABLE = yes
+OLED_DRIVER = SSD1306
ENCODER_ENABLE = yes
LAYOUTS = 65_ansi 65_iso
diff --git a/keyboards/rart/rartlice/keymaps/default/keymap.c b/keyboards/rart/rartlice/keymaps/default/keymap.c
index 0117eeafba..2ba4abff31 100644
--- a/keyboards/rart/rartlice/keymaps/default/keymap.c
+++ b/keyboards/rart/rartlice/keymaps/default/keymap.c
@@ -31,10 +31,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______
),
-
+
};
-#ifdef OLED_DRIVER_ENABLE
+#ifdef OLED_ENABLE
void oled_task_user(void) {
// Host Keyboard Layer Status
oled_write_P(PSTR("R A R T L I C E\nLayer: "), false);
diff --git a/keyboards/rart/rartlice/keymaps/via/keymap.c b/keyboards/rart/rartlice/keymaps/via/keymap.c
index 0156c2fa4d..22e52c403d 100644
--- a/keyboards/rart/rartlice/keymaps/via/keymap.c
+++ b/keyboards/rart/rartlice/keymaps/via/keymap.c
@@ -45,10 +45,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______
),
-
+
};
-#ifdef OLED_DRIVER_ENABLE
+#ifdef OLED_ENABLE
void oled_task_user(void) {
// Host Keyboard Layer Status
oled_write_P(PSTR("* R A R T L I C E *\n Powered by QMK\nLayer: "), false);
diff --git a/keyboards/rart/rartlice/rules.mk b/keyboards/rart/rartlice/rules.mk
index 4751c57c9b..1cc247f162 100644
--- a/keyboards/rart/rartlice/rules.mk
+++ b/keyboards/rart/rartlice/rules.mk
@@ -21,7 +21,8 @@ RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
BLUETOOTH_ENABLE = no # Enable Bluetooth
AUDIO_ENABLE = no # Audio output
WS2812_DRIVER = spi
-OLED_DRIVER_ENABLE = yes
+OLED_ENABLE = yes
+OLED_DRIVER = SSD1306
# Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-21 23:21:28 +0000