Commit graph

11694 commits

Author SHA1 Message Date
George Oikonomou f1c37b309a Merge pull request #1779 from atiselsts/bugfix/cc26xx/rf_poll_mode
CC26xx: enable MCU sleeping while transmitting if and only if not in poll mode
2016-07-16 20:02:43 +01:00
George Oikonomou fe571c7dc3 Merge pull request #1754 from atiselsts/enhancement/cc26xx_reduced_guard_time
CC26xx: change default TSCH guard time to 1.8ms
2016-07-16 19:47:16 +01:00
George Oikonomou f1637ba74d Merge pull request #1781 from atiselsts/bugfix/tsch/delayed_detection
TSCH: add RADIO_DELAY_BEFORE_DETECT to rx guard time when waiting for a packet to be received
2016-07-16 19:46:09 +01:00
Atis Elsts 2fe4b4d5bb CC26xx: enable MCU sleeping while transmitting if and only if not in poll mode 2016-07-16 18:22:20 +01:00
Atis Elsts 081ec100a4 TSCH: add RADIO_DELAY_BEFORE_DETECT to rx guard time when waiting for a packet to be received 2016-07-16 18:08:41 +01:00
George Oikonomou 0313f9abf1 Merge pull request #1751 from atiselsts/bugfix/cc26xx_etimer_sleep
CC26xx: fix a regression in and refactor LPM code
2016-07-16 14:45:56 +01:00
Nicolas Tsiftes 8a5886dfa1 Merge pull request #1767 from simonduq/pr/missing-return
RPL: added missing return, to not join instances with unsupported MOP
2016-07-15 21:10:57 +02:00
Nicolas Tsiftes afa8125913 Merge pull request #1777 from herjulf/master
Fix README.md not reference GPL
2016-07-15 20:30:06 +02:00
Antonio Lignan 0d0e726b38 Merge pull request #1764 from alignan/pull/zoul-dht22
Added DHT22 sensor to Zoul-based platforms
2016-07-15 12:50:34 -05:00
Robert Olsson fbf3daa564 Fix README.md not reference GPL 2016-07-15 17:44:20 +02:00
George Oikonomou d36c8762c1 Merge pull request #1776 from herjulf/master
Removed unused file platform/avr-rss2/dev/ds18b20.c
2016-07-15 15:51:51 +01:00
Robert Olsson a8aa778b31 Removed unused file platform/avr-rss2/dev/ds18b20.c 2016-07-15 13:17:40 +02:00
Oliver Schmidt 98a795b967 Merge pull request #1730 from groessler/something_to_pull
Some 6502 target changes
2016-07-06 09:17:39 +02:00
Simon Duquennoy 80b9bfea93 Merge pull request #1723 from gebart/pr/ieee802154-addr-mode-bugfix
core/net/mac/frame802154: Fix typo in PAN ID compression condition
2016-07-05 18:10:21 +02:00
Simon Duquennoy 4ceaaba4bd RPL: added missing return, to not join instances with unsupported MOP 2016-07-05 12:13:46 +02:00
Christian Groessler 4373aecec2 Tag non-file goals as ".PHONY" 2016-07-05 00:47:52 +02:00
Joakim Nohlgård 6f8306a465 core/net/mac/frame802154: Fix typo in PAN ID compression condition 2016-07-04 18:18:55 +02:00
Antonio Lignan d5e2a779d4 Added DHT22 sensor to Zoul-based platforms 2016-07-04 18:00:09 +02:00
Nicolas Tsiftes c9deeb443a Merge pull request #1757 from simonduq/pr/br-http-nonstoring
RPL border HTTP server: support for non-storing
2016-07-01 15:39:17 +02:00
Simon Duquennoy 5d7ce4e9f2 Merge pull request #920 from cetic/pr-slip-queue
Support more than one pending slip message
2016-07-01 13:50:18 +02:00
Simon Duquennoy 5230562f1f Merge pull request #1761 from MohamedSeliem/patch-1
remove duplicate include
2016-07-01 13:38:10 +02:00
Mohamed Seliem 5d99008afb remove duplicate include
Update uip-ds6-nbr.h
2016-07-01 11:12:52 +02:00
Antonio Lignan 23a0449a97 Merge pull request #1753 from g-oikonomou/bugfix/cc26xx/missing-include
Add missing include
2016-06-30 22:53:45 +02:00
Antonio Lignan 6360a09cc7 Merge pull request #1726 from feshie/pr-zoul-motes-flash-fix
zoul: Add support for flashing to multiple devices
2016-06-30 12:13:41 +02:00
Antonio Lignan 17d784ead3 Merge pull request #1745 from alignan/pull/z1-contiki-conf
Minor changes to z1/contiki-conf.h
2016-06-30 09:47:16 +02:00
George Oikonomou 66a2ecb19e Merge pull request #1755 from atiselsts/bugfix/cc26xx/fast_startup
CC26xx: always request HF crystal oscillator at radio on()
2016-06-29 23:51:04 +01:00
Simon Duquennoy 3e987ec138 Border router: include RPL links in HTTP reply when non-storing mode is enabled 2016-06-29 17:07:00 +02:00
Atis Elsts b6617f17c5 CC26xx: always request HF crystal oscillator at radio on() 2016-06-29 16:41:33 +03:00
Simon Duquennoy 5eb022fdd8 Merge pull request #1750 from yatch/pr/improve-rpl-ext-hdr
Improve RPL extension headers handling
2016-06-29 10:38:17 +02:00
George Oikonomou 91255f5a81 Merge pull request #1711 from xukai871105/master
One fix to sensorTag board_i2c.c
2016-06-28 23:55:02 +01:00
George Oikonomou a509aa7136 Merge pull request #1689 from kqorany/kqorany-esmrf
A new multicast engine called ESMRF for RPL
2016-06-28 23:23:30 +01:00
George Oikonomou 5e66770aaf Merge pull request #1734 from yatch/pr/pr-fix-mcast6-macro
Fix the source address selection for multicast packets
2016-06-28 23:22:08 +01:00
Atis Elsts 1e4141b589 CC26xx: change default TSCH guard time to 1.8ms 2016-06-29 01:14:12 +03:00
Atis Elsts 9caaf26012 CC26xx: fix a regression in and refactor LPM code 2016-06-29 01:03:06 +03:00
George Oikonomou ef8c97f46d Merge pull request #1746 from g-oikonomou/bugfix/cc26xx/fast-startup-off
Disable CC2650_FAST_RADIO_STARTUP by default
2016-06-28 16:15:45 +01:00
Yasuyuki Tanaka ffdc53718d RPL: code cleanup (rpl-ext-header.c) 2016-06-27 20:57:48 +02:00
Yasuyuki Tanaka 13f18fd842 RPL: update uip_ext_len whenever moving to next header (rpl-ext-header.c) 2016-06-27 20:57:48 +02:00
Yasuyuki Tanaka 5a79bad4b1 RPL: prevent unintended memory access (rpl_remove_header)
When it goes to the default label in the switch statement of
rpl_remove_header(), UIP_EXT_BUF does not always point to an IPv6 extension
header. "Move to next header" process should be done only in case of
UIP_PROTO_DESTO. Otherwise, it returns with doing nothing.
2016-06-27 20:57:48 +02:00
Yasuyuki Tanaka e361c49f14 RPL non-storing: fix a bug causing an infinite loop
It falls into an infinite loop if it goes to the default label in the switch
statement of rpl_srh_get_next_hop() or rpl_process_srh_header().
2016-06-27 20:57:48 +02:00
George Oikonomou 3a105f2141 Disable CC2650_FAST_RADIO_STARTUP by default
`CC2650_FAST_RADIO_STARTUP` is required for TSCH, but it currently breaks ContikiMAC. We set the default value to the one that will work with the default choice of RDC.

Fixes #1744
2016-06-27 17:20:26 +01:00
Arthur Fabre ab1652648e zoul: Add support for flashing to multiple devices
This adds support for flashing to multiple devices, by implementing the
$MOTES option used by the Z1.
This replaces the $PORT interface, as it only allowed flashing to one
device at a time, and the $MOTES interface was still used for other
tasks (such as getting a list of connected devices).

A foreach loop is used to dynamically create an upload rule per device
that needs to be flashed.
The "main" upload rule depends on the device specific ones.
This allows for parallel flashing.

The PORT variable can still be sued for backwards compatibility.

Changed the MOTES variable that makes a $(shell) call to not be
recursively expanded.
2016-06-27 11:23:45 +01:00
Antonio Lignan 108e43b103 Made configuration parameters easily overridable to be consistent with Travis CI tests 2016-06-25 23:17:26 +02:00
Benoît Thébaudeau 01a533fb75 Merge pull request #1704 from kkrentz/cc2538-aes-fixes
One fix to CC2538 hardware security
2016-06-25 01:30:16 +02:00
Antonio Lignan 6a2d802b9a Merge pull request #1737 from bthebaudeau/cc2538-fix-missing-result-av
cc2538: aes: Fix possibly missing result available status
2016-06-25 00:14:29 +02:00
George Oikonomou 5a9b493d2b Merge pull request #1743 from alignan/pull/update-cc2538-bsl
Updated cc2538-bsl to version 2.1 (c6100a7)
2016-06-24 23:12:18 +01:00
Antonio Lignan 99822545c5 Added BOARD_STRING to the Z1 platform 2016-06-24 23:58:32 +02:00
Antonio Lignan 0034322fe0 Made configuration parameters easily overridable from project-conf.h (without having to undef first) 2016-06-24 23:54:08 +02:00
Antonio Lignan 1002b7ffee Fixed spacing 2016-06-24 23:36:40 +02:00
Antonio Lignan 442e1be391 Moved project-conf.h inclusion to the top of contiki-conf.h 2016-06-24 23:34:23 +02:00
Antonio Lignan bc8b6cd8ed Updated cc2538-bsl to version 2.1 (c6100a7) 2016-06-24 22:10:39 +02:00