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

FW-415. Fix. #204

Merged
merged 54 commits into from
Jul 2, 2015
Merged

FW-415. Fix. #204

merged 54 commits into from
Jul 2, 2015

Conversation

changtengfei
Copy link
Member

Main changes:

  • implemented a sniffer base on radio project in OpenWSN
  • make parameter of network configurable: like the period of EB, KA, DIO and DAO, whether ackReply, whether channel hopping enabled...
  • add conditional compilation: GOLDEN_IMAGE
    • When GOLDEN_IMAGE defined, slot duration set to 10ms
    • When GOLDEN_IMAGE not defined, slot duration set to 15ms

changtengfei added 30 commits June 6, 2015 22:57
@changtengfei
GD_IM1.Make the variable of image configurable.
eb9d689
@changtengfei
GD_IM1.fix the slotframe length.
a8b846b
@changtengfei
GD_IM1. Define the command used in plugtest TD.
61c569e
@changtengfei
GD-IM1. parameter of security and ack command are only available when…
2fd663a 
… they are set to 0 or 1. Channel parameter is legal only when it 0 or ranges from 11 to 26.
@changtengfei
GD_IM1. divide the dio/dao period by 5.
9ca4f2e
@changtengfei
GD_IM1. create IAR project for cc2538.
6b539c0
@changtengfei
GD_IM1. Fix the timing issue of cc2538.
5346c6b
@changtengfei
GD_IM1. Fixed.
c7b4018
@changtengfei
GD_IM1.add 03oos_macpong project. Update the timing value depending o…
1f0cc20 
…n 10ms slot duration.
@changtengfei
GD_IM1. Keep startup_iar out-of-builder system.
cc64a22
@changtengfei
GD_IM1. add 03oos_macpong project.
51ef540
@changtengfei
GD_IM_ROOT. add sniffer project.
619f40c
@changtengfei
Merge remote-tracking branch 'remotes/upstream/develop' into develop_…
d907df0 
…test

Conflicts:
	openstack/02a-MAClow/IEEE802154E.c
	openstack/02a-MAClow/IEEE802154E.h
@changtengfei
GD_IM. add sniffer.c and sniffer.h
46d1968
@changtengfei
GD_IM. Update python board_info.h to match 10 ms.
328d046
@changtengfei
GD_IM. Printout the last two byte of asn and timeCorrection when sync…
37d6034 
…hronized.
@changtengfei
GD_IM. add idmanager into sniffer project.
cfb5557
@changtengfei
Merge remote-tracking branch 'remotes/malisa/security_154' into develop
aba89e0 
Conflicts:
	inc/opendefs.h
@changtengfei
ID_IM. update IAR project.
1379412
@changtengfei
ID_IM. update the timing of OpenMote-CC2538.
afdf0e9
@changtengfei
GD_IM. update 03oos_sniffer.c.
b15165a
@changtengfei
Merge remote-tracking branch 'remotes/upstream/develop' into develop
60f0152 
Conflicts:
	openstack/02a-MAClow/IEEE802154E.c
@changtengfei
GD_IM. reduce the delayTx to fix the timing of 10ms.
29a1e3c
@changtengfei
Merge remote-tracking branch 'remotes/security/develop' into develop
71e6222 
Conflicts:
	openstack/02a-MAClow/IEEE802154E.c
@changtengfei
GD_IM. 1. print out timecorrection at end of slot. 2. make adaptive d…
1956082 
…ynamically compiled.
@changtengfei
GD_IM. fixed.
4e8ef48
@changtengfei
GD_IM. dynamically define the delayTx value.
8119fe9
@changtengfei
GD_IM. add channel information into openserial_printPacket function.
8def533
@changtengfei
GD_IM_SNIFFER. make the listening channel of sniffer image configurable.
519cc84
@changtengfei
GD_IM. add image option for root and sniffer image.
dffa3db
@twatteyne
Copy link
Member

Please do not commit the images/ directory (add to .gitignore)

twatteyne
twatteyne reviewed Jul 1, 2015
View reviewed changes
openstack/02a-MAClow/IEEE802154E.c
// comment the following line out to disable channel hopping
return SYNCHRONIZING_CHANNEL; // single channel
//return 11+(ieee154e_vars.asnOffset+channelOffset)%16; //channel hopping
// comment the following line out to disable channel hopping
Copy link
Member

Choose a reason for hiding this comment

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

remove this line

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed.

@twatteyne
Copy link
Member

very cool. Some very small suggestion before merging.

changtengfei added 13 commits July 2, 2015 12:05
twatteyne added a commit that referenced this pull request Jul 2, 2015
@twatteyne
Merge pull request #204 from changtengfei/develop
72098d8 
FW-415. Fix.
@twatteyne twatteyne merged commit 72098d8 into openwsn-berkeley:develop Jul 2, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@changtengfei @twatteyne