Commit Graph

13932 Commits

Author SHA1 Message Date
Simon Duquennoy
981c8fbe30 Fix uip6 log 2018-05-13 06:41:35 -07:00
Simon Duquennoy
9de0f76b83 Merge remote-tracking branch 'origin/develop' into contrib/sicslowpan 2018-05-13 06:41:12 -07:00
Simon Duquennoy
3f2d3ebc48
Merge pull request #510 from g-oikonomou/bugfix/tools/baudrates
Add missing case statement
2018-05-12 22:42:06 +02:00
Simon Duquennoy
90ee1aff43
Merge branch 'develop' into bugfix/tools/baudrates 2018-05-12 20:37:59 +02:00
Simon Duquennoy
b6d12670cf
Merge pull request #511 from g-oikonomou/contrib/build/usage
Extend usage string
2018-05-12 20:37:25 +02:00
George Oikonomou
32bdb70afa Extend usage string 2018-05-12 17:06:28 +01:00
George Oikonomou
fd379cd50b Add missing case statement 2018-05-12 15:19:33 +01:00
Simon Duquennoy
29c121403e
Merge pull request #507 from kkrentz/short-pr
Support for IEEE 802.15.4 short addresses
2018-05-12 15:41:02 +02:00
Simon Duquennoy
67dba23b4e
Merge branch 'develop' into short-pr 2018-05-12 14:53:45 +02:00
George Oikonomou
54f51d5213
Merge pull request #509 from kkrentz/dead-pr
Removing dead code
2018-05-12 13:42:50 +01:00
Simon Duquennoy
66c6289db6
Merge branch 'develop' into dead-pr 2018-05-12 13:31:04 +02:00
Simon Duquennoy
e3e081ae31
Merge pull request #504 from simonduq/fix/rpl-urgent-probing
RPL urgent probing fix
2018-05-12 13:14:23 +02:00
kkrentz
83b028af28 linkaddr: Removed linkaddr_extended_t 2018-05-12 04:00:24 -07:00
kkrentz
1c54e8d7d7 packetbuf: Removed attribute KEY_SOURCE_BYTES_0_1 2018-05-12 04:00:14 -07:00
kkrentz
b13d1bc526 AES-128: Removed unused function 2018-05-12 04:00:05 -07:00
kkrentz
4ba95b0768 uip-ds6.c: Compacted code for deriving IIDs from short addresses 2018-05-12 02:42:53 -07:00
kkrentz
21dd6209ff uip: Support for IEEE 802.15.4 short addresses 2018-05-12 02:29:33 -07:00
Simon Duquennoy
1963c43fad
Merge branch 'develop' into fix/rpl-urgent-probing 2018-05-12 09:59:51 +02:00
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