Commit Graph

14509 Commits

Author SHA1 Message Date
George Oikonomou c5a434acea
Merge pull request #653 from onefreebjy/ti-cc2640r2-ble5
Add Bluetooth 5 functionalities to CC2640R2
2018-09-12 23:11:02 +01:00
Jinyan BAI 22718bae34 Edit comments to pass doxygen test 2018-09-12 22:44:33 +01:00
George Oikonomou 0f42e81538
Merge branch 'develop' into ti-cc2640r2-ble5 2018-09-12 12:24:12 +01:00
George Oikonomou 44bb771e56
Merge pull request #609 from tiepettersen/contrib/ti-simplelink
TI CC13xx/CC26xx SimpleLink platform
2018-09-12 12:08:46 +01:00
Edvard Pettersen a7352dc747 Merge branch 'develop' into contrib/ti-simplelink 2018-09-12 12:39:18 +02:00
George Oikonomou 4dcdf45a79
Merge pull request #652 from onefreebjy/ti-cc2640r2
Add support for TI's CC2640R2
2018-09-12 11:00:22 +01:00
Edvard Pettersen 113302d1bc Fixed wrong filename include
Will only trigger an error on case-sensitive systems
2018-09-12 09:50:19 +02:00
Edvard Pettersen 5ea0c80ae1
Merge branch 'develop' into contrib/ti-simplelink 2018-09-12 09:27:43 +02:00
Jinyan BAI a4598b2660 add missing ';' 2018-09-12 00:31:39 +01:00
Jinyan BAI 7acf0bff18 use non-ROM variant functions
since the ROM ones are no longer supported in cc2640r2sdk
2018-09-11 23:42:36 +01:00
Jinyan BAI b82851568f get rid of undeclared identifier 2018-09-11 19:17:26 +01:00
Edvard Pettersen 02fc8fdede Merge branch 'contrib/ti-simplelink' of https://github.com/tiepettersen/contiki-ng into contrib/ti-simplelink 2018-09-11 17:51:54 +02:00
Edvard Pettersen dee1584312 Added missing button defines for sensortag/cc2650 Board 2018-09-11 17:50:11 +02:00
Edvard Pettersen e212fd31fe Added missing defines for PLATFORM_HAS_* 2018-09-11 17:39:17 +02:00
Edvard Pettersen 84384d5efc Added missing LED define in sensortag/cc1350 Board 2018-09-11 16:45:21 +02:00
Jinyan BAI 46eca2ee25 Fix some code style problems 2018-09-11 15:23:34 +01:00
Jinyan BAI 9406f5b5d9 BLE5 support for CC2640R2 2018-09-11 12:45:29 +01:00
Jinyan BAI 3ece31be30 add support for TI's CC2640R2 2018-09-11 12:43:27 +01:00
Edvard Pettersen 86232c86f9 Expanded travis builds with SimpleLink platform
In addition, some small grammar fixes and slight bugfix in
Makefile.simplelink
2018-09-11 13:17:21 +02:00
George Oikonomou 5e9cbceee0
Merge pull request #627 from g-oikonomou/contrib/cc2538-bsl/cc2640r2
Update cc2538-bsl to latest version
2018-09-11 10:45:23 +01:00
George Oikonomou 8bc8f8deee
Merge branch 'develop' into contrib/cc2538-bsl/cc2640r2 2018-09-10 22:06:01 +01:00
George Oikonomou 8ae255c586
Merge pull request #645 from afonsomota/develop
Add qualifier const to ip addresses in uip-ds6-route methods
2018-09-10 22:05:39 +01:00
Afonso Oliveira 4024d3aebc Merge branch 'develop' of https://github.com/afonsomota/contiki-ng into develop 2018-09-10 10:49:55 +01:00
Afonso Oliveira 1e7e721395 correct identation 2018-09-10 10:49:06 +01:00
Afonso Oliveira 81429bf499 Merge branch 'develop' of https://github.com/contiki-ng/contiki-ng into develop 2018-09-10 10:42:48 +01:00
Simon Duquennoy 4380fdd67e
Merge branch 'develop' into contrib/cc2538-bsl/cc2640r2 2018-09-10 10:45:51 +02:00
George Oikonomou 6bb2b2b851
Merge pull request #578 from simonduq/contrib/nightly-runs
Nightly testbed runs
2018-09-10 09:44:21 +01:00
George Oikonomou 83dd2ff10e
Merge branch 'develop' into contrib/nightly-runs 2018-09-10 09:10:02 +01:00
George Oikonomou 6481db2af4
Merge pull request #646 from g-oikonomou/bugfix/rpl-classic-sky
Fix RPL classic compilation for TARGET sky
2018-09-09 23:37:17 +01:00
George Oikonomou 0ba242dbb8
Merge branch 'develop' into bugfix/rpl-classic-sky 2018-09-09 22:32:20 +01:00
George Oikonomou 898ab61874
Merge pull request #650 from atiselsts/bugfix/buildall-launchpad-cc1310
Bugfix in the build-all.sh script: there is also launchpad/cc1310 board
2018-09-09 22:32:03 +01:00
Afonso Oliveira 42be17c8bc
Merge branch 'develop' into develop 2018-09-09 22:07:36 +01:00
Atis Elsts dc294cbabb build-all.sh: there is also launchpad/cc1310 board 2018-09-09 21:49:10 +01:00
Atis Elsts b774736f35 Add link stat packet counters 2018-09-09 21:43:40 +01:00
George Oikonomou bf9fa6d34f Fix multicast engine stats extension usage 2018-09-09 20:25:21 +01:00
George Oikonomou bce7164827 Fix RPL classic compilation for TARGET sky 2018-09-09 20:10:53 +01:00
George Oikonomou 20c5e968b4
Merge pull request #621 from tdesmet/validate-dio-before-init-dag
Add option to validate dio before init dag
2018-09-08 21:15:34 +01:00
George Oikonomou 92b323c7d1
Merge branch 'develop' into validate-dio-before-init-dag 2018-09-08 11:27:04 +01:00
George Oikonomou 1361f7d874
Merge pull request #634 from tdesmet/update-tinydtls
Bump tinydtls to latest commit
2018-09-08 11:13:51 +01:00
Afonso Oliveira 71250c4f2e
Merge branch 'develop' into develop 2018-09-08 10:27:39 +01:00
George Oikonomou 8e7d75435f
Merge branch 'develop' into update-tinydtls 2018-09-08 09:59:45 +01:00
George Oikonomou dedf033668
Merge pull request #629 from arurke/bug/set-correct-dns-record-expiration
Set correct DNS record expiration time
2018-09-08 09:59:32 +01:00
Afonso Oliveira 26eb0524a1 Merge branch 'develop' of https://github.com/afonsomota/contiki-ng into develop 2018-09-08 01:15:54 +01:00
Afonso Oliveira 65f34ad893 Merge branch 'develop' of https://github.com/contiki-ng/contiki-ng into develop 2018-09-08 01:15:21 +01:00
Afonso Oliveira f6fff896fc add const qualifier to tests that require it 2018-09-08 01:14:22 +01:00
George Oikonomou 84be48ae32
Merge branch 'develop' into bug/set-correct-dns-record-expiration 2018-09-08 01:00:29 +01:00
George Oikonomou a77d805bfb
Merge pull request #635 from lafka/lafka-rpl-probing-guard
RPL-CLASSIC: Add guard for urgent probing
2018-09-08 00:59:27 +01:00
Afonso Oliveira a3ccbbe994 Merge branch 'develop' of https://github.com/contiki-ng/contiki-ng into develop 2018-09-08 00:14:23 +01:00
Afonso Oliveira c58774c612
Merge branch 'develop' into develop 2018-09-08 00:13:41 +01:00
George Oikonomou cb6dd29e4a
Merge branch 'develop' into lafka-rpl-probing-guard 2018-09-08 00:08:44 +01:00