[Keyboard] Overhaul Tractyl Manuform (#16134)
This commit is contained in:
Drashna Jaelre
GitHub
parent
b57f8a8b9f
commit
d1cf218b9d
8 changed files with 433 additions and 152 deletions
|
|
@ -50,5 +50,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#define NO_ACTION_MACRO
|
||||
#define NO_ACTION_FUNCTION
|
||||
|
||||
#define POINTING_DEVICE_TASK_THROTTLE
|
||||
#define POINTING_DEVICE_RIGHT
|
||||
|
|
|
|||
|
|
@ -79,7 +79,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#define I2C1_SDA_PIN B9
|
||||
#define I2C1_SCL_PAL_MODE 4
|
||||
#define I2C1_SDA_PAL_MODE 4
|
||||
// #define I2C1_CLOCK_SPEED 400000
|
||||
#define I2C1_CLOCK_SPEED 400000
|
||||
#define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2
|
||||
|
||||
/* encoder config */
|
||||
#define ENCODERS_PAD_A \
|
||||
|
|
|
|||
|
|
@ -61,8 +61,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
|
||||
[_MOUSE] = LAYOUT_5x6_right(
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, KC_WH_U, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, KC_WH_D, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN6, DPI_CONFIG,
|
||||
_______, _______, _______, _______, _______, _______, KC_WH_U, DPI_MOD, DPI_RMOD,S_D_MOD, S_D_RMOD,DRGSCRL,
|
||||
_______, _______, _______, _______, _______, _______, KC_WH_D, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN6, SNIPING,
|
||||
_______, _______, _______, _______, _______, _______, KC_BTN7, KC_BTN4, KC_BTN5, KC_BTN8, _______, _______,
|
||||
_______, _______, _______, _______,
|
||||
_______, _______, KC_BTN3,
|
||||
|
|
|
|||
|
|
@ -24,8 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#define VENDOR_ID 0x44DD
|
||||
#define MANUFACTURER Drashna
|
||||
|
||||
#define USB_POLLING_INTERVAL_MS 1
|
||||
|
||||
/* disable debug print */
|
||||
// #define NO_DEBUG
|
||||
|
||||
|
|
|
|||
|
|
@ -18,114 +18,368 @@
|
|||
#include "transactions.h"
|
||||
#include <string.h>
|
||||
|
||||
#ifndef TRACKBALL_DPI_OPTIONS
|
||||
# define TRACKBALL_DPI_OPTIONS \
|
||||
{ 1200, 1600, 2400 }
|
||||
# ifndef TRACKBALL_DPI_DEFAULT
|
||||
# define TRACKBALL_DPI_DEFAULT 1
|
||||
# endif
|
||||
#endif
|
||||
#ifndef TRACKBALL_DPI_DEFAULT
|
||||
# define TRACKBALL_DPI_DEFAULT 0
|
||||
#endif
|
||||
#ifdef CONSOLE_ENABLE
|
||||
# include "print.h"
|
||||
#endif // CONSOLE_ENABLE
|
||||
|
||||
keyboard_config_t keyboard_config;
|
||||
kb_config_data_t kb_config_data;
|
||||
uint16_t dpi_array[] = TRACKBALL_DPI_OPTIONS;
|
||||
#define DPI_OPTION_SIZE (sizeof(dpi_array) / sizeof(uint16_t))
|
||||
#ifdef POINTING_DEVICE_ENABLE
|
||||
# ifndef CHARYBDIS_MINIMUM_DEFAULT_DPI
|
||||
# define CHARYBDIS_MINIMUM_DEFAULT_DPI 400
|
||||
# endif // CHARYBDIS_MINIMUM_DEFAULT_DPI
|
||||
|
||||
# ifndef CHARYBDIS_DEFAULT_DPI_CONFIG_STEP
|
||||
# define CHARYBDIS_DEFAULT_DPI_CONFIG_STEP 200
|
||||
# endif // CHARYBDIS_DEFAULT_DPI_CONFIG_STEP
|
||||
|
||||
# ifndef CHARYBDIS_MINIMUM_SNIPING_DPI
|
||||
# define CHARYBDIS_MINIMUM_SNIPING_DPI 200
|
||||
# endif // CHARYBDIS_MINIMUM_SNIPER_MODE_DPI
|
||||
|
||||
# ifndef CHARYBDIS_SNIPING_DPI_CONFIG_STEP
|
||||
# define CHARYBDIS_SNIPING_DPI_CONFIG_STEP 100
|
||||
# endif // CHARYBDIS_SNIPING_DPI_CONFIG_STEP
|
||||
|
||||
// Fixed DPI for drag-scroll.
|
||||
# ifndef CHARYBDIS_DRAGSCROLL_DPI
|
||||
# define CHARYBDIS_DRAGSCROLL_DPI 100
|
||||
# endif // CHARYBDIS_DRAGSCROLL_DPI
|
||||
|
||||
# ifndef CHARYBDIS_DRAGSCROLL_BUFFER_SIZE
|
||||
# define CHARYBDIS_DRAGSCROLL_BUFFER_SIZE 6
|
||||
# endif // !CHARYBDIS_DRAGSCROLL_BUFFER_SIZE
|
||||
|
||||
# ifndef CHARYBDIS_POINTER_ACCELERATION_FACTOR
|
||||
# define CHARYBDIS_POINTER_ACCELERATION_FACTOR 24
|
||||
# endif // !CHARYBDIS_POINTER_ACCELERATION_FACTOR
|
||||
|
||||
typedef union {
|
||||
uint8_t raw;
|
||||
struct {
|
||||
uint8_t pointer_default_dpi : 4; // 16 steps available.
|
||||
uint8_t pointer_sniping_dpi : 2; // 4 steps available.
|
||||
bool is_dragscroll_enabled : 1;
|
||||
bool is_sniping_enabled : 1;
|
||||
} __attribute__((packed));
|
||||
} charybdis_config_t;
|
||||
|
||||
static charybdis_config_t g_charybdis_config = {0};
|
||||
|
||||
/**
|
||||
* \brief Set the value of `config` from EEPROM.
|
||||
*
|
||||
* Note that `is_dragscroll_enabled` and `is_sniping_enabled` are purposefully
|
||||
* ignored since we do not want to persist this state to memory. In practice,
|
||||
* this state is always written to maximize write-performances. Therefore, we
|
||||
* explicitly set them to `false` in this function.
|
||||
*/
|
||||
static void read_charybdis_config_from_eeprom(charybdis_config_t* config) {
|
||||
config->raw = eeconfig_read_kb() & 0xff;
|
||||
config->is_dragscroll_enabled = false;
|
||||
config->is_sniping_enabled = false;
|
||||
}
|
||||
|
||||
/**
|
||||
* \brief Save the value of `config` to eeprom.
|
||||
*
|
||||
* Note that all values are written verbatim, including whether drag-scroll
|
||||
* and/or sniper mode are enabled. `read_charybdis_config_from_eeprom(…)`
|
||||
* resets these 2 values to `false` since it does not make sense to persist
|
||||
* these across reboots of the board.
|
||||
*/
|
||||
static void write_charybdis_config_to_eeprom(charybdis_config_t* config) { eeconfig_update_kb(config->raw); }
|
||||
|
||||
/** \brief Return the current value of the pointer's default DPI. */
|
||||
static uint16_t get_pointer_default_dpi(charybdis_config_t* config) { return (uint16_t)config->pointer_default_dpi * CHARYBDIS_DEFAULT_DPI_CONFIG_STEP + CHARYBDIS_MINIMUM_DEFAULT_DPI; }
|
||||
|
||||
/** \brief Return the current value of the pointer's sniper-mode DPI. */
|
||||
static uint16_t get_pointer_sniping_dpi(charybdis_config_t* config) { return (uint16_t)config->pointer_sniping_dpi * CHARYBDIS_SNIPING_DPI_CONFIG_STEP + CHARYBDIS_MINIMUM_SNIPING_DPI; }
|
||||
|
||||
/** \brief Set the appropriate DPI for the input config. */
|
||||
static void maybe_update_pointing_device_cpi(charybdis_config_t* config) {
|
||||
if (config->is_dragscroll_enabled) {
|
||||
pointing_device_set_cpi(CHARYBDIS_DRAGSCROLL_DPI);
|
||||
} else if (config->is_sniping_enabled) {
|
||||
pointing_device_set_cpi(get_pointer_sniping_dpi(config));
|
||||
} else {
|
||||
pointing_device_set_cpi(get_pointer_default_dpi(config));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* \brief Update the pointer's default DPI to the next or previous step.
|
||||
*
|
||||
* Increases the DPI value if `forward` is `true`, decreases it otherwise.
|
||||
* The increment/decrement steps are equal to CHARYBDIS_DEFAULT_DPI_CONFIG_STEP.
|
||||
*/
|
||||
static void step_pointer_default_dpi(charybdis_config_t* config, bool forward) {
|
||||
config->pointer_default_dpi += forward ? 1 : -1;
|
||||
maybe_update_pointing_device_cpi(config);
|
||||
}
|
||||
|
||||
/**
|
||||
* \brief Update the pointer's sniper-mode DPI to the next or previous step.
|
||||
*
|
||||
* Increases the DPI value if `forward` is `true`, decreases it otherwise.
|
||||
* The increment/decrement steps are equal to CHARYBDIS_SNIPING_DPI_CONFIG_STEP.
|
||||
*/
|
||||
static void step_pointer_sniping_dpi(charybdis_config_t* config, bool forward) {
|
||||
config->pointer_sniping_dpi += forward ? 1 : -1;
|
||||
maybe_update_pointing_device_cpi(config);
|
||||
}
|
||||
|
||||
uint16_t charybdis_get_pointer_default_dpi(void) { return get_pointer_default_dpi(&g_charybdis_config); }
|
||||
|
||||
uint16_t charybdis_get_pointer_sniping_dpi(void) { return get_pointer_sniping_dpi(&g_charybdis_config); }
|
||||
|
||||
void charybdis_cycle_pointer_default_dpi_noeeprom(bool forward) { step_pointer_default_dpi(&g_charybdis_config, forward); }
|
||||
|
||||
void charybdis_cycle_pointer_default_dpi(bool forward) {
|
||||
step_pointer_default_dpi(&g_charybdis_config, forward);
|
||||
write_charybdis_config_to_eeprom(&g_charybdis_config);
|
||||
}
|
||||
|
||||
void charybdis_cycle_pointer_sniping_dpi_noeeprom(bool forward) { step_pointer_sniping_dpi(&g_charybdis_config, forward); }
|
||||
|
||||
void charybdis_cycle_pointer_sniping_dpi(bool forward) {
|
||||
step_pointer_sniping_dpi(&g_charybdis_config, forward);
|
||||
write_charybdis_config_to_eeprom(&g_charybdis_config);
|
||||
}
|
||||
|
||||
bool charybdis_get_pointer_sniping_enabled(void) { return g_charybdis_config.is_sniping_enabled; }
|
||||
|
||||
void charybdis_set_pointer_sniping_enabled(bool enable) {
|
||||
g_charybdis_config.is_sniping_enabled = enable;
|
||||
maybe_update_pointing_device_cpi(&g_charybdis_config);
|
||||
}
|
||||
|
||||
bool charybdis_get_pointer_dragscroll_enabled(void) { return g_charybdis_config.is_dragscroll_enabled; }
|
||||
|
||||
void charybdis_set_pointer_dragscroll_enabled(bool enable) {
|
||||
g_charybdis_config.is_dragscroll_enabled = enable;
|
||||
maybe_update_pointing_device_cpi(&g_charybdis_config);
|
||||
}
|
||||
|
||||
void pointing_device_init_kb(void) { maybe_update_pointing_device_cpi(&g_charybdis_config); }
|
||||
|
||||
# ifndef CONSTRAIN_HID
|
||||
# define CONSTRAIN_HID(value) ((value) < -127 ? -127 : ((value) > 127 ? 127 : (value)))
|
||||
# endif // !CONSTRAIN_HID
|
||||
|
||||
/**
|
||||
* \brief Add optional acceleration effect.
|
||||
*
|
||||
* If `CHARYBDIS_ENABLE_POINTER_ACCELERATION` is defined, add a simple and naive
|
||||
* acceleration effect to the provided value. Return the value unchanged
|
||||
* otherwise.
|
||||
*/
|
||||
# ifndef DISPLACEMENT_WITH_ACCELERATION
|
||||
# ifdef CHARYBDIS_POINTER_ACCELERATION_ENABLE
|
||||
# define DISPLACEMENT_WITH_ACCELERATION(d) (CONSTRAIN_HID(d > 0 ? d * d / CHARYBDIS_POINTER_ACCELERATION_FACTOR + d : -d * d / CHARYBDIS_POINTER_ACCELERATION_FACTOR + d))
|
||||
# else // !CHARYBDIS_POINTER_ACCELERATION_ENABLE
|
||||
# define DISPLACEMENT_WITH_ACCELERATION(d) (d)
|
||||
# endif // CHARYBDIS_POINTER_ACCELERATION_ENABLE
|
||||
# endif // !DISPLACEMENT_WITH_ACCELERATION
|
||||
|
||||
/**
|
||||
* \brief Augment the pointing device behavior.
|
||||
*
|
||||
* Implement the Charybdis-specific features for pointing devices:
|
||||
* - Drag-scroll
|
||||
* - Sniping
|
||||
* - Acceleration
|
||||
*/
|
||||
static void pointing_device_task_charybdis(report_mouse_t* mouse_report) {
|
||||
static int16_t scroll_buffer_x = 0;
|
||||
static int16_t scroll_buffer_y = 0;
|
||||
if (g_charybdis_config.is_dragscroll_enabled) {
|
||||
# ifdef CHARYBDIS_DRAGSCROLL_REVERSE_X
|
||||
scroll_buffer_x -= mouse_report->x;
|
||||
# else
|
||||
scroll_buffer_x += mouse_report->x;
|
||||
# endif // CHARYBDIS_DRAGSCROLL_REVERSE_X
|
||||
# ifdef CHARYBDIS_DRAGSCROLL_REVERSE_Y
|
||||
scroll_buffer_y -= mouse_report->y;
|
||||
# else
|
||||
scroll_buffer_y += mouse_report->y;
|
||||
# endif // CHARYBDIS_DRAGSCROLL_REVERSE_Y
|
||||
mouse_report->x = 0;
|
||||
mouse_report->y = 0;
|
||||
if (abs(scroll_buffer_x) > CHARYBDIS_DRAGSCROLL_BUFFER_SIZE) {
|
||||
mouse_report->h = scroll_buffer_x > 0 ? 1 : -1;
|
||||
scroll_buffer_x = 0;
|
||||
}
|
||||
if (abs(scroll_buffer_y) > CHARYBDIS_DRAGSCROLL_BUFFER_SIZE) {
|
||||
mouse_report->v = scroll_buffer_y > 0 ? 1 : -1;
|
||||
scroll_buffer_y = 0;
|
||||
}
|
||||
} else if (!g_charybdis_config.is_sniping_enabled) {
|
||||
mouse_report->x = DISPLACEMENT_WITH_ACCELERATION(mouse_report->x);
|
||||
mouse_report->y = DISPLACEMENT_WITH_ACCELERATION(mouse_report->y);
|
||||
}
|
||||
}
|
||||
|
||||
report_mouse_t pointing_device_task_kb(report_mouse_t mouse_report) {
|
||||
pointing_device_task_charybdis(&mouse_report);
|
||||
mouse_report = pointing_device_task_user(mouse_report);
|
||||
|
||||
return mouse_report;
|
||||
}
|
||||
|
||||
# if defined(POINTING_DEVICE_ENABLE) && !defined(NO_CHARYBDIS_KEYCODES)
|
||||
/** \brief Whether SHIFT mod is enabled. */
|
||||
static bool has_shift_mod(void) {
|
||||
# ifdef NO_ACTION_ONESHOT
|
||||
return mod_config(get_mods()) & MOD_MASK_SHIFT;
|
||||
# else
|
||||
return mod_config(get_mods() | get_oneshot_mods()) & MOD_MASK_SHIFT;
|
||||
# endif // NO_ACTION_ONESHOT
|
||||
}
|
||||
# endif // POINTING_DEVICE_ENABLE && !NO_CHARYBDIS_KEYCODES
|
||||
|
||||
/**
|
||||
* \brief Outputs the Charybdis configuration to console.
|
||||
*
|
||||
* Prints the in-memory configuration structure to console, for debugging.
|
||||
* Includes:
|
||||
* - raw value
|
||||
* - drag-scroll: on/off
|
||||
* - sniping: on/off
|
||||
* - default DPI: internal table index/actual DPI
|
||||
* - sniping DPI: internal table index/actual DPI
|
||||
*/
|
||||
static void debug_charybdis_config_to_console(charybdis_config_t* config) {
|
||||
# ifdef CONSOLE_ENABLE
|
||||
dprintf("(charybdis) process_record_kb: config = {\n"
|
||||
"\traw = 0x%04X,\n"
|
||||
"\t{\n"
|
||||
"\t\tis_dragscroll_enabled=%b\n"
|
||||
"\t\tis_sniping_enabled=%b\n"
|
||||
"\t\tdefault_dpi=0x%02X (%ld)\n"
|
||||
"\t\tsniping_dpi=0x%01X (%ld)\n"
|
||||
"\t}\n"
|
||||
"}\n",
|
||||
config->raw, config->is_dragscroll_enabled, config->is_sniping_enabled, config->pointer_default_dpi, get_pointer_default_dpi(config), config->pointer_sniping_dpi, get_pointer_sniping_dpi(config));
|
||||
# endif // CONSOLE_ENABLE
|
||||
}
|
||||
|
||||
bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
|
||||
if (!process_record_user(keycode, record)) {
|
||||
debug_charybdis_config_to_console(&g_charybdis_config);
|
||||
return false;
|
||||
}
|
||||
|
||||
#ifdef POINTING_DEVICE_ENABLE
|
||||
if (keycode == DPI_CONFIG && record->event.pressed) {
|
||||
if ((get_mods() | get_oneshot_mods()) & MOD_MASK_SHIFT) {
|
||||
keyboard_config.dpi_config = (keyboard_config.dpi_config - 1) % DPI_OPTION_SIZE;
|
||||
} else {
|
||||
keyboard_config.dpi_config = (keyboard_config.dpi_config + 1) % DPI_OPTION_SIZE;
|
||||
}
|
||||
eeconfig_update_kb(keyboard_config.raw);
|
||||
kb_config_data.device_cpi = dpi_array[keyboard_config.dpi_config];
|
||||
pointing_device_set_cpi(kb_config_data.device_cpi);
|
||||
# ifndef NO_CHARYBDIS_KEYCODES
|
||||
switch (keycode) {
|
||||
case POINTER_DEFAULT_DPI_FORWARD:
|
||||
if (record->event.pressed) {
|
||||
// Step backward if shifted, forward otherwise.
|
||||
charybdis_cycle_pointer_default_dpi(/* forward= */ !has_shift_mod());
|
||||
}
|
||||
break;
|
||||
case POINTER_DEFAULT_DPI_REVERSE:
|
||||
if (record->event.pressed) {
|
||||
// Step forward if shifted, backward otherwise.
|
||||
charybdis_cycle_pointer_default_dpi(/* forward= */ has_shift_mod());
|
||||
}
|
||||
break;
|
||||
case POINTER_SNIPING_DPI_FORWARD:
|
||||
if (record->event.pressed) {
|
||||
// Step backward if shifted, forward otherwise.
|
||||
charybdis_cycle_pointer_sniping_dpi(/* forward= */ !has_shift_mod());
|
||||
}
|
||||
break;
|
||||
case POINTER_SNIPING_DPI_REVERSE:
|
||||
if (record->event.pressed) {
|
||||
// Step forward if shifted, backward otherwise.
|
||||
charybdis_cycle_pointer_sniping_dpi(/* forward= */ has_shift_mod());
|
||||
}
|
||||
break;
|
||||
case SNIPING_MODE:
|
||||
charybdis_set_pointer_sniping_enabled(record->event.pressed);
|
||||
break;
|
||||
case SNIPING_MODE_TOGGLE:
|
||||
if (record->event.pressed) {
|
||||
charybdis_set_pointer_sniping_enabled(!charybdis_get_pointer_sniping_enabled());
|
||||
}
|
||||
break;
|
||||
case DRAGSCROLL_MODE:
|
||||
charybdis_set_pointer_dragscroll_enabled(record->event.pressed);
|
||||
break;
|
||||
case DRAGSCROLL_MODE_TOGGLE:
|
||||
if (record->event.pressed) {
|
||||
charybdis_set_pointer_dragscroll_enabled(!charybdis_get_pointer_dragscroll_enabled());
|
||||
}
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
|
||||
/* If Mousekeys is disabled, then use handle the mouse button
|
||||
* keycodes. This makes things simpler, and allows usage of
|
||||
* the keycodes in a consistent manner. But only do this if
|
||||
* Mousekeys is not enable, so it's not handled twice.
|
||||
*/
|
||||
#ifndef MOUSEKEY_ENABLE
|
||||
# endif // !NO_CHARYBDIS_KEYCODES
|
||||
# ifndef MOUSEKEY_ENABLE
|
||||
// Simulate mouse keys if full support is not enabled (reduces firmware size
|
||||
// while maintaining support for mouse keys).
|
||||
if (IS_MOUSEKEY_BUTTON(keycode)) {
|
||||
report_mouse_t currentReport = pointing_device_get_report();
|
||||
currentReport.buttons = pointing_device_handle_buttons(currentReport.buttons, record->event.pressed, keycode - KC_MS_BTN1);
|
||||
pointing_device_set_report(currentReport);
|
||||
report_mouse_t mouse_report = pointing_device_get_report();
|
||||
mouse_report.buttons = pointing_device_handle_buttons(mouse_report.buttons, record->event.pressed, keycode - KC_MS_BTN1);
|
||||
pointing_device_set_report(mouse_report);
|
||||
pointing_device_send();
|
||||
}
|
||||
#endif
|
||||
|
||||
# endif // !MOUSEKEY_ENABLE
|
||||
debug_charybdis_config_to_console(&g_charybdis_config);
|
||||
return true;
|
||||
}
|
||||
__attribute__((weak)) void keyboard_pre_init_sub(void) {}
|
||||
void keyboard_pre_init_kb(void) {
|
||||
// debug_enable = true;
|
||||
// debug_matrix = true;
|
||||
// debug_mouse = true;
|
||||
// debug_encoder = true;
|
||||
|
||||
// This is the debug LED.
|
||||
#if defined(DEBUG_LED_PIN)
|
||||
setPinOutput(DEBUG_LED_PIN);
|
||||
writePin(DEBUG_LED_PIN, !debug_enable);
|
||||
#endif
|
||||
void eeconfig_init_kb(void) {
|
||||
g_charybdis_config.raw = 0;
|
||||
write_charybdis_config_to_eeprom(&g_charybdis_config);
|
||||
maybe_update_pointing_device_cpi(&g_charybdis_config);
|
||||
eeconfig_init_user();
|
||||
}
|
||||
|
||||
memset(&kb_config_data, 0, sizeof(kb_config_data));
|
||||
void matrix_power_up(void) { pointing_device_task(); }
|
||||
|
||||
keyboard_pre_init_sub();
|
||||
keyboard_pre_init_user();
|
||||
void charybdis_config_sync_handler(uint8_t initiator2target_buffer_size, const void* initiator2target_buffer, uint8_t target2initiator_buffer_size, void* target2initiator_buffer) {
|
||||
if (initiator2target_buffer_size == sizeof(g_charybdis_config)) {
|
||||
memcpy(&g_charybdis_config, initiator2target_buffer, sizeof(g_charybdis_config));
|
||||
}
|
||||
}
|
||||
|
||||
void keyboard_post_init_kb(void) {
|
||||
transaction_register_rpc(RPC_ID_KB_CONFIG_SYNC, kb_config_sync_handler);
|
||||
transaction_register_rpc(RPC_ID_KB_CONFIG_SYNC, charybdis_config_sync_handler);
|
||||
|
||||
keyboard_post_init_user();
|
||||
}
|
||||
|
||||
#ifdef POINTING_DEVICE_ENABLE
|
||||
void pointing_device_init_kb(void) {
|
||||
kb_config_data.device_cpi = dpi_array[keyboard_config.dpi_config];
|
||||
pointing_device_set_cpi(kb_config_data.device_cpi);
|
||||
pointing_device_init_user();
|
||||
}
|
||||
|
||||
report_mouse_t pointing_device_task_kb(report_mouse_t mouse_report) {
|
||||
void housekeeping_task_kb(void) {
|
||||
if (is_keyboard_master()) {
|
||||
mouse_report = pointing_device_task_user(mouse_report);
|
||||
}
|
||||
return mouse_report;
|
||||
}
|
||||
#endif
|
||||
// Keep track of the last state, so that we can tell if we need to propagate to slave
|
||||
static charybdis_config_t last_charybdis_config = {0};
|
||||
static uint32_t last_sync = 0;
|
||||
bool needs_sync = false;
|
||||
|
||||
void eeconfig_init_kb(void) {
|
||||
keyboard_config.dpi_config = TRACKBALL_DPI_DEFAULT;
|
||||
#ifdef POINTING_DEVICE_ENABLE
|
||||
kb_config_data.device_cpi = dpi_array[keyboard_config.dpi_config];
|
||||
pointing_device_set_cpi(kb_config_data.device_cpi);
|
||||
#endif
|
||||
eeconfig_update_kb(keyboard_config.raw);
|
||||
eeconfig_init_user();
|
||||
// Check if the state values are different
|
||||
if (memcmp(&g_charybdis_config, &last_charybdis_config, sizeof(g_charybdis_config))) {
|
||||
needs_sync = true;
|
||||
memcpy(&last_charybdis_config, &g_charybdis_config, sizeof(g_charybdis_config));
|
||||
}
|
||||
// Send to slave every 500ms regardless of state change
|
||||
if (timer_elapsed32(last_sync) > 500) {
|
||||
needs_sync = true;
|
||||
}
|
||||
|
||||
// Perform the sync if requested
|
||||
if (needs_sync) {
|
||||
if (transaction_rpc_send(RPC_ID_KB_CONFIG_SYNC, sizeof(g_charybdis_config), &g_charybdis_config)) {
|
||||
last_sync = timer_read32();
|
||||
}
|
||||
}
|
||||
}
|
||||
// no need for user function, is called already
|
||||
}
|
||||
|
||||
#endif // POINTING_DEVICE_ENABLE
|
||||
|
||||
__attribute__((weak)) void matrix_init_sub_kb(void) {}
|
||||
void matrix_init_kb(void) {
|
||||
// is safe to just read DPI setting since matrix init
|
||||
// comes before pointing device init.
|
||||
keyboard_config.raw = eeconfig_read_kb();
|
||||
if (keyboard_config.dpi_config > DPI_OPTION_SIZE) {
|
||||
eeconfig_init_kb();
|
||||
}
|
||||
#ifdef POINTING_DEVICE_ENABLE
|
||||
read_charybdis_config_from_eeprom(&g_charybdis_config);
|
||||
#endif // POINTING_DEVICE_ENABLE
|
||||
matrix_init_sub_kb();
|
||||
matrix_init_user();
|
||||
}
|
||||
|
|
@ -135,40 +389,3 @@ void matrix_scan_kb(void) {
|
|||
matrix_scan_sub_kb();
|
||||
matrix_scan_user();
|
||||
}
|
||||
|
||||
void housekeeping_task_kb(void) {
|
||||
if (is_keyboard_master()) {
|
||||
// Keep track of the last state, so that we can tell if we need to propagate to slave
|
||||
static kb_config_data_t last_kb_config;
|
||||
static uint32_t last_sync = 0;
|
||||
bool needs_sync = false;
|
||||
|
||||
// Check if the state values are different
|
||||
if (memcmp(&kb_config_data, &last_kb_config, sizeof(kb_config_data))) {
|
||||
needs_sync = true;
|
||||
memcpy(&last_kb_config, &kb_config_data, sizeof(kb_config_data));
|
||||
}
|
||||
// Send to slave every 500ms regardless of state change
|
||||
if (timer_elapsed32(last_sync) > 500) {
|
||||
needs_sync = true;
|
||||
}
|
||||
|
||||
// Perform the sync if requested
|
||||
if (needs_sync) {
|
||||
if (transaction_rpc_send(RPC_ID_KB_CONFIG_SYNC, sizeof(kb_config_data), &kb_config_data)) {
|
||||
last_sync = timer_read32();
|
||||
}
|
||||
}
|
||||
}
|
||||
// no need for user function, is called already
|
||||
}
|
||||
|
||||
void kb_config_sync_handler(uint8_t initiator2target_buffer_size, const void* initiator2target_buffer, uint8_t target2initiator_buffer_size, void* target2initiator_buffer) {
|
||||
if (initiator2target_buffer_size == sizeof(kb_config_data)) {
|
||||
memcpy(&kb_config_data, initiator2target_buffer, sizeof(kb_config_data));
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef POINTING_DEVICE_ENABLE
|
||||
void matrix_power_up(void) { pointing_device_task(); }
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@
|
|||
#pragma once
|
||||
|
||||
#include "quantum.h"
|
||||
#include "pointing_device.h"
|
||||
|
||||
#if defined(KEYBOARD_handwired_tractyl_manuform_5x6_right)
|
||||
# include "5x6_right.h"
|
||||
|
|
@ -25,33 +24,100 @@
|
|||
# include "4x6_right.h"
|
||||
#endif
|
||||
|
||||
typedef union {
|
||||
uint32_t raw;
|
||||
struct {
|
||||
uint8_t dpi_config;
|
||||
};
|
||||
} keyboard_config_t;
|
||||
|
||||
typedef union {
|
||||
uint32_t raw;
|
||||
struct {
|
||||
uint16_t device_cpi;
|
||||
};
|
||||
} kb_config_data_t;
|
||||
|
||||
extern keyboard_config_t keyboard_config;
|
||||
extern kb_config_data_t kb_config_data;
|
||||
|
||||
enum ploopy_keycodes {
|
||||
DPI_CONFIG = SAFE_RANGE,
|
||||
#ifdef POINTING_DEVICE_ENABLE
|
||||
# ifndef NO_CHARYBDIS_KEYCODES
|
||||
enum charybdis_keycodes {
|
||||
# ifdef VIA_ENABLE
|
||||
POINTER_DEFAULT_DPI_FORWARD = USER00,
|
||||
# else
|
||||
POINTER_DEFAULT_DPI_FORWARD = SAFE_RANGE,
|
||||
# endif // VIA_ENABLE
|
||||
POINTER_DEFAULT_DPI_REVERSE,
|
||||
POINTER_SNIPING_DPI_FORWARD,
|
||||
POINTER_SNIPING_DPI_REVERSE,
|
||||
SNIPING_MODE,
|
||||
SNIPING_MODE_TOGGLE,
|
||||
DRAGSCROLL_MODE,
|
||||
DRAGSCROLL_MODE_TOGGLE,
|
||||
KEYMAP_SAFE_RANGE,
|
||||
};
|
||||
# define CHARYBDIS_SAFE_RANGE KEYMAP_SAFE_RANGE
|
||||
# define DPI_MOD POINTER_DEFAULT_DPI_FORWARD
|
||||
# define DPI_RMOD POINTER_DEFAULT_DPI_REVERSE
|
||||
# define S_D_MOD POINTER_SNIPING_DPI_FORWARD
|
||||
# define S_D_RMOD POINTER_SNIPING_DPI_REVERSE
|
||||
# define SNIPING SNIPING_MODE
|
||||
# define SNP_TOG SNIPING_MODE_TOGGLE
|
||||
# define DRGSCRL DRAGSCROLL_MODE
|
||||
# define DRG_TOG DRAGSCROLL_MODE_TOGGLE
|
||||
# endif // !NO_CHARYBDIS_KEYCODES
|
||||
|
||||
/** \brief Return the current DPI value for the pointer's default mode. */
|
||||
uint16_t charybdis_get_pointer_default_dpi(void);
|
||||
|
||||
/**
|
||||
* \brief Update the pointer's default DPI to the next or previous step.
|
||||
*
|
||||
* Increases the DPI value if `forward` is `true`, decreases it otherwise.
|
||||
* The increment/decrement steps are equal to CHARYBDIS_DEFAULT_DPI_CONFIG_STEP.
|
||||
*
|
||||
* The new value is persisted in EEPROM.
|
||||
*/
|
||||
void charybdis_cycle_pointer_default_dpi(bool forward);
|
||||
|
||||
/**
|
||||
* \brief Same as `charybdis_cycle_pointer_default_dpi`, but do not write to
|
||||
* EEPROM.
|
||||
*
|
||||
* This means that reseting the board will revert the value to the last
|
||||
* persisted one.
|
||||
*/
|
||||
void charybdis_cycle_pointer_default_dpi_noeeprom(bool forward);
|
||||
|
||||
/** \brief Return the current DPI value for the pointer's sniper-mode. */
|
||||
uint16_t charybdis_get_pointer_sniping_dpi(void);
|
||||
|
||||
/**
|
||||
* \brief Update the pointer's sniper-mode DPI to the next or previous step.
|
||||
*
|
||||
* Increases the DPI value if `forward` is `true`, decreases it otherwise.
|
||||
* The increment/decrement steps are equal to CHARYBDIS_SNIPING_DPI_CONFIG_STEP.
|
||||
*
|
||||
* The new value is persisted in EEPROM.
|
||||
*/
|
||||
void charybdis_cycle_pointer_sniping_dpi(bool forward);
|
||||
|
||||
/**
|
||||
* \brief Same as `charybdis_cycle_pointer_sniping_dpi`, but do not write to
|
||||
* EEPROM.
|
||||
*
|
||||
* This means that reseting the board will revert the value to the last
|
||||
* persisted one.
|
||||
*/
|
||||
void charybdis_cycle_pointer_sniping_dpi_noeeprom(bool forward);
|
||||
|
||||
/** \brief Whether sniper-mode is enabled. */
|
||||
bool charybdis_get_pointer_sniping_enabled(void);
|
||||
|
||||
/**
|
||||
* \brief Enable/disable sniper mode.
|
||||
*
|
||||
* When sniper mode is enabled the dpi is reduced to slow down the pointer for
|
||||
* more accurate movements.
|
||||
*/
|
||||
void charybdis_set_pointer_sniping_enabled(bool enable);
|
||||
|
||||
/** \brief Whether drag-scroll is enabled. */
|
||||
bool charybdis_get_pointer_dragscroll_enabled(void);
|
||||
|
||||
/**
|
||||
* \brief Enable/disable drag-scroll mode.
|
||||
*
|
||||
* When drag-scroll mode is enabled, horizontal and vertical pointer movements
|
||||
* are translated into horizontal and vertical scroll movements.
|
||||
*/
|
||||
void charybdis_set_pointer_dragscroll_enabled(bool enable);
|
||||
#endif // POINTING_DEVICE_ENABLE
|
||||
|
||||
void matrix_init_sub_kb(void);
|
||||
void matrix_scan_sub_kb(void);
|
||||
|
||||
void keyboard_pre_init_sync(void);
|
||||
void keyboard_post_init_sync(void);
|
||||
void housekeeping_task_sync(void);
|
||||
|
||||
void kb_config_sync_handler(uint8_t initiator2target_buffer_size, const void* initiator2target_buffer, uint8_t target2initiator_buffer_size, void* target2initiator_buffer);
|
||||
|
|
|
|||
|
|
@ -953,7 +953,7 @@ void oled_driver_render_logo_left(void) {
|
|||
render_matrix_scan_rate(2);
|
||||
# endif
|
||||
oled_set_cursor(7, 2);
|
||||
# if defined(KEYBOARD_bastardkb_charybdis)
|
||||
# if defined(KEYBOARD_bastardkb_charybdis) || defined(KEYBOARD_handwired_tractyl_manuform)
|
||||
render_pointing_dpi_status(charybdis_get_pointer_sniping_enabled() ? charybdis_get_pointer_sniping_dpi() : charybdis_get_pointer_default_dpi(), 1);
|
||||
|
||||
// credit and thanks to jaspertandy on discord for these images
|
||||
|
|
|
|||
|
|
@ -80,9 +80,9 @@ bool process_record_pointing(uint16_t keycode, keyrecord_t* record) {
|
|||
}
|
||||
break;
|
||||
case MO(_MOUSE):
|
||||
#if defined(KEYBOARD_ploopy) || defined(KEYBOARD_handwired_tractyl_manuform)
|
||||
#if defined(KEYBOARD_ploopy)
|
||||
case DPI_CONFIG:
|
||||
#elif defined(KEYBOARD_bastardkb_charybdis) && !defined(NO_CHARYBDIS_KEYCODES)
|
||||
#elif (defined(KEYBOARD_bastardkb_charybdis) || defined(KEYBOARD_handwired_tractyl_manuform)) && !defined(NO_CHARYBDIS_KEYCODES)
|
||||
case SAFE_RANGE ... (CHARYBDIS_SAFE_RANGE-1):
|
||||
#endif
|
||||
case KC_MS_UP ... KC_MS_WH_RIGHT:
|
||||
|
|
|
|||
Loading…
Reference in a new issue