Commit graph

740 commits

Author SHA1 Message Date
Niclas Finne 9217c8b321 fixed compiler warning 2012-03-14 15:20:02 +01:00
Joakim Eriksson adff634b88 Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2012-03-09 01:11:21 -08:00
Joakim Eriksson ae3ff57c39 replaced inet6 with inet for linux to get tunbridge working. 2012-03-09 01:09:56 -08:00
David Kopf 07f6e10c1c Add display options to border router web page, default now uses stack instead of static buffer.
Turn radio off until prefix is acquired.
2012-03-02 16:01:12 -05:00
Ilya Dmitrichenko b67e49051c Use __APPLE__ instead of __MACH__. 2012-03-02 15:15:46 -05:00
Ilya Dmitrichenko 7621bdfc77 Fixed ifconfig for Darwin 2012-03-02 15:15:45 -05:00
Ilya Dmitrichenko 70d3acf9af Fixed baudrate issue on Darwin. 2012-03-02 15:15:44 -05:00
Matthias Kovatsch cd802979da Fixed token bug in separate response and extended API (thanks to Klaus Hartke for the bug report). 2012-02-06 06:22:55 +01:00
Matthias Kovatsch 2ef46ac47a Bugfix for separate NON requests and updated separate resonse API.\nEnabled multiple BLOCKING_REQUESTs in the same scope. 2012-02-05 06:21:35 +01:00
David Kopf 7110075108 Make static buffer the default, add comments. 2012-03-06 09:10:12 -05:00
Niclas Finne 40c32990e3 Added missing arguments to usage information 2012-03-06 12:33:16 +01:00
Matthias Kovatsch dc6142fa0b Revised Erbium observing. 2012-02-01 03:24:49 +01:00
Matthias Kovatsch 4a02790c76 Simplified Erbium support for separate responses. 2012-01-31 04:38:07 +01:00
Matthias Kovatsch 6e41f6fbe9 Erbium README update. 2012-01-30 01:41:53 +01:00
Matthias Kovatsch de82815186 Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
Conflicts:
	apps/er-coap-06/er-coap-06-engine.c
	apps/er-coap-06/er-coap-06-observing.c
	apps/er-coap-06/er-coap-06-separate.c
	apps/er-coap-06/er-coap-06-transactions.c
	apps/er-coap-06/er-coap-06.c

Removed er-coap-06.
2012-01-30 01:30:49 +01:00
Joakim Eriksson 417a2b691f increase uip buffer size for native border router 2012-02-23 13:59:39 -08:00
Niclas Finne 5fdcd6bc13 Fixed typo, added option to run without slip connection 2012-02-21 14:42:05 +01:00
Nicholas J Humfrey a561d20828 Converted u8_t to uint8_t and u16_t to uint16_t in the examples directory. 2012-02-21 08:33:25 -05:00
Niclas Finne 23a70177b2 Added option to connect to server instead of serial device 2012-02-21 11:05:52 +01:00
David Kopf 0327fe3020 Turn off RDC before SLIP prefix interchange. Disable SIN/SUT prints, leave off-route prints. 2012-02-11 15:15:00 -05:00
Matthias Kovatsch f23e86f589 Moved status code API from REST engine to main coap implementation. 2012-01-30 01:28:43 +01:00
Matthias Kovatsch bca4d56eec Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2012-01-28 18:52:45 +01:00
Matthias Kovatsch 2240289d1f Erbium code cleanup. 2012-01-28 18:52:14 +01:00
Matthias Kovatsch 4c3e858df5 Made Erbium function parameters const where applicable.\nMinor clean-up. 2012-01-20 18:30:12 +01:00
Matthias Kovatsch 0a4c77dbff Fixed snprintf() return value handling. 2012-01-20 16:11:45 +01:00
Niclas Finne aceb36c66b Replaced SELECT_CALLBACK with an API that supports multiple select callbacks 2012-01-19 17:52:01 +01:00
Adam Dunkels 8a89f90e3e Update to the newest RPL API 2012-01-18 06:12:24 -08:00
Matthias Kovatsch c861ce0197 Fixed Erbium bugs (ext. header, client request path) and added server resource config defines. 2012-01-12 20:19:54 +01:00
Nicolas Tsiftes c6abd58340 Include stdarg.h 2012-01-10 11:26:03 +01:00
Nicolas Tsiftes 41ad30f93a Avoid setting GCC-specific flags here. 2012-01-10 11:25:18 +01:00
David Kopf b251619a2f Add wpcap for cygwin/Windows native border router 2012-01-08 13:37:56 -05:00
David Kopf 777cc88872 Add 921600 baud to slip options, fix compiler warnings 2012-01-08 13:33:40 -05:00
Joakim Eriksson 3d388760c3 added parsing of frame to get receiver address, etc 2012-01-08 02:27:37 -08:00
Niclas Finne 8b83ffec67 Added native-border-router and slip-radio 2012-01-01 09:29:33 +01:00
Joakim Eriksson 65163a9b57 Changed FRAMER to return negative values for error to allow 0 size headers. 2012-01-01 09:10:56 +01:00
Niclas Finne 28e5cac1ea Sensors already included by platform 2011-12-20 05:09:34 +01:00
Niclas Finne d14d90ea68 Moved variable definitions from header file 2011-12-20 05:09:31 +01:00
Niclas Finne c0cf69ecbd fixed compiler warnings 2011-12-20 05:09:28 +01:00
Mariano Alvira 5247be27bf dio_intcurrent is now part of the instance struct 2011-12-09 11:15:33 -05:00
Nicolas Tsiftes d0ebeb409e Merge remote-tracking branch 'sf/master' into rpl-patch
Conflicts:
	core/net/tcpip.c
2011-12-08 15:26:11 +01:00
Matthias Kovatsch 6e0bb440ea Restructured Erbium example resources. 2011-12-07 20:51:03 +01:00
Matthias Kovatsch 13140f922f Disabled RDC for CoAP demo purposes due to changing memory requirements of core system. 2011-12-07 20:03:54 +01:00
nvt da4d0280e8 NetDB: a simple DBMS application using Rime's Mesh protocol to transfer queries and responses. 2011-12-06 20:27:41 +01:00
nvt 639bb72855 Added the first Antelope example: a simple command-line interface to the DBMS. 2011-12-06 19:11:04 +01:00
Nicolas Tsiftes 6177187954 Check the return value of udp_new. 2011-12-01 14:40:55 +01:00
Nicolas Tsiftes 2b1549bfe8 Continued merge with sf master 2011-11-21 15:25:13 +01:00
Nicolas Tsiftes 0e32956a63 Merge remote-tracking branch 'sf/master' into rpl-patch 2011-11-21 14:59:31 +01:00
Niclas Finne c273969400 Added missing include 2011-11-15 15:14:43 +01:00
David Kopf 899123a634 Use fixed font for neighbors and routes 2011-10-27 09:25:56 -04:00
Joakim Eriksson cf61e522a8 added powertrace to IPv6 including an example 2011-10-13 15:09:40 +02:00
Matthias Kovatsch df9f871313 Fixed Erbium chunks for minimal-net 2011-10-10 16:09:17 +02:00
Matthias Kovatsch 2522566b68 Added SMALL flag for border-router (exceeded sky memory) 2011-10-10 14:30:31 +02:00
Matthias Kovatsch ce6f8de078 Fixed Erbium example simulation 2011-10-10 14:16:27 +02:00
simonduq dd8576830e Added bursts support in CSMA/ContikiMAC, and CFS-swapping in
queuebuf. Exemplified in examples/udp-stream.
2011-09-27 16:47:03 +02:00
Niclas Finne 3017f92a55 Enabled power commands 2011-09-19 17:58:49 +02:00
Niclas Finne 21bb28bc9b Removed obsolete file (moved to tools/collect-view) 2011-09-19 17:57:35 +02:00
Matthias Kovatsch f71b0bc794 Added Erbium REST engine with new CoAP implementation 2011-09-14 16:33:01 +02:00
David Kopf d01df43a0c Drop unneded null byte at end of httpd-fsdata files. 2011-09-10 13:04:21 -04:00
Adam Dunkels e4aec8340b Added SMALL=1 to make code fit on Tmote Sky 2011-09-06 15:36:25 +02: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
nvt 708435ecc8 Improved the clarity of the Coffee test. 2011-09-05 21:25:01 +02:00
Adam Dunkels bfc314a037 Remove debug output to save space 2011-09-05 12:08:26 +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 126899278c Include string header 2011-09-05 11:41:08 +02:00
Adam Dunkels 722b6e0b96 Print out sender IPv6 address when receiving data. When sending data, include a counter in the message. 2011-09-01 09:19:26 +02:00
Adam Dunkels 69d262af5b Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2011-08-31 20:57:31 +02:00
Adam Dunkels 587ac9c501 Copyright headers 2011-08-31 20:54:57 +02:00
David Kopf 407c76c5df output buffer unused at present, save some RAM 2011-08-31 11:52:55 -04:00
David Kopf 470887eddd Print elf size if ELF_SIZE is defined 2011-08-31 11:50:14 -04:00
Adam Dunkels 2b245cf850 Update to new API 2011-08-29 22:00:25 +02:00
Adam Dunkels 823f28e87c Made the simple UDP examples simpler 2011-08-29 21:51:09 +02:00
Adam Dunkels 2ae835ef65 Simulation file for the unicast example 2011-08-29 21:41:25 +02:00
Adam Dunkels e480740fd9 Simulation file for the broadcast example 2011-08-29 21:41:15 +02:00
Adam Dunkels b3f3163661 Example code for the simple UDP API 2011-08-29 21:33:23 +02:00
David Kopf d2aece89ef Add settings manager with program flash defaults, random routine, periodic prints with ENERGEST, node-id. 2011-08-28 16:22:39 -04:00
David Kopf 5f2b2074f0 Implement WITH_RPL option in makefile 2011-08-28 16:11:48 -04:00
David Kopf c42085c00b Add warning about slip overrun 2011-08-24 10:59:15 -04:00
David Kopf b7cd4fbd90 Add CONTIKI_PROJECT to the makefile, enabling make upload. 2011-08-16 14:37:28 -04:00
maniacbug 1c53807727 Make PERIOD and SERVER_REPLY configurable 2011-08-16 14:17:01 -04:00
maniacbug 912ea85199 Make PERIOD configurable in Makefile 2011-08-16 14:16:19 -04:00
maniacbug 3caf77a60b Added 'webserver6' to CONTIKI_PROJECT. This enables make upload. 2011-08-16 14:14:24 -04:00
David Kopf db5cee9f1b [Forget to add to previous commit]
Free internal webserver from dependency on /apps/webserver.
2011-08-16 10:43:47 -04:00
David Kopf e4257647cd Free internal webserver from dependency on /apps/webserver.
Allow choice of webservers with makefile switch.
2011-08-15 18:30:31 -04:00
David Kopf 83e3b99d54 Let RPL examples enable platform RPL 2011-08-15 14:45:44 -04:00
David Kopf 6ec85fe079 Add Iris port of Shinta Hatatani 2011-08-03 10:17:59 -04:00
Adam Dunkels 63bfaa22ae Bugfix: IPv6 address to Rime address traslation did not appear correctly in the Collect-View GUI. 2011-07-29 20:26:57 +02:00
David Kopf e3368ffb67 Fix avr progmem string accesses, add DEBUGLOGIC, configure sky defaults 2011-07-25 15:08:49 -04:00
David Kopf 0e59a0360e Raven-webserver needs raven-lcd-interface 2011-07-24 12:54:12 -04:00
David Kopf 031c45994b Add WITH_WEBSERVER=<webserver> options 2011-07-24 11:59:28 -04:00
HATATANI Shinta 04b4ff157f change some examples for iris 2011-07-18 19:53:18 +09:00
David Kopf 6355545ded Add template for AUTOSTART_PROCESS 2011-07-11 11:34:04 -04:00
Vincent Brillault dc9cbe647d Changes in RPL implementation :
- Structural modification of RPL data storage.
- Support multiple gateways (multiple DODAG-ID with a unique InstanceID)
- Use Lollipop counters
- Add leaf-only configuration option for RPL
Bugfix :
- Correctly send "Grounded" flag in DIO
2011-07-11 16:52:45 +02:00
nvt 8edea47e0a Added an example of using the Coffee file system. 2011-07-04 18:33:49 +02:00
Nicolas Tsiftes ccfb30707a print node ids correctly 2011-06-28 17:44:35 +02:00
Nicolas Tsiftes a92b31ad21 Minor style improvement. 2011-06-23 15:21:20 +02:00