diff options
| author | Xelus22 <17491233+Xelus22@users.noreply.github.com> | 2021-08-24 16:28:26 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-24 16:28:26 +1000 |
| commit | 4e1c5887c5c08ebd2cf7868c8d9292aa728e7bf0 (patch) | |
| tree | 24ff5bdf570a6a9f5a77a517005bffbb35e46b22 /quantum/split_common | |
| parent | 6fd20acf4be76e7a2bd82d3dfd0a9bcca8c507eb (diff) | |
| download | qmk_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 'quantum/split_common')
| -rw-r--r-- | quantum/split_common/transaction_id_define.h | 4 | ||||
| -rw-r--r-- | quantum/split_common/transactions.c | 4 | ||||
| -rw-r--r-- | quantum/split_common/transport.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/quantum/split_common/transaction_id_define.h b/quantum/split_common/transaction_id_define.h index 8dd2cd065..535bc21ae 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 { | |||
| 70 | PUT_WPM, | 70 | PUT_WPM, |
| 71 | #endif // defined(WPM_ENABLE) && defined(SPLIT_WPM_ENABLE) | 71 | #endif // defined(WPM_ENABLE) && defined(SPLIT_WPM_ENABLE) |
| 72 | 72 | ||
| 73 | #if defined(OLED_DRIVER_ENABLE) && defined(SPLIT_OLED_ENABLE) | 73 | #if defined(OLED_ENABLE) && defined(SPLIT_OLED_ENABLE) |
| 74 | PUT_OLED, | 74 | PUT_OLED, |
| 75 | #endif // defined(OLED_DRIVER_ENABLE) && defined(SPLIT_OLED_ENABLE) | 75 | #endif // defined(OLED_ENABLE) && defined(SPLIT_OLED_ENABLE) |
| 76 | 76 | ||
| 77 | #if defined(ST7565_ENABLE) && defined(SPLIT_ST7565_ENABLE) | 77 | #if defined(ST7565_ENABLE) && defined(SPLIT_ST7565_ENABLE) |
| 78 | PUT_ST7565, | 78 | PUT_ST7565, |
diff --git a/quantum/split_common/transactions.c b/quantum/split_common/transactions.c index 28ea4ef6d..fd676f072 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_ | |||
| 519 | //////////////////////////////////////////////////// | 519 | //////////////////////////////////////////////////// |
| 520 | // OLED | 520 | // OLED |
| 521 | 521 | ||
| 522 | #if defined(OLED_DRIVER_ENABLE) && defined(SPLIT_OLED_ENABLE) | 522 | #if defined(OLED_ENABLE) && defined(SPLIT_OLED_ENABLE) |
| 523 | 523 | ||
| 524 | static bool oled_handlers_master(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) { | 524 | static bool oled_handlers_master(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) { |
| 525 | static uint32_t last_update = 0; | 525 | static uint32_t last_update = 0; |
| @@ -539,7 +539,7 @@ static void oled_handlers_slave(matrix_row_t master_matrix[], matrix_row_t slave | |||
| 539 | # define TRANSACTIONS_OLED_SLAVE() TRANSACTION_HANDLER_SLAVE(oled) | 539 | # define TRANSACTIONS_OLED_SLAVE() TRANSACTION_HANDLER_SLAVE(oled) |
| 540 | # define TRANSACTIONS_OLED_REGISTRATIONS [PUT_OLED] = trans_initiator2target_initializer(current_oled_state), | 540 | # define TRANSACTIONS_OLED_REGISTRATIONS [PUT_OLED] = trans_initiator2target_initializer(current_oled_state), |
| 541 | 541 | ||
| 542 | #else // defined(OLED_DRIVER_ENABLE) && defined(SPLIT_OLED_ENABLE) | 542 | #else // defined(OLED_ENABLE) && defined(SPLIT_OLED_ENABLE) |
| 543 | 543 | ||
| 544 | # define TRANSACTIONS_OLED_MASTER() | 544 | # define TRANSACTIONS_OLED_MASTER() |
| 545 | # define TRANSACTIONS_OLED_SLAVE() | 545 | # define TRANSACTIONS_OLED_SLAVE() |
diff --git a/quantum/split_common/transport.h b/quantum/split_common/transport.h index f7abb9979..1d4f6ed0c 100644 --- a/quantum/split_common/transport.h +++ b/quantum/split_common/transport.h | |||
| @@ -165,9 +165,9 @@ typedef struct _split_shared_memory_t { | |||
| 165 | uint8_t current_wpm; | 165 | uint8_t current_wpm; |
| 166 | #endif // defined(WPM_ENABLE) && defined(SPLIT_WPM_ENABLE) | 166 | #endif // defined(WPM_ENABLE) && defined(SPLIT_WPM_ENABLE) |
| 167 | 167 | ||
| 168 | #if defined(OLED_DRIVER_ENABLE) && defined(SPLIT_OLED_ENABLE) | 168 | #if defined(OLED_ENABLE) && defined(SPLIT_OLED_ENABLE) |
| 169 | uint8_t current_oled_state; | 169 | uint8_t current_oled_state; |
| 170 | #endif // defined(OLED_DRIVER_ENABLE) && defined(SPLIT_OLED_ENABLE) | 170 | #endif // defined(OLED_ENABLE) && defined(SPLIT_OLED_ENABLE) |
| 171 | 171 | ||
| 172 | #if defined(ST7565_ENABLE) && defined(SPLIT_ST7565_ENABLE) | 172 | #if defined(ST7565_ENABLE) && defined(SPLIT_ST7565_ENABLE) |
| 173 | uint8_t current_st7565_state; | 173 | uint8_t current_st7565_state; |
