George Oikonomou
49620903a5
Merge pull request #791 from debug-ito/cooja-add-int-master
...
cooja: add int-master implementation.
2018-12-07 01:43:21 +00:00
Toshio Ito
e7a86cf16b
cooja: add int-master implementation.
...
It's copied from arch/cpu/native/int-master.c, which is just a no-op
stub.
See #790
2018-12-06 11:30:54 +09:00
Joakim Eriksson
ba15c0c6e4
Merge pull request #784 from g-oikonomou/bugfix/nrf52dk
...
Fix the nrf52dk .jlink and .flash make targets
2018-12-02 10:41:05 +01:00
George Oikonomou
944d8da255
Fix the nrf52dk .jlink and .flash make targets
...
Fixes #782
2018-12-01 20:52:47 +00:00
George Oikonomou
372cce8beb
Merge pull request #783 from tiepettersen/contrib/ti-erronous-log-newline
...
Fix correct LOG_INFO in platform.c
2018-11-30 11:32:19 +00:00
Edvard Pettersen
dff3e760b8
Fix correct LOG_INFO in platform.c
...
When logging info about channel and PANID a newline is added for each
logging statement. It should only add a newline for the first LOG_INFO.
2018-11-29 16:42:45 +01:00
George Oikonomou
4d6c8898c2
Merge pull request #776 from tiepettersen/contrib/lp-uart-rx-pin
...
Fixed wrong PIN configuration for UART0_RX on LaunchPads
2018-11-26 13:13:40 +00:00
Edvard Pettersen
081a8cd516
Fixed wrong PIN configuration for UART0_RX on LaunchPads
...
All LaunchPads drives the UART0_RX pin up, but is configured in the
Board file to be pull-down. This alignes the UART0_RX pin configuration
with the development board HW.
2018-11-26 12:04:08 +01:00
George Oikonomou
37c03ecd25
Merge pull request #773 from simonduq/contrib/ext-arch-path
...
Build system: enable compiling with arch directory at arbitrary paths
2018-11-25 02:37:09 +00:00
Simon Duquennoy
f1bbc42121
Build system: enable compiling with arch directory at arbitrary paths
2018-11-23 10:41:40 +01:00
George Oikonomou
cfb25e8242
Merge pull request #771 from simonduq/fix/missing-includes-inttypes
...
Add missing inclusions of <inttypes.h>
2018-11-22 14:45:01 +00:00
Simon Duquennoy
a9aad29617
Add missing inclusions of <inttypes.h>
2018-11-22 15:04:10 +01:00
Niclas Finne
12f3686232
Merge pull request #590 from carlosgp143/contrib/lwm2m-multiple-server
...
Add support for multiple server session in LwM2M
2018-11-21 00:36:43 +01:00
Carlos Gonzalo
416b38861f
Updated lwm2m-standalone submodule
2018-11-19 18:27:15 +01:00
Niclas Finne
82b7b74165
Removed the incomplete feature in LWM2M RD client to "guess" a LWM2M
...
server if none has been specified. This does not belong in the LWM2M
RD client and does not work well with multiple server support.
2018-11-19 18:27:15 +01:00
Niclas Finne
962aa01d30
Combined the functions for registering LWM2M server and bootstrap
...
server into a single function for simpler API.
Updated the LWM2M example to register to a single server by default
but with a configuration option to use multiple servers.
2018-11-19 18:27:15 +01:00
carlosgp143@gmail.com
be71b5fc1d
Added support for multiple server session in LwM2M
2018-11-19 18:27:15 +01:00
Simon Duquennoy
21f9d1710c
Merge pull request #727 from jeppenodgaard/fix/global/ip-addr/removed
...
Fix: Global ip-addr removed if root is rebooted, rejoins network, and then starts acting as root again
2018-11-15 20:55:41 +01:00
Jeppe N. Odgaard
be52ee76a0
Reverted changes to examples/multicast
2018-11-15 16:40:30 +01:00
Jeppe N. Odgaard
e23a1ee118
Use examples/libs/shell instead of modified examples/multicast. Added identical test in tests/14-rpl-lite, but with rpl-lite routing.
2018-11-15 16:38:31 +01:00
jeppenodgaard
e1bf32181f
Merge branch 'develop' into fix/global/ip-addr/removed
2018-11-15 16:06:11 +01:00
George Oikonomou
f5657ec9e2
Merge pull request #763 from lafka/lafka-ldscript-override
...
Allow configurable linker script
2018-11-14 17:59:21 +00:00
Olav Frengstad
5e57f7de83
Allow configurable linker script
...
Make it possible to overwrite `LDSCRIPT` from other Makefiles
2018-11-14 22:35:27 +05:30
George Oikonomou
c9c3befb50
Merge pull request #754 from g-oikonomou/bugfix/macos-getopt
...
Change help messages to specify the -v argument as non-optional
2018-11-13 22:34:49 +00:00
Simon Duquennoy
aecde05134
Merge pull request #760 from contiki-ng/master
...
Merge back 'master', release 4.2, into 'develop'
2018-11-13 13:33:15 +01:00
Simon Duquennoy
d917b4f160
Merge branch 'develop' into bugfix/macos-getopt
2018-11-12 17:56:44 +01:00
Simon Duquennoy
7b076e4af1
Merge pull request #749 from contiki-ng/release-4.2
...
Release v4.2
2018-11-12 17:31:48 +01:00
Simon Duquennoy
9f935f9565
Merge pull request #758 from simonduq/contrib/nightly-plot-DAG-join
...
Nightly runs: keep track of DAG joining events
2018-11-12 17:05:11 +01:00
George Oikonomou
e706c3ee72
Merge branch 'develop' into contrib/nightly-plot-DAG-join
2018-11-12 15:34:43 +00:00
Simon Duquennoy
5a01bb05eb
Merge pull request #759 from g-oikonomou/bugfix/remove-obsolete
...
Remove obsolete header
2018-11-12 14:42:33 +01:00
George Oikonomou
0b9e3c3561
Remove obsolete header
2018-11-12 12:35:53 +00:00
Simon Duquennoy
67ed46944f
Nightly runs: keep track of DAG joining events
2018-11-12 11:38:17 +01:00
George Oikonomou
6bc598d169
Merge pull request #757 from ThisIsIoT/bug/simplelink-linker
...
fixes contiki-ng/contiki-ng#756 simplelink target .bin files too big.
2018-11-12 09:29:40 +00:00
George Oikonomou
d937570e1f
Merge branch 'develop' into bug/simplelink-linker
2018-11-12 09:29:14 +00:00
firmwareguru
504be07f4f
fixes contiki-ng/contiki-ng#756 simplelink target .bin files too big.
2018-11-11 20:58:12 -07:00
George Oikonomou
2e4984f671
Change help messages to specify the -v argument as non-optional
...
This commit changes the help messages of `tunslip6` and native border router such thaty they stop specifying the `level` argument of `-v` as optional.
2018-11-11 16:51:18 +00:00
Simon Duquennoy
d4022a5628
Merge pull request #743 from kkrentz/csma-improvements-pr
...
General improvements to CSMA
2018-11-11 14:43:10 +01:00
Simon Duquennoy
d286854bb4
Merge branch 'develop' into csma-improvements-pr
2018-11-10 15:20:35 +01:00
George Oikonomou
0e7f39c330
Merge pull request #750 from simonduq/merge/4.2-back-to-develop
...
Merge release 4.2 back to develop
2018-11-09 20:27:06 +00:00
Simon Duquennoy
4ea5d41d52
Merge branch release-4.2 back into develop
2018-11-09 17:04:31 +01:00
kkrentz
0c0d7b3e46
CSMA: Assert that n and q are non-NULL in csma-output.c#packet_sent
2018-11-07 03:06:50 -08:00
George Oikonomou
f42618ce94
Merge pull request #745 from simonduq/contrib/shell-empty-cmd
...
Shell: skip empty lines
2018-11-06 00:57:50 +00:00
George Oikonomou
0c7ada4535
Merge branch 'develop' into contrib/shell-empty-cmd
2018-11-05 23:01:04 +00:00
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