deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
11606 commits 6 branches 13 tags 80 MiB
Commit graph

11606 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Joakim Eriksson e9e31e9fd1 replaced add/remove ds6-nbr with an nbr-module controlled update of lladdress to avoid loss of other state information 2016-04-19 13:41:13 +02:00
Joakim Eriksson 2e852f758b added a null check on the lladdr before the memcmp. 2016-04-19 13:36:43 +02:00
Joakim Eriksson 223f002676 fixed the case when the lladdr did not change but the LLAO is there and it is not an override. 2016-04-19 13:36:43 +02:00
Joakim Eriksson 6f271bf853 fixed so that the comparison of old lladdr and llao lladdr is compared instead of two llaos - and improved code style on surrounding code 2016-04-19 13:36:43 +02:00
Joakim Eriksson b2f72fc996 replaces with aligned lladdress and also fixed the second memcpy to avoid risk of inconsistency when nodes change MAC address 2016-04-19 13:36:43 +02:00
Joakim Eriksson 510fc9e51e removed memcpy that cause inconsistency in nbr-table when adding nd6 neighbor with NS/NA. 2016-04-19 13:36:43 +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
thomas-ha 3a76207b59 Use 64 bit values for MAC timer 2016-04-18 11:40:52 +02:00
Phil Rhinehart 5d5544151f Fixed bug in cc26xx-cc13xx rf-core. When running BLE in conjunction with ContikiMAC, oscillators were modified from an interrupt state causing occasional bus faults and infinite loops. We now check if BLE is active prior to modifiying the oscillators to avoid these conditions. 2016-04-18 17:17:07 +08:00
Phil Rhinehart 2a07dc0e0a This fixes an event handling issue in the cc26xx BLE driver. Currently, the rf_ble_beacon_process triggers the BLE beacon upon receiving any event, rather than verifying that the event timer has expired. This means that any PROCESS_BROADCAST (e.g. any sensor event) will fire the beacon. This commit adds logic to prevent this. 2016-04-18 17:14:37 +08:00
thomas-ha 6262025ef3 code style fixes and insert macros from .h 2016-04-15 15:50:20 +02:00
thomas-ha 3bf05d664e moving macros to .c 2016-04-15 15:50:01 +02:00
kkrentz 6fb6fd5bb9 packetbuf: No more splitting of header and data 2016-04-15 03:12:40 -07:00
Marko Gucanin d8db093eb2 renamed ccm-star.c to jn516x-ccm-star.c, adapted Makefile accordingly 2016-04-14 16:55:48 +02:00
Marko Gucanin f1110bf6df removed NETSTACK_LLSEC.init 2016-04-14 16:52:32 +02:00
kkrentz 0af4a18c09 packetbuf: Use MIN macro 2016-04-13 09:20:29 -07:00
kkrentz 3d79292e44 packetbuf: Simplified packetbuf_attr_clear 2016-04-13 09:20:29 -07:00
kkrentz 1014018c2d packetbuf: Removed debugging stuff 2016-04-13 09:20:29 -07:00
kkrentz 11c03eef79 packetbuf: Removed function prototypes 2016-04-13 09:20:29 -07:00
kkrentz a1b91d8b59 packetbuf: Removed commented code 2016-04-13 09:20:29 -07:00
Konrad Krentz d478c0f7f1 packetbuf: Deleted functions that are never called 2016-04-13 09:20:29 -07:00
kkrentz 7353829c72 llsec: Fix for Issue #1537 2016-04-13 09:16:09 -07:00
kkrentz 4a88e9e537 llsec: Removed TSCH_SECURITY_CONF_LEVEL and TSCH_SECURITY_LEVEL 2016-04-13 09:16:08 -07:00
kkrentz 431530bf6b llsec: Added READMEs 2016-04-13 09:16:07 -07:00
Hardy b3f2bba3ec Removed some unnecessary statics in do_event() and process_post(). 
This allows the optimizer to put the corresponding variables into registers.
See also discussion about other static variables:
https://sourceforge.net/p/contiki/mailman/message/35010460/
 2016-04-13 18:12:47 +02:00
kkrentz 403d332555 llsec: Make decorated framer configurable 2016-04-13 07:54:46 -07:00
kkrentz 10d8b05bc6 llsec: Permit dynamic security levels 2016-04-13 07:54:46 -07:00
kkrentz 0379af3624 llsec: Do not define surrogates in packetbuf.h, as otherwise configuration errors go unnoticed 2016-04-13 07:54:46 -07:00
Antonio Lignan c9baf0cb57 Merge pull request #1192 from bkozak-scanimetrics/tcpip_put_temporaries_on_stack 
changed tcpip static temporaries to stack vars
 2016-04-13 09:30:33 +02:00
Antonio Lignan 8f064511d3 Merge pull request #1213 from joakimeriksson/dao_ack_handling 
End-to-End DAO and DAO ACK handling for Contiki RPL.
 2016-04-11 18:53:43 +02:00
Pere Tuset 1d3c37d6da Add OpenMote-CC2538 platform and examples. 2016-04-11 12:35:02 +02:00
thomas-ha 5753fb5173 Clean up the driver 
Move mac_timer_init() into set_poll_mode() and remove now unneccesary clear outs and mask outs of interrupt sources and pending interrupts
 2016-04-07 15:41:15 +02:00
thomas-ha 9ac859a2af add send_on_cca if query 2016-04-07 15:17:44 +02:00
Benoît Thébaudeau 34dd6423f2 Merge pull request #1587 from g-oikonomou/bugfix/travis-arm-aapcs 
Fix failure of ARM-AAPCS travis job
 2016-04-07 00:53:43 +02:00
George Oikonomou 9f1e87466f Fix failure of ARM-AAPCS travis job 
Up till now we have been installing arm-gcc using apt from the team-gcc-arm-embedded ppa.

As discussed in #1453 and implemented in #1504, we have decided to lock travis to use the specific version of the toolchain that is documented in the READMEs of relevant platforms. However, the PPA no longer hosts this version, apt fails to install arm-gcc and as a result the job fails too.

This commit changes the travis job to wget an installation tarball for the desired version, instead of trying to install via apt.
 2016-04-06 23:24:42 +01:00
thomas-ha a7b43de535 add comment, use spaces 2016-04-06 16:54:45 +02:00
Oliver Schmidt 1d0e940a66 Merge pull request #1583 from oliverschmidt/master 
Added compatibility with W5100 shared access.
 2016-04-05 21:41:52 +02:00
Oliver Schmidt 2c48f3b232 Added compatibility with W5100 shared access. 
If the setup of socket 0 to 3 with 4+2+1+1KB is detected then the W5100 is _not_ initialized, otherwise it does set up socket 0 and 1 with 4KB each. Either way socket 0 is used - now with 4KB instead of 8KB as before.
 2016-04-05 21:11:19 +02:00
thomas-ha 2a69999214 space instead of tab 2016-04-05 17:12:48 +02:00
Antonio Lignan 520519860e Merge pull request #1520 from Zolertia/adc-fixed-channels 
Added enabling up to 6 ADC channels and fixed adc-zoul driver problem.
 2016-04-04 14:28:26 +02:00
Toni Lozano a81b4007b0 Allow to use up to 6xADC channels (now hardcoded), disabling the user button 
(PA3) if ADC6 is enabled
 2016-04-04 10:48:43 +02:00
Simon Duquennoy fb31d8d641 Merge pull request #1576 from mguc/jn516x_clock_module_signfix 
JN516x clock module sign error fix
 2016-04-01 08:59:36 +02:00
Marko Gucanin 1818700bde JN516x clock module sign error fix 2016-03-31 13:51:03 +02:00
Simon Duquennoy 2b04888f16 Merge pull request #1574 from warner83/master 
Fixed a bug into tsch-schedule - tsch_schedule_add_link that causes d…
 2016-03-31 13:36:40 +02:00
Atis Elsts c7c3ef3b9c Cooja: add Msp802154BitErrorRadio interface 
The interface more accurately models bit errors due to signal fading as observed in IEEE 802.15.4-compatible radios, such as CC2420 and CC2520.
 2016-03-31 13:41:16 +03:00