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

2967 commits

Author SHA1 Message Date
George Oikonomou
d6656ccde1 Fix minor typo 2016-12-03 23:26:25 +00:00
Mohamed seliem
0ef0a21d9e update for all platforms 2016-12-01 21:26:32 +02:00
Mohamed Seliem
0c65a4db9c update contiki-conf to avoid redfintion of UIP_CONF_RECEIVE_WINDOW 
in case of compiling any example that contains the definition of UIP_CONF_RECEIVE_WINDOW over Z1 mote.
i receive this warning: 
 In file included from ../../../core/./contiki.h:38:0,
                   from ../../../core/./contiki-net.h:37,
                   from httpd-simple.c:43:
  ../../../platform/z1/./contiki-conf.h:225:0: warning: "UIP_CONF_RECEIVE_WINDOW" redefined
 ./project-conf.h:60:0: note: this is the location of the previous definition
 2016-12-01 20:35:29 +02:00
Pablo Corbalán
983d858570 Remove definitions of outdated RPL_CONF_OF 2016-12-01 13:13:41 +01:00
Antonio Lignan
a8acaf08d5 Merge pull request #1938 from makrog/pr/cc1200-fixes 
Fixed checking of the cc1200 GPIO0 pin status.
 2016-11-30 14:24:48 +01:00
Robert Olsson
4ef4bdd0a5 bme280 delay fixes plus Makefile for avr-rss2 2016-11-30 12:04:57 +01:00
Antonio Lignan
f9b32f8139 bme280: reworked to allow platform-specific I2C implementations 2016-11-30 12:04:57 +01:00
Robert Olsson
dcbb5f6271 BME280 I2C integration fixes 2016-11-30 12:04:57 +01:00
Robert Olsson
5c25ec4d11 Example modified to use BME280 2016-11-30 12:04:57 +01:00
MakA
91a6ce6576 Fixed checking of the cc1200 GPIO0 pin status. 2016-11-29 12:16:03 +02:00
Benoît Thébaudeau
3cd7b7efd1 zoul: remote: Add support for FAT 
Signed-off-by: Benoît Thébaudeau <benoit@wsystem.com>
 2016-11-27 22:50:45 +01:00
Benoît Thébaudeau
12ea1bd492 zoul: remote: Factor out duplicate RTC init 
Signed-off-by: Benoît Thébaudeau <benoit@wsystem.com>
 2016-11-27 22:50:44 +01:00
Benoît Thébaudeau
062a8535ec zoul: remote: Add support for SD/MMC 
This change adds SD/MMC support at block level, by porting the SD/MMC
driver.

Signed-off-by: Benoît Thébaudeau <benoit@wsystem.com>
 2016-11-27 22:50:43 +01:00
Andreas Urke
835a6aa6e6 Move RF_CHANNEL such that it is applied for prop mode as well 2016-11-27 16:13:58 +01:00
Yasuyuki Tanaka
a4adc257e8 Add RTIMERTICKS_TO_US_64() macro (platform/cooja) 2016-11-26 11:47:59 +01:00
Antonio Lignan
fc582606f2 Harmonize RF_CHANNEL definition 2016-11-25 10:37:14 +01:00
Benoît Thébaudeau
ab1491be69 CC2538: Use CMSIS-CORE 
Switch to CMSIS-CORE and remove the duplicate code.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
 2016-11-24 22:30:26 +01:00
Simon Duquennoy
ecd1d57eec Merge pull request #1661 from yatch/pr-tsch-cooja-mote 
TSCH on Cooja mote
 2016-11-23 11:59:29 +01:00
Harald Pichler
f9f923d29c bugfix SPI 2016-11-15 09:36:30 +01:00
Harald Pichler
b708fac68d Merge branch 'contiki' 2016-11-15 08:29:23 +01:00
Harald Pichler
c666b18a12 add hardware serial1 to use with arduino api 2016-11-09 15:14:45 +01:00
Antonio Lignan
1ebceb8f23 Merge pull request #1897 from mdlemay/shrink-pinmux-array 
galileo: Shrink pinmux array
 2016-11-02 21:40:42 +01:00
Antonio Lignan
0bb9052840 Merge pull request #1896 from alignan/pull/tsl-256x-rework 
Renamed driver and reworked to support both TSL2561/TSL2563
 2016-10-27 09:29:49 +02:00
Harald Pichler
e6dbb8c3f2 Merge branch 'master' into osd 
Conflicts:
	examples/osd/triggerbaord/sketch.pde
 2016-10-26 17:03:37 +02:00
Nicolas Tsiftes
d690dcae31 Merge pull request #1864 from sumanpanchal/wismote-battery-voltage 
Wismote: Added support for Battery voltage measurement
 2016-10-24 14:41:23 +02:00
Harald Pichler
54e676343f set reciever amplifier to -90dB if use nullmac 2016-10-20 15:41:26 +02:00
Antonio Lignan
94174be708 Renamed driver and reworked to support both TSL2561/TSL2563 2016-10-19 23:13:25 +02:00
Michael LeMay
5c4cc2722e galileo: Shrink pinmux array 
The pins array in galileo-gen2-pinmux.c:galileo_brd_to_cpu_gpio_pin is
unnecessarily large.  This patch reduces its size.
 2016-10-19 09:31:50 -07:00
Antonio Lignan
2f76fc1f77 Merge pull request #1784 from g-oikonomou/contrib/cc1350 
Add CC1350 support
 2016-10-18 12:04:48 +02:00
Oliver Schmidt
fb4c42a357 Added custom log function for CBM machines. 
The log function writes directly to the screen. Combined with the usage of PFS this means that the POSIX layer of the C library isn't referenced anymore thus reducing the memory requirements.
 2016-10-15 23:36:53 +02:00
Oliver Schmidt
d864e73579 Added directory functions to the Commodore Platform File System. 
They reduce the Telnet server's run size by 1231 bytes.
 2016-10-15 18:36:54 +02:00
Oliver Schmidt
c25e965b0c Avoid unnecessary key presses. 
The recently added doesclrscrafterexit() allows cc65 programs to determine if the screen will be cleared after exit(). If that isn't the case then there's no need to ask the user to press a key in order to allow him to read the final program output.
 2016-10-15 15:27:42 +02:00
g.oikonomou@bristol.ac.uk
ec4b403e77 Allow and document IEEE mode for CC13xx 2016-10-07 10:05:14 +01:00
Harald Pichler
34adab3210 remove redefine routing warning 2016-10-02 22:50:10 +02:00
Harald Pichler
9226facda8 remove warnings 2016-10-02 22:49:22 +02:00
Antonio Lignan
6157dce0b5 Merge pull request #1877 from alignan/pull/fix-zoul-doc 
Zoul: updated pin-out images
 2016-09-28 23:05:17 +02:00
Antonio Lignan
fd881bec19 Merge pull request #1874 from alignan/pull/zolertia-firefly-reva1 
Zoul: added new Firefly revision A
 2016-09-28 17:01:19 +02:00
Antonio Lignan
1758eaa08c Zoul: updated pin-out images 2016-09-28 16:54:51 +02:00
Michael LeMay
04446e8da5 galileo: Omit DHCP code when IPv6 is enabled 2016-09-24 17:37:07 -07:00
Antonio Lignan
75e260b2fc Zoul: added new Firefly revision A 2016-09-23 11:44:33 +02:00
Antonio Lignan
e206984d90 Merge pull request #1873 from MohamedSeliem/patch-7 
Doxygen Fix
 2016-09-23 08:31:41 +02:00
Antonio Lignan
e658bdfcfe Merge pull request #1860 from alignan/pull/remote-power-mgmt 
Zoul: power management driver for the RE-Mote revision B
 2016-09-23 08:30:56 +02:00
Antonio Lignan
95ed9a9a91 Merge pull request #1859 from alignan/pull/remote-rtcc-update 
Zoul: RTCC with trigger selection and second-based time increase
 2016-09-23 08:30:20 +02:00
Mohamed Seliem
150b97879d Doxygen Fix 
this minor fixation to avoid Doxygen bug, which appears when doing this in the documented code:
/**
* \exception \c text
*/
void foo();
 2016-09-22 22:30:54 +02:00
Antonio Lignan
268330c7e5 Zoul: power management driver for the RE-Mote revision B 2016-09-22 21:45:54 +02:00
Harald Pichler
a5b59e8cbb Merge branch 'contiki' 
Conflicts:
	.gitmodules
	core/net/mac/contikimac/contikimac.c
	cpu/cc26xx-cc13xx/lib/cc13xxware
 2016-09-21 21:09:29 +02:00
Harald Pichler
6f7e68c3d4 make it possible to config node as host in project.conf 2016-09-20 21:56:32 +02:00
Sumankumar Panchal
7803131ea8 Wismote: Added support for Battery voltage measurement 2016-09-17 11:41:30 +05:30
Harald Pichler
c663bb527e add UIP_CONF_ROUTER to project.conf 2016-09-16 14:12:37 +02:00
George Oikonomou
94d900a76f Merge pull request #1857 from alignan/pull/remote-revb 
Zoul: RE-Mote revision B
 2016-09-14 06:52:02 +01:00
Antonio Lignan
072bf74aa2 Added RTCC function to increase current time in seconds 2016-09-13 15:16:54 +02:00
Antonio Lignan
d1a7740a2c Updated RTCC driver with selectable INT1/INT2 trigger 2016-09-13 15:16:54 +02:00
Nicolas Tsiftes
2d49edfc57 Merge pull request #1849 from MohamedSeliem/patch3 
Make UIP_CONF_DS6_ROUTE_NBU and DS6_NBR_NBU, DS6_ROUTE_NBU obsolete
 2016-09-12 14:25:59 +02:00
Nicolas Tsiftes
8bf235ef86 Merge pull request #1836 from mdlemay/dhcp 
galileo: Add process to perform DHCP configuration
 2016-09-09 16:55:05 +02:00
Yasuyuki Tanaka
6d51c5f58e Reimplement Rtimer of Cooja mote as a microsecond resolution timer 2016-09-06 15:14:10 +02:00
Yasuyuki Tanaka
958ff6e4f6 Fix indentation in cooja-radio.c 2016-09-06 15:14:10 +02:00
Yasuyuki Tanaka
38c5382054 Add timing macros required for TSCH 2016-09-06 15:14:10 +02:00
Yasuyuki Tanaka
671b1cd9b8 Support the radio features required for TSCH 2016-09-06 15:14:10 +02:00
Yasuyuki Tanaka
830753f360 cooja-radio: enable to turn off the turnaround and CCA features 2016-09-06 15:14:10 +02:00
Yasuyuki Tanaka
33e86042e5 Support RADIO_PARAM_LAST_PACKET_TIMESTAMP with get_object() 2016-09-06 15:14:10 +02:00
Mohamed Seliem
1d32a00ebd Fix uip-ds.h table configuration comment 
this PR to update uip-ds.h comments, this small change is made to ease the track of Tables implementation places

remove definition of UIP_CONF_DS6_ROUTE_NBU

retire 2 old macros DS6_NBR_NBU, DS6_ROUTE_NBU

Update uip-ds6.h

Update contiki-conf.h

Update contiki-conf.h

Update contiki-conf.h

fix doxygen comment

Update uip-ds6.h
 2016-09-05 20:59:36 +02:00
Simon Duquennoy
042d077784 Merge pull request #1768 from mguc/jn516x_exception_handler 
JN516x: Exception handler causing infinite loop
 2016-09-05 20:50:35 +02:00
Marko Gucanin
93757e810d added space between ) and { 2016-09-05 17:36:33 +02:00
Nicolas Tsiftes
61c9c21c5c Merge pull request #1834 from mdlemay/gpio-refactor 
galileo: Simplify GPIO APIs and add support for gen. 1
 2016-09-05 16:13:20 +02:00
Antonio Lignan
448c78da5f Zoul: updated ADC[4-5] info and link to wiki with RevA-B delta 2016-09-05 10:34:37 +02:00
Antonio Lignan
5d4b7de426 Zoul: created RE-Mote rev.B platform 2016-09-02 16:53:09 +02:00
Antonio Lignan
3e5b5dca12 Zoul: Updated READMEs 2016-09-01 16:45:16 +02:00
Antonio Lignan
89c507f509 Zoul: created RE-Mote rev.A specific profile 2016-09-01 15:04:54 +02:00
Antonio Lignan
5e400dd43b Zoul: fixed ac-dimmer interrupt disable pin/port and check interrupt source 2016-08-31 15:36:48 +02:00
Antonio Lignan
8d4888c495 Zoul: added driver to control an AC light dimmer with zero-crossing 2016-08-31 12:20:04 +02:00
Antonio Lignan
4ce322b7b0 Merge pull request #1837 from alignan/pull/servo 
Zoul: generic servo driver
 2016-08-31 12:00:31 +02:00
Joakim Eriksson
616b65c962 added support for 6-bytes link-layer address 2016-08-27 22:30:32 +02:00
Antonio Lignan
bc2ff5b352 Merge pull request #1838 from alignan/pull/fix-tmp102-calc 
Zoul: fix TMP102 value conversion
 2016-08-26 00:00:59 +02:00
Antonio Lignan
61e8a174db Merge pull request #1828 from alignan/pull/z1-libraries-cleanup 
Z1: cleaned up non-required libraries from builds and moved SENSORS d…
 2016-08-25 10:54:17 +02:00
Antonio Lignan
32385b2910 Zoul: fix TMP102 value conversion 2016-08-24 16:34:02 +02:00
Antonio Lignan
26c4a81331 Z1: cleaned up non-required libraries from builds and moved SENSORS declaration to its own file 2016-08-24 16:05:38 +02:00
Antonio Lignan
8cc1870663 Zoul: generic servo driver 2016-08-24 14:27:41 +02:00
Michael LeMay
c276081150 galileo: Add process to perform DHCP configuration 
This patch adds a process that is started automatically to request DHCP
configuration.  It also moves the IP configuration ahead of autostart processes
in case some autostart process depends on the IP configuration.
 2016-08-23 13:16:39 -07:00
Michael LeMay
4181179985 galileo: Add support for Gen. 1 pinmux and GPIO 
This patch adds support for IO pinmuxing and GPIO on first generation
Intel Galileo boards.
 2016-08-23 13:02:39 -07:00
Michael LeMay
b17a936bf7 galileo: Add board-level abstraction layer for GPIO 
This patch adds a HAL for GPIOs so that users of the API can specify
board-level IO pin numbers rather than CPU-level pin numbers.
 2016-08-23 13:02:36 -07:00
Michael LeMay
2912559061 galileo: Revise pinmux API to be more intuitive 
This patch replaces the pinmux APIs that require users to look up an arbitrary
function number for the desired function of each pin.  The replacement API
functions have intuitive names and permit users to pass board-level IO port
numbers.  The API functions internally convert those to CPU-level port numbers
when necessary.  Furthermore, when configuring a pin to be a digital input or
output, those API functions also perform the corresponding configuration
operation on the CPU-level GPIO port.  The revised APIs halt when users attempt
to configure a currently-unsupported GPIO, specifically those in the GPIO_SUS
port range and those implemented on the expander chip EXP2.  This also means
that such ports are left unconfigured during initialization, whereas the
pinmuxing for them was setup by the old implementation.
 2016-08-23 13:02:32 -07:00
Michael LeMay
3043f3956c galileo: Simplify pinmux configuration 
This patch refactors the pinmux configuration code for Intel Galileo to simplify
it. This patch also corrects an off-by-one error in how the pin number is
checked in galileo_pinmux_set_pin.
 2016-08-23 12:39:21 -07:00
Michael LeMay
6a3ce86e10 galileo: Add general protection exception handler 
This patch adds a general protection exception handler that prints a
message indicating the faulting instruction and the error code. This is
useful when debugging general protection exceptions.
 2016-08-23 11:34:32 -07:00
Harald Pichler
6cf4e147ed add noncoresec 2016-08-20 14:32:26 +02:00
Harald Pichler
8b887ca429 add button led bled to project 2016-08-20 14:09:44 +02:00
Harald Pichler
12e77a1e58 bugfix cca threshold 2016-08-18 17:26:37 +02:00
Antonio Lignan
6947fc7381 Merge pull request #1826 from alignan/pull/crossval-fix 
Zoul: fixed voltage divider relationship
 2016-08-17 17:33:07 +02:00
George Oikonomou
6f44fb8c44 Merge pull request #1783 from g-oikonomou/bugfix/cc13xx/contikimac-timings 
Adjust ContikiMAC timings for CC13xx PROP mode
 2016-08-17 14:06:07 +01:00
Antonio Lignan
cb42bafbfb Merge pull request #1756 from g-oikonomou/contrib/cc26xx/new-ccxxwares 
Update to latest TI CC13xxware/CC26xxware
 2016-08-16 15:44:41 +02:00
Antonio Lignan
0a02f0ac7c Zoul: fixed voltage divider relationship 2016-08-16 14:24:13 +02:00
Harald Pichler
d3431a0b54 bugfix contiki mac layer droped packets 2016-08-16 11:11:32 +02:00
Harald Pichler
cf40f59843 add pin status 2016-08-15 20:22:49 +02:00
George Oikonomou
39e8435141 Add 460800 baud rate support to Z1 2016-08-12 01:23:50 +01:00
George Oikonomou
d7028652fe Remove legacy sniffer configuration: zoul 2016-08-12 01:23:50 +01:00
George Oikonomou
35c37f356c Remove legacy sniffer configuration: openmote-cc2538 2016-08-12 01:23:50 +01:00
George Oikonomou
4a4b3a344d Remove legacy sniffer configuration: cc2538dk 2016-08-12 01:23:50 +01:00
George Oikonomou
07f984eec2 Remove legacy sniffer references: Docs 2016-08-12 01:23:50 +01:00
George Oikonomou
dbd4f630fd Remove built-in sniffer support: CC13xx PROP mode 2016-08-12 01:23:49 +01:00
George Oikonomou
0de1dc1025 Remove built-in sniffer support: CC2530 2016-08-12 01:23:49 +01:00
George Oikonomou
1a4947499c Merge pull request #1819 from bthebaudeau/cc2538-en-32k-xtal 
CC2538: Use the 32.768-kHz crystal if present
 2016-08-11 23:48:04 +01:00
George Oikonomou
47265c9305 Merge pull request #1813 from arurke/cc26xx_cc13xx_i2c_fixes 
CC26xx/CC13xx fix for burst TX followed by burst RX
 2016-08-11 23:47:42 +01:00
Benoît Thébaudeau
9e03df6cb7 CC2538: Use the 32.768-kHz crystal if present 
Enable the 32.768-kHz crystal on all the CC2538 platforms where it is
present in order to get a better time accuracy.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
 2016-08-11 23:49:03 +02:00
Benoît Thébaudeau
ae5205f9e2 doxygen: Fix orphan modules 
Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
 2016-08-10 04:56:15 +02:00
Andreas Urke
8128986ccd Remove unecessary bool 2016-08-09 22:56:53 +02:00
Andreas Urke
e1359519ab Fix i2c multiple write bug, as reported by Ron Segal: https://sourceforge.net/p/contiki/mailman/message/34633862/ 2016-08-09 22:56:28 +02:00
Nicolas Tsiftes
2e4c6eef54 Merge pull request #1804 from mdlemay/docker 
galileo: Add support for containerized build environment
 2016-08-09 15:19:28 +02:00
Nicolas Tsiftes
956497a672 Merge pull request #1805 from mdlemay/ipv6-link-stats 
galileo: Build link-stats.c when IPv6 is enabled
 2016-08-08 11:39:42 +02:00
Michael LeMay
bde8eb35ae x86, galileo: Fix UART system call authorization initialization 
This patch fixes UART system call authorization initialization (when
protection domain support is enabled) to only initialize the system call
entrypoint and authorization data structures once, prior to per-port
setup. Previously, if two UARTs were configured, the setup procedure for
the second UART would erase the system call authorization for the
first (console) UART, resulting in a crash upon the next attempt to
perform console output.
 2016-08-04 16:09:44 -07:00
Michael LeMay
31ad67abd7 x86: Support configurable UART baud rate 
This patch extends the Intel Quark X1000 SoC UART initialization API to
accept a numeric baud rate specification.
 2016-08-03 07:58:51 -07:00
Michael LeMay
e50b73c9b1 galileo: Add support for containerized build environment 
This patch adds a Dockerfile for building a container configured as a
build environment for Intel Galileo boards.  This patch also provides
documentation for using the containerized build environment.  Finally, it
streamlines the instructions for booting Contiki on Galileo and includes
other documentation refinements.
 2016-08-02 20:54:41 -07:00
Michael LeMay
836fa4d6fa galileo: Build link-stats.c when IPv6 is enabled 
This is required by the IPv6 implementation in Contiki OS.
 2016-07-31 17:03:42 -07:00
Sumankumar Panchal
6dfd358821 TSCH port for CC2538 based platforms. 2016-07-22 09:38:25 +05:30
George Oikonomou
4495d14702 Make ROM bootloader configurable through contiki- or project-conf.h 2016-07-17 00:26:52 +01:00
George Oikonomou
01590088d3 Update to latest CCxxwares: Srf06+EM drivers 2016-07-17 00:26:52 +01:00
George Oikonomou
f6437b6086 Update to latest CCxxwares: Sensortag drivers 2016-07-17 00:26:52 +01:00
George Oikonomou
5de7b1bbac Update to latest CCxxwares: Launchpad drivers 2016-07-17 00:26:51 +01:00
George Oikonomou
c42cb2b0cb Update to latest CCxxwares: common drivers 2016-07-17 00:26:51 +01:00
George Oikonomou
c87e579b06 Adjust ContikiMAC timings for CC13xx PROP mode 
#1684 slightly varied RF startup time and, as a result, threw ContikiMAC timing configuration off. This manifests itself with very poor CC13xx PROP mode radio performance, as documented in #1747.

This pull fixes this bug by slightly increasing ContikiMAC's inter-packet interval. This gives the receiver a little more time to respond with an ACK to unicast frames.

Fixes #1747
 2016-07-17 00:04:07 +01:00
George Oikonomou
dcad5e7e3f Merge pull request #1727 from g-oikonomou/contrib/cc26xx/trng 
Add CC13xx/CC26xx TRNG Support
 2016-07-16 23:34:53 +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
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
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
a8aa778b31 Removed unused file platform/avr-rss2/dev/ds18b20.c 2016-07-15 13:17:40 +02:00
Marko Gucanin
1fc9bbe315 added { } 2016-07-08 16:25:34 +02:00
Marko Gucanin
1a1d17143b return from exception handler if E_EXC_SYSCALL is generated 2016-07-06 16:28:47 +02:00
Marko Gucanin
74d04562df Revert "removed exception handler for SYSCALL, causing an infinite loop after calling vAHI_SwReset()" 
This reverts commit c4def60cdd.
 2016-07-06 15:45:15 +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
Marko Gucanin
c4def60cdd removed exception handler for SYSCALL, causing an infinite loop after calling vAHI_SwReset() 2016-07-05 16:44:24 +02:00
Antonio Lignan
d5e2a779d4 Added DHT22 sensor to Zoul-based platforms 2016-07-04 18:00:09 +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
Atis Elsts
b6617f17c5 CC26xx: always request HF crystal oscillator at radio on() 2016-06-29 16:41:33 +03:00
Harald Pichler
349f6bf429 Merge branch 'contiki' into osd 2016-06-29 09:04:54 +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
Atis Elsts
1e4141b589 CC26xx: change default TSCH guard time to 1.8ms 2016-06-29 01:14:12 +03:00
Harald Pichler
3c8e91d74e cleanup confilicrts 2016-06-28 16:37:16 +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
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
Christian Groessler
c26085ec8c Some 6502 target changes 
- platform/atarixl/Makefile.atarixl: put two more objects into high memory
- platform/atarixl/contiki-conf.h: define WWW_CONF_WGET_EXEC
- tools/6502/Makefile: add 'clean' target; remove unused CONTIKI define
 2016-06-17 16:42:50 +02:00
Nicolas Tsiftes
a8989f9f1c Merge pull request #1724 from nvt/coffee-simplify 
Coffee: minor enhancements
 2016-06-15 18:56:10 +02:00
George Oikonomou
adfeaa5500 Add missing include 2016-06-15 10:31:55 +01:00
Nicolas Tsiftes
5010309005 Make the I/O semantics functionality in Coffee unconditional so that the API becomes consistent across platforms. 
Change certain CPP conditionals into C conditionals, which should be possible for the compiler to optimize at runtime. This makes the source code easier to read.
 2016-06-14 21:08:00 +02:00
Atis Elsts
3a99639294 cc26xx: implement CC2650_FAST_RADIO_STARTUP option, required for TSCH 2016-06-14 00:54:33 +03:00
Atis Elsts
3ff8aa8ad8 srf06-cc26xx: add node_id variable 2016-06-14 00:54:32 +03:00
Atis Elsts
f99511f494 srf06-cc26xx: add default TSCH configuration for the platform 2016-06-14 00:54:32 +03:00