kb01/zmk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ifdefs for link errors when compiling non-central, some includes, other minor hacks to compile, cleanup is needed later

Browse source
This commit is contained in:
Shawn Meier 2022-05-18 23:07:54 -06:00
parent 63a178ed2f
commit 0cfc24bf18
6 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/include/zmk/events/mouse_button_state_changed.h
View file

@ -23,5 +23,5 @@ ZMK_EVENT_DECLARE(zmk_mouse_button_state_changed);
static inline struct zmk_mouse_button_state_changed_event * static inline struct zmk_mouse_button_state_changed_event *
zmk_mouse_button_state_changed_from_encoded(uint32_t encoded, bool pressed, int64_t timestamp) { zmk_mouse_button_state_changed_from_encoded(uint32_t encoded, bool pressed, int64_t timestamp) {
return new_zmk_mouse_button_state_changed((struct zmk_mouse_button_state_changed){ return new_zmk_mouse_button_state_changed((struct zmk_mouse_button_state_changed){
.buttons = HID_USAGE_ID(encoded), .state = pressed, .timestamp = timestamp}); .buttons = ZMK_HID_USAGE_ID(encoded), .state = pressed, .timestamp = timestamp});
} }

2
app/src/behaviors/behavior_mouse_key_press.c
View file

@ -39,7 +39,7 @@ static const struct behavior_driver_api behavior_mouse_key_press_driver_api = {
.binding_pressed = on_keymap_binding_pressed, .binding_released = on_keymap_binding_released}; .binding_pressed = on_keymap_binding_pressed, .binding_released = on_keymap_binding_released};
#define KP_INST(n) \ #define KP_INST(n) \
DEVICE_DT_INST_DEFINE(n, behavior_mouse_key_press_init, device_pm_control_nop, NULL, NULL, \ DEVICE_DT_INST_DEFINE(n, behavior_mouse_key_press_init, NULL, NULL, NULL, \
APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, \ APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, \
&behavior_mouse_key_press_driver_api); &behavior_mouse_key_press_driver_api);

2
app/src/behaviors/behavior_mouse_move.c
View file

@ -48,7 +48,7 @@ static const struct behavior_driver_api behavior_mouse_move_driver_api = {
.time_to_max_speed_ms = DT_INST_PROP(n, time_to_max_speed_ms), \ .time_to_max_speed_ms = DT_INST_PROP(n, time_to_max_speed_ms), \
.acceleration_exponent = DT_INST_PROP(n, acceleration_exponent), \ .acceleration_exponent = DT_INST_PROP(n, acceleration_exponent), \
}; \ }; \
DEVICE_DT_INST_DEFINE(n, behavior_mouse_move_init, device_pm_control_nop, NULL, \ DEVICE_DT_INST_DEFINE(n, behavior_mouse_move_init, NULL, NULL, \
&behavior_mouse_move_config_##n, APPLICATION, \ &behavior_mouse_move_config_##n, APPLICATION, \
CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &behavior_mouse_move_driver_api); CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &behavior_mouse_move_driver_api);

2
app/src/behaviors/behavior_mouse_scroll.c
View file

@ -49,7 +49,7 @@ static const struct behavior_driver_api behavior_mouse_scroll_driver_api = {
.time_to_max_speed_ms = DT_INST_PROP(n, time_to_max_speed_ms), \ .time_to_max_speed_ms = DT_INST_PROP(n, time_to_max_speed_ms), \
.acceleration_exponent = DT_INST_PROP(n, acceleration_exponent), \ .acceleration_exponent = DT_INST_PROP(n, acceleration_exponent), \
}; \ }; \
DEVICE_DT_INST_DEFINE(n, behavior_mouse_scroll_init, device_pm_control_nop, NULL, \ DEVICE_DT_INST_DEFINE(n, behavior_mouse_scroll_init, NULL, NULL, \
&behavior_mouse_scroll_config_##n, APPLICATION, \ &behavior_mouse_scroll_config_##n, APPLICATION, \
CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &behavior_mouse_scroll_driver_api); CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &behavior_mouse_scroll_driver_api);

4
app/src/mouse/key_listener.c
View file

@ -45,6 +45,8 @@ void mouse_clear_cb(struct k_timer *dummy) {
k_work_submit_to_queue(zmk_mouse_work_q(), &mouse_clear); k_work_submit_to_queue(zmk_mouse_work_q(), &mouse_clear);
} }
//TODO: There is probably a better flag to use here
#if(CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL)
static void mouse_tick_timer_handler(struct k_work *work) { static void mouse_tick_timer_handler(struct k_work *work) {
zmk_hid_mouse_movement_set(0, 0); zmk_hid_mouse_movement_set(0, 0);
zmk_hid_mouse_scroll_set(0, 0); zmk_hid_mouse_scroll_set(0, 0);
@ -158,3 +160,5 @@ ZMK_LISTENER(mouse_listener, mouse_listener);
ZMK_SUBSCRIPTION(mouse_listener, zmk_mouse_button_state_changed); ZMK_SUBSCRIPTION(mouse_listener, zmk_mouse_button_state_changed);
ZMK_SUBSCRIPTION(mouse_listener, zmk_mouse_move_state_changed); ZMK_SUBSCRIPTION(mouse_listener, zmk_mouse_move_state_changed);
ZMK_SUBSCRIPTION(mouse_listener, zmk_mouse_scroll_state_changed); ZMK_SUBSCRIPTION(mouse_listener, zmk_mouse_scroll_state_changed);
#endif /* CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL */

5
app/src/mouse/tick_listener.c
View file

@ -11,6 +11,7 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
#include <zmk/event_manager.h> #include <zmk/event_manager.h>
#include <zmk/events/mouse_tick.h> #include <zmk/events/mouse_tick.h>
#include <zmk/endpoints.h> #include <zmk/endpoints.h>
#include <zmk/hid.h>
#include <zmk/mouse.h> #include <zmk/mouse.h>
#include <sys/util.h> // CLAMP #include <sys/util.h> // CLAMP
@ -78,6 +79,7 @@ static struct vector2d update_movement(struct vector2d *remainder,
return move; return move;
} }
#if(CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL)
static void mouse_tick_handler(const struct zmk_mouse_tick *tick) { static void mouse_tick_handler(const struct zmk_mouse_tick *tick) {
struct vector2d move = update_movement(&move_remainder, &(tick->move_config), tick->max_move, struct vector2d move = update_movement(&move_remainder, &(tick->move_config), tick->max_move,
tick->timestamp, tick->start_time); tick->timestamp, tick->start_time);
@ -88,13 +90,16 @@ static void mouse_tick_handler(const struct zmk_mouse_tick *tick) {
zmk_hid_mouse_scroll_update((int8_t)CLAMP(scroll.x, INT8_MIN, INT8_MAX), zmk_hid_mouse_scroll_update((int8_t)CLAMP(scroll.x, INT8_MIN, INT8_MAX),
(int8_t)CLAMP(scroll.y, INT8_MIN, INT8_MAX)); (int8_t)CLAMP(scroll.y, INT8_MIN, INT8_MAX));
} }
#endif
int zmk_mouse_tick_listener(const zmk_event_t *eh) { int zmk_mouse_tick_listener(const zmk_event_t *eh) {
const struct zmk_mouse_tick *tick = as_zmk_mouse_tick(eh); const struct zmk_mouse_tick *tick = as_zmk_mouse_tick(eh);
#if(CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL)
if (tick) { if (tick) {
mouse_tick_handler(tick); mouse_tick_handler(tick);
return 0; return 0;
} }
#endif
return 0; return 0;
} }