deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
12721 commits 6 branches 13 tags 80 MiB
Commit graph

478 commits

Author SHA1 Message Date
Harald Pichler
2f8549aaae Merge branch 'contiki' 
Conflicts:
	cpu/cc26xx-cc13xx/lib/cc13xxware
	cpu/cc26xx-cc13xx/lib/cc26xxware
 2017-01-31 15:00:59 +01:00
Yasuyuki Tanaka
1d5fc88ae9 TSCH: fix indentation in tsch-packet.c 2017-01-10 11:45:59 +01:00
Yasuyuki Tanaka
3dc74dc632 TSCH: fix a wrong return value 
tsch_security_secure_frame() returns the length of MIC in case of
success. Otherwise, it is supposed to return 0. There was one case where
it returns 1 in an error handling block.
 2017-01-10 11:45:59 +01:00
Yasuyuki Tanaka
35a1701236 TSCH: handle error cases returning -1 properly 
- tsch_send_eb_process() in tsch-slot-operation.c
- tsch_rx_slot()         in tsch.c
 2017-01-10 11:45:59 +01:00
Yasuyuki Tanaka
0b81c0de18 TSCH: make *dest_addr const (tsch_packet_create_eack) 2017-01-10 11:45:59 +01:00
Yasuyuki Tanaka
667dd6a210 TSCH: put tsch_ prefix to definitions in the global scope 
struct asn_t         -> struct tsch_asn_t
  struct asn_divisor_t -> tsch_asn_divisor_t
  ASN_ macros          -> TSCH_ASN_ macros
  current_asn          -> tsch_current_asn
 2017-01-10 11:45:59 +01:00
Antonio Lignan
7d9134757f Merge pull request #2004 from yatch/pr/tsch-security-update 
Trivial Updates on tsch-security.[ch]
 2017-01-10 11:23:55 +01:00
Antonio Lignan
bfef0b5d6a Merge pull request #2032 from simonduq/pr/tsch-ka-fix 
TSCH bugfix: reset keep-alive timeout when switching time source
 2017-01-10 08:47:30 +01:00
Nicolas Tsiftes
1537488e74 Merge pull request #2035 from simonduq/pr/csma-fix 
CSMA bugfix: do not use field on a struct that may have been deallocated
 2017-01-09 08:45:49 +01:00
Simon Duquennoy
0de3563ddb CSMA bugfix: do not use field on a struct that may have been deallocated 2017-01-05 10:47:11 +01:00
Simon Duquennoy
fe99f1144a TSCH bugfix: reset keep-alive timeout when switching time source 2017-01-04 11:01:46 +01:00
Yasuyuki Tanaka
4faf139523 TSCH: change the return type of the APIs (tsch-security.h) 
The return type is changed to "int" to "unsigned int" because APIs
provided by tsch-security are supposed to return an integer larger than
or equal to zero. This change clarifies that.
 2016-12-15 19:32:22 +01:00
Yasuyuki Tanaka
da853386a6 TSCH: fix indentation in tsch-packet.c 2016-12-15 19:32:04 +01:00
Yasuyuki Tanaka
38ff8e5283 TSCH: add brief API explanations (tsch-security.h) 2016-12-15 19:16:28 +01:00
Yasuyuki Tanaka
5186fa2ef1 TSCH: set PACKETBUF_ADDR_SENDER before NETSTACK_framer.create() 2016-12-15 15:10:15 +01:00
Yasuyuki Tanaka
da29a5f8e3 ContikiMAC: set PACKET_ADDR_SENDER in qsend_list() 2016-12-15 15:10:15 +01:00
Yasuyuki Tanaka
586fb9a7fe framer-802154: bugfix on source address setting 2016-12-15 15:10:15 +01:00
Nicolas Tsiftes
d133ed898f Merge pull request #1914 from yatch/pr/802154-panid-handling 
frame802154: comply with IEEE 802.15.4-2015 on PAN ID Field Handling
 2016-12-08 18:37:58 +01:00
Yasuyuki Tanaka
5fdd731166 frame802154: fix a typo in a comment 2016-12-05 22:45:07 +01:00
Yasuyuki Tanaka
3872965362 frame802154: comply with IEEE 802.15.4-2015 on PAN ID Field Handling 
This patch changes the behaviors of frame802154_has_panid() for frames
of frame version 0b10 so that it complies with the PAN ID Field Handling
specification in IEEE 802.15.4-2015. For the other frame versions, 0b00
and 0b01, no change is made in frame802154_has_panid().

For more information, please refer to:
https://github.com/contiki-os/contiki/pull/1914/
 2016-12-05 22:45:07 +01:00
Nicolas Tsiftes
f09e84976a Merge pull request #1950 from yatch/pr/update-for-tsch-cooja-mote 
Miscellaneous updates for tsch-cooja-mote
 2016-12-05 18:40:28 +01:00
George Oikonomou
d6656ccde1 Fix minor typo 2016-12-03 23:26:25 +00:00
Yasuyuki Tanaka
106731cec1 TSCH: update README.md 
- add cooja / Cooja mote as supported platform
- correct Rx mode requirements
 2016-11-26 11:47:59 +01:00
George Oikonomou
610eefc2ff Merge pull request #1741 from simonduq/pr/tsch-adaptive-control-traffic 
TSCH adaptive control traffic
 2016-11-25 15:53:32 +00:00
Harald Pichler
0fd28e0585 remove PT_YIELD to habe better ping sync 2016-10-16 22:02:54 +02:00
Harald Pichler
ae79061182 bugfix powercyle and sleep mcu timing 2016-09-23 14:59:30 +02:00
Harald Pichler
a5b59e8cbb Merge branch 'contiki' 
Conflicts:
	.gitmodules
	core/net/mac/contikimac/contikimac.c
	cpu/cc26xx-cc13xx/lib/cc13xxware
 2016-09-21 21:09:29 +02:00
Yasuyuki Tanaka
0ff474e393 Fix indentation in nullrdc.c 2016-09-06 15:14:10 +02:00
Yasuyuki Tanaka
6869dc7004 Yield inside busywaiting loops under cooja-ip64 (nullrdc.c) 
The while loops waiting ACK_WAIT_TIME and AFTER_ACK_DETECTED_WAIT_TIME
cause infinite loop under the cooja-ip64 platform. This is because
RTIMER_NOW(), rtimer_arch_now(), has been changed not to call
cooja_mt_yield() in it since rtimer was reimplemented as a higher
resolution timer.

In order to avoid the infinite loop, cooja_mt_yield() needs to be
called inside the while loops under the platform as well as the cooja
platform.
 2016-09-06 15:14:10 +02:00
Yasuyuki Tanaka
0201208664 TSCH: manage busy waiting on Cooja motes 2016-09-06 15:14:10 +02:00
Nicolas Tsiftes
7cfbbe97af Merge pull request #1740 from simonduq/pr/tsch-minor 
TSCH minor enhancements
 2016-09-05 16:33:48 +02:00
Nicolas Tsiftes
4c7d8d0214 Merge pull request #1739 from simonduq/pr/tsch-seqno 
Improved TSCH sequence number handling
 2016-08-16 14:49:21 +02:00
Nicolas Tsiftes
9fa777d4f4 Merge pull request #1738 from simonduq/pr/mac-seqno-timeout 
mac-seqno: add a lifetime to sequence numbers in history
 2016-08-16 14:48:21 +02:00
Simon Duquennoy
e4241fbeb9 Updated TSCH readme 2016-08-02 18:07:20 +02:00
Simon Duquennoy
dbb82f2439 Merge pull request #1158 from bkozak-scanimetrics/contikimac_fix_first_cycle_start 
Fixed wrong first cycle_start
 2016-07-25 14:57:38 +02:00
Simon Duquennoy
ff5a4751c8 Merge pull request #1610 from simonduq/pr/tsch-rime 
TSCH with Rime
 2016-07-25 14:55:37 +02:00
Sumankumar Panchal
6dfd358821 TSCH port for CC2538 based platforms. 2016-07-22 09:38:25 +05:30
Atis Elsts
081ec100a4 TSCH: add RADIO_DELAY_BEFORE_DETECT to rx guard time when waiting for a packet to be received 2016-07-16 18:08:41 +01:00
Simon Duquennoy
80b9bfea93 Merge pull request #1723 from gebart/pr/ieee802154-addr-mode-bugfix 
core/net/mac/frame802154: Fix typo in PAN ID compression condition
 2016-07-05 18:10:21 +02:00
Joakim Nohlgård
6f8306a465 core/net/mac/frame802154: Fix typo in PAN ID compression condition 2016-07-04 18:18:55 +02:00
Harald Pichler
3c8e91d74e cleanup confilicrts 2016-06-28 16:37:16 +02:00
Simon Duquennoy
54957e4e03 mac-seqno: add a lifetime to sequence numbers in history 2016-06-24 11:23:19 +02:00
Simon Duquennoy
27b20b09a3 TSCH: enable adaptive time synchronization by default 2016-06-23 22:39:54 +02:00
Simon Duquennoy
15dc86aeb1 TSCH: reduce keep-alive traffic as we get more accurate drift estimates 2016-06-23 22:39:44 +02:00
Simon Duquennoy
beb532e7e8 TSCH: use sequence number only for unicast data frames 2016-06-23 22:36:00 +02:00
Simon Duquennoy
ab706a6f33 TSCH: map RPL trickle interval to TSCH EB period 2016-06-23 18:48:01 +02:00
Simon Duquennoy
ee60355c9c TSCH: implement off() 2016-06-23 18:38:12 +02:00
Simon Duquennoy
b1dc8205f0 TSCH: minor logging enhancement 2016-06-23 18:37:42 +02:00
Simon Duquennoy
5a1a8e84d8 TSCH: start scheduling keep-alives only after tsch_is_associated is set 2016-06-23 18:36:04 +02:00
Simon Duquennoy
1acb69e280 TSCH: keep track of Rx channel as packetbuf attribute 2016-06-23 18:35:16 +02:00