Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ZMK Rebase v23.12 #25

Merged
merged 0 commits into from
Dec 18, 2023
Merged

ZMK Rebase v23.12 #25

merged 0 commits into from
Dec 18, 2023

Conversation

chrisandreae
Copy link
Collaborator

Rebases Glove80's patchset onto upstream ZMK at d7d9eed (Wed Nov 15 11:16:59 2023 -0800).

Additionally includes in PR#11 (name Bluetooth device using serial number prefix) and PR#24 (validate devicetree root entity names when remote building).

app/src/hog.c Outdated
}

struct bt_gatt_notify_params notify_params = {
.attr = &hog_svc.attrs[13],

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be updated to .attr = &hog_svc.attrs[16],. Each BT_GATT_CHARACTERISTIC adds two items to the attrs array, so the LED report adds 3 items before the mouse items.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does that mean that this change (taken from the upstream PR) is also insufficient, since it only offsets the index for the consumer report by 2 rather than by 3?

https://github.com/moergo-sc/zmk/pull/25/files#diff-b3e2c5329969f421f8e1dc4e06b59b38e157d9555b2ed0557dc55ce6c9f35097R294

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, the consumer report upstream was added after the mouse report, so it doesn't affect the index of the mouse report

app/src/hog.c Outdated Show resolved Hide resolved
@chrisandreae chrisandreae force-pushed the zmk-rebase-20231119 branch 2 times, most recently from d463963 to f17bd88 Compare November 26, 2023 08:14
@chrisandreae chrisandreae changed the title ZMK Rebase v23.11.1 ZMK Rebase v23.12 Dec 3, 2023
@chrisandreae
Copy link
Collaborator Author

Rebased to upstream ZMK 55aed8e

@chrisandreae chrisandreae force-pushed the zmk-rebase-20231119 branch 2 times, most recently from 74a619c to 179e6dc Compare December 9, 2023 04:01
@chrisandreae chrisandreae force-pushed the zmk-rebase-20231119 branch 2 times, most recently from d28e9fc to c0dbb3c Compare December 10, 2023 04:04
@chrisandreae chrisandreae force-pushed the zmk-rebase-20231119 branch 3 times, most recently from 08ba7d2 to e3bf640 Compare December 18, 2023 09:48
@chrisandreae chrisandreae merged commit e3bf640 into main Dec 18, 2023
49 checks passed
@chrisandreae chrisandreae deleted the zmk-rebase-20231119 branch June 19, 2024 08:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants