summary refs log tree commit diff
path: root/quantum
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 /quantum
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 'quantum')
-rw-r--r--quantum/keyboard.c6
-rw-r--r--quantum/quantum.h2
-rw-r--r--quantum/split_common/transaction_id_define.h4
-rw-r--r--quantum/split_common/transactions.c4
-rw-r--r--quantum/split_common/transport.h4
5 files changed, 10 insertions, 10 deletions
diff --git a/quantum/keyboard.c b/quantum/keyboard.c
index 644d8650dd..473306c65d 100644
--- a/quantum/keyboard.c
+++ b/quantum/keyboard.c
@@ -82,7 +82,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef QWIIC_ENABLE
 #    include "qwiic.h"
 #endif
-#ifdef OLED_DRIVER_ENABLE
+#ifdef OLED_ENABLE
 #    include "oled_driver.h"
 #endif
 #ifdef ST7565_ENABLE
@@ -319,7 +319,7 @@ void keyboard_init(void) {
 #ifdef QWIIC_ENABLE
     qwiic_init();
 #endif
-#ifdef OLED_DRIVER_ENABLE
+#ifdef OLED_ENABLE
     oled_init(OLED_ROTATION_0);
 #endif
 #ifdef ST7565_ENABLE
@@ -477,7 +477,7 @@ MATRIX_LOOP_END:
     qwiic_task();
 #endif
 
-#ifdef OLED_DRIVER_ENABLE
+#ifdef OLED_ENABLE
     oled_task();
 #    ifndef OLED_DISABLE_TIMEOUT
     // Wake up oled if user is using those fabulous keys or spinning those encoders!
diff --git a/quantum/quantum.h b/quantum/quantum.h
index ffb5e0df45..86b717e445 100644
--- a/quantum/quantum.h
+++ b/quantum/quantum.h
@@ -164,7 +164,7 @@ extern layer_state_t layer_state;
 #    include "process_haptic.h"
 #endif
 
-#ifdef OLED_DRIVER_ENABLE
+#ifdef OLED_ENABLE
 #    include "oled_driver.h"
 #endif
 
diff --git a/quantum/split_common/transaction_id_define.h b/quantum/split_common/transaction_id_define.h
index 8dd2cd065f..535bc21aea 100644
--- a/quantum/split_common/transaction_id_define.h
+++ b/quantum/split_common/transaction_id_define.h
@@ -70,9 +70,9 @@ enum serial_transaction_id {
     PUT_WPM,
 #endif  // defined(WPM_ENABLE) && defined(SPLIT_WPM_ENABLE)
 
-#if defined(OLED_DRIVER_ENABLE) && defined(SPLIT_OLED_ENABLE)
+#if defined(OLED_ENABLE) && defined(SPLIT_OLED_ENABLE)
     PUT_OLED,
-#endif  // defined(OLED_DRIVER_ENABLE) && defined(SPLIT_OLED_ENABLE)
+#endif  // defined(OLED_ENABLE) && defined(SPLIT_OLED_ENABLE)
 
 #if defined(ST7565_ENABLE) && defined(SPLIT_ST7565_ENABLE)
     PUT_ST7565,
diff --git a/quantum/split_common/transactions.c b/quantum/split_common/transactions.c
index 28ea4ef6d8..fd676f0729 100644
--- a/quantum/split_common/transactions.c
+++ b/quantum/split_common/transactions.c
@@ -519,7 +519,7 @@ static void wpm_handlers_slave(matrix_row_t master_matrix[], matrix_row_t slave_
 ////////////////////////////////////////////////////
 // OLED
 
-#if defined(OLED_DRIVER_ENABLE) && defined(SPLIT_OLED_ENABLE)
+#if defined(OLED_ENABLE) && defined(SPLIT_OLED_ENABLE)
 
 static bool oled_handlers_master(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) {
     static uint32_t last_update        = 0;
@@ -539,7 +539,7 @@ static void oled_handlers_slave(matrix_row_t master_matrix[], matrix_row_t slave
 #    define TRANSACTIONS_OLED_SLAVE()       TRANSACTION_HANDLER_SLAVE(oled)
 #    define TRANSACTIONS_OLED_REGISTRATIONS [PUT_OLED] = trans_initiator2target_initializer(current_oled_state),
 
-#else  // defined(OLED_DRIVER_ENABLE) && defined(SPLIT_OLED_ENABLE)
+#else  // defined(OLED_ENABLE) && defined(SPLIT_OLED_ENABLE)
 
 #    define TRANSACTIONS_OLED_MASTER()
 #    define TRANSACTIONS_OLED_SLAVE()
diff --git a/quantum/split_common/transport.h b/quantum/split_common/transport.h
index f7abb9979e..1d4f6ed0cd 100644
--- a/quantum/split_common/transport.h
+++ b/quantum/split_common/transport.h
@@ -165,9 +165,9 @@ typedef struct _split_shared_memory_t {
     uint8_t current_wpm;
 #endif  // defined(WPM_ENABLE) && defined(SPLIT_WPM_ENABLE)
 
-#if defined(OLED_DRIVER_ENABLE) && defined(SPLIT_OLED_ENABLE)
+#if defined(OLED_ENABLE) && defined(SPLIT_OLED_ENABLE)
     uint8_t current_oled_state;
-#endif  // defined(OLED_DRIVER_ENABLE) && defined(SPLIT_OLED_ENABLE)
+#endif  // defined(OLED_ENABLE) && defined(SPLIT_OLED_ENABLE)
 
 #if defined(ST7565_ENABLE) && defined(SPLIT_ST7565_ENABLE)
     uint8_t current_st7565_state;