David Kopf
b746c19cac
Merge branch 'master' of git://contiki.git.sourceforge.net/gitroot/contiki/contiki
2011-09-11 12:26:23 -04:00
David Kopf
c22dd67ada
Revert rules to rebuild httpd-fs.c and httpd-fsdata.c
2011-09-11 12:25:30 -04:00
Joakim Eriksson
95dde73618
fixed Sky platform for IAR compiler
2011-09-11 17:18:02 +02:00
David Kopf
d01df43a0c
Drop unneded null byte at end of httpd-fsdata files.
2011-09-10 13:04:21 -04:00
David Kopf
f721f646fa
Adjust sleep time by ticks instead of seconds, proposed by Ivan Delamer
2011-09-10 12:44:49 -04:00
nvt
ab0c04b041
Move 16-bit integer conversion operations into functions, as is done already with 32-bit ops.
2011-09-06 17:28:39 +02:00
Adam Dunkels
8a9ee96c2d
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2011-09-06 15:51:30 +02:00
Adam Dunkels
e4aec8340b
Added SMALL=1 to make code fit on Tmote Sky
2011-09-06 15:36:25 +02:00
Mariano Alvira
3e5afa2b59
replace MAC_CONF_CHANNEL_CHECK_RATE with
...
NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE for redbee-dev and econotag
Removed the obsolete MAC_CONF_CHANNEL_CHECK_RATE (now replaced with
NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE)
2011-09-06 07:49:23 -04:00
Adam Dunkels
7fb4fe2e56
Compile with SMALL=1 to make binary fit in memory
2011-09-06 01:59:16 +02:00
Adam Dunkels
d28ea5e915
Compile with SMALL=1 to make binary fit in memory
2011-09-06 01:59:01 +02:00
Niclas Finne
c46acc0a77
Updated for the latest version of httpd-simple in rpl-border-router
2011-09-06 00:25:20 +02:00
Niclas Finne
c1b88afe48
Added safeguard to avoid copying too much data to filename
2011-09-06 00:19:31 +02:00
Niclas Finne
9ac676c7c8
Typo
2011-09-06 00:18:29 +02:00
Adam Dunkels
7faeb1fa3d
Updated to use latest Rime APIs
2011-09-05 22:38:23 +02:00
Adam Dunkels
e472c6ea97
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2011-09-05 22:20:23 +02:00
nvt
942ba1f7bd
Removed const qualifier to conform with the rest of the Rime interface.
2011-09-05 22:05:41 +02:00
Adam Dunkels
eeb25b9667
If no MAC is defined, create one from the node ID
2011-09-05 22:04:06 +02:00
Niko Pollner
84105f4e47
Improved multihop/mesh route discovery.
...
Packetbuffer is now saved before route discovery and resent when a
route is found.
This solves the following problems:
- First packet sent to a certain node is corrupted.
- Packet to be forwarded that triggers route discovery is lost.
2011-09-05 21:27:38 +02:00
nvt
7397e86f9c
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2011-09-05 21:25:17 +02:00
nvt
708435ecc8
Improved the clarity of the Coffee test.
2011-09-05 21:25:01 +02:00
Adam Dunkels
3fa14d3cd5
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2011-09-05 20:45:24 +02:00
Adam Dunkels
8fee2a507c
Removed the obsolete MAC_CONF_CHANNEL_CHECK_RATE (now replaced with NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE)
2011-09-05 20:43:10 +02:00
Adam Dunkels
0f8145c78b
Removed the obsolete MAC_CONF_CHANNEL_CHECK_RATE (now replaced with NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE)
2011-09-05 20:43:01 +02:00
Adam Dunkels
13853b2cfd
Set default RDC wakeup rate to 8 hz
2011-09-05 20:42:38 +02:00
Adam Dunkels
4fd8133aa3
Removed the obsolete MAC_CONF_CHANNEL_CHECK_RATE (now replaced with NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE)
2011-09-05 20:42:19 +02:00
Adam Dunkels
25c28e06cc
Removed the obsolete MAC_CONF_CHANNEL_CHECK_RATE (now replaced with NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE)
2011-09-05 20:42:12 +02:00
nvt
606b077127
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2011-09-05 20:29:22 +02:00
nvt
644f1c627d
Initialize the DIO object in case options are missing. Updated the terminology regarding options.
2011-09-05 20:28:50 +02:00
Joakim Eriksson
fef1e9b686
fixed bug in analyzers that caused looping analyzers and exceptions
2011-09-05 19:43:47 +02:00
Adam Dunkels
f7a3a8476f
Added a safeguard to fragmentation reassembly: if there are additional bytes in the final fragment, we shave them off in the spirit of being 'liberal in what we accept'
2011-09-05 14:26:48 +02:00
Adam Dunkels
bfc314a037
Remove debug output to save space
2011-09-05 12:08:26 +02:00
Adam Dunkels
4ab042eb9f
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2011-09-05 11:46:31 +02:00
Adam Dunkels
a06cf93e4c
Made the sky and z1 platform handling of PROJECT_CONF_H the same as the other platforms: the makefile should define PROJECT_CONF_H to be the name of the header file to include. This header file should #undef everything it #defines, as it is included after all the other configuration options in contiki-conf.h
2011-09-05 11:46:15 +02:00
Adam Dunkels
3b33c198ed
Fix names of avr-raven platform
2011-09-05 11:42:10 +02:00
Adam Dunkels
ee75ec3ced
Be a little more conservative in terms of what headers not to compress
2011-09-05 11:41:41 +02:00
Adam Dunkels
126899278c
Include string header
2011-09-05 11:41:08 +02:00
Joakim Eriksson
7b50b87e12
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2011-09-05 11:40:22 +02:00
Joakim Eriksson
62705a17ea
Send DAOs if dtsn differs instead of only when larger than last dtsn in DIO
2011-09-05 11:36:53 +02:00
Mariano Alvira
43910c1be7
don't worry about wraparound in rtimer_arch_schedule
2011-09-02 12:36:10 -04:00
Mariano Alvira
6c0bbc492b
change mc1322x rtimers to 32-bit
...
hardcode a close default value for the RTC
2011-09-02 12:32:47 -04:00
Joakim Eriksson
c773920d6e
added analyzer for raw IPv6
2011-09-02 16:19:50 +02:00
Adam Dunkels
bd951031ef
Cleanup of the ContikiMAC code; removed the old an unused announcement code
2011-09-02 14:06:29 +02:00
Adam Dunkels
61ef9b6fc3
Cleanup of the ContikiMAC code; removed the old an unused announcement code
2011-09-02 14:06:27 +02:00
Adam Dunkels
6c607b702a
Use the SICSLOWPAN_CONF_COMPRESSION_THRESHOLD to avoid compressing IPv6 packets smaller than 60 bytes. This allows us to use ContikiMAC without its header, making it 802.15.4 compliant again.
2011-09-02 13:52:19 +02:00
Adam Dunkels
9b53b3aa8e
Small spelling bugfix
2011-09-02 13:51:28 +02:00
Adam Dunkels
2da65385a0
Added a SICSLOWPAN_CONF_COMPRESSION_THRESHOLD that can be used to set a threshold under which header compression should not be used. Below this threshold, headers are not compressed but sent as full IPv6 packets. This is useful for RDC layers, such as ContikiMAC, which set a lower bound for packet size.
2011-09-02 13:51:09 +02:00
Adam Dunkels
3cb42ceb10
Made the ContikiMAC header configurable from contiki-conf.h
2011-09-02 13:37:46 +02:00
Adam Dunkels
9e30f0f7c6
Minor code style fixes
2011-09-02 08:16:50 +02:00
Adam Dunkels
9ce61940c0
bugfix
2011-09-01 18:03:49 +02:00