Commit graph

11358 commits

Author SHA1 Message Date
Nicolas Tsiftes 364afcf204 Merge pull request #1553 from simonduq/pr/leftover-aaaa
Fix a number of leftover mentions of aaaa as a prefix (now fd00)
2016-03-14 15:40:14 +01:00
Simon Duquennoy 88a0db6aee Add missing includes 2016-03-14 14:52:59 +01:00
Simon Duquennoy 4bf868fd99 Fix a number of leftover mentions of aaaa as a prefix (now fd00) 2016-03-14 13:56:00 +01:00
Simon Duquennoy cd981b23d5 Merge pull request #1297 from simonduq/pr/default-prefix
Change the default IPv6 prefix from aaaa::/64 to fd00::/64
2016-03-13 20:39:16 +01:00
Simon Duquennoy a15be9e518 Merge pull request #1438 from jkent/jsonparse
jsonparse: multiple improvements
2016-03-11 14:23:17 +01:00
Nicolas Tsiftes c476194004 Merge pull request #1548 from simonduq/pr/traceroute
uip6, icmp6 and ext header handling fixes: traceroute now working!
2016-03-11 14:14:26 +01:00
Simon Duquennoy 3fa25eac8c uip6: fix bug that caused the payload of ICMPv6 messages not to match that of the original packet 2016-03-10 12:22:23 +01:00
Simon Duquennoy 06e984a02e uip6: enable sending of "port unreachable" ICMPv6 message 2016-03-10 12:22:15 +01:00
Simon Duquennoy 5886bdea31 uip_icmp6_error_output: remove and add RPL ext header instead of inverting it, so that the payload of the returned ICMP error matches the original packet 2016-03-10 12:22:05 +01:00
Simon Duquennoy 9930756d7c uip6: restore proto after calling remove_ext_hdr 2016-03-10 12:21:55 +01:00
Simon Duquennoy add5a8be67 Code style 2016-03-10 11:33:40 +01:00
Simon Duquennoy f5ea8e613e Merge pull request #1547 from yatch/pr-fix-typos-in-prints
RPL: fix typos in debug messages
2016-03-09 13:24:52 +01:00
Yasuyuki Tanaka f83e498978 Fix typos in debug messages 2016-03-09 11:32:24 +01:00
Simon Duquennoy 8e120748d3 Merge pull request #1543 from simonduq/pr/tsch-security-save-space
TSCH-Security regression test: save space
2016-03-07 20:25:54 +01:00
Simon Duquennoy dea04c67d7 Change the default IPv6 prefix from aaaa::/64 to fd00::/64 2016-03-07 17:47:44 +01:00
Simon Duquennoy 8b63b41b96 TSCH-security: disable TSCH logs to save ROM, relax checks in 21-z1-rpl-tsch-security.csc accordingly 2016-03-07 17:43:25 +01:00
Simon Duquennoy 73fcfa42c2 TSCH: fix compiler warning that shows up when disabling TSCH_LOG_LEVEL 2016-03-07 17:42:17 +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
Antonio Lignan 934cdbacca Adapted the ADXL345 sensor to Contiki's sensor API 2016-02-22 12:08:56 +01:00
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