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

8459 commits

This branch
This branch
All branches
Author SHA1 Message Date
Adam Dunkels 0f135afb34 Merge pull request #218 from lebrush/rpl-mixed-network-bug 
Fixes bug a node not using RPL joins a network which does
 2013-05-22 00:26:06 -07:00
Adam Dunkels d8236f9cc1 Merge pull request #248 from karlp/webserver-update 
[webserver] Update urls in default data
 2013-05-22 00:00:26 -07:00
Robert Quattlebaum 092c69b2fb Merge pull request #243 from darconeous/pull-requests/more-gitignore 
Added `*.orig`, `*~`, and `.DS_Store` to `.gitignore`.
 2013-05-21 18:03:15 -07:00
Robert Quattlebaum 36fbbe48aa Merge pull request #244 from darconeous/pull-requests/cpu-native-tapdev-ipv6-fix 
native/net/tapdev: Fix for new `UIP_CONF_IPV6` handling.
 2013-05-21 17:42:44 -07:00
Karl Palsson 2146ee1c84 [webserver] Update urls in default data 
Replace all links to sics.se with contiki.org
 2013-05-21 21:19:32 +00:00
Nicolas Tsiftes ffd18aad82 Merge pull request #221 from lebrush/uip-ds6-notifications 
Make DS6 route notifications optional
 2013-05-21 07:10:31 -07:00
Oliver Schmidt dd6f1c4824 Merge pull request #217 from lebrush/rime-memory 
Use memcpy, memcmp functions for the rime cmp and cpy
 2013-05-21 02:46:13 -07:00
lebrush 6eafa08313 Make DS6 route notifications optional. 2013-05-21 10:05:02 +02:00
lebrush 5bae5e6ffd Fixes imposibility of receiving data when a node not using RPL joins a network 
which does.

The RPL header is processed, declared invalid and the packet discarded. This
is fixed by this commit.
 2013-05-21 10:00:46 +02:00
lebrush c2a7a25a9e Code style fixes 2013-05-21 09:50:30 +02:00
lebrush 26177387fc Use memcpy, memcmp functions for the rime compare and copy functions as they 
are already used all over contiki.
 2013-05-21 09:50:29 +02:00
Nicolas Tsiftes a445c4020d Merge pull request #153 from darconeous/pull-requests/cpu-avr-bootloader 
avr/bootloader.c: Now compatible with bootloaders which always run first
 2013-05-20 05:49:13 -07:00
Nicolas Tsiftes 83c08bdf99 Merge pull request #219 from lebrush/sicslowpan-uip-debug 
Force sicslowpan to use uip-debug rather than an own system
 2013-05-20 04:59:20 -07:00
Nicolas Tsiftes 4b80ad9c89 Merge pull request #239 from darconeous/pull-requests/avr-ravenusb-rpl 
avr-ravenusb/cdc_task: Fix compile issues.
 2013-05-20 04:42:03 -07:00
Nicolas Tsiftes 9b3c704be5 Merge pull request #210 from joakimeriksson/master 
Fixed native border router to compile and have less packet loss (due to slip-dev bug).
 2013-05-20 04:39:36 -07:00
Robert Quattlebaum 09eec82d08 Merge pull request #134 from darconeous/pull-requests/cpu-avr-avrdude-mcu 
cpu/avr: Added "AVRDUDE_MCU" configuration parameter.
 2013-05-19 17:35:26 -07:00
Robert Quattlebaum 4e1e9f8812 Added *.orig, *~, and .DS_Store to .gitignore. 2013-05-19 17:30:02 -07:00
Robert Quattlebaum 9c70e0e5cc native/net/tapdev: Fix for new UIP_CONF_IPV6 handling. 2013-05-19 17:27:30 -07:00
Robert Quattlebaum 382308e6bf Merge pull request #242 from darconeous/pull-request/resolv-bad-nsec-fix 
resolv: Fix for bad NSEC record on announce
 2013-05-19 16:34:03 -07:00
Robert Quattlebaum d0b99cc3cc resolv: Fix for bad NSEC record on announce 2013-05-19 16:09:50 -07:00
Adam Dunkels 9f0de7d633 Merge pull request #211 from malvira/prefix-squash 
Support prefix updates with PIO Handling
 2013-05-19 15:06:02 -07:00
Robert Quattlebaum 674f70b6c3 cpu/avr: Added "AVRDUDE_MCU" configuration parameter. 2013-05-19 14:23:31 -07:00
Adam Dunkels aaac20a950 Merge pull request #225 from tecip-nes/pic32_minor_reorganization 
Pic32 minor reorganization
 2013-05-19 14:22:14 -07:00
Adam Dunkels d87f0cf42a Merge pull request #158 from g-oikonomou/trickle-library 
Trickle Timer Library (RFC 6206)
 2013-05-19 14:13:16 -07:00
George Oikonomou 5ecd2a1e95 Add an example demonstrating trickle timers 2013-05-19 21:51:10 +01:00
George Oikonomou ffeceb9164 Add a Trickle Timer Library (RFC 6206) 2013-05-19 21:51:07 +01:00
Robert Quattlebaum 0d913d0d61 Merge pull request #234 from darconeous/pull-requests/platform-econotag-uip-rpl-override 
platform/econotag: Allow RPL and Router settings to be overridden.
 2013-05-19 12:01:22 -07:00
Robert Quattlebaum 3e0666265d avr-ravenusb/cdc_task: Fix compile issues. 
A lot more changes are in the pipeline, but compiling is a good start.
 2013-05-19 11:31:01 -07:00
Mariano Alvira 95daf04770 Merge pull request #238 from malvira/pr-disable-sky-udp-test 
Travis: disable 02-sky-ipv6-udp test b/c it's still flaky
 2013-05-19 10:21:40 -07:00
Mariano Alvira f90736e7ed Travis: disable 02-sky-ipv6-udp test b/c it's still flaky even with 
the longer test time.
 2013-05-19 13:14:56 -04:00
Robert Quattlebaum 92b4f5fe59 platform/econotag: Allow RPL and Router settings to be overridden. 2013-05-19 08:21:18 -07:00
Robert Quattlebaum 9c17a542a7 avr/bootloader.c: Now compatible with bootloaders which always run first. 
The boot loader now knows when to go into bootstrap mode by
looking for a specific EEPROM value. Also updated code style
to match Contiki code style guidelines.
 2013-05-19 08:21:16 -07:00
Sébastien Dawans 1be01a9c90 Support prefix udpates with PIO Handling 2013-05-19 10:51:57 -04:00
Mariano Alvira 5df586e09d Merge pull request #184 from g-oikonomou/bug-fixes/rimestats 
Rimestats Fix (#183)
 2013-05-19 07:45:22 -07:00
Mariano Alvira b83366b1ef Merge pull request #233 from malvira/pr-disable-netperf 
Travis: disable the netperf test because it is flaky
 2013-05-19 07:03:37 -07:00
Mariano Alvira 68acf28b04 Travis: disable the netperf test because it is flaky 2013-05-19 09:59:02 -04:00
Mariano Alvira 26d81d85a1 Merge pull request #228 from g-oikonomou/bug-fixes/uip-conf-ipv6 
Fix 8051 port builds to play nicely with #173
 2013-05-18 15:36:59 -07:00
Mariano Alvira 87a995374b Merge pull request #232 from malvira/pr-uip6-switch-temp-fix 
change default UIP_CONF_IPV6 back to 0. This is not a complete fix:
 2013-05-18 15:34:41 -07:00
Mariano Alvira 7b9d98c5e2 change default UIP_CONF_IPV6 back to 0. This is not a complete fix: 
see #227 for details. Will merge as it fixes build errors so Travis
can be useful agian.
 2013-05-18 18:30:10 -04:00
Mariano Alvira 251eaeee68 Merge pull request #231 from malvira/pr-remove-twitter 
Remove everything that depended on the now gone twitter APP.
 2013-05-18 15:28:38 -07:00
Mariano Alvira e24a50c1b2 Remove everything that depended on the now gone twitter APP. 2013-05-18 18:22:37 -04:00
Mariano Alvira c450887555 Merge pull request #230 from malvira/pr-travis-fixes 
Travis fixes
 2013-05-18 15:21:00 -07:00
Mariano Alvira e67c07468d Travis: sky-ipv6-udp test needs more time to complete 2013-05-18 18:14:14 -04:00
Mariano Alvira d662279bb4 Travis: disable flaky or failing tests 
* disable hello-world of cooja motes b/c it is flaky
* mark 04-sky-shell-download.csc test as failing. Not sure what
the problem is.
 2013-05-18 18:14:14 -04:00
Mariano Alvira 585dd3fdbd Travis: The test criteria for this test was too strict --- one or two 
packets get lost. Change the test to ensure that data comes back from
every node and we get at least 75 non-duplicate reports.
 2013-05-18 18:14:14 -04:00
Mariano Alvira d396832d48 Travis: Run java with -Xshared:on. The previous jvm had shared on by default and cooja 
requires this.
 2013-05-18 18:14:10 -04:00
Mariano Alvira fd6cc5f696 Travis: fix the download location for the arm/mc1322x toolchain 2013-05-18 18:12:32 -04:00
Mariano Alvira 1ef6112ac7 Travis: correct the name for the ipv6-apps test (travis.yml had the correct name 
--- this is why the test was failing)
 2013-05-18 18:11:59 -04:00
Mariano Alvira 3ea8cce948 Travis: Print out logs so that debugging travis is possible. 2013-05-18 18:11:45 -04:00
Robert Quattlebaum de7b4f325e Merge pull request #229 from darconeous/pull-requests/resolv-mdns-announce-alignment 
resolv: Fix for word alignment issues in `mdns_prep_host_announce_packet()`.
 2013-05-18 14:49:11 -07:00