Commit graph

11940 commits

Author SHA1 Message Date
George Oikonomou
80efd730ae Extend the flash driver to support the MX25R1635F
According to the CC1310LP design files, the flash on it is the same as the flash on the CC2650 LP (MX25R8035F 8Mbit). However, the flash on some CC1310 LPs reportedly identifies itself as the 16Mbit one (MX25R1635F). Instruction sets are identical, we simply need to tell the driver to recognise this part's Device ID.
2016-05-14 20:34:08 +01:00
George Oikonomou
18f67dade2 Compile-test CC1310 LaunchPad sources 2016-05-14 20:32:17 +01:00
George Oikonomou
06f4463996 Extend documentation to include the CC1310 LaunchPad 2016-05-14 20:32:17 +01:00
George Oikonomou
099a933c90 Add support for the CC1310 LaunchPad 2016-05-14 20:32:17 +01:00
George Oikonomou
cd5a0ef291 Consolidate .upload for all CC26xx/CC13xx boards
The block that controls the `.upload` target is unnecessarily replicated in multiple sub-board Makefiles. This was originally done because the SmartRF and the Launchpad can be programmed with the c2538-bsl script, whereas the sensortag cannot.

This commit moves the `cc2538-bsl` / `.upload` target logic to the top level cpu Makefile (`cpu/cc26xx-cc13xx/Makefile.cc26xx-cc13xx`). Board makefiles simply set the make variable `BOARD_SUPPORTS_BSL` to 1 to signal that they can be programmed by the BSL script. If `BOARD_SUPPORTS_BSL` is not equal to 1, trying to use the `.upload` target will return an error message.

For example:

```
$ make BOARD=sensortag/cc2650 cc26xx-demo.upload
using saved target 'srf06-cc26xx'
This board cannot be programmed with the ROM bootloader and therefore does not support the .upload target.
```
2016-05-14 19:30:53 +01:00
George Oikonomou
fd15934235 Merge pull request #1663 from pablocorbalan/cc2650-lp
Add upload script to Makefile.launchpad
2016-05-14 16:05:23 +01:00
Antonio Lignan
171f02a75a Merge pull request #1644 from jdede/setBaudrate
Do not use setBaudrate
2016-05-14 16:27:59 +02:00
Robert Olsson
3c19e870f1 Moving the avr-rss2 platform examples to the global examples
location as suggested by the maintainers.
2016-05-14 12:05:19 +02:00
Pablo Corbalán
5bc158fa75 Add upload script to Makefile.launchpad 2016-05-13 23:06:33 +01:00
Yasuyuki Tanaka
633bf09f6d Fix the path for wpcapslip in testscript for Instant Contiki 2016-05-12 21:15:40 +02:00
Nicolas Tsiftes
98fcac15cd Merge pull request #1651 from gebart/pr/lwm2m-json-sv-bv
oma-lwm2m: Use sv for string value, bv for boolean
2016-05-12 17:01:16 +02:00
Nicolas Tsiftes
eeff8bf970 Merge pull request #1656 from STclab/pr/platform-readme-update
Update to stm32nucleo-spirit1 platform README file.
2016-05-12 16:49:16 +02:00
Nicolas Tsiftes
8f41f2a66d Merge pull request #1657 from tscheffl/ravenusb_IPv6_fix
Fix for IPv6 compilation and linkage errors
2016-05-12 16:15:44 +02:00
Thomas
4870f9e8f3 Fix for IPv6 compilation and linkage errors
Two errors have been spotted, when IPv6 is enabled in the ravenusb
Project-Makefile:
#CONTIKI_NO_NET=1
CONTIKI_WITH_IPV6=1

The compile error results from a variable name mismatch in cdc_task.c
The variable 'r' is undeclared and should be renamed to 'route'

The linker also fails with 'undefined references'
This has been mediated by adding 'core/net' to Modules in the
Project-Makefile.
2016-05-09 18:18:28 +02:00
Marco Grella
d9fd19eb2f Update to stm32nucleo-spirit1 platform README file. 2016-05-05 16:44:07 +02:00
Antonio Lignan
e3d5b745e7 Merge pull request #1653 from gebart/pr/ipso-temperature-cel
ipso-temperature: Use "Cel" for degrees celsius
2016-05-04 22:13:13 +02:00
Joakim Nohlgård
22e9ccadf7 ipso-temperature: Use "Cel" for degrees celsius
Like the IPSO documentation says
2016-05-04 19:21:56 +02:00
Joakim Nohlgård
cb729b0785 oma-lwm2m: Use sv for string value, bv for boolean
Like the OMA docs specify
2016-05-04 19:15:01 +02:00
Simon Duquennoy
2a1da5dbad Merge pull request #1646 from jdede/fix-putchar-ipv4
Fix putchar include when using IPv4
2016-05-04 14:41:18 +02:00
Simon Duquennoy
087470546a Merge pull request #1645 from jdede/z1-fix-include
Fix broken include
2016-05-04 14:39:29 +02:00
Jens Dede
7f80b1ad57 Remove include of stdio.h 2016-05-04 11:12:37 +02:00
Nicolas Tsiftes
617465e465 Merge pull request #1626 from gebart/pr/cfs-readonly-seek
core/cfs: Disallow seeking past the end of a file unless it is writable
2016-05-03 12:52:11 +02:00
Simon Duquennoy
896c58cd98 Merge pull request #1647 from yatch/pr-rpl-regression-substr-fix
Resolve script errors raised during the RPL regression tests on Ubuntu 14.04
2016-05-03 10:28:59 +02:00
Joakim Nohlgård
19550f9f7f core/cfs: Disallow seeking past the end of a file if it is not writable 2016-05-03 07:10:35 +02:00
Jens Dede
59afae85e2 Use if instead of ifdef. Is more contiki standard-compliant 2016-05-02 22:34:58 +02:00
Jens Dede
119291d083 Fix putchar include when using IPv4 2016-05-02 19:13:26 +02:00
Jens Dede
43fb479c9d Fix broken include 2016-05-02 18:57:48 +02:00
Jens Dede
cd7885ae76 do not use setBaudrate 2016-05-02 18:48:16 +02:00
Yasuyuki Tanaka
37b2d9f600 Replace the '+' operator with String.prototype.concat() 2016-05-02 18:18:12 +02:00
Nicolas Tsiftes
0e9234dce6 Merge pull request #1636 from frank-freihube-rmcan-com/fixTrailingZeros
Trailing zeros in file leading to unexpected file length get set in destination buffer
2016-05-02 13:52:13 +02:00
Fredrik Österlind
5c2a0e2652 Merge pull request #1638 from joakimeriksson/cooja-message-list-fix
Fixing Cooja message list to avoid any Swing components when headless
2016-05-02 10:23:13 +02:00
Antonio Lignan
bea58c15bd Merge pull request #1485 from g-oikonomou/contrib/cc2650/launchpad
Add support for the CC2650 LaunchPad (LAUNCHXL-CC2650)
2016-04-29 11:13:05 +02:00
Frank Freihube
59727ede70 fixup! make changes configurable through io_semantics() 2016-04-29 08:12:55 +02:00
Frank Freihube
5bd7fc86c3 make changes configurable through io_semantics() 2016-04-29 08:07:27 +02:00
Simon Duquennoy
1cd06a291e Merge pull request #1639 from yatch/pr-tsch-log-link-null
Handle the case when log->link is NULL in tsch_log_process_pending
2016-04-28 18:12:34 +02:00
Nicolas Tsiftes
70abb211e3 Merge pull request #1635 from simonduq/pr/dao-no-k-flag-in-nopath
RPL: do not add K flag to no-path DAO as we discard the ACK anyway
2016-04-28 14:45:01 +02:00
Nicolas Tsiftes
4d67a48d3d Merge pull request #1625 from kkrentz/llsec-fix
Fix for "LLSEC802154_CONF_ENABLED undefined"
2016-04-28 12:01:15 +02:00
Antonio Lignan
4251539237 Merge pull request #1579 from bkozak-scanimetrics/fix_csma_backoff
Use collisions for csma backoff and retry
2016-04-28 10:24:55 +02:00
Antonio Lignan
a4dfb0b660 Merge pull request #1618 from simonduq/pr/tcpip-code-style
Fixes indent in tcpip.c and uip6.c
2016-04-28 00:12:23 +02:00
Antonio Lignan
a70b9bc277 Merge pull request #1447 from alignan/pull/cc1200-sensniff
Added sensniff support for the CC1200
2016-04-27 23:59:45 +02:00
Antonio Lignan
6afd56e0ee Merge pull request #1634 from simonduq/pr/daoack-fix
DAO ACK fix
2016-04-27 23:47:07 +02:00
Yasuyuki Tanaka
763c63f428 Handle the case when log->link is NULL in tsch_log_process_pending 2016-04-27 20:35:05 +02:00
Joakim Eriksson
19120788c0 made a text-based version of the MessageList for headless execution 2016-04-27 19:32:14 +02:00
Simon Duquennoy
24449e9cba Merge pull request #1637 from simonduq/pr/rpl-default-lifetime
RPL default lifetime
2016-04-27 18:18:47 +02:00
Simon Duquennoy
ace607a32d Fix RPL default lifetime 2016-04-27 17:04:29 +02:00
Simon Duquennoy
87e06af5c5 Merge pull request #1620 from simonduq/pr/tsch-remove-log
TSCH: remove 'not for us' log
2016-04-27 15:41:24 +02:00
Simon Duquennoy
4392507019 RPL: do not add K flag to no-path DAO as we discard the ACK anyway 2016-04-27 14:20:39 +02:00
Simon Duquennoy
bb5e5d5c6b TSCH: use RTIMER_CLOCK_DIFF to compute estimated drift, fixing a bug that would occur on 16-bit rtimer platforms 2016-04-27 14:13:33 +02:00
Simon Duquennoy
0379398d7c RPL DAO ACK: increment DAO seqno before storing it to my_dao_seqno 2016-04-27 14:05:16 +02:00
Simon Duquennoy
f47c0f579d RPL DAO ACK: improve logging 2016-04-27 14:05:08 +02:00