aboutsummaryrefslogtreecommitdiff
path: root/keyboards/kingly_keys
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/kingly_keys
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/kingly_keys')
-rwxr-xr-xkeyboards/kingly_keys/romac/keymaps/boss566y/keymap.c4
-rwxr-xr-xkeyboards/kingly_keys/romac/keymaps/boss566y/rules.mk3
-rw-r--r--keyboards/kingly_keys/romac_plus/keymaps/default/keymap.c4
-rw-r--r--keyboards/kingly_keys/romac_plus/rules.mk3
4 files changed, 8 insertions, 6 deletions
diff --git a/keyboards/kingly_keys/romac/keymaps/boss566y/keymap.c b/keyboards/kingly_keys/romac/keymaps/boss566y/keymap.c
index a636bb476..45e83f761 100755
--- a/keyboards/kingly_keys/romac/keymaps/boss566y/keymap.c
+++ b/keyboards/kingly_keys/romac/keymaps/boss566y/keymap.c
@@ -71,9 +71,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
71 71
72 72
73 73
74#ifdef OLED_DRIVER_ENABLE 74#ifdef OLED_ENABLE
75oled_rotation_t oled_init_user(oled_rotation_t rotation) { 75oled_rotation_t oled_init_user(oled_rotation_t rotation) {
76 return OLED_ROTATION_270; 76 return OLED_ROTATION_270;
77} 77}
78 78
79void oled_task_user(void) { 79void oled_task_user(void) {
diff --git a/keyboards/kingly_keys/romac/keymaps/boss566y/rules.mk b/keyboards/kingly_keys/romac/keymaps/boss566y/rules.mk
index 73fd595ab..eee9c0d53 100755
--- a/keyboards/kingly_keys/romac/keymaps/boss566y/rules.mk
+++ b/keyboards/kingly_keys/romac/keymaps/boss566y/rules.mk
@@ -1,3 +1,4 @@
1VIA_ENABLE = yes 1VIA_ENABLE = yes
2BOOTLOADER = qmk-dfu 2BOOTLOADER = qmk-dfu
3OLED_DRIVER_ENABLE = yes # Enable Support for SSD1306 or SH1106 OLED Displays; Communicating over I2C \ No newline at end of file 3OLED_ENABLE = yes
4OLED_DRIVER = SSD1306 # Enable Support for SSD1306 or SH1106 OLED Displays; Communicating over I2C
diff --git a/keyboards/kingly_keys/romac_plus/keymaps/default/keymap.c b/keyboards/kingly_keys/romac_plus/keymaps/default/keymap.c
index 556af1d1e..29262b8c3 100644
--- a/keyboards/kingly_keys/romac_plus/keymaps/default/keymap.c
+++ b/keyboards/kingly_keys/romac_plus/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
27 KC_1, KC_2, KC_3, 27 KC_1, KC_2, KC_3,
28 MO(1), KC_0, KC_DOT 28 MO(1), KC_0, KC_DOT
29 ), 29 ),
30 30
31 [FN] = LAYOUT( 31 [FN] = LAYOUT(
32 KC_TRNS, KC_HOME, KC_PGUP, 32 KC_TRNS, KC_HOME, KC_PGUP,
33 KC_TRNS, KC_END, KC_PGDN, 33 KC_TRNS, KC_END, KC_PGDN,
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
36 ) 36 )
37}; 37};
38 38
39#ifdef OLED_DRIVER_ENABLE 39#ifdef OLED_ENABLE
40oled_rotation_t oled_init_user(oled_rotation_t rotation) { 40oled_rotation_t oled_init_user(oled_rotation_t rotation) {
41 return OLED_ROTATION_270; // flips the display 180 degrees if offhand 41 return OLED_ROTATION_270; // flips the display 180 degrees if offhand
42} 42}
diff --git a/keyboards/kingly_keys/romac_plus/rules.mk b/keyboards/kingly_keys/romac_plus/rules.mk
index 23e161ed0..6308f17c9 100644
--- a/keyboards/kingly_keys/romac_plus/rules.mk
+++ b/keyboards/kingly_keys/romac_plus/rules.mk
@@ -27,4 +27,5 @@ UNICODE_ENABLE = no # Unicode
27BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID 27BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
28AUDIO_ENABLE = no # Audio output on port C6 28AUDIO_ENABLE = no # Audio output on port C6
29ENCODER_ENABLE = yes # Enable support for EC11 Rotary Encoder 29ENCODER_ENABLE = yes # Enable support for EC11 Rotary Encoder
30OLED_DRIVER_ENABLE = yes # Enable Support for SSD1306 or SH1106 OLED Displays; Communicating over I2C 30OLED_ENABLE = yes
31OLED_DRIVER = SSD1306 # Enable Support for SSD1306 or SH1106 OLED Displays; Communicating over I2C