mirror of
https://github.com/qmk/qmk_firmware.git
synced 2024-12-11 04:10:58 +00:00
Merge remote-tracking branch 'origin/develop' into xap
This commit is contained in:
commit
1653df76d9
@ -213,7 +213,7 @@ typedef struct _split_shared_memory_t {
|
|||||||
bool watchdog_pinged;
|
bool watchdog_pinged;
|
||||||
#endif // defined(SPLIT_WATCHDOG_ENABLE)
|
#endif // defined(SPLIT_WATCHDOG_ENABLE)
|
||||||
|
|
||||||
#if defined(HAPTIC_ENABLE)
|
#if defined(HAPTIC_ENABLE) && defined(SPLIT_HAPTIC_ENABLE)
|
||||||
split_slave_haptic_sync_t haptic_sync;
|
split_slave_haptic_sync_t haptic_sync;
|
||||||
#endif // defined(HAPTIC_ENABLE)
|
#endif // defined(HAPTIC_ENABLE)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user