Commit graph

12396 commits

Author SHA1 Message Date
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 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
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 980de99472 Zoul: Removed misplaced project target 2016-09-13 15:15:24 +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
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
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
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
Nicolas Tsiftes b69e0f6c66 Merge pull request #1833 from sumanpanchal/cc2520-rssi-issue
CC2520: Added offset to calculate correct RSSI value
2016-09-05 16:18:26 +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
Afonso Oliveira 4c5b70e628 fix misplaced bracket causing compilation error when probing is deactivated (RPL_WITH_PROBING=0) 2016-09-05 14:49:41 +01: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 e25a62997d Zoul: cleaned headers, doxygen tags and uncrustified 2016-09-01 16:08:01 +02:00
Antonio Lignan 3227360b92 Zoul: Moved specific rev.A examples 2016-09-01 15:16:31 +02:00
Antonio Lignan 89c507f509 Zoul: created RE-Mote rev.A specific profile 2016-09-01 15:04:54 +02:00
Antonio Lignan 6dd17f5eec MSP430/F2xxx: fix ubr msb byte being hardcoded to zero 2016-09-01 10:25:38 +02:00
Harald Pichler 34a9135f83 activate reciver on 2016-09-01 09:34:57 +02:00
Antonio Lignan 26ed666948 Merge pull request #1844 from alignan/pull/zoul-dimmer-ac
Zoul: added driver to control an AC light dimmer with zero-crossing
2016-08-31 17:04:44 +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
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
Harald Pichler 37ea128d65 Merge branch 'osd'
Conflicts:
	cpu/avr/dev/button-sensor.c
2016-08-24 08:07:33 +02:00
Harald c7de6343d9 Merge pull request #5 from piccaso/max-age
Triggerboard: set max-age header
2016-08-24 07:54:13 +02:00
Sumankumar Panchal 25dea7264a CC2520: Added offset to calculate correct RSSI value 2016-08-24 10:21:14 +05:30
Flo eeb90bab77 gets rid of 'deprecated conversion from string constant to char*' 2016-08-24 00:59:47 +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