Commit graph

7821 commits

Author SHA1 Message Date
Matthias Kovatsch e4c506820d Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2012-02-01 03:25:05 +01:00
Matthias Kovatsch dc6142fa0b Revised Erbium observing. 2012-02-01 03:24:49 +01:00
Ivan Delamer 02d3fd4758 Fixes small bug in uip-nd6.c: when a packet is sent before DAD is
completed, DAD-like message is sent that can create a DAD fail in
another node (if it matches the destination of our packet).
2012-01-31 15:44:29 -07:00
Fredrik Osterlind aecb4b03cc bug fix: rpl was not included correctly 2012-01-31 14:53:52 +01:00
Fredrik Osterlind 06d5d49e50 fix: test failed since shell echo no longer appends a newline 2012-01-31 12:58:07 +01:00
Fredrik Osterlind 02336c8826 new mspsim.jar with msp430x 2012-01-31 11:04:55 +01:00
Matthias Kovatsch 4a02790c76 Simplified Erbium support for separate responses. 2012-01-31 04:38:07 +01:00
nvt 82a7c93b47 Check return value. 2012-01-30 23:51:07 +01:00
Niclas Finne 784ca301f8 Updated for latest coffee-manager 2012-01-30 22:20:46 +01:00
Matthias Kovatsch b44d125d80 Observe handler now checks if GET request. 2012-01-30 22:01:31 +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
David Kopf 23b782b06e Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2012-02-27 17:07:56 -05:00
David Kopf 2b7ecefce7 Remove unused SPI initializer flag from AVR. Comment out in the msp-430 template. 2012-02-27 17:05:22 -05:00
Nicolas Tsiftes 16c437da7e Adjust for the multi-instance structures. 2012-02-27 23:03:52 +01:00
David Kopf 79d65d2adc Merge branch 'master' of git://contiki.git.sourceforge.net/gitroot/contiki/contiki 2012-02-25 10:17:57 -05:00
David Kopf 8aff86b2e4 Merge branch 'master' of github.com:contiki/contiki-mirror 2012-02-25 10:12:46 -05:00
Ilya Dmitrichenko ab9ddc62ea Added TODO note regarding flavours of Windows. 2012-02-25 10:09:37 -05:00
Ilya Dmitrichenko 4b60851527 Missed ifeq ... 2012-02-25 10:09:35 -05:00
Ilya Dmitrichenko 9c99d46e24 Simplified host OS platform detection in Makefiles 2012-02-25 10:09:33 -05:00
Mariano Alvira 008250afc6 econotag: increase UIP_CONF_RECEIVE_WINDOW to 300 for webserver nano 2012-02-24 12:19:05 -05:00
Joakim Eriksson 417a2b691f increase uip buffer size for native border router 2012-02-23 13:59:39 -08: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 a4589ee9da Renamed CoAP transaction ID (tid) to message ID (mid). 2012-01-28 19:21:13 +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
nvt 66868253f0 Enable debug. 2012-01-28 03:34:41 +01:00
nvt 4c75a250e6 Refactoring. 2012-01-28 03:34:16 +01:00
Niclas Finne 1e85183754 fixed debug output and changed to use uip-debug.h for debug output 2012-01-27 15:51:46 +01:00
Joakim Eriksson c3655728b8 fixed extension header handling 2012-01-27 15:40:39 +01:00
Fredrik Osterlind a7e4fa3436 bleeding edge mspsim.jar 2012-01-26 16:21:56 +01:00
Fredrik Osterlind 4653778e8c minor bug fix to avoid need for updating filesystem twice initially 2012-01-26 16:19:01 +01:00
Fredrik Osterlind 4e1432af97 method for emptying simulation event queue 2012-01-26 16:18:13 +01:00
Fredrik Osterlind 3a02e43e09 save command history with configs 2012-01-26 16:16:02 +01:00
Fredrik Osterlind 207fddddf0 method that returns the next wakeup time 2012-01-26 16:14:20 +01:00
Fredrik Osterlind caade67d62 new watchpoint api, and method that allows for manipulating simulation time without affecting the
mote
execution
2012-01-26 16:10:11 +01:00
Fredrik Osterlind 5bcb6ad8a5 updated to mspsims new watchpoint api 2012-01-26 16:09:31 +01:00
Fredrik Osterlind 681b40c3c1 public clean method, and broke out add log messages method 2012-01-26 16:03:41 +01:00
Fredrik Osterlind 08ba0b83dc make clean method public 2012-01-26 16:03:01 +01:00
Fredrik Osterlind 2a86f7a5ad help method for converting from hex string to binary 2012-01-26 16:01:32 +01:00
Adam Dunkels acb2c28fdd small code style fixes; removed left-over function call 2012-01-25 06:41:39 -08:00
Adam Dunkels 6ae8d85c09 simple-udp should be included in the IPv4 build as well. 2012-01-25 06:34:47 -08:00
Adam Dunkels cdfc788967 Increased wait time between main loop polls; cleaned up the code to Contiki code style standards; moved process autostart code to after network setup 2012-01-25 06:34:10 -08:00
Niclas Finne c8c5ddd99d Updated API to avoid compiler warnings (added const) 2012-01-22 22:27:23 +01:00
Niclas Finne b65972d32d Corrected debug output 2012-01-22 22:27:20 +01:00
David Kopf 7ca141b457 Access uart registers directly instead of through intermediate addresses in a RAM struct.
Add a platform define to reduce the number of ports supported by the cpu.
2012-01-21 13:49:58 -05: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
Matthias Kovatsch 690e03a8a7 Removed Erbium CoAP draft-06. 2012-01-20 16:08:24 +01:00
Niclas Finne aceb36c66b Replaced SELECT_CALLBACK with an API that supports multiple select callbacks 2012-01-19 17:52:01 +01:00