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

12734 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Yasuyuki Tanaka ca715fdd6b Use appropriate types for "value" of setInt{16,32,64}ValueOf() 2016-09-06 15:14:10 +02:00
Khaled Qorany ddae68bce3 Referring to the ESMRF engine that was recently merged 2016-09-06 11:24:17 +02:00
Simon Duquennoy 406e517d52 Merge pull request #1848 from afonsomota/noprobingfix 
fix misplaced bracket causing compilation error when probing is disabled
 2016-09-06 08:50:08 +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
Afonso Oliveira 0217776d6e fixed identantion on code below alteration 2016-09-05 16:24:55 +01:00
Nicolas Tsiftes 8e0ecf9b3a Merge pull request #1802 from marcas756/PullReq-SWITCH_BITS_IN_BYTE_STATIC 
Make set_bits_in_byte() static (like for get_bits_in_byte)
 2016-09-05 16:50:25 +02:00
Simon Duquennoy 41d2851a55 Merge pull request #1822 from yatch/pr/fix-rpl-udp-for-non-storing 
Make it easier to use the Non-Storing mode with the rpl-udp example
 2016-09-05 16:48:54 +02:00
Nicolas Tsiftes 7cfbbe97af Merge pull request #1740 from simonduq/pr/tsch-minor 
TSCH minor enhancements
 2016-09-05 16:33:48 +02:00