Commit graph

10094 commits

Author SHA1 Message Date
Harald Pichler
6730ec16c8 Merge branch 'contiki' into osd 2015-02-10 15:13:21 +01:00
Nicolas Tsiftes
e67cd7369e Merge pull request #903 from joakimeriksson/rtable-fix
avoid updating routes that already are correct
2015-02-09 21:41:52 +01:00
Nicolas Tsiftes
5de85e5335 Merge pull request #906 from joakimeriksson/rpl-conf-copy
fixed so that trickle timer and route lifetime rpl config is updated at global repair
2015-02-07 21:23:29 +01:00
Nicolas Tsiftes
5012edadc6 Merge pull request #953 from mcr/master-3.0
added some documentation of native-border-router and slip-radio relationship
2015-02-07 21:22:18 +01:00
Michael Richardson
5699127c9a additional edits to further clarify interface between native-border-router and slip-radio 2015-02-07 10:51:41 -05:00
Joakim Eriksson
3aa8a62e41 avoid updating routes that already are correct 2015-02-06 21:14:20 +01:00
Joakim Eriksson
6edccf35a6 fixed so that trickle timer rpl config is updated at global repair 2015-02-06 13:50:26 +01:00
Nicolas Tsiftes
010a338630 Merge pull request #904 from joakimeriksson/move-etx
moved ETX storage variable from RPL to ds6-nbr
2015-02-06 12:25:35 +01:00
Joakim Eriksson
e7fc14c7a1 fixed comments 2015-02-06 09:22:16 +01:00
Harald Pichler
c30493e535 add Buzzer 2015-02-05 13:44:05 +01:00
Michael Richardson
a0ac6bceb6 added some documentation of native-border-router and slip-radio relationship 2015-02-03 11:05:13 -05:00
Nicolas Tsiftes
b8e2d33e06 Merge pull request #945 from Tom435/master
Atmel AT86RF230 in avr-rcb: added missing macros and initialisations
2015-02-03 00:33:01 +01:00
Thomas Weber
f06bd06b79 corrected line - #if UIP_CONF_IPV6 - in contiki-rcb-main.c to - #if NETSTACK_CONF_WITH_IPV6 - 2015-02-02 22:08:35 +01:00
Harald Pichler
98be2c25ea remove for test purose 2015-01-29 11:01:27 +01:00
Harald Pichler
0f109e3541 Merge branch 'contiki' into osd 2015-01-28 09:34:57 +01:00
Ralf Schlatterbeck
451e2df0f5 Fix IP-Address output (endianness!) 2015-01-27 16:41:30 +01:00
Ralf Schlatterbeck
5ff9b7c989 Don't re-init coap connection 2015-01-27 16:04:07 +01:00
Ralf Schlatterbeck
058ae7bae3 Alleged race-condition was a bug in receiver
Handling put-requests was missing a trailing \0 in the parsed string.
2015-01-27 10:43:03 +01:00
Ralf Schlatterbeck
16afb4b74c Workaround for race-condition 2015-01-27 10:06:22 +01:00
Ralf Schlatterbeck
c8be130f2e Finally fix LED-Strip driver
.. and adapt led-strip.c to changed polarity (again).
2015-01-26 20:44:30 +01:00
Ralf Schlatterbeck
301d8d77bb Non-blocking send 2015-01-26 17:59:14 +01:00
Ralf Schlatterbeck
42f985a297 Add potentiometer app for setting led intensity 2015-01-26 17:27:12 +01:00
Ralf Schlatterbeck
1f3387cd44 Fix submodule URL 2015-01-25 21:06:04 +01:00
Ralf Schlatterbeck
050b55adae Fix LED_Strip_Suli submodule URL 2015-01-25 20:57:47 +01:00
Ralf Schlatterbeck
a2357e648e Invert LED count, use fixed led driver 2015-01-25 19:04:04 +01:00
Ralf Schlatterbeck
f6c158a139 Merge branch 'osd' of github.com:osdomotics/osd-contiki into osd 2015-01-25 18:32:07 +01:00
Ralf Schlatterbeck
e946cd4c13 Add LED strip example
.. not yet working
2015-01-25 18:31:17 +01:00
Harald Pichler
df220072f4 initial upload 2015-01-22 14:03:29 +01:00
Harald Pichler
801316badc update coap 18 macros 2015-01-22 14:01:36 +01:00
Harald Pichler
7b25177a3d Merge branch 'osd' of https://github.com/osdomotics/osd-contiki into osd 2015-01-22 08:56:16 +01:00
Nicolas Tsiftes
2604260653 Merge pull request #896 from simonduq/32bit-align-packetbuf
Align packetbuf on an even 32-bit boundary
2015-01-21 23:33:51 +01:00
Ralf Schlatterbeck
baaa2c5741 Factor/Fix generic resources
Now the old GENERIC_RESOURCE macros works again (but usage has changed).
Common resources (battery, leds, radio) are now in resources-common.
2015-01-21 15:41:21 +01:00
Harald Pichler
75d577c9b5 blocksize 64 2015-01-21 15:08:23 +01:00
Harald Pichler
76e39b2b5d update coap 18 2015-01-21 14:46:36 +01:00
Thomas Weber
0904d985a9 added missing modules in Makefile.avr-rcb, added netstack init functions (to start the at86rf230, modified macros to increase the buffersize) 2015-01-17 19:22:09 +01:00
Thomas Weber
d575f1a6ce added missing modules in Makefile.avr-rcb, added netstack init functions (to start the at86rf230, modified macros to increase the buffersize) 2015-01-17 19:19:16 +01:00
Harald Pichler
ff29ab2c94 bugfix define framer and llsec 2015-01-16 22:22:16 +01:00
Harald Pichler
64e3ed0281 Merge branch 'osd' of https://github.com/osdomotics/osd-contiki into osd 2015-01-16 20:14:07 +01:00
Harald Pichler
b3bf194b88 Merge branch 'osd' of https://github.com/osdomotics/osd-contiki into osd 2015-01-16 15:04:41 +01:00
Harald Pichler
000d37a7fc update modules remove llsec 2015-01-16 15:03:37 +01:00
Harald Pichler
a8e8f54342 Merge branch 'osd' of https://github.com/osdomotics/osd-contiki into osd 2015-01-16 14:19:15 +01:00
Harald Pichler
150aad4ad2 Merge branch 'contiki' into osd 2015-01-16 14:17:16 +01:00
Harald Pichler
4b9314cbde Merge branch 'osd' of https://github.com/osdomotics/osd-contiki into osd 2015-01-13 20:49:38 +01:00
Harald Pichler
007cf1dbe3 Merge branch 'contiki' into osd 2015-01-13 13:14:11 +01:00
Nicolas Tsiftes
7841eface3 Merge pull request #911 from cetic/pr-reset-dao-flag
Reset nopath_received flag when new DAO is received
2015-01-03 11:38:35 +01:00
Nicolas Tsiftes
79517eb477 Merge pull request #910 from cetic/pr-dio-suppr-disabling
Allow disabling of DIO suppression as required by RFC
2015-01-03 11:35:08 +01:00
Harald Pichler
a8728413b2 initial upload 2014-12-31 10:00:09 +01:00
Harald Pichler
2d52ca9051 inital upload 2014-12-31 09:56:05 +01:00
Harald Pichler
2d3cd057c4 initial upload 2014-12-31 09:55:31 +01:00
Harald Pichler
d742fc4b76 changes for coap18 2014-12-31 09:53:24 +01:00