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

FW-548. implementing MSF algorithm for adapting to traffic. #395

Merged
merged 175 commits into from
Mar 20, 2018

Conversation

changtengfei
Copy link
Member

No description provided.

…engfei/openwsn-fw into develop_FW-548

# Conflicts:
#	bsp/boards/python/openwsnmodule_obj.h
#	openapps/SConscript
#	openapps/cstorm/cstorm.c
#	openstack/02b-MAChigh/schedule.c
#	openstack/02b-MAChigh/schedule.h
#	openstack/02b-MAChigh/sixtop.c
#	openstack/02b-MAChigh/sixtop.h
#	openstack/SConscript
#	projects/OpenMote-CC2538/03oos_openwsn/03oos_openwsn.ewp
#	projects/python/SConscript.env
# Conflicts:
#	openstack/02b-MAChigh/sixtop.c
…processing different return code cases rather than just IANA_6TOP_RC_SUCCESS.
# Conflicts:
#	openstack/02b-MAChigh/neighbors.c
…from a neighbor is detected or the parent changed.
# Conflicts:
#	inc/opendefs.h
#	openstack/02a-MAClow/IEEE802154E.c
#	openstack/02b-MAChigh/schedule.c
#	openstack/cross-layers/openqueue.c
@changtengfei changtengfei merged commit dcf26e9 into develop Mar 20, 2018
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.

1 participant