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

8795 commits

This branch
This branch
All branches
Author SHA1 Message Date
Benoît Thébaudeau
f1ca1b742c cc2538: spi: Include spi-arch.h before dev/spi.h 
spi-arch.h configures dev/spi.h, so it must be #included first. Luckily, this
mistake did not have any consequence here, but fix it in order to avoid possible
future issues.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
 2013-11-15 15:56:40 +01:00
Benoît Thébaudeau
f34731c1a9 cc2538: spi: Do not call SPI_WAITFOREORx() at end of init 
If the SSI has never been used and spi_init() is called, then the SSI receive
FIFO is empty and remains so, so calling SPI_WAITFOREORx() at the end of
spi_init() waits endlessly for SSI_SR.RNE to be set. Hence, this call must be
removed in order to avoid a deadlock.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
 2013-11-15 15:56:40 +01:00
Adam Dunkels
a6227e1e3e Merge pull request #350 from AriZuu/udp-stats-fix 
Fix UDP statistics.
 2013-11-14 23:39:16 -08:00
Ari Suutari
8ffd29616a Fix UDP statistics also in ipv6 code. 2013-11-15 08:00:41 +02:00
Nicolas Tsiftes
5688650f6d Merge pull request #391 from cetic/fix-duplicate 
Removed duplicate code in rpl-icmp6
 2013-11-14 12:35:24 -08:00
Adam Dunkels
f2f0540051 Merge pull request #331 from alessandrelli/msp430-gcc-4.7-flags-wismote 
Add mspgcc 4.7.x flags to the wismote makefile
 2013-11-14 12:30:47 -08:00
Adam Dunkels
3f34a146dd Merge pull request #375 from vsaw/tmp-uncrustify-changed 
feat(code-style): Add a script to automatically format all changed files
 2013-11-14 12:30:09 -08:00
Adam Dunkels
4e2e119ec6 Merge pull request #421 from cmorty/submodule_warn 
Decent error if mspsim cant be built
 2013-11-14 12:26:42 -08:00
Nicolas Tsiftes
f70951a8d0 Merge pull request #390 from evilaliv3/C_dellamadonna 
fixed a border-router.c C syntax error
 2013-11-14 11:51:27 -08:00
Adam Dunkels
67ccf43e68 Merge pull request #379 from simonduq/csma-exponential-backoff 
A truncated exponential backoff for csma
 2013-11-14 11:51:07 -08:00
Moritz 'Morty' Strübe
d05b03108a Decent error if mspsim cant be built 2013-11-14 18:14:03 +01:00
Mariano Alvira
6b9b457a60 Merge pull request #385 from ismb-pert/better-error-message 
Better error message in case of wrong CPUREV value
 2013-11-14 07:14:33 -08:00
Simon Duquennoy
03dcca15cb Implement a truncated exponential backoff for csma 2013-11-14 15:02:36 +01:00
George Oikonomou
6da394139c Merge pull request #417 from g-oikonomou/cc2538-readme-toolchain 
Document alternative toolchain for the CC2538DK
 2013-11-14 05:38:54 -08:00
George Oikonomou
2893af5e5d Document alternative toolchain for the CC2538DK 2013-11-14 12:22:21 +00:00
Adam Dunkels
df2d2f53c2 Merge pull request #407 from cmorty/submodule 
Add submodule support for MSPSim and get Travis green again.
 2013-11-14 03:22:03 -08:00
Oliver Schmidt
59c28bc32b Merge pull request #419 from oliverschmidt/master 
Saved six more bytes ;-)
 2013-11-13 14:43:06 -08:00
Oliver Schmidt
1bf5b4380d Saved six more bytes ;-) 2013-11-13 23:32:49 +01:00
Oliver Schmidt
3d3891df35 Merge pull request #418 from frtos-wpan/uninterrupted-cleanup 
Makefile.include (clean): ignore rm -f failing (e.g., on "core")
 2013-11-13 13:35:37 -08:00
Werner Almesberger
6db8788b69 Makefile.include (clean): ignore rm -f failing (e.g., on "core") 
rm -f can still fail, e.g., if trying to delete a directory.

If there was, say, a directory called "core", a "make clean" would
therefore only try to delete the files listed in the first command but
not proceed with the rest of the cleanup.

"make clean" itself failing may also affect any outside build process
that invokes it.
 2013-11-13 17:15:46 -03:00
Oliver Schmidt
497e7fbbac Merge pull request #416 from oliverschmidt/master 
Added missing fixup & removed wait loop from poll.
 2013-11-11 12:06:38 -08:00
Oliver Schmidt
ae1a875881 Added missing fixup & removed wait loop from poll. 2013-11-11 21:03:39 +01:00
Moritz 'Morty' Strübe
dcbd7936ad Move simulation execution from Makefile to Bash script; show Progress 
Additional code is needed to show the progress. Otherwise Travis is
likely to become unhappy and terminates the job. This was no fun within
the Makefile. Moving the execution to a Bash script allows better
maintainability.
In case of an error the error all logs will be printed when using a CI.
 2013-11-11 08:18:35 +01:00
Moritz 'Morty' Strübe
d81abb33fd Remove broken test from regression testing 2013-11-11 08:18:35 +01:00
Moritz 'Morty' Strübe
08047d1a27 Tolerate loosing one packet in 01-sky-shell-collect.csc 2013-11-11 08:18:25 +01:00
Oliver Schmidt
dd30454c80 Merge pull request #415 from oliverschmidt/master 
Added 6502 driver for WIZnet W5100 in MACRAW mode.
 2013-11-09 14:17:07 -08:00
Oliver Schmidt
2d7d1b123d Added 6502 driver for WIZnet W5100 in MACRAW mode. 2013-11-09 23:15:20 +01:00
Adam Dunkels
71eea754d6 Added mspsim as a submodule instead of as a binary mspsim.jar file 2013-11-07 17:28:50 +01:00
Moritz 'Morty' Strübe
c67c048cac Clean up setting channel and CCA-threshold for CC2420 based motes. 
The CCA-threshold now defaults to -46 which give better simulation
results and typically also better experimental results.
This adjustment is also needed due to commit 0a13f99 in mspsim. As
promised in https://github.com/mspsim/mspsim/pull/18 it broke the
regression tests.
 2013-11-07 17:28:33 +01:00
Moritz 'Morty' Strübe
c89e827d6c Make regressiontest reproducable 2013-11-06 17:41:59 +01:00
Moritz 'Morty' Strübe
56afc6d437 Allow setting random seed as parameter 2013-11-06 17:41:53 +01:00
George Oikonomou
ce0b2cacac Merge pull request #365 from g-oikonomou/cc2538-uart-init-fix 
Set peripheral mode for the correct CC2538 UART TX/RX pins
 2013-10-23 07:10:41 -07:00
Sébastien Dawans
a60d3bf6cf Removed duplicate code in rpl-icmp6 2013-10-23 15:43:16 +02:00
Giovanni evilaliv3 Pellerano
7fa2ce1329 fixed a C error "della madonna" 
http://it.wikipedia.org/wiki/Jerry_Cal%C3%A0
 2013-10-23 15:21:07 +02:00
Nicolas Tsiftes
4fd529eed8 Merge pull request #382 from ejoerns/pull-req/core/net 
core/net/mac: Invalid struct member u8 in PRINTADDR
 2013-10-22 08:03:11 -07:00
Gianfranco Costamagna
ddd6b900cd Better error message in case of wrong CPUREV value 2013-10-17 12:33:36 +02:00
Enrico Joerns
4ba22102fd [core/net/mac] Removed invalid struct member u8 in PRINTADDR 2013-10-15 01:43:26 +02:00
Nicolas Tsiftes
6dd9f2c37a Merge pull request #380 from simonduq/fix-rpl-of0 
Fixed printout that used deprectated rpl_parent_t structure
 2013-10-10 08:48:29 -07:00
Oliver Schmidt
35e93f3bae Merge pull request #381 from oliverschmidt/master 
Reverted commit below as the cc65 bug in question is fixed.
 2013-10-08 13:44:23 -07:00
Oliver Schmidt
2316c6b461 Reverted commit below as the cc65 bug in question is fixed. 
Rearranged some expressions to avoid triggering a cc65 bug. (reverse-merged from commit 7134da0915)
 2013-10-08 22:42:41 +02:00
Simon Duquennoy
677b5ede16 Fixed printout that used deprectated rpl_parent_t structure 2013-10-08 14:46:55 +02:00
Adam Dunkels
4e1beb3ed3 Merge pull request #361 from nvt/rpl-mrhof-fix 
MRHOF fixes
 2013-10-07 11:45:31 -07:00
Oliver Schmidt
e263bac1fc Merge pull request #378 from oliverschmidt/master 
Final adjustments for the switch from 'atari' to 'atarixl'.
 2013-10-06 08:24:30 -07:00
Oliver Schmidt
c6474cc8bc Final adjustments for the switch from 'atari' to 'atarixl'. 2013-10-06 17:23:39 +02:00
Oliver Schmidt
b0ecd68957 Merge pull request #377 from oliverschmidt/master 
Finetuned Atari XL memory layout.
 2013-10-05 14:53:38 -07:00
Oliver Schmidt
37b66bac5a Finetuned Atari XL memory layout. 
The Telent server includes both uIP logging and uIP client functionality. Therefore uip.o is somewhat larger.
 2013-10-05 23:51:49 +02:00
Oliver Schmidt
d5ef2a0158 Merge pull request #376 from oliverschmidt/master 
Rearranged some expressions to avoid triggering a cc65 bug.
 2013-10-05 12:29:25 -07:00
Oliver Schmidt
7134da0915 Rearranged some expressions to avoid triggering a cc65 bug. 2013-10-05 21:26:28 +02:00
Valentin Sawadski
b25ef28ade feat(code-style): Add a script to automatically format all changed files 
If executed inside the repository it will run the default Contiki
uncrustify script on all changed .c and .h file. This could be added
as a Git pre-commit hook. See http://git-scm.com/book/en/Customizing-Git-Git-Hooks
 2013-10-05 10:39:47 +02:00
Nicolas Tsiftes
583a1fe9db Merge pull request #374 from g-oikonomou/code-style-tools 
Code Style: Add uncrustify config and helper scripts
 2013-10-04 08:25:01 -07:00