Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: zmkfirmware/zmk
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 631612a229c2d13afe512b9a1f6a5f5c7a6aa7e3
Choose a base ref
..
head repository: zmkfirmware/zmk
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 56df498d7a61ad824f0f671940abd883911b0376
Choose a head ref
Showing with 15 additions and 5 deletions.
  1. +3 −1 app/src/endpoints.c
  2. +9 −3 app/src/hid.c
  3. +3 −1 app/src/workqueue.c
4 changes: 3 additions & 1 deletion app/src/endpoints.c
Original file line number Diff line number Diff line change
@@ -116,7 +116,9 @@ int zmk_endpoints_toggle_transport(void) {
return zmk_endpoints_select_transport(new_transport);
}

struct zmk_endpoint_instance zmk_endpoints_selected(void) { return current_instance; }
struct zmk_endpoint_instance zmk_endpoints_selected(void) {
return current_instance;
}

static int send_keyboard_report(void) {
switch (current_instance.transport) {
12 changes: 9 additions & 3 deletions app/src/hid.c
Original file line number Diff line number Diff line change
@@ -434,12 +434,18 @@ void zmk_hid_mouse_clear(void) { memset(&mouse_report.body, 0, sizeof(mouse_repo

#endif // IS_ENABLED(CONFIG_ZMK_MOUSE)

struct zmk_hid_keyboard_report *zmk_hid_get_keyboard_report(void) { return &keyboard_report; }
struct zmk_hid_keyboard_report *zmk_hid_get_keyboard_report(void) {
return &keyboard_report;
}

struct zmk_hid_consumer_report *zmk_hid_get_consumer_report(void) { return &consumer_report; }
struct zmk_hid_consumer_report *zmk_hid_get_consumer_report(void) {
return &consumer_report;
}

#if IS_ENABLED(CONFIG_ZMK_MOUSE)

struct zmk_hid_mouse_report *zmk_hid_get_mouse_report(void) { return &mouse_report; }
struct zmk_hid_mouse_report *zmk_hid_get_mouse_report(void) {
return &mouse_report;
}

#endif // IS_ENABLED(CONFIG_ZMK_MOUSE)
4 changes: 3 additions & 1 deletion app/src/workqueue.c
Original file line number Diff line number Diff line change
@@ -13,7 +13,9 @@ K_THREAD_STACK_DEFINE(lowprio_q_stack, CONFIG_ZMK_LOW_PRIORITY_THREAD_STACK_SIZE

static struct k_work_q lowprio_work_q;

struct k_work_q *zmk_workqueue_lowprio_work_q(void) { return &lowprio_work_q; }
struct k_work_q *zmk_workqueue_lowprio_work_q(void) {
return &lowprio_work_q;
}

static int workqueue_init(const struct device *_device) {
static const struct k_work_queue_config queue_config = {.name = "Low Priority Work Queue"};