Commit graph

10604 commits

Author SHA1 Message Date
George Oikonomou e768ff95b1 Merge pull request #1339 from msloth/feature-cc26xx-13xx-lpm-no-wakeup-pin
[cc26xx-cc13xx] allow lpm_shutdown() without a wake-up pin set
2015-10-29 11:31:37 +00:00
Oliver Schmidt a5f21feb4f Merge pull request #1331 from oliverschmidt/master
Rearranged ATARI memory usage.
2015-10-28 17:25:39 +01:00
Antonio Lignan 1759411e55 Merge pull request #1280 from alignan/cc1200-changes
Made CC1200 test mode and rx watchdog selectable
2015-10-28 15:42:14 +01:00
Oliver Schmidt 5024468c2f Rearranged ATARI memory usage.
The cc65 memory map for the ATARI XL has two holes so the linker needs hints which object files go where. Source changes lead to object file size changes requiring now and then to rearrange the object files.
2015-10-28 12:22:43 +01:00
Oliver Schmidt 9f42c53e7f Merge pull request #1330 from oliverschmidt/master
Have Git ignore .zip files.
2015-10-28 12:13:46 +01:00
Marcus Linderoth 1906bff17c allow lpm_shutdown without a wake-up pin set 2015-10-28 11:06:26 +01:00
Oliver Schmidt b4ed3d65d4 Have Git ignore .zip files.
.zip files are are common build artifacts but never sources.
2015-10-28 09:47:22 +01:00
Nicolas Tsiftes 17714c2111 Merge pull request #1299 from sumanpanchal/wismote-nodeid-burn-restore-frm-xmem
Burn and restore node id using external flash of Wismote
2015-10-26 18:41:28 +01:00
suman_panchal 5a07279c4f Burn and restore node id using external flash of Wismote 2015-10-24 18:24:38 +05:30
Nicolas Tsiftes 566b251797 Merge pull request #1243 from unmole/coap_fix
CoAP: Fix handling of Token Length greater than 8
2015-10-23 17:58:15 +02:00
Simon Duquennoy 93cd91fbda Merge pull request #1198 from simonduq/tunslip6
new tunslip6 features
2015-10-23 11:10:22 +02:00
Simon Duquennoy 0e31bb12ea Moved generic baudrate defines and selection code to a new module tools/tools-utils.[ch] 2015-10-23 10:54:58 +02:00
Simon Duquennoy 88118482a8 Added more baudrates, added missing defs for MacOS 2015-10-23 10:54:57 +02:00
Simon Duquennoy 55d81ddd3a tunslip6: support MTU configuration, XON/XOFF flow control, and baudrates up
to 1000000 mbps
2015-10-23 10:54:57 +02:00
Simon Duquennoy b979beb075 Merge pull request #1167 from bkozak-scanimetrics/contikimac_fix_qsend_list_packetbuf_pending
Fix Mishandling of PENDING/Queued Packets at ContikiMAC and CSMA
2015-10-23 10:52:17 +02:00
Simon Duquennoy 1e1241f075 Merge pull request #1156 from amitgeron/stunicast-timer-fix
Stunicast timer fix
2015-10-23 10:51:40 +02:00
Simon Duquennoy 9171ba17fc Merge pull request #1304 from simonduq/pr/fix-tunslip6
Fix tunslip6
2015-10-23 09:37:01 +02:00
Fredrik Österlind b28e6a7bef Merge pull request #1318 from sieben/fix_csc_export_gitatributes
Fix CSC & XML export to match .gitattributes
2015-10-22 22:36:04 +02:00
Rémy Léone 00afc92b0c Add binary files file extension 2015-10-22 16:19:39 +02:00
Rémy Léone f2440235b5 Fix CSC & XML export to match .gitattributes 2015-10-22 16:05:40 +02:00
Benoît Thébaudeau bf41de1be5 Merge pull request #1078 from drandreas/cc2538-crypto
cc2538: Add PKA drivers, ECC algorithms and examples
2015-10-21 11:24:35 +02:00
Oliver Schmidt 61a5d234eb Merge pull request #1316 from oliverschmidt/master
Added ZIP file creation to retro distro Makefile.
2015-10-21 11:24:15 +02:00
Adam Dunkels 5e08b15b0a Merge pull request #1313 from tadodotcom/tmp-remove-uip-is-addr-link-local
Removes duplicate of uip_is_addr_linklocal
2015-10-21 08:16:27 +02:00
Oliver Schmidt 4db4b7fcf2 Added ZIP file creation to retro distro Makefile.
The ZIP includes a comment containing the Git SHA of the code built.
2015-10-20 18:18:35 +02:00
Simon Duquennoy 4edfb3671f Merge pull request #1315 from simonduq/pr/fix-jn516x-uart-printf
jn516x uart-driver.c: use DBG_vPrintf instead of printf.
2015-10-20 15:57:12 +02:00
Simon Duquennoy 810036e4f3 jn516x uart-driver.c: use DBG_vPrintf instead of printf. Issue https://github.com/contiki-os/contiki/issues/1314 2015-10-20 14:56:51 +02:00
Simon Duquennoy 2daa3d7377 Merge pull request #1269 from tadodotcom/tmp-uip-fallback-iface
More flexibility for the fallback interface
2015-10-20 11:33:14 +02:00
Antonio Lignan 50ee33630e Made CC1200 test mode and rx watchdog selectable 2015-10-20 11:20:19 +02:00
Valentin Sawadski b0c7dabf4c Removes duplicate of uip_is_addr_linklocal
A simple search and replace of `uip_is_addr_link_local` to ensure the more
commonly used `uip_is_addr_linklocal` is used consistently.
2015-10-20 11:18:46 +02:00
Simon Duquennoy 9c15d1c42f Merge pull request #1063 from simonduq/configure-na
Default NDP configuration
2015-10-18 20:26:55 +02:00
Simon Duquennoy c1797e0ffe Merge pull request #912 from cetic/pr-dag-lifetime
Add DODAG lifetime, update of parent rank when switching dag and multi dodag non-regression test
2015-10-18 20:26:37 +02:00
Simon Duquennoy 10bd49a71a Merge pull request #756 from sieben/dos2unix
dos2unix fix
2015-10-18 20:26:07 +02:00
Simon Duquennoy 86f41f8c7b Merge pull request #1146 from kkrentz/llsec-as-framer
LLSEC as FRAMER
2015-10-18 20:25:30 +02:00
AntiCat d631270af4 cc2538: Add PKA drivers, ECC algorithms and examples 2015-10-18 20:14:17 +02:00
Fredrik Österlind 0c9f11b568 Merge pull request #1308 from cmorty/pull/safe_random
Fix SafeRandom
2015-10-15 18:53:26 +02:00
Moritz 'Morty' Strübe f17fc20fe7 Fix SafeRandom logic 2015-10-15 10:09:57 +02:00
Moritz 'Morty' Strübe 6f86e0bd92 Typos 2015-10-15 10:09:41 +02:00
kkrentz c865982df5 JN516x: Call LLSEC.init instead of LLSEC.bootstrap 2015-10-15 00:41:12 -07:00
Simon Duquennoy bfeff0488d Port JN516x ccm-star implementation to new ccm_star_driver interface 2015-10-14 09:20:44 -07:00
kkrentz 9500be8916 llsec: Declared aead static 2015-10-14 08:22:44 -07:00
Konrad Krentz 1a12ef3334 llsec: Unsecuring within parse 2015-10-14 08:22:44 -07:00
Konrad Krentz 0a6b1cb646 llsec: Added AEAD mode to CCM* 2015-10-14 08:22:44 -07:00
Konrad Krentz c656a4d1c5 llsec: Fixed style issues in CCM* 2015-10-14 08:22:44 -07:00
Konrad Krentz b522c042ec llsec: Replaced bootstrap function with a simple init function 2015-10-14 08:21:40 -07:00
Konrad Krentz 2059b6559e llsec: Let llsec_drivers define their own framer 2015-10-14 08:21:40 -07:00
Simon Duquennoy a9a46b29cc tunslip6: disable IP address inquiry by default. Document -I flag 2015-10-13 09:54:06 +02:00
Simon Duquennoy 30f69b0852 Revert "tunslip6: make printing of sensible strings from mote more reliable"
This reverts commit 6608b62b01.
2015-10-13 09:35:25 +02:00
Oliver Schmidt 79ca771d69 Merge remote-tracking branch 'upstream/master' 2015-10-10 20:34:21 +02:00
Oliver Schmidt 6b29e4b30d Merge pull request #1303 from oliverschmidt/master
Initialize acknowledgment no. on establishment of outgoing TCP connection.
2015-10-10 19:55:28 +02:00
Oliver Schmidt fa9c25cdf5 Merge remote-tracking branch 'upstream/master' 2015-10-10 18:01:14 +02:00