deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
8074 commits 6 branches 13 tags 80 MiB
Commit graph

8074 commits

This branch
This branch
All branches
Author SHA1 Message Date
Adam Dunkels 15deb37e64 Updated DAG version processing to occur even for infinite rank DIOs. This makes it possible for the RPL root to infer the DAG version number from a network that hasn't had a root for a while, and where the rank has increased to infinity. 2012-11-27 23:04:30 +01:00
Adam Dunkels db7cb567f5 Updated the RPL code to better match the Contiki code style 2012-11-27 23:04:30 +01:00
Nicolas Tsiftes 0cb4bf4808 Merge pull request #45 from adamdunkels/netstack-encryption 
Add support for encryption and decryption calls
 2012-11-27 06:30:38 -08:00
Adam Dunkels cb7842bd16 Added support for encryption and decryption of the packetbuf if macros 
NETSTACK_ENCRYPT and NETSTACK_DECRYPT are defined. Those are intended
to be called as functions NETSTACK_ENCRYPT() and NETSTACK_DECRYPT() to
encrypt and decrypt the packetbuf, respectively. If needed, an
initialization function by the name NETSTACK_ENCRYPTION_INIT() can
also be defined.
 2012-11-25 12:05:00 +01:00
Nicolas Tsiftes 63d205e4a2 Merge pull request #44 from adamdunkels/rime-nullptr-guard 
Rime NULL pointer guards
 2012-11-24 11:14:02 -08:00
Adam Dunkels 0cd2f48d6e Added NULL pointer guards 2012-11-22 11:55:01 +01:00
Nicolas Tsiftes 0a8183d295 Merge pull request #42 from adamdunkels/fix-micaz-build 
Fix micaz build
 2012-11-22 01:21:00 -08:00
Nicolas Tsiftes c7434df043 Merge pull request #43 from adamdunkels/add-more-travis-tests 
Add most of the Contiki tests to the Travis build
 2012-11-22 01:20:03 -08:00
Adam Dunkels 4d811b41cc Structured the Contiki tests according to what they are supposed to test and broke them out as multiple parallel jobs. 2012-11-22 08:12:39 +01:00
Adam Dunkels 91206e2249 Avoid multiple definitions of NETSTACK_CONF_MAC. Turn on RPL by default. 2012-11-21 20:11:22 +01:00
Adam Dunkels d51d3f6b3e Remove conditionals around RPL extension header #defines and typedefs. With the conditional, it wasn't possible to compile the rpl-ext-header.c file. Since #defines and typedefs and 'free' at runtime, we gain nothing by having them conditional. 2012-11-21 20:11:22 +01:00
Adam Dunkels 3a669d0caa Merge pull request #41 from adamdunkels/fix-native-build 
Make gcc default LD, and allow override with LD_OVERRIDE
 2012-11-21 11:09:48 -08:00
Adam Dunkels db41a51ae6 Make gcc default LD, and allow override with LD_OVERRIDE 2012-11-21 19:46:31 +01:00
Adam Dunkels 135ae838de Merge pull request #40 from errordeveloper/cross-native 
Enable `native` target for cross-compiling
 2012-11-21 10:14:15 -08:00
Ilya Dmitrichenko d0f18e5d04 Fixed LDFLAGS for cross-compiling of "native" 2012-11-21 18:09:29 +00:00
Ilya Dmitrichenko 092c69639c Enable native target for cross-compiling - 
by now it would have worked if you set CC via
command line (e.g. `make CC=clang`, though it
wouldn't work when CC is set in the platform
makefile which includes `Makefile.native`.
 2012-11-21 18:09:10 +00:00
Ilya Dmitrichenko 6690c5f13e Fix hardcoded reference to nm(1) 2012-11-21 18:09:05 +00:00
Fredrik Österlind 9f6689e538 Merge pull request #13 from adamdunkels/contiki-code-style-tools 
Contiki code style tools update
 2012-11-21 02:49:32 -08:00
Fredrik Österlind 9b447d2b76 Merge pull request #38 from adamdunkels/cleanup-of-old-mac-and-rdc-code 
Remove old unused TDMA-based MAC and RDC code
 2012-11-21 02:47:41 -08:00
Fredrik Österlind 150cb33b94 Merge pull request #16 from cmorty/COOJA_DGRM 
DGRM-Related Patches
 2012-11-21 02:44:13 -08:00
Nicolas Tsiftes 39919655df Merge pull request #39 from adamdunkels/node-id 
Fixed node-id compilation problems on the micaz and exp5438 platforms
 2012-11-21 00:18:11 -08:00
Adam Dunkels e178787999 Fixed compilation problems on the micaz and exp5438 platforms due to the node-id change 2012-11-20 21:16:50 +01:00
Adam Dunkels 6ee1f72486 Removed old unused TDMA-based MAC and RDC code 2012-11-20 20:48:34 +01:00
Adam Dunkels f6f9df802c Updated script per suggestion by @g-oikonomou to allow script to operate on files in subdirectories 2012-11-20 20:11:39 +01:00
Adam Dunkels 9131c4183b Allow contiki-indent to operate on multiple files at once 2012-11-20 20:11:39 +01:00
Adam Dunkels c31a907ccd A small tool that shows the diff between the original file and the file produced by running it through contiki-indent 2012-11-20 20:11:39 +01:00
Nicolas Tsiftes 5a1661dfbf Merge pull request #37 from adamdunkels/node-id 
Cleanup of the node-id.h files
 2012-11-20 11:08:37 -08:00
Adam Dunkels ec8c7e9be0 Cleanup of the node-id.h files. The node-id.h file contains 
declarations of functions for setting and getting a node ID number, a
functionality that exists on many platforms. Since this functionality
was not considered part of the Contiki core, each platform defined its
own node-id.h file. This commit attempts to clean this up by
collecting the node-id.h into a core/sys/node-id.h file that replaces
the old node-id.h files from the platform directories.
 2012-11-20 19:59:46 +01:00
Nicolas Tsiftes 9392ece509 Merge pull request #35 from malvira/travis-econotag 
have travis build TARGET=econotag instead of TARGET=redbee-econotag
 2012-11-20 10:55:44 -08:00
Nicolas Tsiftes 90ad0d58f8 Merge pull request #36 from malvira/econotag-er-no-static-routes 
don't use static routing with econotag platform
 2012-11-20 10:35:57 -08:00
Mariano Alvira e4a383d61d don't use static routing with econotag platform 2012-11-20 13:22:28 -05:00
Mariano Alvira a1c2e471a8 have travis build TARGET=econotag instead of TARGET=redbee-econotag 2012-11-20 12:36:55 -05:00
Adam Dunkels d7763e13db Merge pull request #33 from nvt/coffee-manager 
Coffee manager
 2012-11-20 04:43:08 -08:00
Adam Dunkels 12c462ada0 Merge pull request #14 from errordeveloper/travis 
Travis CI (with split cooja tests and multi-target support)
 2012-11-20 03:43:10 -08:00
Nicolas Tsiftes 8b13d2ea93 The image file size must include the size of the area before the FS. 2012-11-20 12:06:27 +01:00
Niclas Finne 2f72cb043d Minor improvements of coffee-manager. 2012-11-20 10:51:39 +01:00
Adam Dunkels c23bb4cc5c Merge pull request #32 from malvira/new-target-econotag 
Newer and cleaner TARGET=econotag as well as robust mc13224v
 2012-11-20 01:25:17 -08:00
Mariano Alvira 03ab3fe317 Newer and cleaner TARGET=econotag as well as robust mc13224v 
configuration system.

(also deprecate TARGET=redbee-econotag)

- mc13224v now automatically probes hardware config for buck converter
and 32kHz crystal as well as automatically monitors battery voltage
and manages the buck accordingly.

- new flashed based config system for mc13224v parameters such has
  radio modes (demod, autoack), nvmtype, mac address, channel and
  power.

- considerably cleaned up econotag platform code (suffered from severe
  case of bit-rot)
 2012-11-19 19:16:29 -05:00
Ilya Dmitrichenko f46aa7aa73 [ci] Only run some most basic Cooja tests to avoid Travis time-outs 2012-11-19 12:59:11 +00:00
Ilya Dmitrichenko 0c316c8d15 [ci] Provide the mechanism to exclude/mark Cooja tests 2012-11-19 12:58:26 +00:00
Adam Dunkels 01a28e47d5 Merge pull request #31 from nvt/storage-comments 
Improved the comments in Antelope and Coffee.
 2012-11-19 04:42:24 -08:00
nvt 757a54f63c Added some comments about Antelope and Coffee. 2012-11-19 13:21:59 +01:00
Adam Dunkels 31da83d0a3 Merge pull request #30 from malvira/bump-libmc1322x 
Bump libmc1322x
 2012-11-18 15:34:53 -08:00
Mariano Alvira 2c9a538582 Merge branch 'master' of git://git.devl.org/git/malvira/libmc1322x into bump-libmc1322x 
bump libmc1322x to 7bee48243c

Conflicts:
	cpu/mc1322x/board/Makefile.board
	cpu/mc1322x/lib/include/uart.h
	cpu/mc1322x/lib/uart1.c
	cpu/mc1322x/lib/uart2.c
	cpu/mc1322x/src/default_lowlevel.c
 2012-11-18 18:27:39 -05:00
Mariano Alvira 7bee48243c remove old uart1_init and uart2_init prototypes 2012-11-18 18:07:05 -05:00
Mariano Alvira 92856d8831 m12 low power 2012-11-18 17:35:35 -05:00
Mariano Alvira d12df2eed3 use rx and tx queues for uart 2012-11-18 17:35:35 -05:00
Mariano Alvira 731272c240 add routines to set flow control 2012-11-18 17:35:35 -05:00
Mariano Alvira b3e2f30674 change uart_init to take a baud so you don't need a second call to 
setbaud
 2012-11-18 17:35:35 -05:00
Mariano Alvira e7e149d354 new uart_init and uart_setbaud 2012-11-18 17:35:34 -05:00