Ralf Schlatterbeck
7d63a0f487
Merge branch 'osd' into ico
...
Conflicts resolved:
core/net/mac/contikimac/contikimac.c
2016-06-30 09:28:54 +02:00
Ralf Schlatterbeck
d7e6935ec2
Channel check interval is clock_time_t
...
Fix channel_check_interval routine in struct rdc_driver to be of type
clock_time_t -- otherwise this may overflow on some architectures.
2016-05-07 11:46:27 +02:00
Ralf Schlatterbeck
53dd2e5d16
Fix unused variable warning
2016-04-22 12:34:16 +02:00
Harald Pichler
428131e8a8
use dynamic sleep for loop
2016-01-06 21:57:29 +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
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
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
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
Harald Pichler
6b41f23d59
make mcusleep variable, use mcusleepcycle
2015-09-15 09:52:06 +02: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
Harald Pichler
500078ef9a
update to contiki 3.0
2015-08-26 16:01:57 +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
Benoît Thébaudeau
66acf74612
cc2538: examples: Fix build warnings
...
Toolchain used:
arm-none-eabi-gcc (GNU Tools for ARM Embedded Processors) 4.9.3 20150303
(release) [ARM/embedded-4_9-branch revision 221220]
Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2015-06-02 01:38:11 +02:00
Harald Pichler
6a0d407806
Merge branch 'contiki' into osd
2015-05-19 10:54:55 +02:00
Moritz 'Morty' Strübe
0dab6926b3
Move MAX, MIN and ABS to sys/cc.h
2015-05-18 08:53:17 +02:00
Harald Pichler
877bf27f5a
Merge branch 'contiki' into osd
2015-05-15 20:48:26 +02:00
Simon Duquennoy
4a93f5148d
Fixed a number of compiler warnings
2015-05-08 09:07:20 +02:00
Harald Pichler
9efc5d41c1
Merge branch 'contiki' into osd
2014-12-29 08:20:00 +01:00
Harald Pichler
76ea945fd7
add power save mode RDC_CONF_PT_YIELD_OFF
2014-12-09 16:42:45 +01:00
Harald Pichler
a02be51f08
Merge branch 'contiki' into osd
2014-12-07 15:24:00 +01:00
Simon Duquennoy
bd4233a953
Cleanup packetbuf: use rime attributes and addresses only when rime is enabled. Saves 32 byte per queuebuf in the non-rime case.
2014-12-02 16:54:58 +01:00
Simon Duquennoy
a9cc909794
Network layer configuration: replace UIP_CONF_* with NETSTACK_CONF_WITH_*
2014-12-01 21:02:57 +01:00
Harald Pichler
dd917c3260
bugfix server client demo
2014-11-19 13:34:37 +01:00
kkrentz
fb00a217f5
packetbuf: Use packetbuf_holds_broadcast() all-over
2014-11-13 09:58:08 -08:00
kkrentz
2cf7d98cad
ContikiMAC: Create and parse ContikiMAC header in special framer; Expanded framer interface
...
to allow for creating and securing frames in advance; Create and secure frames in advance when sending bursts; Do neither recreate nor resecure frames that come from phase
2014-08-05 05:07:06 -07:00
kkrentz
515287ef17
llsec: Removed superseded NETSTACK_ENCRYPT, NETSTACK_DECRYPT, and
...
NETSTACK_ENCRYPTION_INIT macros
2014-08-05 05:07:05 -07:00
kkrentz
41c5dbf961
llsec: Disable duplicate detection when the LLSEC driver provides replay protection anyway.
2014-08-05 05:07:05 -07:00
kkrentz
eaae9f1100
llsec: Calling NETSTACK_LLSEC.on_frame_created()
2014-08-05 05:04:15 -07:00
Adam Dunkels
45265249fc
Changed the name of the rimeaddr module to linkaddr
2014-01-29 20:12:24 +01:00
Adam Dunkels
8eace27f9b
Moved net/rime.h to net/rime/rime.h
2014-01-26 23:20:45 +01:00
Adam Dunkels
083fe0b594
Moved the contikimac code into a core/net/mac/contikimac module
2014-01-26 23:20:25 +01:00
