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

9330 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nicolas Tsiftes
039dc5fb73 Merge pull request #667 from simonduq/ipv6-ndp-in-default-conf 
Add UIP_CONF_ND6_SEND_NA to contiki-default-conf.h
 2014-06-02 10:51:52 +02:00
George Oikonomou
17a935ddf5 Merge pull request #689 from sieben/doc 
Closing doxygen groups
 2014-06-01 17:36:15 +01:00
Rémy Léone
25c8b0835d Closing doxygen groups 2014-05-30 11:01:20 +02:00
George Oikonomou
4197cccbd6 Merge pull request #679 from alignan/tos-bsl-license 
Added missing license file referenced in z1-bsl-* scripts
 2014-05-22 08:20:16 +01:00
Nicolas Tsiftes
386ec61311 Merge pull request #507 from mkovatsc/coap-18 
Erbium CoAP cleanup for Proposed Standard version
 2014-05-22 08:31:29 +02:00
George Oikonomou
b864ec2b71 Merge pull request #661 from hexluthor/watchdog-enable 
CC2538: Add WATCHDOG_CONF_ENABLE to optionally disable the watchdog timer
 2014-05-18 14:11:49 +02:00
George Oikonomou
eabc244bff Merge pull request #641 from hexluthor/backdoor-conf 
CC2538: Add CONF parameters to select boot loader backdoor pin and logic level
 2014-05-18 13:29:02 +02:00
George Oikonomou
026864d129 Merge pull request #665 from hexluthor/cc2538-flash-conf 
CC2538: Add FLASH_CONF_ORIGIN and FLASH_CONF_SIZE config parameters.
 2014-05-18 13:12:49 +02:00
Matthias Kovatsch
969d512546 Removed references to missing DTLS implementation. 2014-05-15 20:29:05 +02:00
Matthias Kovatsch
ee493dd6af Update to observe-13 (cancellation). 2014-05-15 20:29:05 +02:00
Matthias Kovatsch
2683e13da5 Updated README and Makefile. 2014-05-15 20:29:05 +02:00
Matthias Kovatsch
a26533f501 Updated Cooja simulations. 2014-05-15 20:29:05 +02:00
Lars Schmertmann
351ba413e2 Enabled forcing CON packet for observer notifications each 20 packets 2014-05-15 20:29:04 +02:00
Lars Schmertmann
386d708b56 Added function for easy block1 usage. 
Fixed blocksize calculation when REST_MAX_CHUNK_SIZE != 2^x.
Added example for block1 + separate + block2.
 2014-05-15 20:29:04 +02:00
Lars Schmertmann
bb737f85ae Used Uncrustify and fixed Travis build errors. 2014-05-15 20:29:04 +02:00
Matthias Kovatsch
3dd5bd7a37 Renamed erbium to er-coap to avoid confusion and have a meaningful directory name. 2014-05-15 20:29:03 +02:00
Matthias Kovatsch
7d79b69ada Updated to CoAP Proposed Standard and removed draft versions. 2014-05-15 20:29:03 +02:00
Antonio Lignan
689c59cdf2 Added missing license file referenced in z1-bsl-* scripts 2014-05-15 16:02:57 +02:00
Nicolas Tsiftes
443bbd3948 Merge pull request #664 from simonduq/rpl-link-metric-init-fix 
RPL MRHOF: bypass EWMA when setting a parent's link metric for the first time
 2014-05-14 16:42:29 +02:00
Nicolas Tsiftes
c91782c638 Merge pull request #560 from jdede/ds6_period_configurable 
Make the period for the uip-ds6 periodic task configurable
 2014-05-14 16:35:30 +02:00
Fredrik Österlind
4ca6c01fa9 Merge pull request #672 from claesjac/cooja-eeprom 
Added support for EEPROM device in Cooja
 2014-05-12 14:24:37 +02:00
Claes Jakobsson
9c08f28956 Added EEPROM support for Cooja with a rudimentary hexdump -C like viewer in the mote interface view 2014-05-08 22:35:58 +02:00
Jens Dede
8820597cca Merge branch 'master' of git://github.com/contiki-os/contiki into ds6_period_configurable 2014-05-08 09:27:43 +02:00
Nicolas Tsiftes
f34165bda4 Merge pull request #647 from cetic/pr-select-dag-fix 
rpl_select_parent: Only check parents belonging to the given dag
 2014-05-07 16:13:47 +02:00
Nicolas Tsiftes
812a0299a8 Merge pull request #649 from cetic/pr-dio-preference-fix 
Add user configuration of DIO preference field
 2014-05-07 16:12:56 +02:00
Nicolas Tsiftes
73086e34f7 Merge pull request #632 from nfi/verbosity-control-stm32w 
Add support for verbosity control for building STM32W-based platforms
 2014-05-07 16:12:12 +02:00
Simon Duquennoy
7367eb1829 Add UIP_CONF_ND6_SEND_NA to contiki-default-conf.h 2014-05-05 19:52:52 +02:00
Ian Martin
2abaeaa8cc CC2538: Add FLASH_CONF_ORIGIN and FLASH_CONF_SIZE config parameters. 2014-05-02 11:35:58 -04:00
Ian Martin
7081440eff CC2538: Add WATCHDOG_CONF_ENABLE to optionally disable the watchdog timer. 2014-05-02 10:28:30 -04:00
Oliver Schmidt
4af2661374 Merge pull request #668 from oliverschmidt/master 
Adjustment to cc65 change.
 2014-05-01 22:53:49 +02:00
Oliver Schmidt
5829bc5159 Adjustment to cc65 change. 2014-05-01 21:32:32 +02:00
Nicolas Tsiftes
953312cbb7 Merge pull request #630 from blemmens/z1-bsl-far-memory-support 
Added support to program Z1 far memory with BSL
 2014-04-30 00:59:51 +02:00
Nicolas Tsiftes
dbe83c42ab Merge pull request #651 from cetic/pr-rpl-private-cleanup-fix 
Remove duplicated RPL configuration parameters definition
 2014-04-30 00:55:13 +02:00
Simon Duquennoy
33cfd92475 RPL MRHOF with ETX: bypass weighted moving average when setting a parent's link metric for the first time 2014-04-29 16:25:16 +02:00
Fredrik Österlind
9adf75b10d Merge pull request #450 from darki2002/DGRM_support_BaseRSSI 
Base RSSI support for DGRM
 2014-04-27 11:36:10 +02:00
Fredrik Österlind
e35575f81e Merge pull request #663 from jdede/fix-cooja-export 
Fix exported simulation: add jsyntaxpane JAR, start simulation
 2014-04-27 10:13:10 +02:00
Jens Dede
823abf9d94 Fix exported simulation: add jsyntaxpane JAR, start simulation with maximum speed 2014-04-26 16:02:50 +02:00
George Oikonomou
2ab6355415 Merge pull request #662 from g-oikonomou/travis-url-fix 
Fix Travis failure
 2014-04-26 14:44:39 +01:00
George Oikonomou
78e13a936a Fix Travis failure 
For travis tests, we host pre-built bundles of the arm-gcc and sdcc
toolchains on github, and we download them with curl

Apparently, the URL for those bundles has been changed and the
HTTP response is a 301 redirect. curl doesn't follow it

We change .travis.yml to pull the bundles form the new location
 2014-04-26 14:06:53 +01:00
Ian Martin
ee05810904 Changes suggested by @bthebaudeau. 2014-04-18 10:29:47 -04:00
Laurent Deru
3b503da680 Add user configuration of DIO preference field 2014-04-18 16:26:23 +02:00
Laurent Deru
3fb0d69be6 Remove duplicated configuration parameters definition 2014-04-18 15:37:31 +02:00
George Oikonomou
b0f1199202 Merge pull request #636 from g-oikonomou/fix-random-init-lockup 
Fix CC2538 random_init lockup
 2014-04-18 13:28:40 +01:00
Jens Dede
446208dc1c Merge branch 'master' of git://github.com/contiki-os/contiki into ds6_period_configurable 2014-04-18 13:33:01 +02:00
Jens Dede
96a70f9ab0 Rename as suggested by g-oikonomou 2014-04-18 13:32:40 +02:00
Laurent Deru
79537a6dd7 rpl_select_parent: Only check parents belonging to the given dag 2014-04-18 11:39:33 +02:00
George Oikonomou
49bf7cc241 Merge pull request #616 from hexluthor/listing 
CC2538: Add a Makefile rule to generate a final assembly listing.
 2014-04-17 22:13:52 +01:00
George Oikonomou
d34ee59e97 Merge pull request #623 from ADVANSEE/cc2538-multi-uart 
cc2538: uart: Make it possible to use several UARTs simultaneously
 2014-04-17 20:20:08 +01:00
Benoît Thébaudeau
d93d129da6 cc2538: uart: Make it possible to use several UARTs simultaneously 
This avoids the limitation of having a single UART available at runtime, without
duplicating code.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
 2014-04-17 18:53:44 +02:00
Ian Martin
2cf730a1c6 Un-indent preprocessor directives. 2014-04-17 10:39:00 -04:00