Commit graph

11343 commits

Author SHA1 Message Date
Jens Dede cd7885ae76 do not use setBaudrate 2016-05-02 18:48:16 +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 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
Frank Freihube 7ba5b0d150 Trailing zeros in file leading to unexpected file length get set in destination buffer 2016-04-27 10:39:05 +02:00
Nicolas Tsiftes 37f0931c02 Merge pull request #1613 from nvt/remove-deluge
Remove Deluge and associated test files.
2016-04-26 11:40:28 +02:00
Simon Duquennoy 90b886aa71 Csma: comply with IEEE 802.15.4 2016-04-25 08:52:48 -06:00
Billy Kozak ca0f32f45b Use collisions for csma backoff and retry
The collision count is now used in the calculation fot the CSMA
backoff and transmission will fail after a certain number of
collisisons.
2016-04-25 08:00:56 -06:00
kkrentz 39921f1231 rdc.h: Read LLSEC802154_ENABLED instead of LLSEC802154_CONF_ENABLED 2016-04-25 03:10:42 -07:00
Simon Duquennoy e1ea4955c7 TSCH: remove 'not for us' log 2016-04-25 11:51:43 +02:00
Simon Duquennoy f0f13fa58b Indent uip6.c 2016-04-25 11:50:14 +02:00
Simon Duquennoy 0296e6aba0 Indent tcpip.c 2016-04-25 11:50:14 +02:00
Simon Duquennoy 5b5f07ba52 Merge pull request #1621 from simonduq/pr/fix-travis-output
Fix output of RPL tests
2016-04-25 11:40:36 +02:00
Simon Duquennoy c17e2f7010 Merge pull request #1622 from simonduq/pr/disable-dao-ack
Fixing 04-rpl-large-network
2016-04-25 11:40:25 +02:00
Simon Duquennoy 03ae4c91fa Fix output of RPL tests 2016-04-23 08:06:36 +02:00
Simon Duquennoy 753a557903 Travis: use a single random seed rather than two. As a result, a single failed simulation results in overall failure 2016-04-23 07:58:06 +02:00
Simon Duquennoy f8c4d1155f Disable RPL DAO ACK by default 2016-04-23 07:54:32 +02:00
Nicolas Tsiftes 6ae1b4ab66 Merge pull request #1463 from MichaelKlemm/FixUsingAtmega128RFA1
Fixed using target AVR ATmega128RFA1
2016-04-21 14:30:35 +02:00
Nicolas Tsiftes fb5f0f66dd Removed Deluge and associated test files. 2016-04-21 13:24:16 +02:00
Nicolas Tsiftes 417c76e965 Merge pull request #1611 from nvt/coffee-update-comments
Coffee: improve comments and code formatting
2016-04-21 12:14:43 +02:00
Nicolas Tsiftes 86733e8702 Clarified and cleaned up Coffee's documentation and the debug statements. Formatted some source code for easier reading. 2016-04-20 14:34:17 +02:00
Nicolas Tsiftes 7586195b79 Merge pull request #1608 from nvt/coffee-remove-protected-mem
Remove protected memory from Coffee
2016-04-20 13:36:28 +02:00
Nicolas Tsiftes be13fc7d23 Merge pull request #1605 from tonnenpinguin/pr_fix_slip_config
Add typecast to native border router switch statement
2016-04-20 12:51:43 +02:00
Nicolas Tsiftes 7f700c9564 Remove the protected memory code associated with sensornet checkpointing because this functionality has been removed from Contiki. 2016-04-20 12:47:37 +02:00
Nicolas Tsiftes 204dcb9bbc Merge pull request #1332 from tsparber/collect-view-add-osx
collect-view gui: Add support for OS X serialdump and motelist
2016-04-20 11:57:12 +02:00
Bernhard Hackl 2ad3d85d41 Fix slip config switch statement 2016-04-20 08:14:08 +00:00
Simon Duquennoy d828557563 Merge pull request #1425 from kkrentz/llsec-fixes
random LLSEC fixes
2016-04-19 17:29:00 +02:00
Simon Duquennoy de51dd5c30 Merge pull request #1598 from mguc/jn516x_llsecinit_ccm-star
JN516x NETSTACK_LLSEC.init and ccm-star fix
2016-04-19 17:27:15 +02:00
Simon Duquennoy ba72f0a131 Merge pull request #1422 from kkrentz/packetbuf-cleanup
packetbuf cleanup
2016-04-19 17:23:47 +02:00
George Oikonomou 040bada378 Merge pull request #1590 from OpenMote/master
Add OpenMote-CC2538 platform and examples.
2016-04-18 21:26:15 +01:00
George Oikonomou 00d5645d16 Merge pull request #1601 from philrhinehart/bugfix-cc26xx-ble-events
cc26xx-cc13xx BLE beacon event issue
2016-04-18 20:06:33 +01:00
Pere Tuset 3e00ea55d1 Updated the OpenMote-CC2538 platform and examples. 2016-04-18 16:48:48 +02:00
George Oikonomou cd6d76230d Merge pull request #1602 from philrhinehart/bugfix-cc26xx-rf-oscillators
cc26xx-cc13xx oscillator control issue
2016-04-18 12:00:44 +01:00