diff options
| author | lokher <lokher@gmail.com> | 2023-04-26 16:32:15 +0800 |
|---|---|---|
| committer | lokher <lokher@gmail.com> | 2023-04-26 16:32:15 +0800 |
| commit | e4f4ceaf3f2e3d25fb282273a81f9b58790fc427 (patch) | |
| tree | c0a257eab0ffe5238fdf2c04882e8ee1fe8fc46e /users/drashna/split | |
| parent | 103badc87cb50db1ff3851c84331e86ba78fb681 (diff) | |
merge upstream 713427c
Diffstat (limited to 'users/drashna/split')
| -rw-r--r-- | users/drashna/split/split_config.h | 12 | ||||
| -rw-r--r-- | users/drashna/split/transport_sync.c | 2 | ||||
| -rw-r--r-- | users/drashna/split/transport_sync.h | 2 |
3 files changed, 6 insertions, 10 deletions
diff --git a/users/drashna/split/split_config.h b/users/drashna/split/split_config.h index 21ff3829bb..17daa4f808 100644 --- a/users/drashna/split/split_config.h +++ b/users/drashna/split/split_config.h @@ -3,17 +3,13 @@ #pragma once -// # define SPLIT_TRANSPORT_MIRROR +#define SPLIT_TRANSPORT_MIRROR #define SPLIT_LAYER_STATE_ENABLE #define SPLIT_LED_STATE_ENABLE #define SPLIT_MODS_ENABLE -#ifndef POINTING_DEVICE_ENABLE -# define SPLIT_WATCHDOG_ENABLE -#endif -#ifdef WPM_ENABLE -# define SPLIT_WPM_ENABLE -#endif -#ifdef OLED_ENABLE +#define SPLIT_WATCHDOG_ENABLE +#define SPLIT_WPM_ENABLE +#ifdef SPLIT_OLED_ENABLE # undef SPLIT_OLED_ENABLE #endif #if defined(__AVR__) && !defined(SELECT_SOFT_SERIAL_SPEED) diff --git a/users/drashna/split/transport_sync.c b/users/drashna/split/transport_sync.c index 0284627ed2..bd6f7c5688 100644 --- a/users/drashna/split/transport_sync.c +++ b/users/drashna/split/transport_sync.c @@ -52,7 +52,7 @@ void user_config_sync(uint8_t initiator2target_buffer_size, const void* initiato #ifdef CUSTOM_OLED_DRIVER # include "oled/oled_stuff.h" void keylogger_string_sync(uint8_t initiator2target_buffer_size, const void* initiator2target_buffer, uint8_t target2initiator_buffer_size, void* target2initiator_buffer) { - if (initiator2target_buffer_size == OLED_KEYLOGGER_LENGTH) { + if (initiator2target_buffer_size == (OLED_KEYLOGGER_LENGTH)) { memcpy(&keylog_str, initiator2target_buffer, initiator2target_buffer_size); } } diff --git a/users/drashna/split/transport_sync.h b/users/drashna/split/transport_sync.h index 8bfb49bf63..e27e598f83 100644 --- a/users/drashna/split/transport_sync.h +++ b/users/drashna/split/transport_sync.h @@ -6,7 +6,7 @@ #include "drashna.h" #ifdef OLED_ENABLE # include "oled/oled_stuff.h" -extern char keylog_str[OLED_KEYLOGGER_LENGTH]; +extern char keylog_str[]; #endif typedef union { |