deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
9907 commits 6 branches 13 tags 80 MiB
Commit graph

1033 commits

Author SHA1 Message Date
Adam Dunkels 262c9db1c4 Merge pull request #127 from mkovatsc/master 
Erbium CoAP draft 13
 2013-03-10 12:56:06 -07:00
Robert Quattlebaum f145c17039 core/net/resolv: IPv6 and mDNS ("Bonjour") support. Major refactor. 
This patch updates the DNS resolver to support IPv6 and introduces an
improved API for looking up DNS entries. This patch also adds optional
support for mDNS lookups and responses to the DNS resolver.

Here is a quick summary of the changes:

 * Added support for IPv6 lookups.
 * DNS queries now honor record expiration.
 * Added support for mDNS, compatible with "Bonjour".
 * Implemented a new lookup api, `resolv_lookup2()`, which provides
   more information about the state of the record(error, expired,
   looking-up, etc.).

About mDNS/Bonjour Support
--------------------------

This patch adds basic support for mDNS/Bonjour, which allows you to
refer to the name of a device instead of its IP address. This is
incredibly convenient for IPv6 addresses because they tend to be very
long and difficult to remember. It is especially important for
link-local IPv6 addresses, since not all programs support the '%'
notation for indicating a network interface (required on systems with
more than one network interface to disambiguate).

In other words, instead of typing in this:

 * `http://[fe80::58dc:d7ed:a644:628f%en1]/`

You can type this instead:

 * `http://contiki.local/`

Huge improvement, no?

The convenience extends beyond that: this mechanism can be used for
nodes to talk to each other based on their human-readable names instead
of their IPv6 addresses. So instead of a switch on
`aaaa::58dc:d7ed:a644:628f` triggering an actuator on
`aaaa::ed26:19c1:4bd2:f95b`, `light-switch.local` can trigger the
actuator on `living-room-lights.local`.

What you need to do to be able to look up `.local` names on your
workstation depends on a few factors:

 * Your machine needs to be able to send and receive multicast packets
   to and from the LoWPAN. You can do this easily with the Jackdaw
   firmware on an RZUSBStick. If you have a border router, you will need
   it to bridge the mDNS multicast packets across the border.

 * If you are using a Mac, you win. All Apple devices support mDNS
   lookups.

 * If you are using Windows, you can install Apple's Bonjour for Windows
   package. (This may be already installed on your machine if you have
   installed iTunes) After you install this you can easily do `.local`
   lookups.

 * If you are using a Unix machine, you can install Avahi.

The default hostname is set to `contiki.local.`. You can change the
hostname programmatically by calling `resolv_set_hostname()`. You can
change the default hostname by changing `CONTIKI_CONF_DEFAULT_HOSTNAME`.

You may disable mDNS support by setting `RESOLV_CONF_SUPPORTS_MDNS` to
`0`.

---------------------------------

core/net/resolv: `resolv_lookup2()` -> `resolv_lookup()`

Note that this patch should fix several `resolv_lookup()` bugs
that already existed. There were many cases where `resolv_lookup()`
was being called and the IP address ignored, but later code
assumed that the IP address had been fetched... ANYWAY, those
should be fixed now.

---------------------------------

examples/udp-ipv6: Updated client to use MDNS to lookup the server.

Also updated the Cooja regression test simulation.
 2013-03-10 11:40:08 -07:00
Robert Quattlebaum 1d113f52ad core/net/uip: Rename uip_ethaddr to uip_lladdr. 
There isn't really a good reason I can think of for these
to be different between IPv4 and IPv6.
 2013-03-10 11:39:11 -07:00
Adam Dunkels d2461c9e9a Merge pull request #99 from heipei/slip-radio 
Load Makefile.target for slip-radio
 2013-03-09 05:55:17 -08:00
Matthias Kovatsch 23e56e57b0 Merge branch 'master' of https://github.com/contiki-os/contiki 2013-03-08 20:21:54 +01:00
Oliver Schmidt 49ca10d540 Removed PFS code from C128 WGET. 
On the C128 the custom PFS code doesn't add functionality (as it does with IDE64 support on the C64) but is "only" smaller than the POSIX file i/o code in the C library. But the stdio code in the C library (used in WGET for screen i/o) relies on the POSIX file i/o code anyway so there no point in additionally adding the PFS code to the WGET program.
 2013-03-06 14:50:51 +01:00
Sébastien Dawans de3cd3811d Restore CC2420 as default in slip-radio 2013-02-20 18:26:52 +01:00
Laurent Deru 3486c69981 SLIP-radio support for the Econotag 2013-02-19 21:52:59 +01:00
Sébastien Dawans e05ab21557 SLIP-radio support for the Nooliberry (RF230 radio) 2013-02-19 21:52:54 +01:00
Oliver Schmidt 9040f83fd4 Reduced program size. 
On the C128 the custom PFS code doesn't add functionality (as it does with IDE64 support on the C64) but is "only" smaller than the POSIX file i/o code in the C library. But the POSIX directory access code in the C library relies on the POSIX file i/o code anyway so there no point in additionally adding the PFS code to the FTP program.
 2013-02-14 15:57:20 +01:00
Oliver Schmidt 107b79c019 The recent cc65 snapshot yields somewhat small programs so we can move back to the MTU size used before. 2013-02-14 15:45:33 +01:00
Matthias Kovatsch 82884ab63f Fixed legacy CoAP versions. 2013-02-13 19:22:21 +01:00
Matthias Kovatsch a522357d20 Added Erbium coap-12 and coap-13. 2013-02-13 17:46:35 +01:00
Oliver Schmidt ea4fac679f Allow user to read the result of wget. 
Several retro targets clear the screen after program termination so allow user to read the result.
 2013-02-11 00:24:51 +01:00
Oliver Schmidt 945b334457 Minor uIP code increase from Contiki 2.5 to Contiki 2.6 make a buffer reduction necessary. 2013-02-03 23:41:20 +01:00
Oliver Schmidt 81bc336a93 Updated Contiki URL in sample web page. 2013-02-03 10:57:48 +01:00
Oliver Schmidt 7360444c94 Have the wget process allow the resolver process to initialize properly. 2013-02-01 00:10:03 +01:00
Johannes Gilger 3877f361e4 Load Makefile.target for slip-radio 
This loads Makefile.target into Makefile so we can check for TARGET==sky
when building this. Compilation for sky fails without it.

Signed-off-by: Johannes Gilger <heipei@hackvalue.de>
 2013-01-30 15:34:06 +01:00
Adam Dunkels 47c2b13db5 Merge pull request #78 from g-oikonomou/example-putchars 
We can now turn off example-provided putchars
 2013-01-09 22:41:22 -08:00
George Oikonomou a35580d068 cc2530 udp server example is no longer RPL root by default 2013-01-09 22:46:20 +00:00
George Oikonomou de251aeb85 We can now turn off example-provided putchars 2013-01-09 22:23:22 +00:00
George Oikonomou 64a95dcb59 Code style fixes: sensinode examples 2012-12-16 19:28:56 +00:00
George Oikonomou 594ba9a0ed Code style fixes: cc2530dk examples 2012-12-16 19:28:56 +00:00
George Oikonomou e38b419e84 Deleted obsolete sensinode examples 2012-12-16 19:28:41 +00:00
Adam Dunkels 99f541e8fd Updated to the latest uip-ds6-route API 2012-11-27 23:04:34 +01:00
Adam Dunkels 5406dd8b18 Updated to use the new uip-ds6-route API 2012-11-27 23:04:34 +01:00
Adam Dunkels ec8c7e9be0 Cleanup of the node-id.h files. The node-id.h file contains 
declarations of functions for setting and getting a node ID number, a
functionality that exists on many platforms. Since this functionality
was not considered part of the Contiki core, each platform defined its
own node-id.h file. This commit attempts to clean this up by
collecting the node-id.h into a core/sys/node-id.h file that replaces
the old node-id.h files from the platform directories.
 2012-11-20 19:59:46 +01:00
Mariano Alvira e4a383d61d don't use static routing with econotag platform 2012-11-20 13:22:28 -05:00
George Oikonomou 5762179159 cc2530dk: Sniffer example changes: 
- Building for the cc2531 USB dongle by default
- We turn on USB-serial buffered mode

Closes #21
 2012-11-04 21:44:38 +00:00
George Oikonomou 9215081f41 cc2530dk: Border router example changes: 
- It now plays nicely with the cc2531 USB dongle
- We build it for the dongle by default
- Debugging with cc2530dk functions instead of printf
- Using __nonbanked optimisations
- During prefix requests, invert LED blinking to make things more visible
- Removed leftover include
- Code style fixes

See Pull Request #21
 2012-11-04 21:44:24 +00:00
George Oikonomou 13f20225a6 Sensinode: Border router debug without printf 
Closes #20
 2012-11-04 21:44:06 +00:00
George Oikonomou be93f1ae52 cc2531: Added a new USB demo project (CDC-ACM) 
See Pull Request #18
 2012-11-01 17:42:01 +00:00
Adam Dunkels 944537fccf Removed all old RCS tags in the Contiki source tree. Those RCS tags are not used any more, as we are now using git to manage the Contiki source tree 2012-10-26 15:54:49 +02:00
Niclas Finne f5c8cff5b2 Made MT stack size configurable 2012-10-23 00:52:52 +02:00
George Oikonomou 8699f7741d Fixed typos and a stray printf. Adjusted comments 2012-09-07 17:31:25 +01:00
simonduq 1bb055bae6 Fixed the udp-stream example: use the new RPL interface, reduce RAM usage 2012-08-30 13:22:27 +02:00
Antonio Lignan c5e9d688a5 Fixed sht11 driver, now ensures the i2c bus is disabled when initializing 2012-08-16 14:12:27 +02:00
Antonio Lignan 73e7f25cbc Simple phidget-like relay driver for the Z1 mote with basic functionalities 2012-07-30 11:27:13 +02:00
George Oikonomou 43f2790357 Added channel_get() to the cc2x3x RF drivers 2012-07-11 10:53:14 +01:00
Nicolas Tsiftes 86115a392e Include string.h 2012-06-27 15:44:53 +02:00
Nicolas Tsiftes 0ba83a10df Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2012-06-27 15:42:51 +02:00
Joakim Eriksson 51b73127e9 * Simple JSON parser and generator. 
* Simple HTTP webservice with support for both receiving and sending HTTP requests.
* json-ws example that optionally push sensor data to COSM over IPv6.
 2012-06-12 16:42:16 +02:00
Niclas Finne f177284a73 Added option to specify the IPv6 prefix 2012-06-12 16:32:05 +02:00
Nicolas Tsiftes 21f2b42090 Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2012-06-11 08:01:03 +02:00
David Kopf 37c407b177 Patch from Landon Fuller adds const to PROGMEM, required for newer avr-gcc 2012-06-10 12:54:11 -04:00
Matthias Kovatsch 9096da299e Added sub-resource example. 2012-06-09 12:20:57 +02:00
Matthias Kovatsch ed66cfa364 Disabled debugging. 2012-06-09 11:18:51 +02:00
Matthias Kovatsch 6c813f0fb1 Fixed bug in debug print noticed by Linus. 2012-06-09 11:14:25 +02:00
Matthias Kovatsch 4a96e12890 Added Giovanni Pellerano's radio resource. 2012-06-09 10:47:09 +02:00
Nicolas Tsiftes e84d6fc665 Added default targets and removed certain C flags. 2012-06-04 20:02:23 +02:00
Fredrik Osterlind c2b7e26e33 removed io.h include, now handled by Contiki to support more compilers 2012-05-29 17:08:17 +02:00
David Kopf e62f2c3977 Ensure MAXDADNS is defined in uip-ds6.h 
Set no RPL as webserver6.minimal-net default and update README
 2012-05-28 10:01:34 -04:00
Fredrik Osterlind 6ff349f3e6 bugfix in fragmentation test mode: avoid reading from outside buffer placed on stack 2012-05-25 14:36:13 +02:00
George Oikonomou 2f89f41b5a cc2x3x RPL/non-RPL handling: 
- Relevant examples explicitly request it in their Makefile
- Removed the definition of UIP_CONF_IPV6_RPL from
  contiki-conf.h. If needed, it's defined through a -D
 2012-05-16 15:22:31 +01:00
George Oikonomou 1f7171f943 Adjust cc2x3x ports to the new clock API 2012-05-16 15:22:31 +01:00
George Oikonomou efd6d12831 cc2530dk and Sensinode example udp server code cleanup 2012-05-16 15:22:31 +01:00
Matthias Kovatsch 3dea97e247 Updated file references and README. 2012-05-13 17:15:57 +02:00
Matthias Kovatsch 0038acfa87 Cleaned up filenames 2012-05-13 17:13:54 +02:00
Matthias Kovatsch 222a858254 Optimized configuration to fit into sky again. 2012-05-13 16:23:28 +02:00
Antonio Lignan 6df9ffb731 Zolertia's light sensor ziglet 2012-05-11 13:39:59 +02:00
Antonio Lignan 5a431482bf Squeeze websense example 2012-05-09 10:44:41 +02:00
George Oikonomou 52d0117086 Offload some bytes off the cc2x3x stack for the sensinode & cc2530dk udp server example 2012-04-26 17:21:33 +01:00
George Oikonomou 4147c7e58d cc2530dk example comment fix 2012-04-26 16:28:04 +01:00
George Oikonomou febcf0fc41 The cc2530dk blink-hello example now makes sense for cc2531 2012-04-26 16:27:23 +01:00
George Oikonomou dd26accc07 We can now use SDCC's __nonbanked feature 
This allows us to reduce CODE footprint of SDCC projects
built with --model-huge. Use carefully!

* Added a facility which allows us to enable/disable the
  feature from the CPU dir (CC_CONF_NON_BANKED_OPTIMIZATION)
* Added the CC_NON_BANKED keyword to some platform files
  (expands to __nonbanked)
* Started using this for some examples
 2012-04-26 15:28:43 +01:00
Niclas Finne 16bb9295f3 Added configurable delay between slip packets to avoid losing data 2012-04-20 22:40:45 +02:00
Niclas Finne 28c62208cb Added check for illegal attributes in packet attribute serialization 2012-04-20 22:40:24 +02:00
Niclas Finne 1733f3b6bc Added command context. Patch by Joakim Eriksson 2012-04-20 22:31:37 +02:00
David Kopf ea667cef2d Change Huginn and Muninn for params.c storage 2012-04-09 10:10:45 -04:00
David Kopf c31f57ffb1 RPL is now default. 2012-04-09 10:09:21 -04:00
George Oikonomou 225a6aff8c Improved cc2x30 timer test examples 
* Adjusted the cc2530 timer-test example to reflect recent changes to clock_delay()
* Sensinode now uses the newer timer-test example copied over from cc2530dk
* Deleted the obsolete clock-test. timer-test is a superset
 2012-04-03 16:32:08 +01:00
George Oikonomou 977bc548f3 Renamed sensinode-debug to debug 2012-04-02 11:22:19 +01:00
Matthias Kovatsch ed92994784 Clean-up and fix for rest-server-example. 2012-03-29 18:56:46 +02:00
Matthias Kovatsch 8f9247560a Managed consistent representation generation for /obs. 2012-03-29 18:16:27 +02:00
Matthias Kovatsch c023faead2 Added Content-Type to observe notifications. 2012-03-29 18:16:25 +02:00
Matthias Kovatsch 949ba03bda Changed notify API to passing a notification message. 2012-03-29 18:16:24 +02:00
Matthias Kovatsch d102d8c607 Changed separate API and fixed token bug. 2012-03-29 18:16:23 +02:00
Matthias Kovatsch c7c7bcbf81 Branched and added custom address to Makefile. 2012-03-29 18:16:22 +02:00
George Oikonomou 23e7f242f6 Changes to the ping part of the cc2530 and Sensinode udp-ipv6 examples 
- Remove obsolete variable declarations
- prettier printf output
- cc2530 example turns on printfs
 2012-03-29 13:10:25 +01:00
George Oikonomou 4f1e251603 Some uN_t had crept back in cc2530dk and sensinode. 
Changed to uintN_t plus a bit of code formatting
 2012-03-29 13:10:10 +01:00
Vasilis Michopoulos 9475737f4b Changed some sensinode/cc2530 examples to use uip-debug.h instead of the old #define DEBUG N 2012-03-29 13:08:24 +01:00
George Oikonomou 78450aeab6 Fixed mis-formatted printfs 2012-03-29 13:08:12 +01:00
Niclas Finne 7bf4fa4bff Removed obsolete mac pointer 2012-03-28 21:51:19 +02:00
George Oikonomou 2755e261bf Turn off printf for sensinode examples which will otherwise not fit our flash 2012-03-23 16:49:49 +00:00
George Oikonomou 80002e8fd1 Fixed the stub-rdc driver used by various cc2x30 examples 2012-03-23 16:48:09 +00:00
George Oikonomou ad256e5014 New platform: TI cc2530 Development Kit 
This commits adds support for TI's SmartRF05 Eval. Board with cc2530 EMs
Some initial support for cc2531 USB dongles
 2012-03-23 14:41:07 +00:00
George Oikonomou b7674c3636 Reincarnate the sensinode/cc2430 port 2012-03-23 14:41:07 +00:00
Matthias Kovatsch 063bb12bd0 Fixed debug/test prints. 2012-03-19 18:37:25 +01:00
Matthias Kovatsch 2aa1f587bd Added ETSI IoT CoAP Plugtests server and tweaked rest-server-example. 2012-03-17 16:51:28 +01:00
Matthias Kovatsch e794088d19 Made Block1 support dependent on resource handlers.\nAdded flags and target for minimal-net. 2012-03-17 15:32:51 +01:00
Matthias Kovatsch 3a3d457a57 Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2012-03-17 11:50:17 +01:00
Matthias Kovatsch 186f227972 Also excluded platform native from static routing. 2012-03-17 11:47:09 +01:00
Joakim Eriksson 90e969344a added config for serializing attributes 2012-03-16 03:08:47 -07:00
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
Nicolas Tsiftes 3f72907b41 Made the file size configurable. 2011-06-14 17:14:30 +02:00
Salvatore Pitrulli 7043c25cd9 Bugfix in page layout for mb851-websense example. 2011-05-28 12:50:12 +02:00
Salvatore Pitrulli efffaac0ff Changed default size of uIP buffer and removed serial line input for mb851-websense example. 2011-05-28 12:50:10 +02:00
Mariano Alvira 97f70a2334 group light and leds together; use PLATFORM_HAS defines 2011-05-27 11:00:24 -04:00
Oliver Schmidt 4af9f534cc Added the Telnet server to the examples supported by cc65. 2011-05-21 23:24:55 +02:00
Niclas Finne 28780dff57 Removed example for deprecated Rime abstraction 2011-05-12 15:14:41 +02:00
Salvatore Pitrulli 5eabf33211 Added functions for deep sleep to mbxxx platform. 2011-04-27 18:12:23 +02:00
Salvatore Pitrulli aa968309af Merge remote branch 'sf/master' 2011-04-16 16:27:10 +02:00
Salvatore Pitrulli 774ac10bca Added Makefile.target for mb851. 2011-04-14 08:01:49 +02:00
dogan yazar 31a14c3d90 Commented periodic resource related stuff for the sake of small code print and added minimal-net configuration in README. 2011-04-13 00:07:47 +02:00
Niclas Finne 61fa812351 Added missing separators in Javascript. Fixed sensors web page to use the right Javascript function to reload sensor data. 2011-04-12 08:15:29 +02:00
Niclas Finne 6facc252a2 Updated to latest collect-neighbor API 2011-04-12 07:54:05 +02:00
Niclas Finne 4181e4774e Updated to configure MAC using NETSTACK 2011-04-12 07:52:14 +02:00
dogan yazar 91dd236c55 Changes for minimal-net and bug fix for buffer handling. 2011-04-12 00:09:15 +02:00
Salvatore Pitrulli 6655c876f2 Added functions and example for deep sleep on mb851. 
The added function let a process to make the system go
into deep sleep for maximum power saving.
The udp-ipv6-example shows how to use these new functions.
 2011-04-08 11:53:48 +00:00
Niclas Finne 5a4a39afb3 changed etx to metric 2011-04-07 09:46:37 +02:00
Oliver Schmidt 4a731dfda9 Allow for non-GUI win32 apps. 2011-04-03 10:56:18 +02:00
Enric M. Calvo 1716d837fc Merge branch 'master' of git://contiki.git.sourceforge.net/gitroot/contiki/contiki into master_cleanup 
Makefile.z1 is broken into .common and .z1 to share it with Z1 Starter Platform

Conflicts:
	.gitignore
	platform/z1/Makefile.z1
 2011-03-25 17:46:38 +01:00
Enric M. Calvo 425edf3a44 Cleaned up some files, moved z1-websense example 2011-03-16 17:41:03 +01:00
Joakim Eriksson 90ae09c7e5 fixed parsing of address to handle [<addr>] 2011-03-22 10:42:38 +01:00
dak664 14246ef811 Add optional build without internal webserver 2011-03-13 11:59:17 -04:00
dak664 97a71fea76 Conditional inclusion of the internal webserver 2011-03-11 15:07:15 -05:00
Joakim Eriksson 7033bc859e fixed the prefix query 2011-03-11 16:34:30 +01:00
dak664 d4f58ca7f0 Server address options giving different 6lowpan header compression 2011-03-08 14:15:55 -05:00
Enric M. Calvo 07f59a5142 Cleaned up z1-websense.c file 2011-03-08 12:18:26 +01:00
Enric M. Calvo ae6791abb8 minor tweaks to z1-websense and .gitignore 2011-03-08 12:03:14 +01:00
Enric M. Calvo bd2d1ee4be ictp:z1-websense with battery in mV 2011-03-08 11:19:30 +01:00
Enric M. Calvo 73fc5f6ae7 Meaningful units for msp temp&batt sensors 2011-03-08 10:05:47 +01:00
Enric M. Calvo 127a3d03ad Added IPv6 z1-websense demo w/MSP batt&temp sensor 2011-03-08 09:27:38 +01:00
Enric M. Calvo 7c3527a062 ICTP: lowered radio power + print unicast data 2011-03-07 22:33:59 +01:00
Enric M. Calvo 7fc41e1706 M Makefile.common to add tmp102 sensor by default 2011-03-07 21:23:58 +01:00
Enric M. Calvo 9c2f335e57 Merge branch 'master' of git@github.com:enricmcalvo/contiki-2.x 2011-03-07 16:35:12 +01:00
Enric M. Calvo ae67f3c257 added example-unicast2 and 3 for ictp 2011-03-07 16:33:01 +01:00
Mariano Alvira ca831a1553 rest-example: add coap client to Makefile all goal 2011-03-05 17:08:25 -05:00
Mariano Alvira 53daa9e835 rest-example: include <string.h> for memcpy 2011-03-05 17:07:56 -05:00
Mariano Alvira 43f0ad85f5 rest-example: don't do a hard override of config options 2011-03-05 16:51:33 -05:00
Enric M. Calvo c5548c5ca9 added mV test-battery file 2011-03-04 15:58:09 +01:00
Enric M. Calvo 07d921b08e Modified Makefile and test-potent.c for ICTPWSN 2011-03-04 15:54:21 +01:00
Enric M. Calvo ef706670e5 added example-unicast2.c 2011-03-03 17:20:11 +01:00
Enric M. Calvo a098cdb5df added makefile 2011-03-03 17:19:06 +01:00
Enric M. Calvo 70a500df50 added example unicast with temperature 2011-03-03 17:13:42 +01:00
Enric M. Calvo efb4a69887 Cleaned up rssi-scanner example directory 2011-03-03 13:58:25 +01:00
Enric M. Calvo b54c97c7cf Added ViewRSSI3D example. 2011-03-03 13:55:33 +01:00
Enric M. Calvo 621aff1aeb Correceted cc2420 function calls+modified makefile 2011-03-03 13:50:56 +01:00
Enric M. Calvo 0c6fd04f44 Modified contiki-conf.h and added sensys-scanner. 2011-03-03 13:44:28 +01:00
Fredrik Osterlind 499c13a357 removed execute flag of source files (avoids diff problems with egit) 2011-03-01 18:16:42 +01:00
Enric M. Calvo 701a42e239 Added dummy light driver. Now skywebsense likes Z1 
The light sensor driver is mapped to the same pin as the potentiometer
in Z1 Starter Platform. sky-websense is untouched, though.
 2011-02-27 21:28:25 +01:00
Enric M. Calvo 414d926966 Sky-websense compiles for Z1 (testing) 2011-02-27 20:10:09 +01:00
Enric M. Calvo 404b735cc4 Fixed radio and contiki conf to get RIME working 
cc2420 isr handled at cc2420-arch, disabled accel. interrupts and modified
platform/z1/contiki-conf.h to use same mac as sky.
Added example-broadcast-button, sends packets every second or when button pushed.
Works with other Z1s and Sky
 2011-02-27 12:35:19 +01:00
Enric M. Calvo 9acdb98a56 Added a quick sht11 sensor driver support for Z1 
Support for Sensirion SHT1x/SHT7x support is adapted from core for Z1 in the Ziglet port.
XXX TODO:
 + Remove SHT11_PWR
 + Lines are shared with I2C, hence port reconfiguration must be added at the driver level.
 2011-02-26 12:41:56 +01:00
Enric M. Calvo 44ce1699f2 Definition of Z1 Starter Platform in contiki/platforms + LEDs + Potentiometer 2011-02-25 16:08:50 +01:00
Enric M. Calvo 3ec4143252 Added Potentiometer sensor in Z1 Platform 2011-02-25 16:01:40 +01:00
Enric M. Calvo 659f36eb79 Updated *-sensor.c files from the sky platform. 
Fixed battery-sensor plus added simple test (XXX)
 2011-02-25 15:35:41 +01:00
Mariano Alvira ea527da162 don't do a hard override of platform config in rpl project config 2011-02-08 09:21:16 -05:00
Mariano Alvira 8a9384c22e rest-example is now rest-server-example 2011-02-08 09:07:45 -05:00
David Kopf 2ff236c4be Update description of make process. 2011-02-08 07:03:32 -05:00
dak664 ee65d0d887 Allow other (compatible) AVR targets 2011-02-07 13:37:43 -05:00
enricmcalvo af6d2f3e72 Added tmp102-related makefiles directives for proper compilation. 2011-01-23 18:54:18 +00:00
enricmcalvo 47613e57ad Added test program in the z1 examples directory for the tmp102 temperature sensor. 2011-01-20 10:28:48 +00:00
joxe db0423af20 added response to Mac addr request and added addrs in printout 2011-01-17 20:05:51 +00:00
salvopitru dcff411f9d New example for mb851 board that comes from sky-websense. 2011-01-17 10:58:04 +00:00
joxe d7712b27d0 added undef of putchar for platforms where it is a macro 2011-01-14 17:57:48 +00:00
joxe 8663cb8921 fixed compilation error 2011-01-12 20:00:48 +00:00
joxe 20f8777fd6 patched rest-example 2011-01-12 18:30:29 +00:00
adamdunkels 820d6eb334 Allow the network to settle before sending first packet. Packet transmissions are now periodic, and randomized within each period. 2011-01-10 15:11:44 +00:00
nvt-se 540675bc6a Updated the announcement example to follow the current API. 2011-01-07 23:23:31 +00:00
doganyazar 0630e0c465 Mentioned Matthias Kovatsch's CoAP Firefox plugin as an example CoAP client. 2011-01-03 22:31:57 +00:00
doganyazar 5fcfd826bd Minor modification in .well-known/core service after the comments of Matthias Kovatsch. 2011-01-03 22:25:04 +00:00
doganyazar a81efabfb5 Clarification in README 2011-01-03 22:19:32 +00:00
dak664 26cebb6436 Show avr-size once and only once regradless of whether recompilation is needed. 2010-12-22 22:47:33 +00:00
dak664 95982b40ba $make will show avr-size once and only once whether or not a build needs to occur. 2010-12-22 21:13:09 +00:00
salvopitru d86b7c4592 Added example for the elfloader on the MB851 platform, taken from sky-shell-exec example. 2010-12-15 15:33:30 +00:00
salvopitru c325e212f6 Changed COFFEE_FILES to COFFEE. 2010-12-15 14:50:29 +00:00
dak664 ced88c2eff Give jackdaw fe80::0 address and number webservers from fe80::1 2010-12-14 23:22:01 +00:00
dak664 1d2a5ca671 Minor format and comment changes 2010-12-14 22:51:04 +00:00
adamdunkels 73cdccb9f4 New example that shows how to send and receive broadcast and unicast as well as how to use a simple Contiki list and a memb memory block pool. 2010-12-14 10:07:28 +00:00
dak664 35b2ce0cdb Add status page link, show correct rssi, fix indexing off array in ipv4 builds 2010-12-04 21:32:35 +00:00
dak664 a5cbd0cd94 Add status page, change ipv6 address to ::101 and ::102 2010-12-04 21:24:29 +00:00
dak664 0f6c089179 README additions 2010-12-03 20:45:35 +00:00
dak664 8ab0467705 Add hello-world README 2010-12-03 16:39:56 +00:00
dak664 3d3ad9e2c2 Fixes to allow ipv4 (hello world) builds 2010-12-01 16:23:55 +00:00
dak664 fe904bab40 Use proper recursive make invokation 2010-12-01 15:05:39 +00:00
doganyazar b58e13f8e1 Defined wITH_COAP=1 to made COAP default rather than HTTP 2010-11-30 14:47:02 +00:00
doganyazar f363140186 Minor bug fix found by Niclas. 2010-11-30 13:28:48 +00:00
doganyazar 37b47e4cf2 Syntax update 2010-11-30 13:22:26 +00:00
doganyazar dfa12351da Added some more description to README. 
Makefile update is about changing ifdef to ifeq so that users don't be misleaded.
 2010-11-29 12:55:35 +00:00
doganyazar d14e8996ab Added more details to README and small printing modification in client example. 2010-11-24 10:56:53 +00:00
doganyazar c4f5ebcaaa Added a coap client and running coap-client-server COOJA simulation. Made README more detailed. 2010-11-24 10:10:48 +00:00
doganyazar 24a5dafcd3 Removing unnecessary files to add the new ones. 2010-11-23 20:59:26 +00:00
adamdunkels 125656d3cd Let node ID 1 be the source 2010-11-15 21:50:02 +00:00
adamdunkels ee6f542a06 Add checks for file size problems (fix by Roger Larsson) 2010-11-15 21:49:05 +00:00
nifi 2b1f62afea Example application that runs the Contiki Shell with Collect View 2010-11-12 17:46:56 +00:00
dak664 9e94ba9803 Allow non-ipv6 build, e.g. Hello World 2010-11-12 17:15:00 +00:00
nifi 3975abec8a Debug output cleanup (fixed compiler warning) 2010-11-12 13:17:45 +00:00
salvopitru 28e1445a0f Added a simple implementation of Coffee for STM32W108. 2010-11-10 11:20:44 +00:00
joxe a920b73903 fixed Makefile to work with platform other than sky 2010-11-07 18:32:55 +00:00
adamdunkels 5cdc2e877f Don't place link if destination is the null address 2010-11-07 10:32:13 +00:00
enricmcalvo 5faeca7bfe Added test application to test accelerometer 2010-11-07 08:41:48 +00:00
adamdunkels 47e7fd35c2 Data collection example 2010-11-06 15:17:38 +00:00
adamdunkels 994e350026 Broadcast example 2010-11-06 15:03:48 +00:00
adamdunkels 5783e704d4 Hello, world example 2010-11-06 14:56:48 +00:00
adamdunkels 6947e750d0 Removed left-over powertrace include 2010-11-06 14:43:45 +00:00
adamdunkels 46ce00c173 Even out the transmissions during the interval 2010-11-06 11:55:15 +00:00
adamdunkels f4671d63e1 Added network arrows in Cooja, fixed so that node ID 1 now is sink 2010-11-06 10:44:06 +00:00
adamdunkels 1bf044f2c4 Moved project-conf.h 2010-11-03 15:46:41 +00:00
adamdunkels 5444581739 Data collection over RPL/IPv6 2010-11-03 15:36:38 +00:00
adamdunkels 04fa714930 Moved the Collect-view application from the examples/sky-shell directory and into its own tools/collect-view directory 2010-11-03 14:53:05 +00:00