Commit Graph

414 Commits

Author SHA1 Message Date
Simon Duquennoy
a6d8c9cf3f
Merge branch 'develop' into contrib/build/cleanup 2018-04-04 10:02:57 +02:00
George Oikonomou
e3ac8c449c Adjust build system
* Remove lib from CONTIKI_TARGET_DIRS since we no longer have anything in this dir
* Build dbg.c (has been added)
* Do not build sprintf.c (has been removed)
* Add os/lib/dbg-io to MODULES
2018-04-03 22:49:41 +01:00
George Oikonomou
16f61bc769 Delete platform-specific implementation of stdio functions 2018-04-03 22:49:41 +01:00
George Oikonomou
f0315cf5c7 Implement dbg_putchar() and dbg_send_bytes()
Those two functions are needed so we can use os/lib/dbg-io for this platform. The old putchar() in slip.c is no longer needed.
2018-04-03 22:49:41 +01:00
George Oikonomou
76bcfcb8cc Move slip.c to top-level platform code dir 2018-04-03 22:49:41 +01:00
Simon Duquennoy
4b11f8c99e
Merge branch 'develop' into contrib/build/cleanup 2018-04-03 14:50:17 +02:00
Simon Duquennoy
1884fe9b0e
Merge branch 'develop' into contrib/jn516x/leftover-br 2018-04-03 14:22:57 +02:00
George Oikonomou
7872da3c9b Transition platform native to the new LED HAL 2018-04-02 22:14:55 +01:00
George Oikonomou
6857d2fe20 Implement the GPIO HAL for platform native 2018-04-02 22:14:55 +01:00
George Oikonomou
b8a43e8bf9 Implement the button HAL for platform native 2018-04-02 22:14:55 +01:00
George Oikonomou
4ededd17d6 Emulate interrupt manipulation on native 2018-04-02 22:13:56 +01:00
Simon Duquennoy
fb93316f21
Merge branch 'develop' into contrib/native/remove-typedefs 2018-04-02 20:33:24 +02:00
George Oikonomou
1d59a258ed Remove obsolete typedefs 2018-04-01 14:34:52 +01:00
George Oikonomou
b2438b4563 Enable putchar for all arm platforms
Instead of having to #undef putchar in every file where we want to use it, we undef it across the board. See the comment in arm-def.h as to why this needs done.
2018-03-30 22:20:48 +01:00
George Oikonomou
be2a818eaa Adjust nrf52832 compile output 2018-03-30 21:23:00 +01:00
George Oikonomou
c7e36a3d55 Change clean target to be more explicit
Previously, the clean target would delete a number of file extensions, many of which currently unknown to our build system (old platforms?). This commit changes the target so that it only cleans what we know we are building. Platforms / CPUs can append to the target with platform-specific build artifacts.
2018-03-30 21:22:59 +01:00
George Oikonomou
1d3122750a Define different mspsim-maptable per project
The rule is changed such that it makes sure the .map file gets built first. We have separate map files per project, so we need separate mspsim-maptables
2018-03-30 21:22:59 +01:00
George Oikonomou
16d8c5b4f9 Use a variable for the Contiki-NG archive file
Prevents having to hard-code the filename in multiple cpu/platform makefiles and allows us to easily rename it across the board in the future
2018-03-30 21:22:59 +01:00
George Oikonomou
87dfa61fd6 Use dbg.c from the CPU dir and delete platform file 2018-03-30 21:06:52 +01:00
George Oikonomou
ce540a8bca Harmonise filename pattern for the .map file
All map files are now called example-platform.map (e.g. hello-world-native.map).
2018-03-30 20:24:59 +01:00
George Oikonomou
04ca5fd46a Update doxygen content and structure 2018-03-30 15:24:04 +01:00
George Oikonomou
86b10b69aa Resolve multiple symbol definitions 2018-03-30 15:23:50 +01:00
George Oikonomou
1bf1f37b24 Build dbg-io as a module 2018-03-30 15:23:50 +01:00
George Oikonomou
6d592945a0 Use a single common dbg.h 2018-03-30 15:23:50 +01:00
George Oikonomou
40f6b1a2ba Rename files to resolve filename conflicts 2018-03-30 15:23:50 +01:00
George Oikonomou
ed3e2c850e Remove depedency to a debug-uart.h 2018-03-30 15:23:50 +01:00
George Oikonomou
bb338affeb Move dbg-io to os 2018-03-30 15:23:50 +01:00
George Oikonomou
a0e8b51950 Add license and copyright notice 2018-03-30 15:23:50 +01:00
George Oikonomou
89148eb030 Include contiki.h 2018-03-30 15:23:49 +01:00
George Oikonomou
888a99ed3c Move macros to top of file 2018-03-30 15:23:49 +01:00
George Oikonomou
4e3c7efa5f Fix code style 2018-03-30 15:23:49 +01:00
George Oikonomou
632ab90161 Apply cosmetic changes 2018-03-30 15:23:49 +01:00
George Oikonomou
8fb2b2074e Delete jn516x-specific BR example
#132 deleted other jn516x-specific BR examples, but this one was missed. This pull deletes the leftover example.

This is the only place where we are still using the obsolete `SLIP_BRIDGE_CONF_NO_PUTCHAR` define (all others were removed by #135). This pull removes that too.
2018-03-30 15:21:52 +01:00
Atis Elsts
a9e9d0f3ec CC26xx: increase size of the region reserved for stack from 256 bytes to 1024 bytes 2018-03-29 14:09:38 +01:00
George Oikonomou
4ff15877e5
Merge branch 'develop' into contrib/cooja-main 2018-03-24 16:08:14 +00:00
Simon Duquennoy
3ec52a3f8a
Merge branch 'develop' into bugfix/launchpad-leds 2018-03-24 13:07:49 +01:00
George Oikonomou
22b4a40dd6 Cross-platform MQTT client example 2018-03-23 22:35:28 +00:00
George Oikonomou
59df70fcd2 Fix launchpad LED colour mappings 2018-03-23 22:23:00 +00:00
Simon Duquennoy
59ebacd384 Platform Cooja: port to common main 2018-03-23 12:23:27 -07:00
Joakim Eriksson
0c31f4dd95
Merge branch 'develop' into wip/button-hal 2018-03-21 07:19:51 +01:00
George Oikonomou
dc8aa6aeca Fix link layer address retrieval from flash 2018-03-18 13:10:21 +00:00
George Oikonomou
155e2c9b0a Support both old and new button API in common examples
This change is temporary so travis can pass until all platforms have been migrated to the new API
2018-03-14 09:34:47 +00:00
George Oikonomou
a5ea8d44e9 Use the new button HAL: Zoul 2018-03-14 09:34:46 +00:00
George Oikonomou
d22ea1df99 Use the new button HAL: OpenMote-CC2538 2018-03-14 09:34:46 +00:00
George Oikonomou
974a7549e9 Use the new button HAL: CC2538DK 2018-03-14 09:34:46 +00:00
George Oikonomou
7bf6679806 Allow the GPIO HAL to enable corresponding port interrupt on the NVIC 2018-03-14 09:34:46 +00:00
George Oikonomou
1dcb8426d6 Use the button HAL for all CC13xx/CC26xx devices 2018-03-14 09:34:45 +00:00
George Oikonomou
8ac1cf92ce Implement the new button HAL: Sensortag 2018-03-14 09:34:45 +00:00
George Oikonomou
f199ff0a5f Implement the new button HAL: Launchpad 2018-03-14 09:34:45 +00:00
George Oikonomou
3f4fef4625 Implement the new button HAL: SmartRF06 + CC13xxEM/CC26xxEM 2018-03-14 09:34:44 +00:00
George Oikonomou
3014e8cf07 Start the sensors process conditionally
(Not all boards have sensors)
2018-03-14 09:34:44 +00:00
Simon Duquennoy
76773c7b13
Merge branch 'develop' into bugfix/cc13xx/prop-mode-pan-id 2018-03-14 09:20:38 +01:00
George Oikonomou
e2d5e2dfee Add missing includes 2018-03-13 22:47:45 +00:00
George Oikonomou
de975bbabe Move BLE readme to the corresponding example dir 2018-03-13 22:47:45 +00:00
Jaroslav Kysela
1575222e4e JN516x SDK 4170 build 1745 does not have vMMAC_SetChannel() function
- use only vMMAC_SetChannelAndPower()
- remove redundant call in init()
2018-03-13 20:10:52 +01:00
George Oikonomou
7859b3c189 Only print RADIO_PARAM_PAN_ID if the radio supports it 2018-03-12 15:26:43 +00:00
George Oikonomou
8624fa1601 Initialise variables explicitly 2018-03-12 15:17:47 +00:00
Simon Duquennoy
7fe4d913b7
Merge branch 'develop' into contrib/build-all 2018-03-12 14:22:34 +01:00
George Oikonomou
c250cf93b7
Merge branch 'develop' into feature/ipv6_over_ble 2018-03-12 08:52:25 +00:00
dongdongbh
4b173ce01f add cfs support for srf06-cc26xx 2018-03-11 02:07:46 +08:00
Atis Elsts
a0707dfcb6 Orion: do not auto-enable IP64 as this causes compilation issues on many examples. Orion examples enable IP64 explicitly 2018-03-09 16:29:07 +00:00
Simon Duquennoy
0bacdd451e nrf52832: fix .map filename 2018-03-09 16:29:06 +00:00
Simon Duquennoy
b0b71f6624 Do not attempt to compile SLIP for nrf52dk 2018-03-09 16:29:06 +00:00
Atis Elsts
449d7dd5e7 Add CLEAN targets for sky and native platforms 2018-03-09 16:29:06 +00:00
Atis Elsts
dab9ea0817 nrf52dk: move the build error when building without IPv6 from Makefile to C header file to enable PLATFORMS_EXCLUDE syntax in Makefiles 2018-03-09 16:29:06 +00:00
George Oikonomou
888063e9e6
Merge branch 'develop' into bugfix/cc26xx-rx-packet-size 2018-03-02 21:48:58 +00:00
George Oikonomou
c8debbac22 Add RGB LED driver 2018-03-01 15:29:30 +00:00
George Oikonomou
0dfd39adcf Adjust data types for legacy LED API implementations 2018-03-01 15:29:30 +00:00
George Oikonomou
d52bfa0f22 Enable the legacy LED API for respective platforms 2018-03-01 15:29:30 +00:00
George Oikonomou
b1537374fb Migrate to the new LED HAL (CC26xx/CC13xx) 2018-03-01 15:29:30 +00:00
George Oikonomou
ab710a8ed0 Implement the new LED HAL (Sensortag CC26xx/CC13xx) 2018-03-01 15:29:29 +00:00
George Oikonomou
877c758aaf Implement the new LED HAL (Launchpad CC26xx/CC13xx) 2018-03-01 15:29:29 +00:00
George Oikonomou
f932e51128 Implement the new LED HAL (SmartRF06 CC26xx/CC13xx) 2018-03-01 15:29:29 +00:00
George Oikonomou
ce4caf2c7c Implement and use the new LED HAL (Zoul) 2018-03-01 15:29:29 +00:00
George Oikonomou
e39472f7d0 Implement and use the new LED HAL (OpenMote) 2018-03-01 15:29:29 +00:00
George Oikonomou
f468fcd2a7 Implement and use the new LED HAL (CC2538DK) 2018-03-01 15:29:29 +00:00
George Oikonomou
424bee9464 Add CC2538 GPIO conversion macro 2018-03-01 15:29:29 +00:00
George Oikonomou
6004084785 Fix Zoul build when RTCC is enabled 2018-03-01 13:34:32 +00:00
Simon Duquennoy
635d8d78f7 Zoul platform.c: include stdlib.h 2018-03-01 13:34:32 +00:00
Simon Duquennoy
a2262786b1 Zoul platform.c: removing leftover PRINTF 2018-03-01 13:34:32 +00:00
Atis Elsts
df160d9347 CC26xx IEEE mode radio driver: allow reception of packets shorter than 5 bytes 2018-03-01 13:26:56 +00:00
Atis Elsts
02f26ffff5 Fix BOARDS string in srf06-cc26xx platform makefile to accurately reflect all valid values of the BOARD variable 2018-02-27 12:03:58 +00:00
George Oikonomou
1c993bf354 Remove unnecessary MODULES from platform Makefiles 2018-02-26 00:07:20 +00:00
George Oikonomou
cab38d9ea8 Use the GPIO HAL for Zoul sensor drivers 2018-02-25 23:15:56 +00:00
Simon Duquennoy
e30423f6cc
Merge branch 'develop' into contrib/gpio-hal 2018-02-25 18:17:32 +01:00
George Oikonomou
46cf366698
Merge branch 'develop' into contrib/PRI 2018-02-24 15:03:46 +00:00
George Oikonomou
b9a321d602 Add GPIO HAL example 2018-02-24 12:50:02 +00:00
George Oikonomou
df0659cd1a Use the GPIO HAL (CC2538DK) 2018-02-24 12:50:02 +00:00
George Oikonomou
488a906018 Use the GPIO HAL (OpenMote CC2538) 2018-02-24 12:50:02 +00:00
George Oikonomou
749c4e5cd8 Use the GPIO HAL (Zoul) 2018-02-24 12:50:02 +00:00
George Oikonomou
095a89d937 Adjust CC2538 CPU drivers to use the GPIO HAL 2018-02-24 12:50:02 +00:00
George Oikonomou
10c2bcde15 Build the GPIO HAL for the CC2538 2018-02-24 12:50:02 +00:00
George Oikonomou
ab7d7cd9f4 Implement the GPIO HAL for the CC2538 2018-02-24 12:50:02 +00:00
George Oikonomou
f1d1932c5c Adjust CC13xx/CC26xx drivers to use the GPIO HAL 2018-02-24 12:50:01 +00:00
George Oikonomou
421d95bc00 Build the GPIO HAL for CC13xx/CC26xx 2018-02-24 12:50:01 +00:00
George Oikonomou
d88c3d0c01 Implement the GPIO HAL for CC13xx/CC26xx 2018-02-24 12:50:01 +00:00
George Oikonomou
5065bf0519
Merge branch 'develop' into contrib/native-conf-mac 2018-02-24 12:37:43 +00:00
Simon Duquennoy
884ba9805c Added missing inclusions of inttypes.h 2018-02-23 10:58:46 -08:00
Simon Duquennoy
38caaeb9d1 Platform native: make MAC address configurable 2018-02-23 04:22:01 -08:00
Niclas Finne
309745780e Removed the remaining Contiki Interface declaration macros (CCIF/CLIF) 2018-02-21 01:14:10 +01:00
George Oikonomou
fd72afbfcb Allow Shell operaction for CC13xx/CC26xx
Fixes #187
2018-02-16 15:42:45 +00:00
George Oikonomou
5f6eee66ff Correctly check against minumum RX frame length 2018-02-16 15:04:02 +00:00
MartenBE
e2d5f737db Deleted duplicate const specifiers 2018-02-02 15:26:16 +01:00
Niclas Finne
21a1a2e220 Platform: native: initialize serial line 2018-01-26 23:19:15 +01:00
Simon Duquennoy
526aad9606 Disable TSCH HW frame filtering on platform sky 2018-01-12 09:20:14 -08:00
spoerk
1defa2646a Fixed Doxygen problem 2018-01-03 16:18:21 +01:00
spoerk
f8d2c3fa48 code style fixes 2018-01-03 15:52:36 +01:00
spoerk
604e846ff1 Merge branch 'develop' of github.com:contiki-ng/contiki-ng into feature/ipv6_over_ble 2018-01-03 15:27:42 +01:00
spoerk
03ec1ea401 Some documentation added 2018-01-03 15:18:01 +01:00
spoerk
2a49608af6 link layer problem fixed 2018-01-03 14:51:23 +01:00
spoerk
35c08597e6 BLE L2CAP moved to the other MAC implementations 2018-01-03 14:36:14 +01: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
6de6e15ce7 Move RPL border router from example to os/services 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
84ea0971bc Remove obsolete flag AUTOSTART_ENABLE, as well as .co and .ce files 2017-12-22 05:21:39 -08: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
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
George Oikonomou
3bbcc6288f Include board.h after configuration is fully known 2017-12-18 16:50:40 +00: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
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
spoerk
fd0f0ca4b6 Merge branch 'develop' of github.com:contiki-ng/contiki-ng into feature/ipv6_over_ble 2017-12-15 11:41:27 +01:00
spoerk
7a7c4e0015 added support for IPv6 over BLE communication 2017-12-15 11:20:44 +01:00
George Oikonomou
d780719530 Compile platform native with NULLNET 2017-12-13 09:40:02 +00:00
Laurent Deru
ccb705ed31 Use clock_gettime() instead of gettimeofday() to have a monotonic clock and use CLOCK_CONF_SECOND explicitly 2017-12-12 16:53:51 +01:00
George Oikonomou
82bc3363d1 Use Cortex-M mutexes (CC13xx/CC26xx) 2017-12-09 17:09:58 +00:00
George Oikonomou
48c10d3e30 Use Cortex-M mutexes (CC2538) 2017-12-09 17:09:58 +00:00
George Oikonomou
62a79c09fc Add mutex implementation for Cortex-M 2017-12-09 17:09:58 +00:00
George Oikonomou
bdddf41ca9 Use Cortex-M memory barriers (CC13xx/CC26xx) 2017-12-09 17:09:57 +00:00
George Oikonomou
755a6b88df Use Cortex-M memory barriers (CC2538) 2017-12-09 17:09:57 +00:00
George Oikonomou
35bd4eb1d8 Provide memory barrier for all Cortex-M CPUs 2017-12-09 17:09:57 +00:00
George Oikonomou
690bad7d5e Allow different CPUs to specify how they hook into CMSIS 2017-12-09 17:09:57 +00:00
George Oikonomou
103df5c95e Provide memory barrier (msp430) 2017-12-09 17:09:56 +00:00
George Oikonomou
4094297d3e Implement master interrupt manipulation (nrf52832) 2017-12-09 17:08:32 +00:00
George Oikonomou
6dfc53dfb3 Implement master interrupt manipulation (JN516x) 2017-12-09 17:08:31 +00:00
George Oikonomou
9396b6da6e Implement master interrupt manipulation (MSP430) 2017-12-09 17:08:31 +00:00
George Oikonomou
98664e99ee Implement master interrupt manipulation (CC2538) 2017-12-09 17:08:31 +00:00
George Oikonomou
f1774cc1e0 Implement master interrupt manipulation (CC13xx/CC26xx) 2017-12-09 17:08:31 +00:00
Joakim Eriksson
52e012d3c1 optimized flash usage due to fit sky 2017-12-09 10:22:19 +01:00
George Oikonomou
0a76ff8ee7 Harmonise platform configuration files (Sky) 2017-12-08 17:07:33 +00:00
George Oikonomou
df54d30a2a Pull CPU-related constants from the CPU header (Sky) 2017-12-08 17:07:32 +00:00
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