Commit Graph

14861 Commits

Author SHA1 Message Date
George Oikonomou
1a43e255f8
Merge pull request #730 from cperezpenichet/cc2420_carrier
Unmodulated carrier transmission for cc2538 & cc2420
2018-11-05 23:00:09 +00:00
George Oikonomou
cf9be4e7f8
Merge branch 'develop' into cc2420_carrier 2018-11-05 21:45:27 +00:00
George Oikonomou
98f35fe091
Merge pull request #746 from simonduq/contrib/nbr-error-msg
Native border router: clearer error messages
2018-11-05 16:14:25 +00:00
Simon Duquennoy
5d8fda2af4 Native border router: clearer error messages 2018-11-05 16:04:02 +01:00
Simon Duquennoy
07915ac580 Shell: skip empty lines 2018-11-05 16:03:21 +01:00
Niclas Finne
f24be610f5
Merge pull request #558 from joakimeriksson/contrib/csma-llsec
Add back link layer security for CSMA
2018-11-02 18:21:18 +01:00
Joakim Eriksson
ecb214bb2d clear uipbuf including its attributes before creating a packet 2018-11-02 15:44:45 +01:00
Niclas Finne
93c7aae49e
Update os/services/shell/shell-commands.c
Co-Authored-By: joakimeriksson <joakime@sics.se>
2018-11-02 15:20:07 +01:00
Niclas Finne
ef9b1f32ba
Update os/services/shell/shell-commands.c
Co-Authored-By: joakimeriksson <joakime@sics.se>
2018-11-02 15:19:27 +01:00
kkrentz
f71db7cc90 CSMA: Discard frames that come from ourselves 2018-11-02 07:14:25 -07:00
kkrentz
74780d5962 CSMA: Do not parse twice/Acknowledge MAC command frames, too 2018-11-02 07:13:23 -07:00
kkrentz
e4dcba32c9 CSMA: Do not depend depend on sequence numbers to identify packets 2018-11-02 07:13:23 -07:00
Simon Duquennoy
bda7c329ba
Merge branch 'develop' into contrib/csma-llsec 2018-11-02 01:13:14 +01:00
Joakim Eriksson
16ac869645 removed some no longer needed hard-coded calculations in the sicslowpan code 2018-10-31 23:02:14 +01:00
jeppenodgaard
00018d4c1b
Merge branch 'develop' into fix/global/ip-addr/removed 2018-10-30 17:18:35 +01:00
Jeppe Odgaard
5f441a509f Merge branch 'fix/global/ip-addr/removed' of https://github.com/jeppenodgaard/contiki-ng into fix/global/ip-addr/removed 2018-10-30 17:06:56 +01:00
Jeppe Odgaard
693e6fdb30 Increased rpl_done, because time to build rpl seems to be faster in Cooja with graphical interface. 2018-10-30 17:05:49 +01:00
Joakim Eriksson
35123e9dd8 fixed better packet size assumptions 2018-10-30 16:36:55 +01:00
Joakim Eriksson
42dfc81af2 added LLSEC attributes form packetbuf to uipbuf when receiving IP packet, and a few other minor fixes 2018-10-30 16:06:11 +01:00
Carlos Pérez Penichet
2d2d6b3ad6 Fixed code style issues 2018-10-29 11:15:40 +01:00
Simon Duquennoy
2b0c2d5e4a
Merge pull request #714 from simonduq/contrib/uip-cleanup
Safer uIP6 buffer handling
2018-10-29 11:09:54 +01:00
Simon Duquennoy
a2b7b996e4
Merge branch 'develop' into contrib/uip-cleanup 2018-10-29 10:18:10 +01:00
George Oikonomou
c174d7ddcc
Merge pull request #733 from kkrentz/init-pr
Fix to queuebuf initialization
2018-10-27 15:49:49 +01:00
kkrentz
468a14b528 moved initialization of queuebuf to contikimac-main.c 2018-10-27 07:13:36 -07:00
Carlos Pérez Penichet
a906f03a25 cc2420 return to last state when disabling carrier
Made cc2420 follow the same logic as cc2538 when
disabling the unmodulated carrier. Now they both
return to the state they were in before the carrier
was enabled.
2018-10-26 16:28:20 +02:00
Carlos Pérez Penichet
c6770112af Fixed code style and removed forgotten pritf's 2018-10-25 11:49:20 +02:00
Carlos Pérez Penichet
79a4fe33a6 Unmodulated carrier transmission for cc2538
Modified the cc2538 driver to enable the radio test
mode to emit unmodulated carriers (tones).
A carrier can be enabled using the normal radio driver
API:
NETSTACK_CONF_RADIO.set_value(
RADIO_PARAM_POWER_MODE,
RADIO_POWER_MODE_CARRIER_ON);

Once enabled, the carrier can be disabled like this:
NETSTACK_CONF_RADIO.set_value(
RADIO_PARAM_POWER_MODE,
RADIO_POWER_MODE_CARRIER_OFF);
2018-10-25 11:24:44 +02:00
Simon Duquennoy
189fd594d3
Merge pull request #401 from yatch/pr/nbr-multi-ipv6-addrs
Introduce UIP_DS6_NBR_MULTI_IPV6_ADDRS
2018-10-24 16:48:45 +02:00
Yasuyuki Tanaka
4d8bb2f550 uip-ds6-nbr: check memb availability before adding an nbr_table entry 2018-10-24 07:03:10 -07:00
Yasuyuki Tanaka
54a2889614 test/10-ipv6-nbr: add 01-test-nbr-multi-addrs 2018-10-24 07:03:10 -07:00
Yasuyuki Tanaka
319b70345a uip-ds6-nbr: introduce UIP_DS6_NBR_MAX_6ADDRS_PER_NBR 2018-10-24 07:01:57 -07:00
Yasuyuki Tanaka
17aa75f0cf uip-ds6-nbr: add doxygen comments (and re-order some functions) 2018-10-24 07:01:57 -07:00
Yasuyuki Tanaka
ee452b5287 uip-ds6-nbr: introduce UIP_DS6_NBR_MULTI_IPV6_ADDRS
This feature, which is disabled by default, extends the neighbor cache
management in order to have multiple IPv6 address associated with a
single link-layer address as neighbor caches.

To use this feature, set 1 to UIP_DS6_NBR_CONF_MAX_NEIGHBOR_CACHES.
2018-10-24 07:01:57 -07:00
Yasuyuki Tanaka
8ef5c8b8c6 uip-ds6-nbr: make ds6_neighbors a local variable
All the nbr_table API calls with ds6_neighbors are replaced with
uip_ds6_nbr APIs accordingly.
2018-10-24 07:01:57 -07:00
Yasuyuki Tanaka
e29093efec tests/09-ipv6: add tests for UIP_DS6_NBR_MULTI_IPV6_ADDRS feature 2018-10-24 06:59:42 -07:00
Carlos Pérez Penichet
feb1513b46 Unmodulated carrier transmission for cc2420
Modified the cc2420 driver to enable the radio test
mode to emit unmodulated carriers (tones).
A carrier can be enabled using the normal radio driver
API:
NETSTACK_CONF_RADIO.set_value(
    RADIO_PARAM_POWER_MODE,
    RADIO_POWER_MODE_CARRIER_ON);

Once enabled, the carrier can be disabled like this:
NETSTACK_CONF_RADIO.set_value(
    RADIO_PARAM_POWER_MODE,
    RADIO_POWER_MODE_CARRIER_OFF);
2018-10-24 15:26:40 +02:00
Simon Duquennoy
42436cc486
Merge pull request #703 from simonduq/fix/json-buffer-overflows
Json library: fix a number of potential buffer overflows
2018-10-24 12:16:38 +02:00
Simon Duquennoy
37e9027807
Merge pull request #729 from debug-ito/tsch-resync-target
tsch: skip re-synchronization when time source has been already changed
2018-10-24 11:46:42 +02:00
Simon Duquennoy
ab1e2f8d28
Merge branch 'release-4.2' into fix/json-buffer-overflows 2018-10-24 10:49:37 +02:00
Simon Duquennoy
470ee43644
Merge pull request #717 from g-oikonomou/contrib/tests/out-of-tree
Add out of tree build tests
2018-10-24 10:48:55 +02:00
Simon Duquennoy
4dc465c16f
Merge branch 'develop' into tsch-resync-target 2018-10-24 10:06:48 +02:00
Simon Duquennoy
2ffe42c069
Merge pull request #387 from yatch/pr/rename-srf06-cc26xx
Rename srf06-cc26xx to cc26x0-cc13x0
2018-10-24 10:04:51 +02:00
Simon Duquennoy
3b9394d9ad
Merge branch 'release-4.2' into contrib/tests/out-of-tree 2018-10-24 10:02:35 +02:00
Simon Duquennoy
dea14f7799
Merge pull request #698 from g-oikonomou/contrib/build/dirs
Change build output dir structure and filenames
2018-10-24 10:02:10 +02:00
Yasuyuki Tanaka
2af3665b04 simplelink: correct a comment in Makefile.cc13xx-cc26xx 2018-10-23 13:32:55 -07:00
Yasuyuki Tanaka
0bcdd39cc6 Rename 'arch/cpu/cc26xx-cc13xx' to 'arch/cpu/cc26x0-cc13x0' 2018-10-23 13:32:03 -07:00
Yasuyuki Tanaka
7a6cbff5f6 Rename srf06/{cc26xx,cc13xx} to srf06/{cc26x0,cc13x0} 2018-10-23 13:09:02 -07:00
Yasuyuki Tanaka
61fba4dcde Rename srf06-cc26xx to cc26x0-cc13x0 2018-10-23 13:04:32 -07:00
George Oikonomou
1dc0249836 Adjust the jn516x build system to the new build output dir structure 2018-10-23 17:54:35 +01:00
George Oikonomou
14eeeccebc Always create example.$(TARGET) under build/ and then copy to . 2018-10-23 17:47:32 +01:00