Commit graph

7120 commits

Author SHA1 Message Date
HATATANI Shinta
04b4ff157f change some examples for iris 2011-07-18 19:53:18 +09:00
HATATANI Shinta
3c168cc395 merge iris and micaz 2011-07-17 10:36:35 +09:00
David Kopf
656e80b57a Tag version commits and override CONTIKI_VERSION_STRING with git describe 2011-07-16 08:53:44 -04:00
HATATANI Shinta
e6d5ff2f18 Merge branch 'master' of https://github.com/shinta-h/contiki-iris
Conflicts:
	platform/iris/platform-conf.h
2011-07-15 16:41:29 +09:00
HATATANI Shinta
94a6f4087c some trivial change 2011-07-15 16:36:25 +09:00
HATATANI Shinta
a7d713d253 Now iris port works with tunslip6 (Thanks to Suhas K) 2011-07-15 16:36:25 +09:00
HATATANI Shinta
f4740a062a IRIS port is working with uIPv6 2011-07-15 16:36:25 +09:00
HATATANI Shinta
9a201f6934 create iris directory 2011-07-15 16:36:24 +09:00
Mariano Alvira
758fc37307 mc1322x: flush the rx fifos when full 2011-07-12 07:05:04 -04:00
David Kopf
6355545ded Add template for AUTOSTART_PROCESS 2011-07-11 11:34:04 -04:00
David Kopf
c699ccbe30 Add higher baud rates, fix occasional buffer overflow 2011-07-10 10:23:45 -04:00
Mariano Alvira
4c36473ff5 don't set the rx level 2011-07-09 17:02:15 -04:00
Mariano Alvira
4cf9514aa9 fix gpio initialization for uart2 2011-07-09 14:33:03 -04:00
Mariano Alvira
6d96721ac4 mc1322x: block in uart putc if the TX buffer is full. Can also be
configured to drop chars instead with UARTx_DROP_CHARS
2011-07-09 12:46:30 -04:00
Mariano Alvira
e80f9eb4b5 mc1322x: build fixes for uart2 2011-07-08 19:40:42 -04:00
Mariano Alvira
e2d74fa0a5 Merge branch 'master' of git://git.devl.org/git/malvira/libmc1322x into uart-upstream
Conflicts:
	cpu/mc1322x/lib/include/uart.h
	cpu/mc1322x/src/default_lowlevel.c
2011-07-08 19:21:15 -04:00
Mariano Alvira
6b45e353e1 add uart1, uart2 and a common uart.h include 2011-07-08 18:48:19 -04:00
nvt
8edea47e0a Added an example of using the Coffee file system. 2011-07-04 18:33:49 +02:00
Mariano Alvira
6624ee04a1 fix asy syntax for new versions of asy 2011-07-04 11:35:11 -04:00
Niclas Finne
4b26f92e04 Added platform configuration files with resource definitions for the JCreate and Sentilla USB platforms 2011-07-01 17:18:57 +02:00
Niclas Finne
1d07330ac0 Made the platform config file configurable. 2011-07-01 17:16:12 +02:00
Niclas Finne
d635c03b52 Fixed bug when reading temperature (abstemp was not always set). 2011-06-30 18:16:35 +02:00
David Kopf
6ea7250af7 Change ctimer startup order, add multihop to wpcap and minimal-net platform. 2011-06-30 12:12:07 -04:00
David Kopf
058bb6039b Include status cgi's with explicit define 2011-06-30 12:10:16 -04:00
Nicolas Tsiftes
77a44c560a The flags field got widened to 9 bits. 2011-06-28 17:49:32 +02:00
Nicolas Tsiftes
ccfb30707a print node ids correctly 2011-06-28 17:44:35 +02:00
Nicolas Tsiftes
b1fea35e47 Fixed issues with propagation of the route lifetime configuration. Removed deprecated configuration parameters. 2011-06-28 17:08:44 +02:00
Nicolas Tsiftes
baa6578341 Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2011-06-28 15:36:53 +02:00
David Kopf
cfd3198fda Restore lines that were excluded for VC++ test build 2011-06-28 08:59:39 -04:00
David Kopf
46de21e771 Allow ipv6 builds on win32 platform. (webserver6 builds with cygwin, needs changes for VC++ compiler) 2011-06-28 08:24:23 -04:00
David Kopf
c48b7ab78d Add RPL nodes and border router to minimal-net platform (cygwin only) 2011-06-28 08:19:48 -04:00
Nicolas Tsiftes
a92b31ad21 Minor style improvement. 2011-06-23 15:21:20 +02:00
Nicolas Tsiftes
6749281a87 Rediscover lost routes when forwarding packets. Also refresh route entries when sending packets through them. Patch from Jaroslav Meduna. 2011-06-23 14:45:11 +02:00
Nicolas Tsiftes
17da1fb933 Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2011-06-23 13:47:50 +02:00
David Kopf
6b434a553f Implement SRAM routine of Georg von Zengen 2011-06-21 13:03:58 -04:00
HATATANI Shinta
47af2f26e4 Now iris port works with tunslip6 (Thanks to Suhas K) 2011-06-20 21:47:29 +09:00
Niclas Finne
28b0479c06 Added optional address filtering 2011-06-15 17:51:57 +02:00
Niclas Finne
e8a96dc202 Bug fix: update packet attributes in queued packets in CSMA instead of doing a full packetbuf copy after transmissions. The lower layers often add their own headers to packetbuf. 2011-06-15 16:10:07 +02:00
HATATANI Shinta
8f30113c50 IRIS port is working with uIPv6 2011-06-15 22:23:28 +09:00
HATATANI Shinta
cae1e122e8 create iris directory 2011-06-15 22:23:27 +09:00
Joakim Eriksson
6a1469aeb2 Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2011-06-14 23:49:51 +02:00
Joakim Eriksson
1aad1e66c1 fixed bug in UDP packet handling 2011-06-14 23:46:38 +02:00
Nicolas Tsiftes
3f72907b41 Made the file size configurable. 2011-06-14 17:14:30 +02:00
Nicolas Tsiftes
ddd245ed15 Added streaming mode for page updates. Rewrote and removed some legacy code. Improved error checks and comments. 2011-06-14 17:12:15 +02:00
Nicolas Tsiftes
48e6e801c2 Removed redundant tokens at the end of preprocessor conditions 2011-06-10 17:44:48 +02:00
Nicolas Tsiftes
ce909a97e6 Removed unread stack variable 2011-06-10 17:41:46 +02:00
Niclas Finne
4bac5ac7b9 updated to latest version of MSPSim with improved support for Dwarf 2011-06-09 01:29:59 +02:00
dak664
d6db9e4e86 Add project-conf.h to platform contiki-conf.h files.
Fix jackdaw comments.
2011-06-08 09:12:57 -04:00
Niclas Finne
154f971b2b collect_send() should return 0 if the packet could not be enqueued to be sent 2011-06-07 19:45:41 +02:00
Niclas Finne
dc426d789b msp430.h has been merged with msp430def.h for code to compile with IAR compiler 2011-06-07 18:54:57 +02:00