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.

Sign up for GitHub

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

Jump to bottom

ble_mesh: Fix OP_TIME_SET and OP_TIME_STATUS (IDFGH-12074) #13135

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ble_mesh: Fix OP_TIME_SET and OP_TIME_STATUS (IDFGH-12074) #13135

wants to merge 1 commit into from
+4 −2

Conversation

s0be
Copy link
Contributor

@s0be s0be commented Feb 7, 2024

When a user app is handling these messages, the tai_utc_delta and time_zone_offset fields are not correctly populated. Resolve by properly setting the fields.

@CLAassistant
Copy link

CLAassistant commented Feb 7, 2024 •
edited
Loading

CLA assistant check
All committers have signed the CLA.

@github-actions GitHub Actions
Copy link

github-actions bot commented Feb 7, 2024 •
edited
Loading

Messages
📖 🎉 Good Job! All checks are passing!

👋 Hello s0be, we appreciate your contribution to this project!

📘 Please review the project's Contributions Guide for key guidelines on code, documentation, testing, and more.
🖊️ Please also make sure you have read and signed the Contributor License Agreement for this project.
Click to see more instructions ...


This automated output is generated by the PR linter DangerJS, which checks if your Pull Request meets the project's requirements and helps you fix potential issues.

DangerJS is triggered with each push event to a Pull Request and modify the contents of this comment.

Please consider the following:
- Danger mainly focuses on the PR structure and formatting and can't understand the meaning behind your code or changes.
- Danger is not a substitute for human code reviews; it's still important to request a code review from your colleagues.
- To manually retry these Danger checks, please navigate to the Actions tab and re-run last Danger workflow.

Review and merge process you can expect ...


We do welcome contributions in the form of bug reports, feature requests and pull requests via this public GitHub repository.

This GitHub project is public mirror of our internal git repository

1. An internal issue has been created for the PR, we assign it to the relevant engineer.
2. They review the PR and either approve it or ask you for changes or clarifications.
3. Once the GitHub PR is approved, we synchronize it into our internal git repository.
4. In the internal git repository we do the final review, collect approvals from core owners and make sure all the automated tests are passing.
- At this point we may do some adjustments to the proposed change, or extend it by adding tests or documentation.
5. If the change is approved and passes the tests it is merged into the default branch.
5. On next sync from the internal git repository merged change will appear in this public GitHub repository.

Generated by 🚫 dangerJS against 302c297

@espressif-bot espressif-bot added the Status: Opened Issue is new label Feb 7, 2024
@github-actions github-actions bot changed the title ble_mesh: Fix OP_TIME_SET and OP_TIME_STATUS ble_mesh: Fix OP_TIME_SET and OP_TIME_STATUS (IDFGH-12074) Feb 7, 2024
@s0be
Copy link
Contributor Author

s0be commented Feb 28, 2024

Anything I need to do to get this reviewed/merged?

@s0be
Copy link
Contributor Author

s0be commented Jul 29, 2024

@forx157 We're still carrying this patch. It's obvious this is a bug, what do I need to do to get this merged?

@forx157
Copy link
Collaborator

forx157 commented Aug 6, 2024

Hi, @s0be
Sorry this has sat around for an extraordinary long time without further feedback.
I've pushed this into our internal review & merge queue, PR will be updated once it's merged to master.
Thanks again for your contribution!

@forx157
Copy link
Collaborator

forx157 commented Aug 6, 2024

Hi, @s0be
Could update your commit info with the following format:
fix(ble_mesh): your commit info

@s0be
Copy link
Contributor Author

s0be commented Aug 7, 2024

Thanks @forx157 I think I did it? I'm more familiar with PRs on gitlab than github.

@forx157
Copy link
Collaborator

forx157 commented Aug 9, 2024

Hi, @s0be
Thanks for that. I've pushed this into our internal review & merge queue, PR will be updated once it's merged to master.

forx157
forx157 reviewed Aug 12, 2024
View reviewed changes
components/bt/esp_ble_mesh/models/server/time_scene_server.c Outdated
@@ -386,7 +387,8 @@ static void time_set(struct bt_mesh_model *model,
change.time_set.subsecond = srv->state->time.subsecond;
change.time_set.uncertainty = srv->state->time.uncertainty;
change.time_set.time_authority = srv->state->time.time_authority;
change.time_set.tai_utc_delta_curr = srv->state->time.subsecond;
change.time_set.tai_utc_delta_curr = srv->state->time.tai_utc_delta_curr;
change.time_set.time_zone_offset_curr = srv->state->time.time_zone_offset_curr
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
change.time_set.time_zone_offset_curr = srv->state->time.time_zone_offset_curr
change.time_set.time_zone_offset_curr = srv->state->time.time_zone_offset_curr;

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sorry about that, split this out of a larger patch series and didn't notice there was a fixup in a later commit.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@forx157 friendly nudge. I pushed the semicolon.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Hi, @s0be
The changes you've committed have been merged into the internal branch and will be synced to github in the future!

@s0be
fix(ble_mesh): Fix OP_TIME_SET and OP_TIME_STATUS
302c297 
When a user app is handling these messages, the tai_utc_delta and
time_zone_offset fields are not correctly populated.  Resolve by
properly setting the fields.
espressif-bot pushed a commit that referenced this pull request Aug 22, 2024
@s0be
fix(ble_mesh): Fix OP_TIME_SET and OP_TIME_STATUS
09442d9 
When a user app is handling these messages, the tai_utc_delta and
time_zone_offset fields are not correctly populated.  Resolve by
properly setting the fields.

Signed-off-by: luoxu <luoxu@espressif.com>
Closes #13135
espressif-bot pushed a commit that referenced this pull request Aug 22, 2024
@s0be
fix(ble_mesh): Fix OP_TIME_SET and OP_TIME_STATUS
cc32d8c 
When a user app is handling these messages, the tai_utc_delta and
time_zone_offset fields are not correctly populated.  Resolve by
properly setting the fields.

Signed-off-by: luoxu <luoxu@espressif.com>
Closes #13135
@espressif-bot espressif-bot added Status: Done Issue is done internally Resolution: Done Issue is done internally and removed Status: Opened Issue is new labels Oct 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@forx157 forx157 forx157 left review comments

Assignees

@forx157 forx157

Labels
Resolution: Done Issue is done internally Status: Done Issue is done internally
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@s0be @CLAassistant @forx157 @espressif-bot