Commit graph

12404 commits

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
Laurent Deru
79537a6dd7 rpl_select_parent: Only check parents belonging to the given dag 2014-04-18 11:39:33 +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
Ian Martin
2cf730a1c6 Un-indent preprocessor directives. 2014-04-17 10:39:00 -04: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
Ian Martin
16936d864c Rename FLASH_CCA_CONF_BOOTLDR_BACKDOOR_PIN to FLASH_CCA_CONF_BOOTLDR_BACKDOOR_PORT_A_PIN. 2014-04-16 10:19:37 -04:00
harald
ac79f1b596 change battery and cpttem format to xx.xx 2014-04-16 09:31:48 +02:00
Ian Martin
1a63c47cf9 CC2538: Add CONF parameters to select boot loader backdoor pin and logic level. 2014-04-15 17:36:55 -04:00
Niclas Finne
ceb868d934 Modified project setup for er-rest-example and rest-example to use
nullrdc and nullmac to reduce the code size. This allows the examples
to compile on Tmote Sky again.
2014-04-15 22:59:20 +02:00
Niclas Finne
0327623ae1 Minor update to improve output in extended RF API example. On 16 bit
platforms, PAN id and short address might be negative when used as
16 bit signed integers.
2014-04-15 22:50:11 +02: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
harald
b0c8597dbc add shutter control resources, reset,timer 2014-04-15 17:29:05 +02: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
harald
b6e0ef1d95 add contiki led, remove led1,led2 2014-04-15 07:27:33 +02:00
harald
f77717158d simplify project-conf.h 2014-04-15 07:27:33 +02:00
harald
f9d67ed10c bugfix statusled include 2014-04-15 07:27:33 +02:00
harald
f40bf6d803 bugfix includes and names 2014-04-15 07:27:33 +02:00
harald
59713f6d3b adapt new names and api 2014-04-15 07:27:33 +02:00
harald
67dba47c23 remove not needed binary files 2014-04-15 07:27:33 +02:00
harald
aa568a28a3 add /s/cputemp resource 2014-04-15 07:27:32 +02:00
harald
f9abb44d6e add /p/name and p/model resource, remove info 2014-04-15 07:27:32 +02:00
harald
86cd1ec02f remove t4 driver at the moment, config problem 2014-04-15 07:27:32 +02:00
Marcus Priesch
992e54fe25 Factored to support configurable amount of pwm's, fixes 2014-04-15 07:27:32 +02:00
Marcus Priesch
bf6f388691 initial check in 2014-04-15 07:27:32 +02:00
harald
67783600aa compile all osd-examples 2014-04-15 07:27:32 +02:00
harald
251abdda29 simplified led resource to one led actuator 2014-04-15 07:27:32 +02:00
harald
d87287b745 initial upload 2014-04-15 07:27:32 +02:00
harald
d8d0a507e1 remove link status and bugfix params.c 2014-04-15 07:27:32 +02:00
harald
11b7022ce6 add patch milligrad ds1820 from Jan-Benedict Glaw 2014-04-15 07:27:32 +02:00
harald
87028c1f60 temp and hum sensors values xxxx -> xx.xx 2014-04-15 07:27:32 +02:00
harald
f8c298a495 add dhtxx temp coap 2014-04-15 07:27:32 +02:00
harald
51f179eacf config panid over defines 2014-04-15 07:27:32 +02:00
harald
1f586c7735 define new tria pins, configurable type ligt or shutter or plug 2014-04-15 07:27:32 +02:00
harald42
7d354d8a37 initial upload 2014-04-15 07:27:32 +02:00
harald42
2ddd2ba38a cleanup code add coap13 support 2014-04-15 07:27:32 +02:00
harald42
b50f4e2119 remove xmac config 2014-04-15 07:27:32 +02:00
harald42
806de3f204 cleanup code, add coap13 support 2014-04-15 07:27:32 +02:00
harald42
15167d541e del unused files 2014-04-15 07:27:31 +02:00
harald42
39a830d9a9 del unused file 2014-04-15 07:27:31 +02:00
harald42
116ce888c4 code cleanup 2014-04-15 07:27:31 +02:00
harald42
184dee491e cleanup code 2014-04-15 07:27:31 +02:00
harald42
4f05557905 remove old project use climate instead 2014-04-15 07:27:31 +02:00
harald42
1b56526fe0 delete old example 2014-04-15 07:27:31 +02:00
harald42
aac4fcc8e1 cleanup code 2014-04-15 07:27:31 +02:00