Commit graph

12749 commits

Author SHA1 Message Date
Michael LeMay 04446e8da5 galileo: Omit DHCP code when IPv6 is enabled 2016-09-24 17:37:07 -07:00
Harald Pichler ae79061182 bugfix powercyle and sleep mcu timing 2016-09-23 14:59:30 +02:00
Nicolas Tsiftes ef78b44a86 Merge pull request #1871 from gkelly/fix-rpl-debug
rpl: fix debugging PRINTF in find_removable_dio
2016-09-23 13:34:49 +02:00
Simon Duquennoy 75090f648a Merge pull request #1870 from simonduq/pr/cc1200-1.2kbps
CC1200 added config for 1.2 kbps
2016-09-23 13:13:26 +02:00
Antonio Lignan 75e260b2fc Zoul: added new Firefly revision A 2016-09-23 11:44:33 +02:00
Simon Duquennoy ba739f679e cc1200: configurable tx-rx turaround time 2016-09-23 09:41:20 +02:00
Simon Duquennoy 5dd3d03699 cc1200: call watchdog_periodic while in busy-wait 2016-09-23 09:10:42 +02:00
Simon Duquennoy 086499a864 cc1200: added configuration for 868 MHz 2-FSK at 1.2 kbps 2016-09-23 09:06:14 +02:00
Simon Duquennoy 622d576439 cc1200: configure RSSI offset as part of cc1200_rf_cfg 2016-09-23 09:06:13 +02:00
Simon Duquennoy 97843ed322 cc1200: use Hz instead of kHz for channel spacing 2016-09-23 09:06:05 +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
Garret Kelly 42c4cb94e0 rpl: fix debugging PRINTF in find_removable_dio 2016-09-22 10:54:55 -04:00
Antonio Lignan 6aa5890e73 Merge pull request #1869 from nfi/cooja-export-simulations-with-wismote-and-z1
Added support in Cooja to include Wismote and Z1 motes when exporting simulations
2016-09-22 12:26:11 +02:00
Niclas Finne e648373677 Cooja now supports Wismote and Z1 motes when exporting simulations as
executable JAR.
2016-09-22 10:56:56 +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
Mohamed Seliem 682abac7b7 update uart1.c to include Special function registers bits
including "sfr-bits.h" to define PERCFG_U1CFG, and UCSR_MODE
2016-09-21 14:32:09 +02:00
Harald Pichler 6f7e68c3d4 make it possible to config node as host in project.conf 2016-09-20 21:56:32 +02:00
Harald Pichler 2fd23f99ed config as hostnode, add coap client 2016-09-20 21:49:52 +02:00
Harald Pichler 8b1745214c bugfix answear speed 2016-09-20 21:22:11 +02:00
Harald Pichler 28f2b2caa8 add coap client function 2016-09-20 21:20:34 +02:00
Yannic Schröder d524211c2a Clean exit of serialdump when hitting Ctrl-C
Ctrl-C is the best way to close serialdump after using make login.
With a clean exit it will signal to make that the make run was successful.
2016-09-20 14:18:21 +02:00
Yannic Schröder 9e080e8aa5 Terminate serialdump when serial device disconnects
The running serialdump does not recover from a disconnected device but
runs indefinitely with outputting anything. This makes it quit with a
proper error message.
2016-09-20 14:16:40 +02:00
Yannic Schröder 2974b796d1 Initialize serialdump termios properly
termios i_flags were not initialized and could be set to arbitrary values
this resulted in unpredicted behaviour of the output like additional
newlines
2016-09-20 14:14:14 +02:00
Sumankumar Panchal 7803131ea8 Wismote: Added support for Battery voltage measurement 2016-09-17 11:41:30 +05:30
Harald Pichler 5de29079ae bugfix switch netstack mode 2016-09-16 16:18:02 +02:00
Harald Pichler fd12dcccf0 bugfix minimal push button time 2016-09-16 14:31:38 +02:00
Harald Pichler c663bb527e add UIP_CONF_ROUTER to project.conf 2016-09-16 14:12:37 +02:00
Antonio Lignan 3f4436bac9 Merge pull request #1846 from alignan/pull/msp430-uart0-baud-ubr-fix
MSP430/F2xxx: fix ubr msb byte being hardcoded to zero
2016-09-14 09:08:25 +02:00
George Oikonomou be1f19ad73 Merge pull request #1851 from kqorany/patch-1
Improve multicast documentation
2016-09-14 06:53:14 +01: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
Antonio Lignan 980de99472 Zoul: Removed misplaced project target 2016-09-13 15:15:24 +02:00
Mohamed Seliem f6795b4972 Neighbor Solicitation Processing (ns_input)
In the newest version of contiki, the function uip_nd6_ns_input() is obsolete.
ns_input function is defined static to be restrictively used in uip-nd6.c file, so removing the obsolete function requires moving the function description to the new function
2016-09-13 09:24:46 +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
Mohamed Seliem 675d9325b9 DAD: Remove useless "if" that tests if the source address is unspecified
No need to do the unspecified address twice.

#if UIP_ND6_DEF_MAXDADNS > 0
    if(uip_is_addr_unspecified(&UIP_IP_BUF->srcipaddr)) {
      /* DAD CASE */
       ..........
#else /* UIP_ND6_DEF_MAXDADNS > 0 */
    if(uip_is_addr_unspecified(&UIP_IP_BUF->srcipaddr)) {
      /* DAD CASE */
      goto discard; 
#endif /* UIP_ND6_DEF_MAXDADNS > 0 */

this logic will bring confusion, especially if you analyze the other ND functions (NUD, address resolution)  .
2016-09-10 10:56:19 +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
Nicolas Tsiftes 2c5c7d4f26 Merge pull request #1719 from jcook/master
RPL: Remove useless `else' block as def_route will be removed before if ex…
2016-09-09 16:48:01 +02:00
Michael LeMay 24f23588dd x86: Fix section alignment for EFI binaries
This patch fixes the section alignment specification in the linker script for
the Intel Quark X1000 SoC so that the UEFI GenFw program generates correct EFI
binaries.  See the added comment in quarkX1000.ld for details.
2016-09-08 12:13:28 -07:00
Harald Pichler 5b288a5777 Merge branch 'osd' 2016-09-08 10:33:24 +02:00
Nicolas Tsiftes fa6771f058 Merge pull request #1677 from gebart/pr/lwm2m-instance-list
oma-lwm2m: Add functionality to send object instance list as core link format
2016-09-06 16:50:11 +02:00
Yasuyuki Tanaka 30ddd97124 TSCH: add a sample .csc file and configuration for Cooja mote 2016-09-06 15:14:10 +02:00
Yasuyuki Tanaka 0ff474e393 Fix indentation in nullrdc.c 2016-09-06 15:14:10 +02:00
Yasuyuki Tanaka 6869dc7004 Yield inside busywaiting loops under cooja-ip64 (nullrdc.c)
The while loops waiting ACK_WAIT_TIME and AFTER_ACK_DETECTED_WAIT_TIME
cause infinite loop under the cooja-ip64 platform. This is because
RTIMER_NOW(), rtimer_arch_now(), has been changed not to call
cooja_mt_yield() in it since rtimer was reimplemented as a higher
resolution timer.

In order to avoid the infinite loop, cooja_mt_yield() needs to be
called inside the while loops under the platform as well as the cooja
platform.
2016-09-06 15:14:10 +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 0201208664 TSCH: manage busy waiting on Cooja motes 2016-09-06 15:14:10 +02:00