Joakim Eriksson
|
d8e54ca585
|
fixed for compilation with IAR compiler
|
2011-04-06 20:14:30 +02:00 |
|
Joakim Eriksson
|
26f0a6e88e
|
changed ext to link_metric
|
2011-03-28 16:17:53 +02:00 |
|
nvt
|
cdaf58f892
|
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
|
2011-03-17 20:23:53 +01:00 |
|
nvt
|
8078ef7705
|
ROOT_RANK is now a macro function.
|
2011-03-17 20:21:56 +01:00 |
|
Nicolas Tsiftes
|
65366d10c1
|
Update the metric container correctly. Use only one ETX initializer.
|
2011-03-16 13:29:01 +01:00 |
|
Joakim Eriksson
|
6554e87c00
|
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
|
2011-03-15 14:15:55 +01:00 |
|
Joakim Eriksson
|
5f4d4550fc
|
fixed RPL statistics bug and added parent switch stats
|
2011-03-15 14:14:41 +01:00 |
|
nvt
|
4739143126
|
Generalized MRHOF and added partial support for energy objects in DAG metric containers.
|
2011-03-15 01:16:20 +01:00 |
|
nvt
|
a7addf990f
|
Avoid hysteresis check if neither p1 nor p2 is the preferred parent.
|
2011-03-04 16:40:40 +01:00 |
|
Joakim Eriksson
|
fa0fbf5dab
|
fixed format of transit subopt
|
2011-03-01 12:33:34 +01:00 |
|
Joakim Eriksson
|
3cd7835f5c
|
made DIO parameters configurable
|
2011-02-22 18:24:05 +01:00 |
|
Joakim Eriksson
|
68e9fb2a5c
|
added annotate when setting root and joining dag
|
2011-02-22 16:19:42 +01:00 |
|
nvt
|
e9234a8404
|
Error: the value was printed before setting it
|
2011-02-22 02:01:15 +01:00 |
|
Lionel Debroux
|
5cb49e8b07
|
Several compiler warning fixes:
* msp430: fix "implicit declaration of function" warnings in clock.c, by including watchdog.h;
* sky: fix a couple pointer target signedness warnings;
* core: fix several signed/unsigned comparison warnings;
* framer-802154: "const static" -> "static const" to fix compiler warnings;
* core: comment or remove unused variables and function definitions.
Signed-off-by: Lionel Debroux <lionel_debroux@yahoo.fr>
Signed-off-by: Mariano Alvira <mar@devl.org>
|
2011-02-20 19:28:14 -05:00 |
|
nvt
|
01b7a4f7f2
|
Replaced ROOT_RANK with a macro that allows for other min_hoprankinc parameters than the default. Also made some minor style improvements.
|
2011-02-20 20:15:40 +01:00 |
|
Mariano Alvira
|
bb1baffc79
|
change FIX2ETX -> NEIGHBOR_INFO_FIX2ETX in some debug prints.
|
2011-02-17 20:54:57 -05:00 |
|
Nicolas Tsiftes
|
93a7280a1a
|
Replaced old description
|
2011-02-15 18:10:15 +01:00 |
|
nvt
|
99d0387a8e
|
Merge branch 'master' of github.com:adamdunkels/contiki-2.x
|
2011-02-15 01:13:41 +01:00 |
|
nvt
|
a093c262ee
|
Improved objective function API so DAG metric containers can be generated cleanly. The packet generation now asks the OF to provide a fresh logical presentation of the metric container, which is then translated to raw packet format.
|
2011-02-15 01:13:30 +01:00 |
|
Adam Dunkels
|
db37e38156
|
Make sure we don't remove the preferred parent
|
2011-02-14 23:01:11 +01:00 |
|
nvt
|
cbe4513bf4
|
basic support for parsing metric containers in DIOs
|
2011-02-13 23:17:56 +01:00 |
|
nvt
|
539ff33104
|
Turn off debugging
|
2011-02-13 21:36:07 +01:00 |
|
nvt
|
5ec2f19dc9
|
Remove only the worst parent if the table is full when processing a DIO.
|
2011-02-13 21:33:47 +01:00 |
|
Adam Dunkels
|
432928d000
|
Changed the name of macros defined in neighbor-info.h to have the NEIGHBOR_INFO prefix.
|
2011-02-13 21:29:59 +01:00 |
|
Adam Dunkels
|
acb5480aa9
|
Changed the name of macros defined in neighbor-info.h to have the NEIGHBOR_INFO prefix.
|
2011-02-13 21:21:14 +01:00 |
|
Adam Dunkels
|
15bf73ba08
|
Use DAG_RANK() macro to compute rank
|
2011-02-13 19:01:15 +01:00 |
|
Adam Dunkels
|
e980072817
|
Don't add neighbor as a potential parent if its rank is too high.
|
2011-02-13 18:05:28 +01:00 |
|
Adam Dunkels
|
2a96835c05
|
Don't remove all parents that have a worse rank than an incoming DIO: we may inadvertently remove our preferred parent. Instead, remove parents with a rank that is worse than our preferred parent. If we are lucky, this will give us enough space for the new parent.
|
2011-02-13 14:16:15 +01:00 |
|
Adam Dunkels
|
f1ac94e415
|
Slight code complexity reduction
|
2011-02-13 14:14:49 +01:00 |
|
Adam Dunkels
|
3a824d0ed6
|
Added a hysteresis when choosing a new parent: don't switch parent unless the ETX is significantly better (1.5 ETX better).
|
2011-02-13 14:14:16 +01:00 |
|
Joakim Eriksson
|
48fb9dda9e
|
fixed of0 to respect min hop rank increase
|
2011-02-13 11:25:53 +01:00 |
|
nvt
|
20171985c6
|
Split the RPL header into a private and a public header.
|
2011-02-11 16:21:17 +01:00 |
|
Adam Dunkels
|
706045120f
|
Changed the variable name local_confidence to etx to better reflect what it was used for
|
2011-02-11 14:18:57 +01:00 |
|
Adam Dunkels
|
ba6bf7dd6b
|
Rewrote the parent selection to favour parents with a low ETX and a good rank. The old parent selection would always favour parents with a lower rank, regardless of their ETX, which in some cases lead to suboptimal parent selections. Also, the old code was buggy in that it would always pick the worst parent (the one with the highest ETX).
|
2011-02-11 14:17:26 +01:00 |
|
Joakim Eriksson
|
d24c63c0f1
|
fixed so that minhoprankinc is configurable
|
2011-02-10 19:44:12 +01:00 |
|
Joakim Eriksson
|
d518c84471
|
made rank calculation depend on selected parent when joining DAG
|
2011-02-08 19:59:50 +01:00 |
|
Nicolas Tsiftes
|
aeca16d01f
|
Just update the node rank and let rpl_process_parent_event take care of the rest
|
2011-02-07 17:29:23 +01:00 |
|
Nicolas Tsiftes
|
e3638d2791
|
Updated to the minrank-hysteresis OF
|
2011-02-04 15:46:01 +01:00 |
|
joxe
|
389a4f9220
|
added rpl-all-nodes multicast address to nodes mcast addresses
|
2011-01-25 22:41:30 +00:00 |
|
joxe
|
e79c0ab1ee
|
fixed rpl so that it sends and receives on the rpl-all-nodes multicast address
|
2011-01-25 09:55:12 +00:00 |
|
joxe
|
3a643fa0c6
|
added address macros for rpl-all-nodes
|
2011-01-25 09:54:03 +00:00 |
|
nvt-se
|
7a43b7d832
|
Configuration of the objective function made easier. Updated OF0 to the new rank calculation.
|
2011-01-04 20:43:28 +00:00 |
|
nvt-se
|
8f76c82433
|
Improved DAO management.
|
2010-12-17 15:24:25 +00:00 |
|
nvt-se
|
dae3dc22f3
|
Corrected a comment that was accidentally overwritten in a previous commit
|
2010-12-15 19:57:40 +00:00 |
|
nvt-se
|
cd08939b38
|
Corrected the reported ETX in the initial callback, and fixed the coding style
|
2010-12-15 14:35:07 +00:00 |
|
nvt-se
|
79ae813f88
|
Improved macro definitions and removed obsolete declarations.
|
2010-12-15 13:37:34 +00:00 |
|
nvt-se
|
542bbd4b31
|
Increased the width of dio_next_delay to avoid possible wrappings
|
2010-12-15 12:24:00 +00:00 |
|
nvt-se
|
486f202d09
|
Fixed problem with too large values for the DIO timer.
|
2010-12-15 12:12:27 +00:00 |
|
dak664
|
9c66df6de1
|
Fix ancient RAND_MAX compiler warning
|
2010-12-13 16:52:02 +00:00 |
|
joxe
|
3e293e6cfc
|
updated rpl dio message format to be compliant with latest version
|
2010-12-13 10:59:37 +00:00 |
|