Commit graph

2177 commits

Author SHA1 Message Date
Fredrik Österlind
0a2804fd69 Merge pull request #846 from ejoerns/pull-req/cooja-platform
Cooja platform fixes
2014-11-05 15:21:18 +01:00
Enrico Joerns
0d12bcffcb [cooja-platform] Fixes for slip-bridge compatibility
* Added dev/uart1.h header file to cooja platform
* Added slip arch stub
* Suppress examples putchar definition as cooja platform provides its own

Note that the uart1.h file should only be an intermediate solution.
A generic contiki-wide definition for uart handling is required as each
platform defines its own varying set of uart functions.
2014-11-04 00:14:06 +01:00
Enrico Joerns
5a4c2e0d1f [cooja-platform] Add cast to linkaddr_t to avoid warning 2014-11-04 00:09:45 +01:00
Enrico Joerns
f8445ba1bd [cooja-platform] Remove unused variable 'shortaddr'
This variable was set but never used in the code
2014-11-04 00:09:45 +01:00
Enrico Joerns
2bc1e08f19 [cooja-platform] Include eeprom.h to avoid implicit declaration warning 2014-11-04 00:09:45 +01:00
Antonio Lignan
ef6c351d0c Add function to change I2C baudrate and push relevant configuration values to platform config 2014-10-20 14:23:36 +02:00
Nicolas Tsiftes
0d39ee96ad Merge pull request #820 from alignan/serialnum_as_nodeid
Use the Z1 product ID as MAC/Node ID if no value is found in XMEM
2014-10-20 11:38:11 +02:00
Nicolas Tsiftes
27cde1ff81 Merge pull request #824 from alignan/fix_warnings
Warning fixes
2014-10-20 11:16:36 +02:00
Antonio Lignan
cceb97059c Use the Z1 product ID as MAC/Node ID if no value is found in the XMEM 2014-10-20 10:36:49 +02:00
Antonio Lignan
c836fbfbd9 Fixes warnings, bad code and code style 2014-10-20 10:28:00 +02:00
Moritz 'Morty' Strübe
c0783e2841 sky: Initialize energest as early as possible
If energest is initialized too late, the radio is not accounted
until the first switch. This is a problem when the radio is always
listening.
2014-10-09 09:42:56 +02:00
Mariano Alvira
e803a654b4 Merge pull request #684 from SmallLars/2nd-button
Enabled 2nd button on platform econotag
2014-10-08 14:05:24 -05:00
Adam Dunkels
d891d11324 Merge pull request #557 from kkrentz/llsec-integration
Integration of Link Layer Security
2014-10-08 15:45:46 +02:00
Antonio Lignan
5bbb0cabbc Added battery capability to Z1 platform 2014-10-08 11:53:09 +02:00
Antonio Lignan
343a3d3f7b Added missing radio capability define to Z1 platform config 2014-09-24 11:42:55 +02:00
Atis Elsts
0e9c051485 Fix time accounting on TI EXP5438 MSP430x5438a experimenters board 2014-08-21 18:10:53 +02:00
Nicolas Tsiftes
35b6032c64 Merge pull request #745 from PaulCorbalan/patch-1
Add PLATFORM_HAS_RADIO in Sky Platform
2014-08-18 15:08:37 +02:00
kkrentz
94d2b519e4 aducrf101mkxz: added llsec module 2014-08-05 09:15:40 -07:00
kkrentz
2cf7d98cad ContikiMAC: Create and parse ContikiMAC header in special framer; Expanded framer interface
to allow for creating and securing frames in advance; Create and secure frames in advance when sending bursts; Do neither recreate nor resecure frames that come from phase
2014-08-05 05:07:06 -07:00
kkrentz
c15a05aee1 Sky: Use the cc2420_aes_128_driver by default 2014-08-05 05:07:06 -07:00
kkrentz
c6a98f2968 CC2420: Turned SPI macros to functions and removed redundant AES API 2014-08-05 05:07:06 -07:00
kkrentz
c032b67969 llsec: Noncompromise-resilient 802.15.4 security 2014-08-05 05:07:05 -07:00
kkrentz
7943751b16 Sky: DEBUG on/off switch 2014-08-04 01:09:57 -07:00
kkrentz
c7b394c51b Sky: Calling NETSTACK_LLSEC.bootstrap from contiki-sky-main.c 2014-08-04 01:09:57 -07:00
kkrentz
c396a85364 llsec: Added a layer in between NETSTACK_MAC and NETSTACK_NETWORK for implementing link layer security 2014-08-04 01:09:57 -07:00
Jim Paris
9b76c2fb17 aducrf101: Adjust default buffer sizes to fit better in available RAM 2014-07-29 18:25:55 -04:00
Adam Dunkels
62b8aafb03 Merge pull request #722 from royscheefhals/contiki-fix
char * data to void * data parameter in process_start
2014-07-28 22:04:36 +02:00
Nicolas Tsiftes
582bfcb8c6 Merge pull request #696 from sieben/doc
Correct several doxygen tags (\file,...)
2014-07-28 11:42:41 +02:00
Rémy Léone
8c3fa17ec0 Correct several doxygen tags (\file) 2014-07-28 11:11:45 +02:00
George Oikonomou
95e2cd9021 Merge pull request #732 from camilorodegheri/patch-1
Update README.md
2014-07-27 22:55:00 +01:00
Jim Paris
6db05caed9 Fix radio hangups when trying to transmit with radio off.
The border-router tries to transmit and do other stuff after turning
the radio off, and the radio driver didn't handle that very well.
With this fix, it's no longer necessary to reset the border router
after starting tunslip6.
2014-07-23 16:21:53 -04:00
Jim Paris
6937b29670 Add Windows build instructions for ev-aducrf101mkxz platform 2014-07-23 16:21:53 -04:00
Jim Paris
07201d13a3 Add IAR compiler support for ADuCRF101 2014-07-23 16:21:53 -04:00
Jim Paris
4f1fc3557c Add README.md for ev-aducrf101mkxz platform 2014-07-23 16:21:53 -04:00
Jim Paris
ad141b00fb Implement rtimers for ADuCRF101 2014-07-22 21:18:16 -04:00
Jim Paris
c8716f4d57 Add platform LED driver 2014-07-22 21:18:16 -04:00
Jim Paris
63692ba96d Add button sensor support (BOOT button) 2014-07-22 21:18:16 -04:00
Jim Paris
4cb97a3311 Move RF RX into its own process 2014-07-22 21:18:16 -04:00
Jim Paris
b7373edf8c Add ADuCRF101 radio driver 2014-07-22 21:18:16 -04:00
Jim Paris
5673b46e86 Add initial EV-ADuCRF101MKxZ platform support 2014-07-22 21:18:16 -04:00
Nicolas Tsiftes
784b20c04d Merge pull request #739 from alignan/merge_z1sp_with_z1
Merges Z1SP into Z1 platform
2014-07-04 22:03:27 +02:00
Oliver Schmidt
9ee1bae150 Only wait for a keypress if the user is told to press a key. 2014-07-04 19:33:35 +02:00
Antonio Lignan
5467674fcc Merges Z1SP into Z1 platform 2014-07-04 10:41:05 +02:00
Pablo Corbalán
a490986401 Add PLATFORM_HAS_RADIO in Sky Platform
In order to use the er-server-example Radio resource it is required that the platform defines that it has a radio. This line might be required in other platforms.
2014-07-03 14:59:13 +01:00
Rémy Léone
f111058472 Removing trailing whitespaces 2014-06-30 20:01:05 +02:00
Ian Martin
6ae6c4768e rl78: Change RIMEADDR_CONF_SIZE to LINKADDR_CONF_SIZE because the rimeaddr module has been renamed to linkaddr. 2014-06-28 22:07:57 -04:00
Camilo Rodegheri
a50e933f4b Update README.md
Adding new command for ftdi_sio which applies to Kernel>3.12 used by Ubuntu 14.04 LTS
2014-06-21 15:04:48 -03:00
Antonio Lignan
3d64b80e40 Added flags to enable 20-bit support from msp430-gcc 4.7.x 2014-06-17 12:55:08 +02:00
Nicolas Tsiftes
4c5fa6ff5d Merge pull request #713 from adamdunkels/pr/drop-iris
Remove the unmaintained iris platform
2014-06-13 12:57:52 +02:00
Roy Scheefhals
1058ea986a Changed the parameter 'char * data' of process_start to the
type process_data_t. This was an artifact when the choice was
made to use the void * type for the data parameter in processes.

Changed parameter 'void * data' of process_post_synch to
process_data_t for consistency.

Checked all the uses of process_start() in contiki and fixed casts
of the data parameter.
2014-06-12 13:40:28 +02:00
Adam Dunkels
9ceb059c21 Merge pull request #611 from nfi/cc2x20-sfd-config
Corrected CC2x20 sfd config and startup message.
2014-06-11 23:17:05 +02:00
Adam Dunkels
d7e4443ab2 Remove the unmaintained iris platform 2014-06-11 19:52:19 +02:00
Nicolas Tsiftes
da8e9a3e8d Merge pull request #655 from atiselsts/stm32_patches
Fix inconsistent usage of short/long integer type in mbxxx platform's configuration file.
2014-06-07 23:21:59 +02:00
Nicolas Tsiftes
350c83c947 Merge pull request #656 from atiselsts/native_platform_patches
Minor improvements for the native platform
2014-06-07 23:06:36 +02:00
George Oikonomou
ba9c2d40eb Merge pull request #682 from g-oikonomou/watchdog-cc2538
Confine CC2538 WDT on/off conf inside the driver
2014-06-03 22:05:08 +01:00
George Oikonomou
25cd0788a6 Merge pull request #683 from g-oikonomou/sensinode-modules
Fix MODULES for the Sensinode platform
2014-06-03 22:03:42 +01:00
Adam Dunkels
64f65b4e45 Merge pull request #617 from nfi/extended-radio-api
Extended radio API with support for setting channel, pan id, addressing modes, etc
2014-06-03 21:32:53 +02:00
Nicolas Tsiftes
3650950460 Merge pull request #678 from simonduq/sky-disable-ndp
Disable IPv6 Neighbor Discovery Protocol by default on the sky platform
2014-06-02 10:52:07 +02:00
Rémy Léone
25c8b0835d Closing doxygen groups 2014-05-30 11:01:20 +02:00
Lars Schmertmann
50481722a8 Enabled 2nd button on platform econotag 2014-05-23 11:50:12 +02:00
George Oikonomou
6e08841e5c Fix MODULES for the Sensinode platform 2014-05-18 15:30:54 +02:00
George Oikonomou
807ee624e4 Confine CC2538 WDT on/off conf inside the driver
Instead of requiring all calls to `watchdog_start` to be
wrapped inside `#if WATCHDOG_CONF_ENABLE` guards, we control
things from within the WDT driver itself.

This commit also includes some minor documentation and
indentation cleanups
2014-05-18 14:12:16 +02:00
George Oikonomou
b864ec2b71 Merge pull request #661 from hexluthor/watchdog-enable
CC2538: Add WATCHDOG_CONF_ENABLE to optionally disable the watchdog timer
2014-05-18 14:11:49 +02:00
George Oikonomou
eabc244bff Merge pull request #641 from hexluthor/backdoor-conf
CC2538: Add CONF parameters to select boot loader backdoor pin and logic level
2014-05-18 13:29:02 +02:00
George Oikonomou
026864d129 Merge pull request #665 from hexluthor/cc2538-flash-conf
CC2538: Add FLASH_CONF_ORIGIN and FLASH_CONF_SIZE config parameters.
2014-05-18 13:12:49 +02:00
Simon Duquennoy
6e53ab6eb0 Disable IPv6 Neighbor Discovery Protocol by default on the sky platform 2014-05-14 17:29:18 +02:00
Claes Jakobsson
9c08f28956 Added EEPROM support for Cooja with a rudimentary hexdump -C like viewer in the mote interface view 2014-05-08 22:35:58 +02:00
Ian Martin
2abaeaa8cc CC2538: Add FLASH_CONF_ORIGIN and FLASH_CONF_SIZE config parameters. 2014-05-02 11:35:58 -04:00
Ian Martin
7081440eff CC2538: Add WATCHDOG_CONF_ENABLE to optionally disable the watchdog timer. 2014-05-02 10:28:30 -04:00
George Oikonomou
08c884afa0 Improve the CC2538 extended RF API implementation
* Decouple 64-bit address from LINKADDR_SIZE
* get and set object from/to the start/end of the src/dest buffer
* We expect size == 8 (rather than size < 8) for both get_ and set_object. Error otherwise
* The RF no longer sets parameters by itself. We let the platform do this, using the extended API.
2014-04-23 12:20:16 +01:00
George Oikonomou
3183805ba4 Implement extended RF API for the CC2530 RF 2014-04-23 12:16:50 +01:00
Atis Elsts
7dcfe77fba Fix inconsistent usage of short/long integer type in mbxxx platform's configuration file.
The type used to store rtimer ticks on this platform is 32-bit integer, but the macro uses 16-bit comparison.
As a result, the output of the RTIMER_CLOCK_LT(a,b) macro was incorrect when used for comparisons between time values with sufficiently large difference.
The code to repeat this problem on mbxxx platform:

  rtimer_clock_t a = 6 * RTIMER_ARCH_SECOND;
  rtimer_clock_t b = 0;
  printf("%d\n", RTIMER_CLOCK_LT(a,b)); // expected output: "0", actual: "1"
2014-04-22 14:52:50 +02:00
Atis Elsts
9cbfede2b6 Explicitly initialize queue buffer in the main startup routine only if uIP is used.
The Rime stack already does this on its own, and there is no need to do it twice.
2014-04-22 14:40:04 +02:00
Atis Elsts
b9e15a5986 Make native platform's main loop less noisy. 2014-04-22 14:38:08 +02:00
Atis Elsts
6ea744421b Initialize the rtimer component on native platform's startup.
Otherwise applications that use rtimers die when run as native code because of an unhandled signal.
2014-04-22 14:35:01 +02:00
Ian Martin
ee05810904 Changes suggested by @bthebaudeau. 2014-04-18 10:29:47 -04: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
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
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
Ian Martin
1a63c47cf9 CC2538: Add CONF parameters to select boot loader backdoor pin and logic level. 2014-04-15 17:36:55 -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
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
fc6814a104 Added stub for extended radio API for seedeye 2014-04-03 13:38:31 +02:00
Niclas Finne
b8a23564a3 Added stub for extended radio API for Cooja 2014-04-03 13:38:29 +02:00
Niclas Finne
b13b5fc9ac Fixed typo to correctly print the radio channel at startup 2014-03-28 11:54:12 +01:00
Ian Martin
336224633a Eliminate UART_CONF_IBRD and UART_CONF_FBRD. 2014-03-22 10:26:03 -04:00
François Revol
726bdd699a native: Add CTK to the module list
It is needed for apps compiled WITH_GUI.
2014-03-21 23:01:02 +01:00
Nicolas Tsiftes
b78eb96a54 Merge pull request #590 from g-oikonomou/native-rpl-module
Include the RPL module for the native platform
2014-03-18 12:32:56 +01:00
Oliver Schmidt
d1d6278f42 Added info on W5100 driver. 2014-03-15 16:56:08 +01:00
George Oikonomou
4704eeb919 Include the RPL module for the native platform 2014-03-09 03:29:43 +00:00
George Oikonomou
6dc9dfa6c2 Merge pull request #551 from JelmerT/feature-cc2538-bsl
CC2538 serial boot loader python script
2014-03-09 02:11:36 +00:00
Jelmer Tiete
34e48f4233 Added bootloader backdoor configuration for cc2538DK in contiki-conf.h and selector in startup-gcc.c. Updated Makefile.cc2538dk to support direct uploading. Also updated the platform readme to include the workflow with cc2538-bsl. 2014-03-07 15:44:08 +01:00
Brad Campbell
d14f0d5eed CC2538: add secondary location to ieee address
The CC2538 currently has two addressing options: a hardcoded address set
at compile time or the address stored in primary address section of the
info page. This commit adds the option to choose the secondary location
of the ieee address from the info page, or any memory address.

To use, define `IEEE_ADDR_CONF_USE_SECONDARY_LOCATION` in `project-conf.h`
or similar.

For example:

    #define IEEE_ADDR_CONF_USE_SECONDARY_LOCATION 1
2014-03-06 10:31:30 -05:00
Oliver Schmidt
a1cd642e6e Merge pull request #554 from oliverschmidt/master
Fixed win32 broken by recent changes.
2014-02-02 12:10:57 -08:00
Oliver Schmidt
71c671b6cf Fixed win32 broken by recent changes. 2014-02-02 20:19:47 +01:00
George Oikonomou
a63376f8be Use -Os for CC2538 builds
As discussed in #503, -Os was broken with one of the toolchains
recommended in the platform's README and for that reason we were
using -O2 by default.

This commit sets the default to -Os and updates the README to no
longer recommend the toolchain in question
2014-01-31 20:02:43 +00:00
Adam Dunkels
45265249fc Changed the name of the rimeaddr module to linkaddr 2014-01-29 20:12:24 +01:00