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

9277 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jens Dede 446208dc1c Merge branch 'master' of git://github.com/contiki-os/contiki into ds6_period_configurable 2014-04-18 13:33:01 +02:00
Jens Dede 96a70f9ab0 Rename as suggested by g-oikonomou 2014-04-18 13:32:40 +02:00
George Oikonomou 49bf7cc241 Merge pull request #616 from hexluthor/listing 
CC2538: Add a Makefile rule to generate a final assembly listing.
 2014-04-17 22:13:52 +01:00
George Oikonomou d34ee59e97 Merge pull request #623 from ADVANSEE/cc2538-multi-uart 
cc2538: uart: Make it possible to use several UARTs simultaneously
 2014-04-17 20:20:08 +01:00
Benoît Thébaudeau d93d129da6 cc2538: uart: Make it possible to use several UARTs simultaneously 
This avoids the limitation of having a single UART available at runtime, without
duplicating code.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
 2014-04-17 18:53:44 +02:00
George Oikonomou db754a57d7 Merge pull request #598 from lab11/spi-flush2 
[SPI + CC2538] Update the SPI driver for CC2538
 2014-04-16 22:42:53 +01:00
Ian Martin 23a3a7f004 Add a note about "make cc2538-demo.lst" to the platform README. 2014-04-16 10:47:01 -04:00
Brad Campbell af27d2d252 [CC2538-SPI] Implement SPI_FLUSH, spi mode, !CS 
Because the CC2538 has a multi-byte SPI RX FIFO, flushing the buffer
requires more than just a single read. This adds a loop that empties the
entire RX buffer on a FLUSH().

Different SPI chips needs different SPI settings. This commit adds a
function that allows chip drivers to configure the SPI peripheral before
using it.

The frame pin the driver was using as a chip select does not work as
most devices expect it to. It toggles after every byte, and most chips
interpret that as end of message. To make drivers more reliable, each
chip driver should setup a GPIO and assert it as needed.
 2014-04-15 14:07:10 -04:00
Brad Campbell a96dc90250 [SPI] Make SPI_FLUSH() more versatile 
Currently the SPI driver in core/ sets `SPI_FLUSH()` to be a single read
of the spi RX buffer. This is fine for many microcontrollers, but newer
platforms like the CC2538 have a multi-byte FIFO for the RX buffer. In
that case, a single read is not guaranteed to flush the RX. This commit
allows `SPI_FLUSH()` to be platform dependent if needed, but doesn't
change for platforms where it works.
 2014-04-15 14:04:42 -04:00
Fredrik Österlind d3b9954342 Merge pull request #639 from ejoerns/pull-req/cooja-plugin-pos 
[Cooja] Set location of newly created plugins relative to second last activated plugin
 2014-04-15 09:51:29 +02:00
Fredrik Österlind 3a08f77489 Merge pull request #640 from ejoerns/pull-req/cooja-loglistener-fix 
[Cooja] plugins/LogListener: Prevent from throwing ArrayIndexOutOfBoundsException
 2014-04-15 09:09:39 +02:00
Enrico Joerns 055c70b455 [cooja] Set location of newly created plugins relative to second last activated plugin. 
Setting the position based on the number
of total inner frames was very inflexible
and caused pad positioning for larger number
of frames.

Setting the location of new plugin frames
to the second last activated one tries to
meet two requirements:
- Avoid covering the last activated plugin frame,
i.e. the one that was active when new plugin
start was invoked.
- Set new plugin near an actively used desktop pane
location and allow 'diagonal stacking'
 2014-04-15 00:48:52 +02:00
Enrico Joerns b53cee163d [cooja] plugins/LogListener: Prevent from throwing 
ArrayIndexOutOfBoundsException in case of empty logTable
 2014-04-15 00:22:24 +02:00
Nicolas Tsiftes 19cd33664d Merge pull request #633 from nfi/verbosity-control-msp430 
Add support for verbosity control for building MSP430-based platforms with the IAR compiler.
 2014-04-14 16:38:07 +02:00
Nicolas Tsiftes ce2ed95b93 Merge pull request #585 from g-oikonomou/generic-icmp6-in-hooks 
Generic ICMPv6 input hooks
 2014-04-14 16:12:10 +02:00
George Oikonomou 602f834caf Merge pull request #472 from ADVANSEE/cc2538-clock-adjust-etimer-poll 
cc2538: clock: Fix clock / timer issues with PM1/2
 2014-04-13 16:35:17 +01:00
George Oikonomou 33abe26ec8 Merge pull request #411 from ADVANSEE/cc2538-adc 
cc2538: Add adc driver and example
 2014-04-13 03:05:12 +01:00
George Oikonomou 22554e6d72 Merge pull request #596 from hexluthor/cc2538-uart-baudrate 
cc2538: Support any UART baudrate.
 2014-04-13 02:51:58 +01:00
Niclas Finne 2c953c3346 Support verbosity control when building MSP430-based platforms with 
the IAR compiler.
 2014-04-11 17:36:42 +02:00
Fredrik Österlind dbb8f3ec13 Merge pull request #626 from ejoerns/pull-req/cooja-vis-advanced 
[Cooja] plugins/Visualizer: Multi-mote selection functionality
 2014-04-11 09:57:37 +02:00
Enrico Joerns ad0e192d84 [cooja] plugins/Visualizer: Replaced multiple if-string with switch over 
strings
 2014-04-11 09:23:30 +02:00
Enrico Joerns cef3c4079d [cooja] Reformatted Visualizer and skins code 2014-04-11 09:23:28 +02:00
Enrico Joerns ea979fa027 [cooja] plugins/Visualizer: Use more specific catches and multi-catches 
if possible
 2014-04-11 09:20:53 +02:00
Enrico Joerns 84b687efeb [cooja] Automated code updates that do not make any functional changes 
- made loggers final
- added some diamond interface cosmetic
- shortened if-return statements
- replaced size == 0 check with .isEmpty()
 2014-04-11 09:20:52 +02:00
Enrico Joerns 6e9b0e1497 [cooja] Added @Override annotations for Visualizer and skins 2014-04-11 09:20:52 +02:00
Enrico Joerns 8e648bcece [cooja] apps/mrm: Adapted MRM visualizer skin to show adequate 
information for multi-selections
 2014-04-11 09:20:52 +02:00
Enrico Joerns e69b08f5fd [cooja] plugins/skins: Adapted DGRM and UDGM visualizer skins to show 
adequate information for multi-selections
 2014-04-11 09:20:46 +02:00
Enrico Joerns ac61c45950 [cooja] plugins/Visualizer: Updated quick help to match new control 
capabilities
 2014-04-11 09:05:53 +02:00
Enrico Joerns 22ac769781 [cooja] plugins/Visualizer: Multi-mote selection functionality 
This adds multi-mote selection capabilities to the visualizer plugin:

- [Ctrl + Mouse Drag]: Rectangular selection of multiple motes
- [Ctrl + Mouse Click]: Add/Remove motes from current selection
- Mouse Drag on any selected Mote: Move all currently selected motes

Note: This changes previous behaviour of using Ctrl key.
 2014-04-11 09:05:38 +02:00
Oliver Schmidt ea2c407aeb Merge pull request #627 from ejoerns/pull-req/git-relstr-fix 
Makefile.include: Fix git version string generation for external projects
 2014-04-09 22:20:47 +02:00
Nicolas Tsiftes 3829860c3c Merge pull request #620 from adamdunkels/push/socket-api 
New TCP and UDP socket APIs
 2014-04-09 22:12:59 +02:00
Adam Dunkels 1075effa22 Include udp-socket.h and tcp-socket.h by default in all applications that include contiki-net.h 2014-04-09 22:01:18 +02:00
Adam Dunkels 367eed96f4 Add a compile test for the tcp-socket example 2014-04-09 22:01:18 +02:00
Adam Dunkels ca5652d981 TCP socket server example 2014-04-09 21:57:05 +02:00
Nicolas Tsiftes 1b49b68c3b Merge pull request #606 from atiselsts/master 
Fix MCU clock calibration in msp430f2xxx based platforms (e.g. Zolertia Z1)
 2014-04-09 21:52:08 +02:00
Enrico Joerns 29894bbdfa Makefile.include: Setting RELSTR based on git tags requires to be in 
the contiki directory
 2014-04-09 19:11:35 +02:00
Nicolas Tsiftes a7dbf46b8e Merge pull request #608 from nvt/rpl-fixes 
Minor RPL improvements
 2014-04-07 11:13:38 +02:00
George Oikonomou 1d690995f6 Merge pull request #576 from nkigen/patch-2 
New MACRO for creating jsontree_array
 2014-04-04 09:13:31 +01:00
George Oikonomou 529ab761ac Register generic ICMPv6 handlers for ROLL TM 2014-04-04 00:09:29 +01:00
George Oikonomou 017697f91d Register generic ICMPv6 handlers for RPL 2014-04-04 00:09:27 +01:00
George Oikonomou 1d3da44991 Register generic ICMPv6 handlers for IPv6 ND 2014-04-04 00:09:26 +01:00
George Oikonomou af43d2125b Register generic handlers for ICMPv6 Echo Request / Reply 2014-04-04 00:02:53 +01:00
George Oikonomou 1d84962e80 Replace old switch-based ICMPv6 type/code management 2014-04-04 00:02:53 +01:00
George Oikonomou b6978b30e8 Declare and Implement generic ICMPv6 handler management 2014-04-04 00:02:52 +01:00
Ian Martin 56d0dfdc7a CC2538: Add a Makefile rule to generate a final assembly listing. 2014-04-02 18:17:49 -04:00
Fredrik Österlind d387f27a65 Merge pull request #610 from nfi/mspsim-auto-compile 
Autocompile MSPSim and warn if submodule is not initialized.
 2014-04-02 16:06:25 +02:00
Nicolas Tsiftes 429024f0a1 Merge pull request #609 from adamdunkels/push/csma-fix 
CSMA bugfix: count transmissions correctly
 2014-03-28 17:27:30 +01:00
Nicolas Tsiftes 0a202d3952 Cleaned up some of the comments and output strings. 2014-03-28 13:38:52 +01:00
Nicolas Tsiftes afbb82030e Ensure that the objective function's reset function is called at least once. This will enable the objective function to initialize itself during run-time. 2014-03-28 13:38:52 +01:00
Niclas Finne 279b7fd040 Added rule to autocompile mspsim if needed and show warning if submodule MSPSim has not been initialized 2014-03-28 11:11:51 +01:00