From 1ed03f498fa204178c2696c510ac6a2cd8524e2d Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sun, 26 Nov 2023 18:36:45 +0000 Subject: Remove userspace keymaps (#22544) --- users/drashna/split/readme.md | 29 ----- users/drashna/split/split_config.h | 26 ----- users/drashna/split/transport_sync.c | 201 ----------------------------------- users/drashna/split/transport_sync.h | 28 ----- 4 files changed, 284 deletions(-) delete mode 100644 users/drashna/split/readme.md delete mode 100644 users/drashna/split/split_config.h delete mode 100644 users/drashna/split/transport_sync.c delete mode 100644 users/drashna/split/transport_sync.h (limited to 'users/drashna/split') diff --git a/users/drashna/split/readme.md b/users/drashna/split/readme.md deleted file mode 100644 index 5dad340122..0000000000 --- a/users/drashna/split/readme.md +++ /dev/null @@ -1,29 +0,0 @@ -# Custom Split Transport - -To disable the customized split transport, add `CUSTOM_SPLIT_TRANSPORT_SYNC = no` to your `rules.mk`. - -This syncs a number of additional settings, such as the keymap_config (magic settings), user eeprom configs, and misc firmware settings. - -Additionally, this supports a watchdog timer reset for the secondary split side. - -## User State Config - -The User states that it sync are: - -* Audio Enable status -* Audio Clicky states -* Unicode mode -* Pointing Device tap toggle status -* Swap Hands status -* Host Driver status - -## Userspace Config - -The userspace config states that are synced are: - -* RGB layer indication -* "is overwatch" status -* nuke switch -* Swapped numbers -* RGB Matrix idle animation -* Autocorrect enable status diff --git a/users/drashna/split/split_config.h b/users/drashna/split/split_config.h deleted file mode 100644 index fd8bf95515..0000000000 --- a/users/drashna/split/split_config.h +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#define SPLIT_TRANSPORT_MIRROR -#define SPLIT_LAYER_STATE_ENABLE -#define SPLIT_LED_STATE_ENABLE -#define SPLIT_MODS_ENABLE -#define SPLIT_WATCHDOG_ENABLE -#define SPLIT_WPM_ENABLE -#define SPLIT_ACTIVITY_ENABLE -#define SPLIT_DETECTED_OS_ENABLE -#define SPLIT_HAPTIC_ENABLE -#ifdef SPLIT_OLED_ENABLE -# undef SPLIT_OLED_ENABLE -#endif -#if defined(__AVR__) && !defined(SELECT_SOFT_SERIAL_SPEED) -# define SELECT_SOFT_SERIAL_SPEED 1 -#endif -#ifdef CUSTOM_SPLIT_TRANSPORT_SYNC -# define SPLIT_TRANSACTION_IDS_USER RPC_ID_USER_STATE_SYNC, RPC_ID_USER_KEYMAP_SYNC, RPC_ID_USER_CONFIG_SYNC, RPC_ID_USER_PLACEHOLDER, RPC_ID_USER_OLED_KEYLOG_STR -#endif - -#define CRC8_USE_TABLE -#define CRC8_OPTIMIZE_SPEED diff --git a/users/drashna/split/transport_sync.c b/users/drashna/split/transport_sync.c deleted file mode 100644 index d5a1241586..0000000000 --- a/users/drashna/split/transport_sync.c +++ /dev/null @@ -1,201 +0,0 @@ -// Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "transport_sync.h" -#include "transactions.h" -#include - -#ifdef UNICODE_COMMON_ENABLE -# include "process_unicode_common.h" -extern unicode_config_t unicode_config; -# include "keyrecords/unicode.h" -#endif -#ifdef AUDIO_ENABLE -# include "audio.h" -extern audio_config_t audio_config; -extern bool delayed_tasks_run; -#endif -#if defined(POINTING_DEVICE_ENABLE) && defined(KEYBOARD_handwired_tractyl_manuform) -extern bool tap_toggling; -#endif -#ifdef SWAP_HANDS_ENABLE -extern bool swap_hands; -#endif - -extern userspace_config_t userspace_config; - -uint16_t transport_keymap_config = 0; -uint32_t transport_userspace_config = 0, transport_user_state = 0; - -user_runtime_config_t user_state; - -void user_state_sync(uint8_t initiator2target_buffer_size, const void* initiator2target_buffer, uint8_t target2initiator_buffer_size, void* target2initiator_buffer) { - if (initiator2target_buffer_size == sizeof(transport_user_state)) { - memcpy(&transport_user_state, initiator2target_buffer, initiator2target_buffer_size); - } -} -void user_keymap_sync(uint8_t initiator2target_buffer_size, const void* initiator2target_buffer, uint8_t target2initiator_buffer_size, void* target2initiator_buffer) { - if (initiator2target_buffer_size == sizeof(transport_keymap_config)) { - memcpy(&transport_keymap_config, initiator2target_buffer, initiator2target_buffer_size); - } -} -void user_config_sync(uint8_t initiator2target_buffer_size, const void* initiator2target_buffer, uint8_t target2initiator_buffer_size, void* target2initiator_buffer) { - if (initiator2target_buffer_size == sizeof(transport_userspace_config)) { - memcpy(&transport_userspace_config, initiator2target_buffer, initiator2target_buffer_size); - } -} - -#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+1)) { - memcpy(&oled_keylog_str, initiator2target_buffer, initiator2target_buffer_size); - } -} -#endif - -void keyboard_post_init_transport_sync(void) { - // Register keyboard state sync split transaction - transaction_register_rpc(RPC_ID_USER_STATE_SYNC, user_state_sync); - transaction_register_rpc(RPC_ID_USER_KEYMAP_SYNC, user_keymap_sync); - transaction_register_rpc(RPC_ID_USER_CONFIG_SYNC, user_config_sync); -#ifdef CUSTOM_OLED_DRIVER - transaction_register_rpc(RPC_ID_USER_OLED_KEYLOG_STR, keylogger_string_sync); -#endif -} - -void user_transport_update(void) { - if (is_keyboard_master()) { - transport_keymap_config = keymap_config.raw; - transport_userspace_config = userspace_config.raw; -#ifdef AUDIO_ENABLE - user_state.audio_enable = is_audio_on(); - user_state.audio_clicky_enable = is_clicky_on(); -#endif -#if defined(POINTING_DEVICE_ENABLE) && defined(POINTING_DEVICE_AUTO_MOUSE_ENABLE) - user_state.tap_toggling = get_auto_mouse_toggle(); -#endif -#ifdef UNICODE_COMMON_ENABLE - user_state.unicode_mode = unicode_config.input_mode; - user_state.unicode_typing_mode = unicode_typing_mode; -#endif -#ifdef SWAP_HANDS_ENABLE - user_state.swap_hands = swap_hands; -#endif - user_state.host_driver_disabled = get_keyboard_lock(); - - transport_user_state = user_state.raw; - } else { - keymap_config.raw = transport_keymap_config; - userspace_config.raw = transport_userspace_config; - user_state.raw = transport_user_state; -#ifdef UNICODE_COMMON_ENABLE - unicode_config.input_mode = user_state.unicode_mode; - unicode_typing_mode = user_state.unicode_typing_mode; -#endif -#if defined(POINTING_DEVICE_ENABLE) && defined(POINTING_DEVICE_AUTO_MOUSE_ENABLE) - if (get_auto_mouse_toggle() != user_state.tap_toggling) { - auto_mouse_toggle(); - } -#endif -#ifdef SWAP_HANDS_ENABLE - swap_hands = user_state.swap_hands; -#endif - set_keyboard_lock(user_state.host_driver_disabled); - } -} - -void user_transport_sync(void) { - if (is_keyboard_master()) { - // Keep track of the last state, so that we can tell if we need to propagate to slave - static uint16_t last_keymap = 0; - static uint32_t last_config = 0, last_sync[4], last_user_state = 0; - bool needs_sync = false; -#ifdef CUSTOM_OLED_DRIVER - static char keylog_temp[OLED_KEYLOGGER_LENGTH + 1] = {0}; -#endif - - // Check if the state values are different - if (memcmp(&transport_user_state, &last_user_state, sizeof(transport_user_state))) { - needs_sync = true; - memcpy(&last_user_state, &transport_user_state, sizeof(transport_user_state)); - } - // Send to slave every 500ms regardless of state change - if (timer_elapsed32(last_sync[0]) > 250) { - needs_sync = true; - } - - // Perform the sync if requested - if (needs_sync) { - if (transaction_rpc_send(RPC_ID_USER_STATE_SYNC, sizeof(user_state), &user_state)) { - last_sync[0] = timer_read32(); - } - needs_sync = false; - } - - // Check if the state values are different - if (memcmp(&transport_keymap_config, &last_keymap, sizeof(transport_keymap_config))) { - needs_sync = true; - memcpy(&last_keymap, &transport_keymap_config, sizeof(transport_keymap_config)); - } - - // Send to slave every 500ms regardless of state change - if (timer_elapsed32(last_sync[1]) > 250) { - needs_sync = true; - } - - // Perform the sync if requested - if (needs_sync) { - if (transaction_rpc_send(RPC_ID_USER_KEYMAP_SYNC, sizeof(transport_keymap_config), &transport_keymap_config)) { - last_sync[1] = timer_read32(); - } - needs_sync = false; - } - - // Check if the state values are different - if (memcmp(&user_state, &last_config, sizeof(transport_userspace_config))) { - needs_sync = true; - memcpy(&last_config, &user_state, sizeof(transport_userspace_config)); - } - - // Send to slave every 500ms regardless of state change - if (timer_elapsed32(last_sync[2]) > 250) { - needs_sync = true; - } - - // Perform the sync if requested - if (needs_sync) { - if (transaction_rpc_send(RPC_ID_USER_CONFIG_SYNC, sizeof(transport_userspace_config), &transport_userspace_config)) { - last_sync[2] = timer_read32(); - } - needs_sync = false; - } - -#ifdef CUSTOM_OLED_DRIVER - // Check if the state values are different - if (memcmp(&oled_keylog_str, &keylog_temp, OLED_KEYLOGGER_LENGTH + 1)) { - needs_sync = true; - memcpy(&keylog_temp, &oled_keylog_str, OLED_KEYLOGGER_LENGTH + 1); - } - if (timer_elapsed32(last_sync[3]) > 250) { - needs_sync = true; - } - - // Perform the sync if requested - if (needs_sync) { - if (transaction_rpc_send(RPC_ID_USER_OLED_KEYLOG_STR, OLED_KEYLOGGER_LENGTH + 1, &oled_keylog_str)) { - last_sync[3] = timer_read32(); - } - needs_sync = false; - } -#endif - } -} - -void housekeeping_task_transport_sync(void) { - // Update kb_state so we can send to slave - user_transport_update(); - - // Data sync from master to slave - user_transport_sync(); -} diff --git a/users/drashna/split/transport_sync.h b/users/drashna/split/transport_sync.h deleted file mode 100644 index d241e5446f..0000000000 --- a/users/drashna/split/transport_sync.h +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "drashna.h" -#ifdef OLED_ENABLE -# include "oled/oled_stuff.h" -#endif - -typedef union { - uint32_t raw; - struct { - bool audio_enable :1; - bool audio_clicky_enable :1; - bool tap_toggling :1; - uint8_t unicode_mode :3; - bool swap_hands :1; - bool host_driver_disabled :1; - uint8_t unicode_typing_mode :3; - bool is_oled_enabled :1; - }; -} user_runtime_config_t; - -extern user_runtime_config_t user_state; - -void keyboard_post_init_transport_sync(void); -void housekeeping_task_transport_sync(void); -- cgit v1.2.3