Commit Graph

14064 Commits

Author SHA1 Message Date
Simon Duquennoy
f93c334ef1
Merge pull request #444 from simonduq/contrib/rtimer-config
rtimer clock size: more consistent config
2018-05-12 09:59:38 +02:00
Simon Duquennoy
5ef74e9cfc
Merge branch 'develop' into contrib/rtimer-config 2018-05-11 21:10:33 +02:00
Simon Duquennoy
6acac2aa91
Merge pull request #471 from g-oikonomou/contrib/mqtt-client-with-watson
Easy switch to IBM Watson mode
2018-05-11 21:10:12 +02:00
Simon Duquennoy
f5074176a5
Merge branch 'develop' into contrib/mqtt-client-with-watson 2018-05-11 18:30:44 +02:00
George Oikonomou
3719f82737
Merge pull request #508 from contiki-ng/master
Merge master back into develop
2018-05-11 16:27:12 +01:00
Simon Duquennoy
7da2787933
Merge pull request #502 from contiki-ng/release-4.1
Release v4.1
2018-05-11 16:59:14 +02:00
George Oikonomou
c9a9a27d4f
Merge branch 'master' into release-4.1 2018-05-11 14:54:57 +01:00
George Oikonomou
1a8490d50e
Merge pull request #500 from g-oikonomou/contrib/release-into-develop
Merge release-4.1 into develop
2018-05-11 14:52:42 +01:00
Simon Duquennoy
777a132a69 Merge remote-tracking branch 'origin/develop' into contrib/release-into-develop 2018-05-11 05:53:13 -07:00
Simon Duquennoy
a4c3e4373f Merge remote-tracking branch 'origin/release-4.1' into contrib/release-into-develop 2018-05-11 05:52:42 -07:00
George Oikonomou
fae44c09f5
Merge pull request #503 from simonduq/contrib/rpl-lite-disable-squared-etx
RPL Lite: disable MRHOF ETX squaring by default
2018-05-11 13:38:48 +01:00
Simon Duquennoy
73bc179ceb link-stat: increase penalty applied in case of no-ack 2018-05-11 05:08:28 -07:00
Simon Duquennoy
6aa17cce95 RPL Lite: disable MRHOF ETX squaring by default 2018-05-11 04:46:41 -07:00
George Oikonomou
d3aa0dcf6d
Merge pull request #505 from ianno/develop
Fixed driver for DHT22 sensor in zoul platform
2018-05-10 21:12:14 +01:00
Antonio Iannopollo
32578321cb
removed problematic .c extension in Makefile 2018-05-10 10:33:53 -07:00
Antonio Iannopollo
0b9f03f442 fixed dht22 driver 2018-05-09 19:29:24 -07:00
Antonio Iannopollo
51a4960fa8 fixed dht22 driver and example 2018-05-09 19:25:08 -07:00
Simon Duquennoy
72f558fb6e RPL Classic: make sure no more than one probe gets in queue at any given time 2018-05-09 14:42:03 -07:00
Simon Duquennoy
a2d9093cef RPL Lite: make sure no more than one probe gets in queue at any given time 2018-05-09 14:42:03 -07:00
George Oikonomou
b45d284be2 Merge branch 'release-4.1' into develop 2018-05-09 22:18:01 +01:00
Simon Duquennoy
e05e0d08bd
Merge pull request #495 from nfi/contrib/lwm2m-ipso-object-server-example
Updated lwm2m-ipso-object server-example for latest RPL/CoAP APIs
2018-05-09 21:07:43 +02:00
Simon Duquennoy
46e1633c19
Merge pull request #493 from simonduq/fix/make-nullnet-cflags
Makefile.include: include nullnet only when using MAKE_NET_NULLNET
2018-05-08 19:34:59 +02:00
Simon Duquennoy
083c4b9152
Merge branch 'develop' into fix/make-nullnet-cflags 2018-05-08 18:36:42 +02:00
Simon Duquennoy
f2394720c8 Makefile.include: include nullnet only when using MAKE_MAC_NULLNET 2018-05-08 08:14:38 -07:00
Niclas Finne
fa54354d92 Updated lwm2m-ipso-object server-example for latest RPL/CoAP APIs 2018-05-07 07:01:25 +02:00
George Oikonomou
ded9a1656f
Merge pull request #494 from MartenBE/fix-typo-usage-string
Fixed typo for savetarget target in usage string
2018-05-06 20:44:07 +01:00
MartenBE
9194b65d22 Fixed typo for savetarget target in usage string 2018-05-06 21:05:54 +02:00
Joakim Eriksson
6f9701a178
Merge pull request #492 from nfi/contrib/update-tinydtls
Updated tinydtls submodule to latest version
2018-05-06 17:07:21 +02:00
Simon Duquennoy
2ebc16281a
Merge pull request #452 from simonduq/contrib/rpl-configurable-mrhof
RPL MRHOF: configurable max link metric and path cost
2018-05-05 09:31:34 +02:00
Simon Duquennoy
6501576183 RPL MRHOF: configurable max link metric and path cost 2018-05-04 12:57:43 -07:00
Simon Duquennoy
cc0ae54308
Merge pull request #432 from lafka/lafka-cortex-makefile-relpath
Automatically resolve realpath of CONTIKI
2018-05-04 21:55:37 +02:00
Simon Duquennoy
ed5eb17f68
Merge branch 'develop' into lafka-cortex-makefile-relpath 2018-05-04 21:29:16 +02:00
Simon Duquennoy
08c52a1bcf
Merge branch 'release-4.1' into contrib/update-tinydtls 2018-05-04 21:03:04 +02:00
Joakim Eriksson
7381c44299
Merge pull request #491 from nvt/fix-default-file-size
Improved default file size in Antelope
2018-05-04 19:45:37 +02:00
Niclas Finne
7aed97f514 Updated tinydtls submodule to latest version 2018-05-04 19:15:03 +02:00
Simon Duquennoy
b32618c432
Merge branch 'release-4.1' into fix-default-file-size 2018-05-04 18:41:46 +02:00
Simon Duquennoy
8046c2d0b7
Merge pull request #490 from joakimeriksson/contrib/storage-example-makefile-fix
fixed platforms to build for in Makefile
2018-05-04 18:41:16 +02:00
Nicolas Tsiftes
f5cee451d1 Use a default Coffee file reservation size in Antelope that is selected in relation to the file system size. 2018-05-04 18:12:10 +02:00
Joakim Eriksson
15e51288ec fixed platforms to build for in Makefile 2018-05-04 18:01:18 +02:00
George Oikonomou
96b5be6810
Merge pull request #480 from lafka/lafka-802154-ifdef-guards
Allow custom frequency bands (+ some TI radio tweak options)
2018-05-04 13:23:07 +01:00
George Oikonomou
059fbeb3e7
Merge pull request #485 from nfi/contrib/shell-refresh-routes-lite
Fix shell to compile with rpl-classic
2018-05-04 13:22:58 +01:00
George Oikonomou
9f653c63d8
Merge branch 'develop' into lafka-802154-ifdef-guards 2018-05-04 12:17:21 +01:00
George Oikonomou
684167cd91
Merge branch 'release-4.1' into contrib/shell-refresh-routes-lite 2018-05-04 12:16:56 +01:00
George Oikonomou
2a1b4299b3
Merge pull request #484 from simonduq/contrib/nullrouting-nullnet-consistent-naming
Nullrouting: lowercase string description
2018-05-04 12:16:11 +01:00
Simon Duquennoy
1dd49c2ffb
Merge branch 'release-4.1' into contrib/nullrouting-nullnet-consistent-naming 2018-05-04 12:03:28 +02:00
Simon Duquennoy
096e550967
Merge pull request #486 from nfi/contrib/coap-lwm2m-log-module-names
Shorter log module names for CoAP/LWM2M/DTLS for nicer log output
2018-05-04 12:03:18 +02:00
Niclas Finne
f6330996f7 dtls: shorter log module name for aligned log output 2018-05-04 11:11:17 +02:00
Niclas Finne
3c12738050 lwm2m: shorter log module names for aligned log output 2018-05-04 11:02:43 +02:00
Niclas Finne
5c4fad921e coap: shorter log module names for aligned log output 2018-05-04 11:02:37 +02:00
Niclas Finne
57ad48ca40 Added compile regression test for native rpl-border-router with RPL Classic 2018-05-04 10:43:23 +02:00