Antonio Lignan
f065971efc
Merge pull request #1619 from simonduq/pr/tsch-rtimer16-fix
...
Fix bug in TSCH for platforms with 16-bit rtimer
2016-06-01 23:03:50 +02:00
Antonio Lignan
8d6a290382
Merge pull request #1682 from simonduq/pr/fix-tsch-log
...
Fix tsch-log bug
2016-05-25 18:02:36 +02:00
Simon Duquennoy
2299a763d0
Fix tsch-log bug
2016-05-25 17:38:10 +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
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
Yasuyuki Tanaka
763c63f428
Handle the case when log->link is NULL in tsch_log_process_pending
2016-04-27 20:35:05 +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
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
kkrentz
4a88e9e537
llsec: Removed TSCH_SECURITY_CONF_LEVEL and TSCH_SECURITY_LEVEL
2016-04-13 09:16:08 -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
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
Carlo Vallati
855703e936
Fixed a bug into tsch-schedule - tsch_schedule_add_link that causes deadlock if a new link cannot be created
2016-03-31 10:35:19 +02:00
Oliver Schmidt
111a976f1e
Explicitly mark constant as 'unsigned' to avoid unnecessary promotion to 'long'.
...
Long constants trigger the performance warning "Constant is long" with cc65.
2016-03-28 14:39:16 +02:00
Joakim Eriksson
444015df67
refactored the rpl-nbr-policy to be called from nbr-table module
2016-03-26 09:45:37 +01:00
Simon Duquennoy
3057cb3363
TSCH: reset now also flushes all queues and resets backoff exponents
2016-03-15 16:24:04 +01:00
Simon Duquennoy
4b4ea36e9b
TSCH: substract RADIO_DELAY_BEFORE_DETECT from ACK timestamp (more accurate timeout for the following busy wait)
2016-03-15 16:23:57 +01:00
Simon Duquennoy
0fd097f821
TSCH: bound max packet size to the system's packetbuf size
2016-03-15 16:23:57 +01:00
Simon Duquennoy
0aa36eaa0a
TSCH: explicitly turn radio off after ACK tx
2016-03-15 16:23:57 +01:00
Simon Duquennoy
73fcfa42c2
TSCH: fix compiler warning that shows up when disabling TSCH_LOG_LEVEL
2016-03-07 17:42:17 +01:00
Simon Duquennoy
cc58384b40
jn516x: remove temporary adjustements for compilation in a 802.15.4e-free Contiki
2015-12-07 11:51:50 +01:00
Atis Elsts
d79ce957a1
Adaptive time synchronization for TSCH
2015-12-07 11:51:41 +01:00
Simon Duquennoy
7eabf8d391
TSCH: latest update from https://github.com/EIT-ICT-RICH/contiki
2015-12-04 15:21:58 +01:00
Simon Duquennoy
2ca7a1a79f
TSCH security: port to new ccm-star and llsec APIs
2015-12-04 15:21:56 +01:00
Simon Duquennoy
b0f936263e
Added IEEE 802.15.4e TSCH (TimeSlotted Channel Hopping) MAC layer
2015-12-04 15:21:52 +01:00
Simon Duquennoy
ecba49c282
Add support for IEEE 802.15.4e Information Elements (IEs). All IEs used by TSCH are currently included.
2015-12-04 15:21:50 +01:00
Simon Duquennoy
5cf9871d5b
Added support for IEEE 802.15.4 frame version 2
2015-12-04 15:21:50 +01:00
Atis Elsts
b5d17bb620
ContikiMAC: use RTIMER_GUARD_TIME #define to avoid accidentally scheduling a rtimer in the past on platforms with fast rtimer ticks
2015-12-03 17:37:26 +01:00
Simon Duquennoy
27fd590b51
Merge pull request #1228 from bkozak-scanimetrics/contikimac_replace_function_pointer_cast
...
Replaced function pointer cast in contikimac
2015-12-01 15:35:28 +01:00
Antonio Lignan
d31ba8dfdc
Replaced tabs leftover in previous commit
2015-11-24 10:21:23 +01:00
Antonio Lignan
e2cf8f9868
Made ContikiMAC more configurable (on uknoblic behalf)
2015-11-23 14:03:51 +01:00
Simon Duquennoy
fbd78a7e3b
Merge pull request #1293 from simonduq/pr/fix-warnings
...
Fix a number of compiler warnings and enable -Werror in Travis
2015-11-10 08:49:11 +01: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
5dd6261fef
Nullrdc: added missing include for cooja nodes
2015-10-20 10:11:15 +02:00
Konrad Krentz
1a12ef3334
llsec: Unsecuring within parse
2015-10-14 08:22:44 -07:00
Konrad Krentz
2059b6559e
llsec: Let llsec_drivers define their own framer
2015-10-14 08:21:40 -07:00
Nicolas Tsiftes
a536801e24
Merge pull request #657 from atiselsts/networking_patches
...
Phase RDC memory allocation bugfix
2015-09-24 16:50:00 +02:00
Billy Kozak
467f28286c
The CSMA driver no longer throttles queued packets
...
Fix for #1166
Updated the CSMA driver so it no longer applies a time delay for
sending queued packets which were sent without error.
2015-09-18 09:35:29 -06:00
Billy Kozak
32e668ae2a
Fix for #1165
...
It is possible that packetbuf is modified by the call to
mac_call_sent_callback. If this occurs ContikiMAC will not be able to
recognize that a packet is pending.
This fixes this problem by storing pending status in a local variable before
calling mac_call_sent_callback.
2015-09-18 09:33:10 -06:00
Simon Duquennoy
63ddba93a9
Merge pull request #1169 from feshie/pr-warnings-fix
...
Fix multiple warnings (TCPIP, coap-observe, msp430, z1/tmp102, ContikiMAC)
2015-09-08 09:05:44 +02:00
Billy Kozak
7b27ad64ca
Replaced function pointer cast in contikimac
...
Replaced a cast of the funciton pointer to powercycle with a
wrapper calling powercycle which has the correct signature.
The previous implementation was an instance of undefined behaviour
according to the C standard.
2015-09-01 10:16:43 -06:00
Atis Elsts
b75f673801
RDC phase optimization: correct the behavior in case of memory allocation failure
...
phase_wait did not check whether queuebuf_new_from_packetbuf() returns NULL. This potentially causes send_packet to behave incorrectly; the proper packet would not be sent out (because queuebuf_to_packetbuf(NULL) is a no-op). Instead, whatever has been left in the packet buffer by its previous user will be sent out.
2015-08-14 16:37:00 +02:00
Simon Duquennoy
dc4de9d001
Merge pull request #1161 from g-oikonomou/contrib/contikimac-sw-ack
...
Implement TX of S/W ACKs with ContikiMAC
2015-08-04 13:15:03 +02:00
Arthur Fabre
8739113308
Fix warnings in ContikiMAC
...
../..//core/net/mac/contikimac/contikimac.c:503:11: warning: variable
‘seqno’ set but not used [-Wunused-but-set-variable]
../..//core/net/mac/contikimac/contikimac.c:496:7: warning: variable
‘len’ set but not used [-Wunused-but-set-variable]
Both of these variables are only used if RDC_CONF_HARDWARE_ACK is not
true.
Their definitions and use have been moved into #ifdef guards so they do
not appear if RDC_CONF_HARDWARE_ACK is set.
2015-07-16 13:49:31 +01:00
George Oikonomou
315f6fe535
Implement TX of S/W ACKs with ContikiMAC
2015-07-12 00:07:33 +01:00
George Oikonomou
503a992887
Make ContikiMAC more configurable
...
Allow the project / platform to provide values for CCA_SLEEP_TIME and LISTEN_TIME_AFTER_PACKET_DETECTED.
This is useful for sub-ghz operation.
This has been shamelessly stolen from the [Mountain Sensing project](https://github.com/feshie/contiki )
@heliosfa @kmartinez
2015-07-11 23:55:44 +01:00