Commit graph

11170 commits

Author SHA1 Message Date
thomas-ha 73d36ebb6b SFD timestamp
Only save SFD timestamp when we are actually receiving.
2016-03-07 18:34:54 +01:00
thomas-ha b0a673ca5c Changes to enable TSCH
poll mode for TSCH including SFD timestamps and send_on_cca
2016-03-07 17:46:53 +01:00
thomas-ha b4c2cd9619 Macros for TSCH
US_TO_RTIMERTICKS(US) and RTIMERTICKS_TO_US(T)
2016-03-07 17:25:40 +01:00
Oliver Schmidt 8b3d220761 Merge pull request #1542 from oliverschmidt/master
Adjusted segment names to match recent cc65 change.
2016-03-06 21:29:50 +01:00
Oliver Schmidt 6876b97466 Adjusted segment names to match recent cc65 change. 2016-03-06 21:11:18 +01:00
Nicolas Tsiftes fbf3aba152 Merge pull request #1513 from mdlemay/check-newlib-conf
galileo: build_newlib.sh: Exit on configuration error
2016-03-03 13:39:27 +01:00
Nicolas Tsiftes da5044acb2 Merge pull request #1514 from mdlemay/newlib-filter-patches
galileo: build_newlib.sh: Only apply patch files with the extension ".patch"
2016-03-03 13:38:56 +01:00
Simon Duquennoy df5ff896a8 Merge pull request #1536 from gebart/pr/function-prototypes
fix warning: function declaration isn't a prototype
2016-03-02 10:29:00 +01:00
Simon Duquennoy c7bb3b7b9f Merge pull request #1309 from iot-lab/tunslip_tun_conflict
Fix default tun/tap issue with multiple tunslip6
2016-03-02 09:53:00 +01:00
Joakim Nohlgård 1219790312 examples/er-rest-example/resources/res-event.c: fix warning: function declaration isn't a prototype 2016-03-02 07:25:19 +01:00
Joakim Nohlgård 4ff571beb2 apps/er-coap/er-coap-separate.h: fix warning: function declaration isn't a prototype 2016-03-02 07:12:33 +01:00
Joakim Nohlgård 9159903f5a apps/er-coap/er-coap-transactions.h: fix warning: function declaration isn't a prototype 2016-03-02 07:12:31 +01:00
Joakim Nohlgård e32b46a866 core/lib/gcr.c: fix warning: function declaration isn't a prototype 2016-03-02 07:12:27 +01:00
Joakim Nohlgård d7d836fda0 core/net/rpl/rpl.h: fix warning: function declaration isn't a prototype 2016-03-02 07:00:57 +01:00
Joakim Nohlgård 52e7ea9cc4 core/net/rpl/rpl-dag.c: fix warning: function declaration isn't a prototype 2016-03-02 07:00:57 +01:00
Joakim Nohlgård 2e47bf9cdc core/net/ipv6/sicslowpan.c: fix warning: function declaration isn't a prototype 2016-03-02 07:00:57 +01:00
Joakim Nohlgård 7c11034ab7 core/lib/trickle-timer.c: fix warning: function declaration isn't a prototype 2016-03-02 07:00:57 +01:00
Joakim Nohlgård de7850ed58 core/lib/settings.h: fix warning: function declaration isn't a prototype 2016-03-02 07:00:57 +01:00
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
Michael LeMay 66629ae58f galileo: build_newlib.sh: Exit on configuration error
This patch adds a check for the result of the newlib configure command
and immediately exits the build_newlib.sh script if configure fails.
2016-02-16 11:36:57 -08: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
Michael LeMay 16145f645a galileo: build_newlib.sh: Only apply patch files with the extension ".patch"
This avoids treating as patches other files that may happen to be
present in the newlib patch directory in a working tree.
2016-02-12 13:45:25 -08: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