Commit Graph

619 Commits

Author SHA1 Message Date
George Oikonomou
aa016c3c29 Pull CPU-related configuration from the CPU header (Sky) 2017-12-08 17:07:32 +00:00
George Oikonomou
d7b426c105 Move user configuration to contiki-conf.h 2017-12-08 17:07:32 +00:00
George Oikonomou
ddd15692e1 Rename and restructure the msp430 constants header 2017-12-08 17:07:32 +00:00
George Oikonomou
fdb60ab22f Move non-configuration macros to msp430def.h 2017-12-08 16:59:02 +00:00
George Oikonomou
49cb138020 Provide header file with configuration for the msp430 2017-12-08 16:59:02 +00:00
George Oikonomou
4a129fefc6 Remove obsolete macro 2017-12-08 16:59:02 +00:00
George Oikonomou
abe583ed75 Harmonise platform configuration files (nrf52dk) 2017-12-08 16:59:02 +00:00
George Oikonomou
4bdc2f7513 Harmonise platform configuration files (jn516x) 2017-12-08 16:59:02 +00:00
George Oikonomou
da5d415bc1 Pull CPU-related configuration from the CPU header (Zoul) 2017-12-08 16:32:49 +00:00
George Oikonomou
458fbb1ee2 Pull CPU-related constants from the CPU header (Zoul) 2017-12-08 16:32:49 +00:00
George Oikonomou
369f58a60b Pull CPU-related configuration from the CPU header (OpenMote) 2017-12-08 16:32:49 +00:00
George Oikonomou
91c437e631 Pull CPU-related constants from the CPU header (OpenMote) 2017-12-08 16:32:49 +00:00
George Oikonomou
88feb34ec7 Pull CPU-related configuration from the CPU header (CC2538DK) 2017-12-08 16:32:49 +00:00
George Oikonomou
03435d826e Pull CPU-related constants from the CPU header (CC2538DK) 2017-12-08 16:32:49 +00:00
George Oikonomou
ba8f37bef4 Pull CPU-related constants from the CPU header (nrf52dk) 2017-12-08 16:32:49 +00:00
George Oikonomou
fb9c0beb37 Pull CPU-related configuration from the CPU header (CC13xx/CC26xx) 2017-12-06 16:00:46 +00:00
George Oikonomou
5c07cb02a8 Pull CPU-related constants from the CPU header (CC13xx/CC26xx) 2017-12-06 16:00:46 +00:00
George Oikonomou
fdde5dc669 Provide header file with configuration common to all CC26xx-based platforms 2017-12-06 16:00:46 +00:00
George Oikonomou
ea2fb7bcc1 Provide header file with configuration common to all CC2538-based platforms 2017-12-06 16:00:46 +00:00
George Oikonomou
d66633ffc4 Provide header file with defines for the CC2538 2017-12-06 16:00:46 +00:00
George Oikonomou
945c66b7f8 Provide header file with defines for the CC13xx/CC26xx 2017-12-06 16:00:46 +00:00
George Oikonomou
4b4234db40 Provide header file with defines for the nrf52832 2017-12-06 16:00:46 +00:00
George Oikonomou
a05db7322d Provide header file with configuration common to all CM4-based CPUs 2017-12-06 16:00:46 +00:00
George Oikonomou
3a0ea73310 Provide header file with configuration common to all CM3-based CPUs 2017-12-06 16:00:46 +00:00
George Oikonomou
3bb60074df Provide header file with configuration common to all Arm CPUs 2017-12-06 16:00:46 +00:00
Simon Duquennoy
e795517750
Merge branch 'develop' into contrib/stack-guard 2017-12-05 15:16:54 +01:00
George Oikonomou
fdb4d8f24a Use the CM4 common build instrastructure for nrf52832 2017-12-03 15:04:11 +00:00
George Oikonomou
238962d528 Use the CM3 common Makefile to build CC13xx/CC26xx-based platforms 2017-12-03 15:04:11 +00:00
George Oikonomou
64c310bf2a Use the CM3 common Makefile to build CC2538-based platforms 2017-12-03 15:04:11 +00:00
George Oikonomou
e458240200 Change asm() to __asm()
This is required in order to compile with -std=c99
2017-12-03 15:04:10 +00:00
George Oikonomou
1e18f090ac Add Makefile for all CM3 CPUs 2017-12-03 15:04:10 +00:00
George Oikonomou
92c572bf76 Add Makefile for all CM4 CPUs 2017-12-03 15:04:10 +00:00
George Oikonomou
6333e3b8f7 Move CMSIS arm/cortex-m and add Makefile 2017-12-03 15:04:00 +00:00
George Oikonomou
9aa9a05b93 Add Makefile for all Arm CPUs 2017-12-03 15:03:37 +00:00
George Oikonomou
e6915a25ee Add missing copyright header 2017-12-03 00:14:08 +00:00
George Oikonomou
0870ade055 Restructure docs for the nrf52832 2017-12-03 00:14:08 +00:00
George Oikonomou
bb18bd4a48 Restructure docs for the CC13xx/CC26xx CPUs 2017-12-03 00:05:12 +00:00
George Oikonomou
618ca50fe7 Restructure docs for the CC2538 CPU 2017-12-03 00:05:12 +00:00
George Oikonomou
4324bce6b0 Re-structure OpenMote-CC2538 documentation 2017-12-03 00:05:12 +00:00
George Oikonomou
c316f4afbd Re-structure zoul documentation 2017-12-03 00:05:12 +00:00
George Oikonomou
d4680c656a Create doxygen groups for platforms
* Cooja
* Native
* jn516x
* nrf52dk
2017-12-03 00:05:12 +00:00
George Oikonomou
f25318b60d Create doxygen groups for CPUs
* CC2538
* CC13xx-CC26xx
* nrf52832
2017-12-03 00:05:11 +00:00
George Oikonomou
c8ecd201f5 Tidy-up CMSIS documentation
Define the group within the CMSIS dir and rename a doxygen group that was not displaying correctly in the built docs
2017-12-02 23:30:48 +00:00
George Oikonomou
1b87b86f2e Create doxygen group for ARM CPUs 2017-12-02 23:30:47 +00:00
George Oikonomou
e84eb8247b Remove doxygen groups for obsolete CPUs and platforms 2017-12-02 23:30:47 +00:00
Joakim Eriksson
8cefc3ea39 added some missing NRF52 scripts for flashing and fixed baudrate to be 115200 2017-12-01 23:34:16 +01:00
Atis Elsts
f9516eae73 Add stack check library and example 2017-12-01 13:35:06 +00:00
George Oikonomou
cbecd8c122 Add CC13xx/CC26xx CMSIS support 2017-11-27 11:19:31 +00:00
George Oikonomou
4d92c63194 Fix MODULES for the CC2538
This commit fixes two bugs related to the usage of MODULES for CC2538-based platforms:

* newlib is no longer under `lib/newlib` but under `os/lib/newlib`.
* There is no such thing as `sys` under `arm/common`, so this module is removed.
2017-11-26 22:08:25 +00:00
alexstanoev
9bbc9202a4 Add JTAG interface configuration in contiki-conf.h for CCxx platforms
This adds a new toggle to `contiki-conf.h` which controls access to the
JTAG debug interface on CC26xx/CC13xx platforms.
2017-11-26 18:13:03 +00:00
George Oikonomou
390a4849df Don't disable the debug interface by default
This commit updates both CCxxwares to latest version. In this latest version, we revert two older commits that disable the debug interface by default in `ccfg.c` in the two respective submodules.
2017-11-26 16:50:58 +00:00
Xenofon (Fontas) Fafoutis
b415d57a99 enhanced BLE support for cc26xx-cc13xx 2017-11-25 16:53:23 +00:00
George Oikonomou
065bad280d Adjust return types of JN516x-specific slip implementation 2017-11-24 12:31:21 +00:00
Atis Elsts
f43e114a24 cc26xx ieee-mode.c: limit the time spend in waiting for transmissions to finish 2017-11-23 15:51:26 +00:00
Simon Duquennoy
bc741c00cc cc2538 platforms: initialize linkaddr in phase 2 but set RF params only in phase 3 2017-11-23 05:19:00 -08:00
Simon Duquennoy
faf526b441
Merge branch 'develop' into contrib/remove-mt 2017-11-17 19:40:06 +01:00
Simon Duquennoy
8f7b8cd23e Removing unused Cooja MT functions 2017-11-17 08:24:10 -08:00
Atis Elsts
02c065db69 add deep sleep tracking for CC26xx 2017-11-15 12:17:53 +00:00
Atis Elsts
7b26ead9de add deep sleep tracking for CC2538 2017-11-15 12:17:44 +00:00
Joakim Eriksson
d71559d153
Merge branch 'develop' into contrib/disable-annotate 2017-11-14 22:53:18 +01:00
George Oikonomou
917c4c87de Remove LED undefs 2017-11-12 11:58:35 +00:00
Simon Duquennoy
0952960b91 Removing multi-threading support 2017-11-11 15:28:11 +01:00
Simon Duquennoy
3572ab1f4f Platform cooja: disable TCPIP annotations by default 2017-11-10 23:46:51 +01:00
George Oikonomou
6212359628 Remove obsolete sensors from the native platform
The native platform code has a number of sensor drivers, all of which appear to be stubs and/or unused. This commit removes them.

Even though the platform doesn't have LEDs, we leave this one intact so that LED-using examples can still build.
2017-11-10 15:11:18 +00:00
Niclas Finne
5c6117e698 Platform native: Avoid trying to use the tun when the tun is not available.
This allows a native platform application to run without network.
2017-11-02 01:32:51 +01:00
George Oikonomou
ec77214226 Remove obsolete SLIP_foo_CONF_NO_PUTCHAR 2017-11-01 10:04:48 +00:00
Simon Duquennoy
1275c4cb9e
Merge pull request #139 from nfi/contrib/energest-deep-lpm
New energest type for deep sleep plus configurable type for Energest time source
2017-10-31 23:24:12 +01:00
George Oikonomou
a05a6b59d0 Remove all unnecessary BAUD2UBR macro definitions 2017-10-31 21:56:38 +00:00
George Oikonomou
73544572cf Change all calls to adhere to new prototype 2017-10-31 21:56:38 +00:00
George Oikonomou
aa07073acd Change all slip_arch_init implementations 2017-10-31 21:56:38 +00:00
George Oikonomou
6d0f43f291 Remove stub instances of uart1.h
Some platforms provide this header file because some examples used to assume its presence. Now that the examples no longer make this assumption, those stub headers are no longer required.
2017-10-31 21:56:38 +00:00
Niclas Finne
e6ba2664b8 energest: removed include of energest from contiki.h to avoid circular dependency 2017-10-31 22:18:17 +01:00
Niclas Finne
1c4622bad6 energest: Added new energest type ENERGEST_TYPE_DEEP_LPM to support
energy estimations of both sleep and deep sleep CPU modes.

Added configurable type ENERGEST_TIME_T to re-add support for clocks with
wrapping time as energest time source.
2017-10-31 22:17:30 +01:00
Simon Duquennoy
d9ae1118ef
Merge pull request #137 from simonduq/pr/logging-fixes
Minor logging fixes
2017-10-31 22:04:46 +01:00
Simon Duquennoy
646764b128 Platform native: print global IPv6 at init 2017-10-31 18:59:53 +01:00
Simon Duquennoy
5c1ad6e394 Use logging module for tun6-net 2017-10-31 16:15:51 +01:00
George Oikonomou
26d5efb784 Re-arrange the CC26xx startup sequence 2017-10-29 23:18:39 +00:00
George Oikonomou
fd38d85c6e Fix compile error for the Cooja platform 2017-10-29 23:18:39 +00:00
George Oikonomou
5fb10c5665 Add missing include 2017-10-29 23:18:39 +00:00
Simon Duquennoy
56d1f795ff Minor fixes to platform initialization 2017-10-29 23:18:38 +00:00
Simon Duquennoy
ff4ad7998a cc2538 platform.c: set link-layer address in phase two, as the Netstack initialization code needs it 2017-10-29 23:18:38 +00:00
Simon Duquennoy
7abc331047 cc2538 platforms: do not set Main log level from contiki-conf 2017-10-29 23:18:38 +00:00
George Oikonomou
f15b11b564 Change default logging level to NONE 2017-10-29 23:18:38 +00:00
George Oikonomou
91afb507b4 Use the logging module (CC2538DK) 2017-10-29 23:18:38 +00:00
George Oikonomou
463230d739 Use the logging module (JN516x) 2017-10-29 23:18:38 +00:00
George Oikonomou
edaa0c29cd Use the logging module (Native) 2017-10-29 23:18:38 +00:00
George Oikonomou
2430dd9f5a Use the logging module (nrf52dk) 2017-10-29 23:18:38 +00:00
George Oikonomou
59e5ec6860 Use the logging module (Openmote) 2017-10-29 23:18:37 +00:00
George Oikonomou
82b6875e62 Use the logging module (Sky) 2017-10-29 23:18:37 +00:00
George Oikonomou
6c8294b1e6 Use the logging module (CC26xx/CC13xx) 2017-10-29 23:18:37 +00:00
George Oikonomou
248db78214 Use the logging module (Zoul) 2017-10-29 23:18:37 +00:00
George Oikonomou
fec382602b Use the logging module (CC2538 SoC) 2017-10-29 23:18:37 +00:00
George Oikonomou
7b3f77ac2e Remove leftover includes 2017-10-29 23:18:37 +00:00
George Oikonomou
d7e78df728 Remove leftover call 2017-10-29 23:18:37 +00:00
George Oikonomou
36a22c5d33 Rename function to better match what it actually does 2017-10-29 23:18:36 +00:00
George Oikonomou
8de3ffbc2e Don't initialise the queuebuf unconditionally
Currently, it is only used by 6LoWPAN when fragmentation is enabled, by TSCH and by CSMA. Platforms that disable fragmentation and choose a different MAC layer (e.g. NULLMAC) will unnecessarily end up with the module linked in the image, wasting flash and/or RAM space.
2017-10-29 23:18:36 +00:00
George Oikonomou
3a1d362549 Provide boot sequence hooks (Native) 2017-10-29 23:18:36 +00:00
George Oikonomou
c41cd3b75e Provide boot sequence hooks (jn516x) 2017-10-29 23:18:36 +00:00
George Oikonomou
902b8154b7 Provide boot sequence hooks (Sky) 2017-10-29 23:18:36 +00:00
George Oikonomou
543f5ff1cd Provide boot sequence hooks (nrf52dk) 2017-10-29 23:18:35 +00:00
George Oikonomou
fd239a32c3 Provide boot sequence hooks (Zoul) 2017-10-29 23:18:35 +00:00
George Oikonomou
47f02608c3 Provide boot sequence hooks (OpenMote) 2017-10-29 23:18:35 +00:00
George Oikonomou
61d9ec3c35 Provide boot sequence hooks (CC2538DK) 2017-10-29 23:18:35 +00:00
George Oikonomou
827acf4770 Implement common early-stage init for all CC2538-based platforms 2017-10-29 23:18:35 +00:00
George Oikonomou
db87b3c858 Provide boot sequence hooks (CC13xx-CC26xx) 2017-10-29 23:18:35 +00:00
Niclas Finne
21f2c22da4 Updated make rules for MSPSim as submodule to Cooja 2017-10-18 20:40:13 +02:00
Simon Duquennoy
882be25428 Merge pull request #94 from simonduq/pr/misc
Miscellaneous fixes
2017-10-14 09:24:45 +02:00
Simon Duquennoy
4d8277366d Merge pull request #97 from sics-iot/contrib/cleanup-energest
Made energest more configurable
2017-10-14 09:24:14 +02:00
Niclas Finne
358385b450 Removed obsolete radio-sensor API 2017-10-13 01:06:47 +02:00
Niclas Finne
18b5f6d667 energest: made energest more configurable
* energest time defaults to rtimer but can be configured via
  ENERGEST_CONF_CURRENT_TIME and ENERGEST_CONF_SECOND.

* Additional energest types can be added by platform and application
  using ENERGEST_CONF_PLATFORM_ADDITIONS and ENERGEST_CONF_ADDITIONS.

* Energest times are now 64 bit and thereby non-wrapping in most systems.

* Removed unused energest types for serial and sensors.
2017-10-13 00:17:30 +02:00
Niclas Finne
888a04e70f energest: removed support for ENERGEST_CONF_LEVELDEVICE_LEVELS 2017-10-13 00:05:31 +02:00
Niclas Finne
fafe4bb1f3 energest: replaced some energest on/off with ENERGEST_SWITCH() 2017-10-12 23:59:11 +02:00
Niclas Finne
7317316942 energest: removed energest type ENERGEST_TYPE_IRQ 2017-10-12 23:57:38 +02:00
Niclas Finne
8b930bfa06 energest: removed energest types for reading/writing flash 2017-10-12 23:53:31 +02:00
Simon Duquennoy
663d1f121d Autoconfigure Orchestra whenever the module is included 2017-10-12 18:32:19 +02:00
Simon Duquennoy
9cb34c85c0 TSCH: more automated configuration 2017-10-12 17:09:19 +02:00
Simon Duquennoy
09c0213898 Auto-enable USB serial on cc2538 when TSCH is used with SLIP or with the shell 2017-10-12 17:09:04 +02:00
Simon Duquennoy
a1f74d6568 Shell: start automatically whenver the module is included 2017-10-12 17:08:42 +02:00
Simon Duquennoy
a8e952096b Makefile.cooja: remove now uneeded duplicate later configuration 2017-10-12 08:47:01 +02:00
Simon Duquennoy
41967732b1 Added MAKE_ROUTING make variable for cleaner routing protocol selection 2017-10-12 08:42:42 +02:00
Simon Duquennoy
91b8ee860e Makefile.include: added target 'boards' to show the list of boards available for the current target 2017-10-10 21:06:35 +02:00
George Oikonomou
75ed5a03a6 Build CC2538 USB functionality from within our own CPU dir 2017-10-10 21:04:28 +02:00
George Oikonomou
bf4dd68be3 Remove cpu/cc253x
This was used by platform CC2530DK which has been removed.
2017-10-10 21:04:26 +02:00
George Oikonomou
8050864226 Move USB sourcefiles to the CC2538 CPU dir
Previously, the CC2538 port would compile USB-related files from their original location under the CC2531 CPU dir. We are now removing the latter, but we need to keep those files.
2017-10-10 21:04:23 +02:00
George Oikonomou
f6dcadbc4a Include "contiki.h" to pull in platform/example configuration 2017-10-08 17:03:05 +01:00
George Oikonomou
82a1212f2b Relax platform configuration for 6lowpan fragmentation 2017-10-08 17:03:04 +01:00
George Oikonomou
5e13874850 Move inclusion of project-conf.h to the top of contiki-conf.h 2017-10-08 16:50:25 +01:00
Simon Duquennoy
9acb4c895a tun6-net warning message 2017-10-08 15:01:36 +02:00
Simon Duquennoy
fb0de6dd7a Various fixes to netstack config 2017-10-08 14:47:34 +02:00
Joakim Eriksson
db344197d4 added warning on native when not running sudo / not able to allocate tun 2017-10-08 09:55:49 +02:00
Joakim Eriksson
40f189a3a3 removed NETSTACK_CONF_MAC_OTHER 2017-10-08 00:46:57 +02:00
Joakim Eriksson
5d87cd1b5f moved the MAKE_NET code in makefile include so that platform makefiles are before decisions 2017-10-08 00:46:57 +02:00
Joakim Eriksson
1143d6f5aa addressed some of the suggestions on the PR - naming and netstack MAC 2017-10-08 00:44:02 +02:00
Joakim Eriksson
8cf65ed01a changed NETSTACK configuration on network layer 2017-10-08 00:44:02 +02:00
Joakim Eriksson
1b2b043f24 fixed nullnet and its examples 2017-10-08 00:44:02 +02:00
Joakim Eriksson
3091a9010a added tun6 interface for native - removed old codebase for tap/tun/wpcap 2017-10-08 00:44:02 +02:00
Joakim Eriksson
dd1dd89c11 fixed include file to not declare send function 2017-10-08 00:44:02 +02:00
Joakim Eriksson
48049f120c fixed compilation issue on cooja-net driver 2017-10-08 00:44:02 +02:00
Joakim Eriksson
4aaf680c5b fixed some compilation issues cause by removing tcpip-output callback 2017-10-08 00:44:02 +02:00
Simon Duquennoy
a92319bbca Rename PROJECT_CONF_H to PROJECT_CONF_PATH for clarity and so as to avoid possible conflicts with guards in project-conf.h files 2017-10-07 09:45:41 +02:00
Simon Duquennoy
68d75edfd2 Merge pull request #84 from sics-iot/pr/ncurses
Platform native: do not lib ncurses
2017-10-07 08:19:39 +02:00
Simon Duquennoy
9b5d6e834a Platform native: do not link ncurses 2017-10-06 18:13:33 +02:00
Simon Duquennoy
25d69965a4 Move some readme files to wiki 2017-10-06 16:28:26 +02:00
Simon Duquennoy
c43da309d0 Merge pull request #80 from sics-iot/pr/doxygen-modules
Rework Doxygen modules
2017-10-02 14:13:43 +02:00
Simon Duquennoy
14779f29f8 Rework Doxygen modules 2017-09-29 22:18:48 +02:00
Simon Duquennoy
f9e3e7efcc Removing platform cooja-ip64 2017-09-29 15:02:34 +02:00
Simon Duquennoy
543408db68 Re-organzie ip stack implementation 2017-09-22 17:09:54 +02:00
Simon Duquennoy
d9f9138ed2 Added NullNet, a network layer for non-IP-enabled cases 2017-09-22 14:34:20 +02:00
Simon Duquennoy
0aa44c3c22 Homogenize NET layer config with MAC 2017-09-22 14:34:20 +02:00
Simon Duquennoy
1a8f04effc TSCH: move platform-specific configuration flags to platform configuration files 2017-09-22 14:34:20 +02:00
Simon Duquennoy
ffc94f832c MAC layer configuration done from Makefile instead of .h files 2017-09-22 14:34:20 +02:00
Simon Duquennoy
688c6ee114 TSCH: comment on how the TSCH base drift is computed 2017-09-11 15:07:17 +09:00
Simon Duquennoy
0f92c6ebfd Include contiki.h instead of contiki-conf.h so as to ensure consistent inclusion of contiki-default-conf.h 2017-09-08 14:20:59 +02:00
Simon Duquennoy
5fcb2c9442 Only include cfs module in platforms that support cfs 2017-09-02 09:16:32 +02:00
Niclas Finne
2165978d14 Moved cfs-posix to native platform 2017-09-01 17:22:11 +02:00
Niclas Finne
2c86194ef8 Renamed core to os 2017-09-01 15:29:00 +02:00
766f0766e6 Removed platform Galileo 2017-08-31 15:58:56 +02:00
Simon Duquennoy
38ce63a614 jn516x: minor fixes 2017-07-11 15:44:48 +02:00
Simon Duquennoy
385d709f3c cc2538 TSCH: set base drift to compensate for inaccuracy of running a 32k timer 2017-07-11 15:44:24 +02:00
Simon Duquennoy
ac31def1ce Native platform contiki-conf.h: removed unused configuration flags 2017-07-06 10:01:56 +02:00
Simon Duquennoy
dc9e77eaf2 Simplify CSMA configuration 2017-07-06 10:01:56 +02:00
Simon Duquennoy
9a0087faf3 Simplify configuration through more suitable defaults, and removed unused features. Cleanup many configuration files. 2017-07-06 10:01:55 +02:00
Simon Duquennoy
1469268d32 Rework naming and configuration of sicslowpan compression levels 2017-07-05 19:48:42 +02:00
Simon Duquennoy
ffdbbb3084 Rename NETSTCK_ROUTING_STATE_SIZE to NETSTACK_MAX_ROUTE_ENTRIES, fix rpl-udp example accordingly 2017-06-30 18:03:58 +02:00
Simon Duquennoy
5df65382b3 rpl-lite: added state to DAG and only start advertising once reachable, added poisoning and leaving after a delay, improved management of DAG expiration 2017-06-29 16:53:17 +02:00
Simon Duquennoy
bf5bea583e Disable TCP by default, homogenize UDP and TCP connections config 2017-06-29 16:46:29 +02:00
Simon Duquennoy
f64ec24c9b Rename CONTIKI_NETWORK_DENSITY and CONTIKI_NETWORK_SIZE to NBR_TABLE_CONF_MAX_NEIGHBORS and NETSTCK_ROUTING_STATE_SIZE 2017-06-29 16:46:23 +02:00
Simon Duquennoy
a6643a9835 Added RPL-lite, a lightweight implementation of RPL. This is the new default. 2017-06-29 16:46:07 +02:00
Nicolas Tsiftes
9bb51087bf Renamed the drivers directory to arch to reflect that this is the main place for architecture-dependent functionality. 2017-06-28 16:20:43 +02:00