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

11149 commits

This branch
This branch
All branches
Author SHA1 Message Date
George Oikonomou debdc767cc Merge pull request #1534 from JelmerT/feature/cc2538-bsl_update 
Update of cc2538-bsl to 4340542
 2016-02-29 22:49:06 +00:00
Jelmer Tiete d7ee563023 Updates cc2538-bsl to 4340542, main changes are fix for contiki-os/contiki#1533 and an added option to invert the RTS and DTR lines when auto starting the bootloader 2016-02-29 13:48:24 +01:00
Antonio Lignan a3e13f1269 Merge pull request #1525 from Zolertia/remote-zonik 
Added Zolertia Zonik sound sensor test and drivers
 2016-02-26 23:19:38 +01:00
Nicolas Tsiftes 65caef495a Merge pull request #1354 from tsparber/pr-count-icmp-stats 
uIP Stats: Count sent ICMP6 packets
 2016-02-26 15:16:35 +01:00
Nicolas Tsiftes 5c7bc22321 Merge pull request #1526 from alignan/pull/fix-shell-exec-no-process-name 
Fixes error when processes name are not used
 2016-02-26 15:12:44 +01:00
Aitor Mejias 56aeb7cd7e Added Zolertia Zonik sound sensor test and drivers 2016-02-22 16:49:35 +01:00
Antonio Lignan 4d4930921e Fixes error when processes name are not used 2016-02-22 16:02:06 +01:00
George Oikonomou 93b9089164 Merge pull request #1504 from bthebaudeau/travis-force-aapcs-toolchain-version 
travis: Force AAPCS toolchain version
 2016-02-20 23:50:17 +00:00
Simon Duquennoy b53a1569d9 Merge pull request #1439 from jkent/jsontree 
jsontree: new features
 2016-02-20 12:49:07 +01:00
Antonio Lignan 0e17b98372 Merge pull request #1518 from Zolertia/pm10-remove-issue 
Removed PM10 code lines from adc-sensors driver
 2016-02-15 17:38:36 +01:00
Toni Lozano 2cbde75b02 Removed PM10 code lines from adc-sensors driver 2016-02-15 14:45:26 +01:00
Antonio Lignan 0dbed519a5 Merge pull request #1507 from Zolertia/remote-voc-test 
Added VOC (iAQ-Core) drivers and test application
 2016-02-15 12:21:32 +01:00
Aitor Mejias cb1e7c2c45 Added VOC (iAQ-Core) drivers and test application 2016-02-15 11:00:48 +01:00
Antonio Lignan 4cd0e3ad35 Merge pull request #1516 from alignan/pull/weather-meter-contikimac 
Weather meter: replaced rtimer by ctimer as it was breaking contikimac
 2016-02-13 23:02:17 +01:00
Antonio Lignan 25ff850a43 Weather meter: replaced rtimer by ctimer as it was breaking contikimac 2016-02-13 22:33:05 +01:00
Antonio Lignan c6ded00dc4 Merge pull request #1512 from alignan/pull/fix-z1-websense 
Fix z1-websense example
 2016-02-13 16:35:50 +01:00
Antonio Lignan b2b573e9e7 Fix z1-websense example 2016-02-12 19:10:02 +01:00
Simon Duquennoy 99de563e8d Merge pull request #1503 from amitgeron/route_discovery_typo 
Typo
 2016-02-08 13:35:03 +01:00
Benoît Thébaudeau 910f7b1ac8 travis: Force AAPCS toolchain version 
Make Travis CI use the GNU ARM Embedded toolchain version specified by
the READMEs, instead of automatically using the latest version provided
by the PPA. In this way, the READMEs will still be correct after a PPA
upgrade, and the version used by Contiki is under control.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
 2016-02-07 18:21:57 +01:00
Amit Geron ba6419cc25 Typo 
* route_discovery_expicit_open --> route_discovery_explicit_open
 2016-02-07 11:58:31 +02:00
Simon Duquennoy daa83ee3ef Merge pull request #1404 from amitgeron/route_discovery_channels 
Add route_discovery_explicit_open()
 2016-02-05 23:12:39 +01:00
Simon Duquennoy 5afdae1399 Merge pull request #1498 from alignan/pull/fix-ip64-warnings 
Fix ip64 warnings and error
 2016-02-05 23:02:39 +01:00
Benoît Thébaudeau 287092db42 Merge pull request #1486 from alignan/pull/cc2538-common 
Unified cc2538 examples into single cc2538-common placeholder
 2016-02-04 23:48:35 +01:00
Antonio Lignan 45c125949a Unified cc2538 examples into single cc2538-common placeholder 2016-02-04 17:26:11 +01:00
Nicolas Tsiftes 9b3e334c7d Merge pull request #1497 from simonduq/pr/shell-warnings 
Fix compiler warnings in shell
 2016-02-04 13:14:26 +01:00
Nicolas Tsiftes 4dce5f6765 Merge pull request #1494 from simonduq/pr/uip6-debug 
Minor debug output fixes
 2016-02-04 13:09:21 +01:00
Simon Duquennoy ebdc536d61 Merge pull request #1496 from simonduq/pr/jn516x-serial-input 
jn516x enable serial input whenever there is no fallback interface
 2016-02-04 10:02:15 +01:00
Antonio Lignan c924567d86 Fix ip64 warnings 2016-02-04 00:26:54 +01:00
Simon Duquennoy fa078381cf Fix compiler warnings in shell 2016-02-03 18:01:25 +01:00
Simon Duquennoy f87f7e7edd jn516x enable serial input whenever there is no fallback interface 2016-02-03 17:53:29 +01:00
Simon Duquennoy 521cc7600d Minor debug output fixes 2016-02-03 17:10:24 +01:00
Simon Duquennoy 9f383ba534 Merge pull request #1492 from simonduq/pr/jn516x-minor 
Reworking jn516x default configuration and examples
 2016-02-03 11:41:10 +01:00
Simon Duquennoy 658cf0d2cc Reworking jn516x default configuration and examples 2016-02-03 10:35:48 +01:00
Simon Duquennoy 79a0709cd7 Merge pull request #1491 from simonduq/pr/sicslowpan-printf 
Fix compiler errors and warnings in sicslowpan.c PRINTF statements
 2016-02-03 09:35:05 +01:00
Simon Duquennoy f0d1b6c5bb Fix PRINTF statement in sicslowpan 2016-02-02 17:18:45 +01:00
Simon Duquennoy 5d67a612b4 Merge pull request #1402 from simonduq/pr/ci-simexec-log-output 
Travis: improved output for failed Cooja simulation
 2016-02-01 15:30:13 +01:00
Simon Duquennoy 77fac155c1 Merge pull request #1489 from simonduq/pr/jn516x-examples-tsch 
Adding TSCH to examples/jn516x/rpl
 2016-02-01 15:08:20 +01:00
Nicolas Tsiftes eef96f3ba7 Merge pull request #1480 from mdlemay/revise-clang-flags 
galileo: Revise include flags for LLVM Clang
 2016-02-01 14:25:53 +01:00
Nicolas Tsiftes deb39df3a3 Merge pull request #1478 from zq301/patch-11 
a memory overflow in shell-vars.c
 2016-02-01 14:25:06 +01:00
Simon Duquennoy badc4b77f1 Merge pull request #1488 from simonduq/pr/jn516x-uart 
jn516x: flush only uart Tx FIFO in main loop, leaving Rx FIFO intact
 2016-02-01 14:19:44 +01:00
Simon Duquennoy 15a5f27080 Adding TSCH to examples/jn516x/rpl 2016-02-01 13:38:53 +01:00
Simon Duquennoy 7c3108bf3b jn516x: flush only uart Tx FIFO in main loop, leaving Rx FIFO intact 2016-02-01 13:36:18 +01:00
Antonio Lignan 447286197f Merge pull request #1487 from alignan/pull/weather-meter-wind-bane-fix 
Fixed casts and calculations for the wind direction circular averaging
 2016-01-31 23:40:42 +01:00
Antonio Lignan 35345cdb40 Fixed casts and calculations for the wind direction circular averaging 2016-01-31 22:51:08 +01:00
George Oikonomou 7d6966b22c Merge pull request #1483 from Zolertia/pm10-sensor 
Added PM10, VAC and AAC sensor drivers
 2016-01-27 11:47:07 +00:00
George Oikonomou a2d7b87936 Merge pull request #1479 from g-oikonomou/bugfix/cc13xx/dont-mask-cmdsta 
Allow the caller to access the entire content of CMDSTA
 2016-01-27 11:46:01 +00:00
Toni Lozano 1f6dafecb0 Modified ADC measurement of PM10 driver to include adc-zoul direct access 2016-01-26 17:55:48 +01:00
Antonio Lignan 8337843d69 Minor fixes 2016-01-26 09:45:43 +01:00
Michael LeMay 6557194fc5 galileo: Revise include flags for LLVM Clang 
This patch revises the compiler flags when LLVM Clang is in use to
cause Clang to automatically use its built-in header files rather than
those for GCC.
 2016-01-25 14:01:16 -08:00
Antonio Lignan 9f1376d37a Merge pull request #1453 from g-oikonomou/contrib/test-with-arm-gcc-5 
Change travis arm tests to use gcc-arm-embedded v5
 2016-01-25 21:32:28 +01:00