Commit graph

11426 commits

Author SHA1 Message Date
Antonio Lignan 1be30d52dc Removed unused blocks and made functions static 2016-02-22 12:08:56 +01:00
Antonio Lignan 151f532225 Adapted the TMP102 sensor to Contiki's sensor API 2016-02-22 12:08:56 +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 1f445172ff galileo: Fix build help message in examples
This patch fixes examples/galileo/Makefile so that it actually
displays the intended help message when an unrecognized EXAMPLE is
selected.
2016-02-16 21:19:44 -08:00
Michael LeMay b82d92e373 galileo: Add I2C callbacks example
This patch adds an example for I2C callbacks that is very similar to
the i2c-LSM9DS0 example except that it uses a PWM device that is built
into the platform.
2016-02-16 21:19:44 -08:00
Michael LeMay 58874ea25d x86, galileo: Refactor I2C and GPIO initialization
This patch revises the I2C and GPIO initialization code to always be
run during platform boot rather than within each process that requires
it.

This patch also revises the gpio-output example to use a pin that is
set as an output by the default pinmux configuration.  Previously, it
used a pin that was set as an output by the pinmux configuration that
is in effect when the OS does not change the pinmux configuration.
2016-02-16 21:19:44 -08:00
Michael LeMay 3e64447631 galileo: Expand README for examples
This patch expands the instructions in examples/galileo/README.md.
2016-02-16 21:19:44 -08:00
Michael LeMay c9bffe6d5a galileo: Convert README for examples into README.md
This patch renames and reformats examples/galileo/README to use
Markdown.
2016-02-16 21:19:44 -08:00
Michael LeMay c815fa4511 x86: Use shared ISR for I2C and GPIO
This patch permits interrupts to be generated by both the I2C and GPIO
controllers for simultaneously-executing applications. The controllers
share a single interrupt pin, INTC. Prior to this patch,
quarkX1000_gpio_init() routed INTA to PIRQC and IRQ 10 (due to an
incorrect assumption that INTA is connected to the GPIO controller),
and quarkX1000_i2c_init() routed INTC to PIRQC and IRQ 9. The I2C
controller initialization is a prerequisite for GPIO initialization,
so the final configuration was that INTA and INTC were both routed to
PIRQC and IRQ 10. Thus, only the GPIO ISR was being invoked, even if
the I2C controller was actually responsible for the interrupt.

This patch refactors the I2C and GPIO ISR setup and handler code so
that the shared portions are combined in
cpu/x86/drivers/legacy_pc/shared-isr.[ch].  The I2C and GPIO drivers
communicate their interrupt information to the shared component by
placing structures in a specific section of the binary.
2016-02-16 21:19:44 -08: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
Wojciech Bober 943e526860 nrf52dk: added build artifacts to git ignore 2016-02-15 09:37:38 +01:00
Wojciech Bober 2d45a4207a nrf52dk: regression tests 2016-02-15 09:37:38 +01:00
Wojciech Bober 38481c513d nrf52dk: added examples 2016-02-15 09:37:38 +01:00
Wojciech Bober d39ad95db5 nrf52dk: platform support 2016-02-15 09:37:38 +01:00
Wojciech Bober 20f9515ed1 nrf52dk: cpu/nrf52832 support 2016-02-15 09:37:38 +01:00
Wojciech Bober 0671640ea2 Extended SOURCEDIRS variable with EXTRALDIRS variable in Makefile.include
Directories listed in this variable are added to include and
source (vpath) search paths.

Contents of this variable aren't automatically prefixed with
Contki root. This allows for inclusion of folders that are
outside Contiki root.
2016-02-15 09:37:38 +01:00
Wojciech Bober 803d170b55 Fixed unsused variable warning when SICSLOWPAN_CONF_FRAG is undefined 2016-02-15 09:37:38 +01:00
Wojciech Bober 1cc659d882 Allow for using a fixed frame header length.
When SICSLOWPAN_FRAMER_HDRLEN is defined its value is used
as a frame header length. This allows for using sicslowpan
without calling a framer. This is usefull if framer is not
used on a given platform or when header length is always
the same.

In addition this commit also fixes an inline define.
2016-02-15 09:37:38 +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
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