Skip to content

Corrected mbed-mesh-api thread/6lowpan tasklets interface disconnect/connect #7878

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
Merged
merged 2 commits into from
Aug 28, 2018
Merged

Corrected mbed-mesh-api thread/6lowpan tasklets interface disconnect/connect #7878

merged 2 commits into from
Aug 28, 2018

Conversation

mikaleppanen
Copy link

@mikaleppanen mikaleppanen commented Aug 24, 2018 •
edited
Loading

Description

Thread tasklet: Added check for valid interface ID to network scan timer start so that it is not triggered after disconnect. Added variable for mac api so that it is not tried to set again after re-connecting.

6lowpan tasklet: Removed main tasklet ID and used instead tasklet id. Added check for valid interface ID to network scan timer start so that it is not triggered after disconnect. Added small delay to re-connect
so that stack has time to send its status events to application after disconnect.

This pull request and changes from:

#7818

Fixes issue:

#5023

Pull request type

[X] Fix
[ ] Refactor
[ ] Target update
[ ] Functionality change
[ ] Breaking change

@mikaleppanen
Copy link
Author

@SeppoTakalo @artokin Please review.

@0xc0170 0xc0170 requested a review from a team August 24, 2018 09:24
0xc0170
0xc0170 approved these changes Aug 27, 2018
View reviewed changes
Copy link
Contributor

@0xc0170 0xc0170 left a comment

Choose a reason for hiding this comment

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

Style changes - still needs to be done for this modules? I think yes, so shall do soon

kjbracey
kjbracey reviewed Aug 27, 2018
View reviewed changes
features/nanostack/mbed-mesh-api/source/MeshInterfaceNanostack.cpp Outdated
@@ -130,6 +134,11 @@ nsapi_error_t Nanostack::Interface::register_phy()
{
NanostackLockGuard lock;

if (_device_id >= 0) {
Copy link
Contributor

Choose a reason for hiding this comment

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

I have an equivalent but differently-written equivalent to this hunk in the pending https://github.com/ARMmbed/mbed-os/pull/7818/files. Could you make it match, to avoid conflicts?

Copy link
Author

@mikaleppanen mikaleppanen Aug 27, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

I removed my changes to rf phy registration from MeshInterfaceNanostack.cpp. Issues will be fixed in your pull request.

Mika Leppänen added 2 commits August 27, 2018 15:08
Corrected 6lowpan tasklet during interface disconnect/connect
68f5739 
Removed main tasklet ID and used instead tasklet id. Added check
for valid interface ID to network scan timer start so that it
is not triggered after disconnect. Added small delay to re-connect
so that stack has time to send its status events to application
after disconnect.
Corrected thread tasklet during interface disconnect/connect
1250ceb 
Added check for valid interface ID to network scan timer start so that it
is not triggered after disconnect. Added variable for mac api so that it
is not tried to set again after re-connecting.
@0xc0170
Copy link
Contributor

0xc0170 commented Aug 27, 2018

/morph build

@mbed-ci
Copy link

mbed-ci commented Aug 27, 2018

Build : SUCCESS

Build number : 2926
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/7878/

Triggering tests

/morph test
/morph export-build
/morph mbed2-build

@mbed-ci
Copy link

mbed-ci commented Aug 27, 2018

Exporter Build : FAILURE

Build number : 2546
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/exporter/7878/

@mbed-ci
Copy link

mbed-ci commented Aug 28, 2018

Test : SUCCESS

Build number : 2677
Test logs :http://mbed-os-logs.s3-website-us-west-1.amazonaws.com/?prefix=logs/7878/2677

@0xc0170
Copy link
Contributor

0xc0170 commented Aug 28, 2018

/morph export-build

@mbed-ci
Copy link

mbed-ci commented Aug 28, 2018

Exporter Build : SUCCESS

Build number : 2553
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/exporter/7878/

@0xc0170 0xc0170 merged commit 665f10e into ARMmbed:master Aug 28, 2018
@0xc0170
Copy link
Contributor

0xc0170 commented Aug 28, 2018

@mikaleppanen

This pull request and changes from:
#7818

This is dependency or not?

@mikaleppanen
Copy link
Author

This can be merged as it is. The #7818 is needed for full fix of the issue #5023, but both PRs can be merged individually.

@0xc0170
Copy link
Contributor

0xc0170 commented Aug 28, 2018

Thanks, I tagged both for 5.10. This could potentially be in 5.9.7 .

@mikaleppanen mikaleppanen mentioned this pull request Aug 29, 2018
Closed
@mikaleppanen mikaleppanen deleted the mesh_conn_corr branch August 30, 2018 09:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@0xc0170 0xc0170 0xc0170 approved these changes

@SeppoTakalo SeppoTakalo SeppoTakalo approved these changes

@kjbracey kjbracey kjbracey approved these changes

Assignees
No one assigned
Labels
release-version: 5.10.0-rc1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@mikaleppanen @0xc0170 @mbed-ci @SeppoTakalo @kjbracey