George Oikonomou
b6aac6b008
Don't define NULL internally
2017-12-22 16:42:54 +02:00
George Oikonomou
f56822e968
Include contiki.h to pull in possible configuration
2017-12-22 16:42:54 +02:00
George Oikonomou
c117872d6c
Merge pull request #270 from simonduq/contrib/br-as-a-module
...
Making RPL Border Router an OS module
2017-12-22 16:42:09 +02:00
George Oikonomou
da33b56778
Merge branch 'develop' into contrib/br-as-a-module
2017-12-22 15:26:14 +02:00
Simon Duquennoy
fa765e67b0
JN516x: fix SLIP configuration
2017-12-22 05:21:39 -08:00
Simon Duquennoy
7f1dd819ef
RPL BR: remove platform-specific code for sky. Add putchar with SLIP support to arch, like in other platforms
2017-12-22 05:21:39 -08:00
Simon Duquennoy
91ca67d393
CI: minor printout fix
2017-12-22 05:21:39 -08:00
Simon Duquennoy
6de6e15ce7
Move RPL border router from example to os/services
2017-12-22 05:21:39 -08:00
Simon Duquennoy
89c4f5e509
RPL BR: rework such as the main .c file defines its own process
2017-12-22 05:21:39 -08:00
Simon Duquennoy
070b493391
Automatically include module-macros.h when provided by modules
2017-12-22 05:21:39 -08:00
Simon Duquennoy
cf262c57c8
RPL BR and slip-radio: use c flag '-imacros' to include module-specific defines
2017-12-22 05:21:39 -08:00
Simon Duquennoy
e63d428a91
RPL BR: more rafactoring: move project-conf and sky module to project top-level
2017-12-22 05:21:39 -08:00
Simon Duquennoy
81d1b1bd80
PROJECTDIR now turned into modules via MODULES_REL
2017-12-22 05:21:39 -08:00
Simon Duquennoy
a0961ac2a1
Build system: automatically include Makefiles from PROJECTDIRS
2017-12-22 05:21:39 -08:00
Simon Duquennoy
c2d301a434
Remove unnecessary '-' before inclusion of Makefile.identify-target
2017-12-22 05:21:39 -08:00
Simon Duquennoy
e744f0a505
Refactor rpl-border-router makefile
2017-12-22 05:21:39 -08:00
Simon Duquennoy
2fd6fa1fd6
Automatically compile .c files from PROJECTDIRS
2017-12-22 05:21:39 -08:00
Simon Duquennoy
84ea0971bc
Remove obsolete flag AUTOSTART_ENABLE, as well as .co and .ce files
2017-12-22 05:21:39 -08:00
Simon Duquennoy
97727ffeb0
Merge pull request #253 from contiki-ng/contrib/update-cooja
...
Update Cooja submodule
2017-12-22 14:13:18 +01:00
Joakim Eriksson
abf1c76133
Merge branch 'develop' into contrib/update-cooja
2017-12-22 13:42:36 +01:00
Simon Duquennoy
624925d5bd
Merge pull request #268 from cetic/fix-rpl-address-selection
...
Always select a global address within the DODAG
2017-12-22 13:24:24 +01:00
Simon Duquennoy
62752fce63
Merge branch 'develop' into fix-rpl-address-selection
2017-12-22 11:48:14 +01:00
Simon Duquennoy
a6c45a7a1f
Merge pull request #266 from cetic/pr-native-updates
...
Various native platform updates
2017-12-22 11:48:05 +01:00
Laurent Deru
511497b3b6
Make uip_stats_t int instead of short for native
2017-12-22 11:23:39 +01:00
Laurent Deru
acbe590b52
Don't override UIP_CONF_BYTE_ORDER in contiki-conf.h for native platform
2017-12-22 11:23:39 +01:00
Laurent Deru
d0ca150a38
Document new native platform defines
2017-12-22 11:23:04 +01:00
Laurent Deru
c26aed5565
Always select a global address within the DODAG
2017-12-21 10:32:11 +01:00
Laurent Deru
9fe252d107
Make stdin select callback configurable
2017-12-20 14:15:29 +01:00
Laurent Deru
ca16bf1bd2
Make select timeout user configurable for native platform
2017-12-20 14:15:29 +01:00
Simon Duquennoy
be4535c49e
Merge pull request #240 from cetic/fix-ra-rdnss
...
RDNSS and DNSSL do not rely on O Flag
2017-12-20 13:14:11 +01:00
Simon Duquennoy
836249a8c8
Merge branch 'develop' into fix-ra-rdnss
2017-12-20 12:42:34 +01:00
Simon Duquennoy
686aaffaa0
Merge pull request #241 from cetic/fix-non-router-compilation
...
Fix compilation error when not in Router mode
2017-12-20 12:42:22 +01:00
Simon Duquennoy
7286491c16
Merge branch 'develop' into fix-ra-rdnss
2017-12-20 11:37:55 +01:00
Simon Duquennoy
8b14fc8d4a
Merge branch 'develop' into fix-non-router-compilation
2017-12-20 11:37:06 +01:00
Laurent Deru
425b463df8
Fix logic of RA flags related to RDNSS
2017-12-20 10:23:16 +01:00
Laurent Deru
4b43e4971b
Fix compilation error when not in Router mode
2017-12-20 10:14:11 +01:00
Simon Duquennoy
6339b64064
Update Cooja submodule
2017-12-20 01:12:14 -08:00
George Oikonomou
af82779300
Merge pull request #261 from g-oikonomou/bugfix/cc13xx-cc26xx/bootloader
...
Include board.h after configuration is fully known
2017-12-18 23:39:27 +00:00
George Oikonomou
3bbcc6288f
Include board.h after configuration is fully known
2017-12-18 16:50:40 +00:00
Simon Duquennoy
9024e4244c
Merge pull request #263 from simonduq/contrib/ci-artifacts
...
CI tests: cleaner compilation artifacts
2017-12-18 15:44:42 +01:00
Simon Duquennoy
c1be96e1e1
Merge branch 'develop' into contrib/ci-artifacts
2017-12-18 15:17:43 +01:00
Simon Duquennoy
26b94bc4c7
Merge pull request #262 from g-oikonomou/contrib/default-second-expansion
...
Link without using an archive file
2017-12-18 15:16:12 +01:00
Simon Duquennoy
7e5ab3bf7c
CI tests: cleaner compilation artifacts
2017-12-18 05:46:30 -08:00
George Oikonomou
38987352c4
Change variables to static
2017-12-17 22:24:48 +00:00
George Oikonomou
b5fa28e2d4
Link without using an archive file
...
For reasons discussed long ago and that have to do with how ld handles weak symbols, it was decided that it was preferable to link using an explicit list of object files, instead of adding object files to an archive first and then linking using this archive. This was applied for the CC2538, but not for CC13xx/CC26xx.
This pull applies this link logic to all CM3s. For this to work with the Contiki-NG build system, we need `.SECONDEXPANSION:`, so this pull moves that to the common CM3 Makefile.
2017-12-17 21:31:39 +00:00
Simon Duquennoy
fa1842ccb5
Merge pull request #258 from g-oikonomou/bugfix/nrf52dk-clean
...
Remove nrf52832.a on make clean
2017-12-17 17:16:00 +01:00
Simon Duquennoy
9877d14a94
Merge branch 'develop' into bugfix/nrf52dk-clean
2017-12-17 16:17:18 +01:00
Simon Duquennoy
8c3a379efe
Merge pull request #260 from g-oikonomou/contrib/tidyup-gitignore
...
Gitignore saved defines
2017-12-17 16:15:11 +01:00
George Oikonomou
53bbd6f2e8
Gitignore saved defines
2017-12-17 01:54:43 +00:00
George Oikonomou
14ad14e7d3
Remove nrf52832.a on make clean
...
When building for nrf52dk, `make clean` does not remove `nrf52832.a`. This commit fixes this.
2017-12-17 01:20:38 +00:00
