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

12116 commits

This branch
This branch
All branches
Author SHA1 Message Date
Yasuyuki Tanaka 651147df57 TSCH: Fix incorrect test criteria for regression-tests 
The tests are recognized as success when a return value by
rpl_ns_num_nodes(), the number of entries in the nodelist, tells all the
routes for the nodes in the network are installed.

There are eight nodes in addition to one root node. Therefore, the value
for test success should not be eight but nine since we have to take into
account an nodelist entry for the root.
 2017-01-19 14:35:37 +01:00
Yasuyuki Tanaka ac937eda24 TSCH: re-enable TSCH regression tests with Cooja mote 2017-01-19 14:25:06 +01:00
Yasuyuki Tanaka 83f2382791 Orchestra: avoid a link error for nbr_routes 2017-01-19 13:55:08 +01:00
Antonio Lignan a7b5050382 Merge pull request #2047 from contiki-os/orion-update-motelist-string 
Orion: update motelist string
 2017-01-15 16:06:23 +01:00
George Oikonomou 82fd325b7a Merge pull request #2069 from alignan/pull/light-example-verbatim 
Explicitly specify light sensor model in example
 2017-01-15 11:52:09 +00:00
Antonio Lignan 999b246fd2 Explicitly specify light sensor model in example 2017-01-14 22:57:08 +01:00
Antonio Lignan 3d40056f4f Merge pull request #2054 from cetic/pr-check-incoming-rank 
Reject parents with invalid rank
 2017-01-13 16:08:00 +01:00
Antonio Lignan 0fb4a68332 Merge pull request #2052 from cetic/pr-rpl-route-infinite-lifetime 
Make RPL route lifetime RFC compliant
 2017-01-13 16:07:09 +01:00
Laurent Deru f9ffa252f6 Reject parents with invalid rank 2017-01-13 12:32:33 +01:00
Laurent Deru d866e6bd34 Make RPL route lifetime RFC compliant 2017-01-13 10:54:06 +01:00
Antonio Lignan 10d54f228b Orion: update motelist string 
Updates the expected motelist string
 2017-01-12 11:23:20 +01:00
Nicolas Tsiftes c1f11cfaa9 Merge pull request #2034 from Vinggui/patch-1 
Fixing Avr-Zigbit Makefile not compiling.
 2017-01-12 07:49:30 +01:00
Vinicius Guimaraes 5e05a951f2 Fixing Avr-Zigbit Makefile not compiling 
Fixed two errors in Zigbit's makefile:
-Compiling "frame.c" here is not necessary (already done in radio's makefile) and brings up an error. Removing it.
-Fixed undefined reference to "link_stats_input_callback" in "../../core/net/ipv6/sicslowpan.c:1521". Module "core/net" was missing.
Compiling working now.
 2017-01-11 15:56:20 -02:00
Simon Duquennoy bb4f2e5678 Merge pull request #2043 from e120guru/master 
Fixed rime-tsch sync problem in Cooja
 2017-01-11 18:15:43 +01:00
Michael Karlsson 22d10ba03a Added Cooja target config to rime-tsch example 2017-01-11 16:35:16 +01:00
Simon Duquennoy fe210b05f0 Merge pull request #2002 from yatch/pr/tsch-misc-update 
TSCH Miscelleneous updates
 2017-01-10 14:05:36 +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 4069ac5262 TSCH: add a regression test for tsch-packet.c 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 82f3ce392e Merge pull request #2028 from joakimeriksson/minimal-net-ND-fix 
added support for 6-bytes link-layer address
 2017-01-10 09:07:50 +01:00
Antonio Lignan 247d79ea7c Merge pull request #2011 from jdede/z1-llsec 
Enable llsec on Z1 nodes
 2017-01-10 09:07:27 +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
George Oikonomou 960b81d484 Merge pull request #2024 from alignan/pull/eth-gw 
Zolertia Orion ethernet router with active POE support
 2017-01-09 21:03:45 +00:00
George Oikonomou 14757201a5 Merge pull request #2027 from alignan/pull/fix-adc-channels 
zoul: fix a bitmask bug in channels used
 2017-01-09 21:02:20 +00: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
Vinicius Guimaraes 42557bf484 Fixing Avr-Zigbit Makefile not compiling. 
I just tried to compile this platform for my Zigbit mote (AT86RF230) here in a hello-world example, but it didn't work.
I reviewed this makefile and found that the request to compile "frame.c" was not necessary and bring up a missing error:
"make: *** No rule to make target `obj_avr-zigbit/frame.o', needed by `contiki-avr-zigbit.a'.  Stop."
Frame.c is already inserted in radio's makefile.

Another problem was the undefined reference created by the missing module "core/net":
"contiki-avr-zigbit.a(sicslowpan.o): In function `input':"
"contiki/examples/hello-world/../../core/net/ipv6/sicslowpan.c:1521: undefined reference to `link_stats_input_callback'"

Both solved now. Hope it helps anyone else.
 2017-01-04 16:58:53 -02:00
Antonio Lignan 53efcec1fa Merge pull request #1994 from yatch/pr/bugfix-framer802154-sender-addr 
Bugfix on source address setting in framer_802154.create()
 2017-01-04 14:10:57 +01:00
Simon Duquennoy fe99f1144a TSCH bugfix: reset keep-alive timeout when switching time source 2017-01-04 11:01:46 +01:00
Antonio Lignan 6e07fd7019 Merge pull request #2001 from joakimeriksson/cooja-quick-ui-fix 
fixed so that Cooja can run in quick mode when having UI
 2017-01-03 10:26:52 +01:00
Antonio Lignan 6aaf1c356c Merge pull request #2029 from t-than/master 
Minor typo change
 2017-01-02 09:18:54 +01:00
Thanos Tsakiris 92ad29ab33 Minor typo change 2016-12-30 13:13:53 +02:00
Joakim Eriksson cbf4a843e2 fixed comment. 2016-12-29 22:49:01 +01:00
Antonio Lignan 9d12801f01 Merge pull request #2026 from alignan/pull/fix-firefly-doc 
Minor documentation fixes
 2016-12-29 18:00:49 +01:00
Antonio Lignan a7e617657a zoul: fix a bitmask bug in channels used 2016-12-29 14:19:32 +01:00
Antonio Lignan fb9c6009a2 Fixed Firefly revision A image links 2016-12-29 13:40:50 +01:00
Antonio Lignan a98792a79f Updated ARM toolchain information 2016-12-29 13:38:09 +01:00
Antonio Lignan 6bda852052 Updated maintainer info 2016-12-29 13:32:35 +01:00
Antonio Lignan 579620ce0e Added Zolertia Orion ethernet router with active POE support 2016-12-29 13:07:53 +01:00
Antonio Lignan 9befc02331 Merge pull request #1997 from yatch/pr/packetbuf-remaininglen 
Introduce packetbuf_remaininglen()
 2016-12-27 22:38:14 +01:00
Antonio Lignan 2464cdadc9 Merge pull request #1973 from g-oikonomou/contrib/sensniff-submodule 
Add sensniff as a submodule
 2016-12-25 19:42:18 +01:00
Antonio Lignan cf2b24971b Merge pull request #1978 from makrog/pr/cc1200-fixes 
Added NullRDC and ContikiMAC timings for Zolertia RE-Mote.
 2016-12-23 18:31:47 +01:00
Jens Dede 7b2c687789 Use hardware-AES on z1 as default 2016-12-22 20:08:19 +01:00
Jens Dede 0b68334e95 Enable llsec on Z1 nodes 2016-12-21 14:54:15 +01:00
George Oikonomou edec34f684 Merge pull request #2008 from alignan/pull/change-baudrate-zoul 
zoul: default cc2538-bsl baudrate to 460800
 2016-12-21 02:30:19 +00:00
Antonio Lignan 3594cf5167 zoul: default cc2538-bsl baudrate to 460800 2016-12-20 18:18:28 +01:00