Henry-Hiles/qmk_userspace
1
0
Fork 0
forked from mirrors/qmk_userspace
Code Pull requests Activity

Fix ifdefs for OLED split sync code (#14017)

Browse source
This commit is contained in:
Drashna Jaelre 2021-08-15 00:54:08 -07:00 • committed by GitHub
commit f56c202fb3
Failed to generate hash of commit
4 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
keyboards/splitkb/kyria/rev1/config.h
View file

@ -71,6 +71,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef OLED_DRIVER_ENABLE
# define OLED_DISPLAY_128X64
# define SPLIT_OLED_ENABLE
#endif
/* RGB matrix support */

4
quantum/split_common/transaction_id_define.h
View file

@ -70,9 +70,9 @@ enum serial_transaction_id {
PUT_WPM,
#endif // defined(WPM_ENABLE) && defined(SPLIT_WPM_ENABLE)
#if defined(OLED_ENABLE) && defined(SPLIT_OLED_ENABLE)
#if defined(OLED_DRIVER_ENABLE) && defined(SPLIT_OLED_ENABLE)
PUT_OLED,
#endif // defined(WPM_ENABLE) && defined(SPLIT_OLED_ENABLE)
#endif // defined(OLED_DRIVER_ENABLE) && defined(SPLIT_OLED_ENABLE)
#if defined(ST7565_ENABLE) && defined(SPLIT_ST7565_ENABLE)
PUT_ST7565,

4
quantum/split_common/transactions.c
View file

@ -522,7 +522,7 @@ static void wpm_handlers_slave(matrix_row_t master_matrix[], matrix_row_t slave_
////////////////////////////////////////////////////
// OLED
#if defined(OLED_ENABLE) && defined(SPLIT_OLED_ENABLE)
#if defined(OLED_DRIVER_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;
@ -542,7 +542,7 @@ static void oled_handlers_slave(matrix_row_t master_matrix[], matrix_row_t slave
# define TRANSACTIONS_OLED_SLAVE() TRANSACTION_HANDLER_SLAVE(oled_handlers)
# define TRANSACTIONS_OLED_REGISTRATIONS [PUT_OLED] = trans_initiator2target_initializer(current_oled_state),
#else // defined(OLED_ENABLE) && defined(SPLIT_OLED_ENABLE)
#else // defined(OLED_DRIVER_ENABLE) && defined(SPLIT_OLED_ENABLE)
# define TRANSACTIONS_OLED_MASTER()
# define TRANSACTIONS_OLED_SLAVE()

4
quantum/split_common/transport.h
View file

@ -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_ENABLE) && defined(SPLIT_OLED_ENABLE)
#if defined(OLED_DRIVER_ENABLE) && defined(SPLIT_OLED_ENABLE)
uint8_t current_oled_state;
#endif // defined(OLED_ENABLE) && defined(SPLIT_OLED_ENABLE)
#endif // defined(OLED_DRIVER_ENABLE) && defined(SPLIT_OLED_ENABLE)
#if defined(ST7565_ENABLE) && defined(SPLIT_ST7565_ENABLE)
uint8_t current_st7565_state;