Enric M. Calvo
|
fccce4e4a8
|
Merge commit 'upstreamsf/master'
|
2011-02-23 15:28:18 +01:00 |
|
Joakim Eriksson
|
6ffb38103e
|
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
|
2011-02-22 18:26:37 +01:00 |
|
Joakim Eriksson
|
3cd7835f5c
|
made DIO parameters configurable
|
2011-02-22 18:24:05 +01:00 |
|
Adam Dunkels
|
6a6c3dd417
|
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
|
2011-02-22 17:35:41 +01:00 |
|
Adam Dunkels
|
64e273d388
|
Moved the backyard/ directory to contikiprojects
|
2011-02-22 17:35: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 |
|
Mariano Alvira
|
c857e57d2f
|
msp430: fix "implicit declaration of function" warnings in clock.c, by including watchdog.h
|
2011-02-21 09:23:52 -08:00 |
|
Adam Dunkels
|
733aaa546f
|
Made the number of MAC sequence numbers to remember configurable; fixed bug with power attribution to the idle state.
|
2011-02-21 14:11:32 +01:00 |
|
Adam Dunkels
|
24af4888bc
|
Made the number of MAC sequence numbers to remember configurable
|
2011-02-21 14:11:17 +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 |
|
dak664
|
263f7e6ebd
|
Insidious minimal-net segmentation fault if initialized ptr not declared static.
|
2011-02-19 15:43:43 -05:00 |
|
Mariano Alvira
|
8f9cf50e55
|
set timestamp packet attribute
|
2011-02-18 12:46:34 -05:00 |
|
Mariano Alvira
|
a86a0fbe0e
|
set lqi packet attribute
|
2011-02-18 12:46:10 -05:00 |
|
Mariano Alvira
|
07f77b02eb
|
Merge remote branch 'libmc1322x/master'
|
2011-02-18 12:38:30 -05:00 |
|
Mariano Alvira
|
5012757673
|
add rx_time parameter and fill with *MACA_TIMESTAMP
|
2011-02-18 12:35:20 -05:00 |
|
Mariano Alvira
|
c0b21702ed
|
add a cast to a debug message to remove a warning.
|
2011-02-18 11:11:31 -05:00 |
|
François Revol
|
777518d653
|
Fix some typos.
Signed-off-by: François Revol <revol@free.fr>
Signed-off-by: Mariano Alvira <mar@devl.org>
|
2011-02-18 11:01:43 -05:00 |
|
Enric M. Calvo
|
08adec2eeb
|
Updated *-sensor.c files from the sky platform.
Fixed battery-sensor plus added simple test (XXX)
|
2011-02-18 16:12:56 +01:00 |
|
Mariano Alvira
|
bb1baffc79
|
change FIX2ETX -> NEIGHBOR_INFO_FIX2ETX in some debug prints.
|
2011-02-17 20:54:57 -05:00 |
|
Mariano Alvira
|
2e331b51e8
|
Merge remote branch 'libmc1322x/master' into update-libmc1322x
Conflicts:
cpu/mc1322x/COPYING
|
2011-02-17 14:41:47 -05:00 |
|
Mariano Alvira
|
2e33e1694a
|
Merge branch 'libmc13-9f82e068' into update-libmc1322x
|
2011-02-17 14:39:20 -05:00 |
|
Mariano Alvira
|
7cdfbb0947
|
remove cvs keywords from cpu/mc1322x
|
2011-02-17 14:36:55 -05:00 |
|
Enric M. Calvo
|
1b2878baa4
|
Corrected some typos in the PORT1 ISR function.
|
2011-02-16 12:02:36 -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
|
20bf23cf06
|
Replaced ifdef with if, as salvopitru suggested
|
2011-02-14 15:53:08 +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
|
0df450f0dc
|
Add the NEIGHBOR_ATTR prefix to a macro name
|
2011-02-13 21:34:59 +01:00 |
|
nvt
|
4125c38808
|
missing word
|
2011-02-13 21:34:29 +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
|
ed3995960d
|
Changed the name of macros defined in neighbor-info.h to have the NEIGHBOR_INFO prefix.
|
2011-02-13 21:21:13 +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 |
|
Mariano Alvira
|
a4ef14f204
|
strip cvs style keywords from everything
|
2011-02-12 18:12:45 -05:00 |
|
Mariano Alvira
|
e951e350df
|
print status messages with DEBUG_MACA
|
2011-02-12 15:34:21 -05:00 |
|
Mariano Alvira
|
0058fdc824
|
fixes to remove warnings when building with DEBUG_MACA
|
2011-02-12 15:33:19 -05:00 |
|
Mariano Alvira
|
7c7864eae2
|
add autoacking
|
2011-02-12 15:29:11 -05:00 |
|
nvt
|
20171985c6
|
Split the RPL header into a private and a public header.
|
2011-02-11 16:21:17 +01:00 |
|
Fredrik Osterlind
|
0fd6dea8d8
|
Merge branch 'refs/heads/master' of https://fros4943@github.com/adamdunkels/contiki-2.x.git into HEAD
|
2011-02-11 15:47:15 +01:00 |
|