diff options
| author | Nick Brassel <[email protected]> | 2023-05-29 06:17:24 +1000 | 
|---|---|---|
| committer | Nick Brassel <[email protected]> | 2023-05-29 06:17:24 +1000 | 
| commit | 5024370dd0b441e86ace3089193e84c5b050d892 (patch) | |
| tree | b661d5b154be987f9c3dba3a526b70e0b63f9fef /quantum/split_common/transactions.c | |
| parent | 16767e4d59c2334fcd2d5e6556a68d5ff60ffd7b (diff) | |
| parent | 8b1d86eabf399e82af7738fb675b9c74195d0f98 (diff) | |
| download | qmk_firmware-5024370dd0b441e86ace3089193e84c5b050d892.tar.gz qmk_firmware-5024370dd0b441e86ace3089193e84c5b050d892.zip | |
Merge branch 'develop'0.21.0
Diffstat (limited to 'quantum/split_common/transactions.c')
| -rw-r--r-- | quantum/split_common/transactions.c | 63 | 
1 files changed, 63 insertions, 0 deletions
| diff --git a/quantum/split_common/transactions.c b/quantum/split_common/transactions.c index 8e1961b586..b3c80f1194 100644 --- a/quantum/split_common/transactions.c +++ b/quantum/split_common/transactions.c @@ -790,6 +790,63 @@ static void haptic_handlers_slave(matrix_row_t master_matrix[], matrix_row_t sla  #endif // defined(HAPTIC_ENABLE) && defined(SPLIT_HAPTIC_ENABLE) +#if defined(SPLIT_ACTIVITY_ENABLE) + +static bool activity_handlers_master(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) { +    static uint32_t             last_update = 0; +    split_slave_activity_sync_t activity_sync; +    activity_sync.matrix_timestamp          = last_matrix_activity_time(); +    activity_sync.encoder_timestamp         = last_encoder_activity_time(); +    activity_sync.pointing_device_timestamp = last_pointing_device_activity_time(); +    return send_if_data_mismatch(PUT_ACTIVITY, &last_update, &activity_sync, &split_shmem->activity_sync, sizeof(activity_sync)); +} + +static void activity_handlers_slave(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) { +    set_activity_timestamps(split_shmem->activity_sync.matrix_timestamp, split_shmem->activity_sync.encoder_timestamp, split_shmem->activity_sync.pointing_device_timestamp); +} + +// clang-format off +#    define TRANSACTIONS_ACTIVITY_MASTER() TRANSACTION_HANDLER_MASTER(activity) +#    define TRANSACTIONS_ACTIVITY_SLAVE() TRANSACTION_HANDLER_SLAVE_AUTOLOCK(activity) +#    define TRANSACTIONS_ACTIVITY_REGISTRATIONS [PUT_ACTIVITY] = trans_initiator2target_initializer(activity_sync), +// clang-format on + +#else // defined(SPLIT_ACTIVITY_ENABLE) + +#    define TRANSACTIONS_ACTIVITY_MASTER() +#    define TRANSACTIONS_ACTIVITY_SLAVE() +#    define TRANSACTIONS_ACTIVITY_REGISTRATIONS + +#endif // defined(SPLIT_ACTIVITY_ENABLE) + +//////////////////////////////////////////////////// +// Detected OS + +#if defined(OS_DETECTION_ENABLE) && defined(SPLIT_DETECTED_OS_ENABLE) + +static bool detected_os_handlers_master(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) { +    static uint32_t last_detected_os_update = 0; +    os_variant_t    detected_os             = detected_host_os(); +    bool            okay                    = send_if_condition(PUT_DETECTED_OS, &last_detected_os_update, (detected_os != split_shmem->detected_os), &detected_os, sizeof(os_variant_t)); +    return okay; +} + +static void detected_os_handlers_slave(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) { +    slave_update_detected_host_os(split_shmem->detected_os); +} + +#    define TRANSACTIONS_DETECTED_OS_MASTER() TRANSACTION_HANDLER_MASTER(detected_os) +#    define TRANSACTIONS_DETECTED_OS_SLAVE() TRANSACTION_HANDLER_SLAVE_AUTOLOCK(detected_os) +#    define TRANSACTIONS_DETECTED_OS_REGISTRATIONS [PUT_DETECTED_OS] = trans_initiator2target_initializer(detected_os), + +#else // defined(OS_DETECTION_ENABLE) && defined(SPLIT_DETECTED_OS_ENABLE) + +#    define TRANSACTIONS_DETECTED_OS_MASTER() +#    define TRANSACTIONS_DETECTED_OS_SLAVE() +#    define TRANSACTIONS_DETECTED_OS_REGISTRATIONS + +#endif // defined(OS_DETECTION_ENABLE) && defined(SPLIT_DETECTED_OS_ENABLE) +  ////////////////////////////////////////////////////  split_transaction_desc_t split_transaction_table[NUM_TOTAL_TRANSACTIONS] = { @@ -818,6 +875,8 @@ split_transaction_desc_t split_transaction_table[NUM_TOTAL_TRANSACTIONS] = {      TRANSACTIONS_POINTING_REGISTRATIONS      TRANSACTIONS_WATCHDOG_REGISTRATIONS      TRANSACTIONS_HAPTIC_REGISTRATIONS +    TRANSACTIONS_ACTIVITY_REGISTRATIONS +    TRANSACTIONS_DETECTED_OS_REGISTRATIONS  // clang-format on  #if defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER) @@ -846,6 +905,8 @@ bool transactions_master(matrix_row_t master_matrix[], matrix_row_t slave_matrix      TRANSACTIONS_POINTING_MASTER();      TRANSACTIONS_WATCHDOG_MASTER();      TRANSACTIONS_HAPTIC_MASTER(); +    TRANSACTIONS_ACTIVITY_MASTER(); +    TRANSACTIONS_DETECTED_OS_MASTER();      return true;  } @@ -867,6 +928,8 @@ void transactions_slave(matrix_row_t master_matrix[], matrix_row_t slave_matrix[      TRANSACTIONS_POINTING_SLAVE();      TRANSACTIONS_WATCHDOG_SLAVE();      TRANSACTIONS_HAPTIC_SLAVE(); +    TRANSACTIONS_ACTIVITY_SLAVE(); +    TRANSACTIONS_DETECTED_OS_SLAVE();  }  #if defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER) | 
