diff --git a/app/include/zmk/behavior.h b/app/include/zmk/behavior.h index ab95fd8e..4f230d5f 100644 --- a/app/include/zmk/behavior.h +++ b/app/include/zmk/behavior.h @@ -15,6 +15,7 @@ struct zmk_behavior_binding { char *behavior_dev; uint32_t param1; uint32_t param2; + uint32_t param3; }; struct zmk_behavior_binding_event { diff --git a/app/include/zmk/split/bluetooth/service.h b/app/include/zmk/split/bluetooth/service.h index 112cd552..b18b1ca6 100644 --- a/app/include/zmk/split/bluetooth/service.h +++ b/app/include/zmk/split/bluetooth/service.h @@ -23,6 +23,7 @@ struct zmk_split_run_behavior_data { uint8_t state; uint32_t param1; uint32_t param2; + uint32_t param3; } __packed; struct zmk_split_run_behavior_payload { diff --git a/app/src/behavior_queue.c b/app/src/behavior_queue.c index 1511e755..e075be75 100644 --- a/app/src/behavior_queue.c +++ b/app/src/behavior_queue.c @@ -28,8 +28,8 @@ static void behavior_queue_process_next(struct k_work *work) { struct q_item item = {.wait = 0}; while (k_msgq_get(&zmk_behavior_queue_msgq, &item, K_NO_WAIT) == 0) { - LOG_DBG("Invoking %s: 0x%02x 0x%02x", item.binding.behavior_dev, item.binding.param1, - item.binding.param2); + LOG_DBG("Invoking %s: 0x%02x 0x%02x 0x%02x", item.binding.behavior_dev, item.binding.param1, + item.binding.param2, item.binding.param3); struct zmk_behavior_binding_event event = {.position = item.position, .timestamp = k_uptime_get()}; diff --git a/app/src/split/bluetooth/central.c b/app/src/split/bluetooth/central.c index abb37a0b..b80c8f0b 100644 --- a/app/src/split/bluetooth/central.c +++ b/app/src/split/bluetooth/central.c @@ -814,6 +814,7 @@ int zmk_split_bt_invoke_behavior(uint8_t source, struct zmk_behavior_binding *bi struct zmk_split_run_behavior_payload payload = {.data = { .param1 = binding->param1, .param2 = binding->param2, + .param3 = binding->param3, .position = event.position, .state = state ? 1 : 0, }}; diff --git a/app/src/split/bluetooth/service.c b/app/src/split/bluetooth/service.c index 505eb363..5484ad72 100644 --- a/app/src/split/bluetooth/service.c +++ b/app/src/split/bluetooth/service.c @@ -80,10 +80,11 @@ static ssize_t split_svc_run_behavior(struct bt_conn *conn, const struct bt_gatt struct zmk_behavior_binding binding = { .param1 = payload->data.param1, .param2 = payload->data.param2, + .param3 = payload->data.param3, .behavior_dev = payload->behavior_dev, }; - LOG_DBG("%s with params %d %d: pressed? %d", binding.behavior_dev, binding.param1, - binding.param2, payload->data.state); + LOG_WRN("%s with params %d %d %d: pressed? %d", binding.behavior_dev, binding.param1, + binding.param2, binding.param3, payload->data.state); struct zmk_behavior_binding_event event = {.position = payload->data.position, .timestamp = k_uptime_get()}; int err;