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
Matthias Kovatsch
4a02790c76
Simplified Erbium support for separate responses.
2012-01-31 04:38:07 +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
Joakim Eriksson
321ecc9fab
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2012-02-21 19:07:40 +01:00
Joakim Eriksson
5a65e3cc8b
tuned RPL parameters and improved calculation of path etx
2012-02-21 19:06:58 +01:00
David Kopf
745f071c98
Eliminate unused variable warnings. Dummy test of PT_YIELD_FLAG does not change program size.
2012-02-21 11:23:54 -05:00
David Kopf
ea3d427c33
Add PAGETITLE option to webserver-nano, compress status page white space.
2012-02-21 11:19:25 -05:00
David Kopf
deb75d3d97
Several bugfixes
2012-02-21 11:14:52 -05:00
David Kopf
59e459e0e9
Add missing mtarch_stop function
2012-02-21 11:11:53 -05:00
David Kopf
6e45dfe5ff
PROGMEM changes needed for newer avr-gcc compiler
2012-02-21 11:10:57 -05:00
Niclas Finne
5fdcd6bc13
Fixed typo, added option to run without slip connection
2012-02-21 14:42:05 +01:00
Nicholas J Humfrey
aa67ad67cc
Converted u8_t to uint8_t and u16_t to uint16_t in the docs and tools directories.
2012-02-21 08:33:25 -05:00
Nicholas J Humfrey
680225e99d
Converted u8_t to uint8_t and u16_t to uint16_t in the platforms directory.
...
Added "These names are deprecated, use C99 names" warnings the contiki-conf.h files that were missing it.
2012-02-21 08:33:25 -05: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
Nicholas J Humfrey
efab964451
Converted u8_t to uint8_t and u16_t to uint16_t in the apps directory.
2012-02-21 08:33:25 -05:00
Nicholas J Humfrey
1cda3da17e
Converted u8_t to uint8_t and u16_t to uint16_t in the cpu directory.
2012-02-21 08:33:24 -05:00
Nicholas J Humfrey
372de7d08a
Converted u8_t to uint8_t and u16_t to uint16_t in the rest of core (specifically ctk/vnc, slip and the loader code)
2012-02-21 08:33:24 -05:00
Joakim Eriksson
d44396f883
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2012-02-21 13:21:19 +01:00
Joakim Eriksson
2752337e69
fixed lollipop counter
2012-02-21 13:20:20 +01:00
Niclas Finne
23a70177b2
Added option to connect to server instead of serial device
2012-02-21 11:05:52 +01:00
Nicholas J Humfrey
3fe55673d3
Converted deprecated uIP types in the network stack to standard C99 names (in stdint.h)
2012-02-17 22:45:13 +00:00
Mariano Alvira
022d7193d1
main makefile: also search TARGETDIRs when listing all available targets
2012-02-17 11:54:06 -05:00
Mariano Alvira
6233de96b9
main makefile: remove unnecessary realpath because it breaks on cygwin
2012-02-17 11:51:56 -05:00
Mariano Alvira
68591919e6
mc1322x: add -MMD to Makefile.mc1322x to correctly create dependencies
2012-02-16 11:17:15 -05:00
Fredrik Osterlind
2c9316c5fa
more informative error messages at simulation error
2012-02-16 15:51:32 +01:00
Mariano Alvira
43062b6d74
mc1322x: change how board.h works to allow default board.h (defaults
...
to econotag)
2012-02-13 10:01:36 -05:00
Mariano Alvira
ee8f2c669e
mc1322x: remove symbols.{c,h}
2012-02-13 10:01:36 -05:00
Mariano Alvira
bde97a0356
add emacs mode hint to Makefile.include
2012-02-13 09:57:53 -05:00
Mariano Alvira
e13dc1d5ee
Provide a way to add additional TARGET search directories.
...
E.g. in a makefile do:
TARGETDIRS += ../targets
This will search for targets in ../targets as well as
$(CONTIKI)/platforms
A error will occur if more than one targets with the same name are
found.
2012-02-13 09:57:53 -05:00
Mariano Alvira
9f54eeacd7
Provide a way to add additional APPS search directories.
...
E.g. in a makefile do:
APPDIRS += ${addprefix ../apps/, $(APPS)}
2012-02-13 09:57:53 -05:00
David Kopf
20a5c794dd
Move address initialization to after proce_init. Something in that now wiping the address array.
2012-02-11 15:19:28 -05: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
David Kopf
9d6542d49b
Fix minimal-net webserver6, broken after native border router changes.
2012-02-11 15:03:24 -05:00
David Kopf
38267bfd5a
Webserver-nano: Add page load times, remove workaround code for bug in arm strformat.c, correct the double count of leading zeros there.
2012-02-11 14:58:35 -05:00
Oliver Schmidt
cb12d7b745
Minor formatting adjustment.
2012-02-10 18:56:40 +01:00
Oliver Schmidt
f5debc9d42
Adjusted relative path to BREADBOX64 to work when 'contiki' and 'contikiprojects' are siblings.
2012-02-10 17:19:40 +01:00
Niclas Finne
b56198dc3c
Added option to read sensor data from TCP connection
2012-02-02 17:38:33 +01:00
