aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2021-08-15 00:54:08 -0700
committerGitHub <noreply@github.com>2021-08-15 00:54:08 -0700
commitf56c202fb31ad7cdfdbcb4083dd5dad54d2b508f (patch)
treea813175b83350b0cb6c3d056b31105f8b3a38ef0
parent488aaa0980b113240a461d6d7878c62f5663f5c6 (diff)
downloadqmk_firmware-f56c202fb31ad7cdfdbcb4083dd5dad54d2b508f.tar.gz
qmk_firmware-f56c202fb31ad7cdfdbcb4083dd5dad54d2b508f.zip
Fix ifdefs for OLED split sync code (#14017)
-rw-r--r--keyboards/splitkb/kyria/rev1/config.h1
-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
4 files changed, 7 insertions, 6 deletions
diff --git a/keyboards/splitkb/kyria/rev1/config.h b/keyboards/splitkb/kyria/rev1/config.h
index 2c96e74a7..9df5a3823 100644
--- a/keyboards/splitkb/kyria/rev1/config.h
+++ b/keyboards/splitkb/kyria/rev1/config.h
@@ -71,6 +71,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
71 71
72#ifdef OLED_DRIVER_ENABLE 72#ifdef OLED_DRIVER_ENABLE
73# define OLED_DISPLAY_128X64 73# define OLED_DISPLAY_128X64
74# define SPLIT_OLED_ENABLE
74#endif 75#endif
75 76
76/* RGB matrix support */ 77/* RGB matrix support */
diff --git a/quantum/split_common/transaction_id_define.h b/quantum/split_common/transaction_id_define.h
index 3b78402d4..8dd2cd065 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_ENABLE) && defined(SPLIT_OLED_ENABLE) 73#if defined(OLED_DRIVER_ENABLE) && defined(SPLIT_OLED_ENABLE)
74 PUT_OLED, 74 PUT_OLED,
75#endif // defined(WPM_ENABLE) && defined(SPLIT_OLED_ENABLE) 75#endif // defined(OLED_DRIVER_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 de42882df..7eb3eca3e 100644
--- a/quantum/split_common/transactions.c
+++ b/quantum/split_common/transactions.c
@@ -522,7 +522,7 @@ static void wpm_handlers_slave(matrix_row_t master_matrix[], matrix_row_t slave_
522//////////////////////////////////////////////////// 522////////////////////////////////////////////////////
523// OLED 523// OLED
524 524
525#if defined(OLED_ENABLE) && defined(SPLIT_OLED_ENABLE) 525#if defined(OLED_DRIVER_ENABLE) && defined(SPLIT_OLED_ENABLE)
526 526
527static bool oled_handlers_master(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) { 527static bool oled_handlers_master(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) {
528 static uint32_t last_update = 0; 528 static uint32_t last_update = 0;
@@ -542,7 +542,7 @@ static void oled_handlers_slave(matrix_row_t master_matrix[], matrix_row_t slave
542# define TRANSACTIONS_OLED_SLAVE() TRANSACTION_HANDLER_SLAVE(oled_handlers) 542# define TRANSACTIONS_OLED_SLAVE() TRANSACTION_HANDLER_SLAVE(oled_handlers)
543# define TRANSACTIONS_OLED_REGISTRATIONS [PUT_OLED] = trans_initiator2target_initializer(current_oled_state), 543# define TRANSACTIONS_OLED_REGISTRATIONS [PUT_OLED] = trans_initiator2target_initializer(current_oled_state),
544 544
545#else // defined(OLED_ENABLE) && defined(SPLIT_OLED_ENABLE) 545#else // defined(OLED_DRIVER_ENABLE) && defined(SPLIT_OLED_ENABLE)
546 546
547# define TRANSACTIONS_OLED_MASTER() 547# define TRANSACTIONS_OLED_MASTER()
548# define TRANSACTIONS_OLED_SLAVE() 548# define TRANSACTIONS_OLED_SLAVE()
diff --git a/quantum/split_common/transport.h b/quantum/split_common/transport.h
index 1d4f6ed0c..f7abb9979 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_ENABLE) && defined(SPLIT_OLED_ENABLE) 168#if defined(OLED_DRIVER_ENABLE) && defined(SPLIT_OLED_ENABLE)
169 uint8_t current_oled_state; 169 uint8_t current_oled_state;
170#endif // defined(OLED_ENABLE) && defined(SPLIT_OLED_ENABLE) 170#endif // defined(OLED_DRIVER_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;