Commit Graph

11497 Commits

Author SHA1 Message Date
Marco Casaroli
cade3c7699 Merge branch 'master' of https://github.com/contiki-os/contiki into fixes 2016-06-03 11:49:04 -03:00
Oliver Schmidt
0151a7c27e Merge pull request #1706 from oliverschmidt/master
Make use of new cl65 option --print-target-path.
2016-06-03 15:13:08 +02:00
Nicolas Tsiftes
71dcbe0533 Merge pull request #1654 from gebart/pr/lwm2m-json-writer
oma-lwm2m: Add JSON writer
2016-06-03 14:53:27 +02:00
Simon Duquennoy
b3ea124958 Merge pull request #1394 from joakimeriksson/nbrtable-nd6-fix
Removed memcpy that cause inconsistency in nbr-table when adding nd6 neighbors.
2016-06-03 14:44:54 +02:00
Simon Duquennoy
43c7b43adf Merge pull request #1679 from tidyjiang8/bug_chameleon_raw_hdrsize
fix the bug about chameleon raw hdrsize
2016-06-03 14:40:12 +02:00
Simon Duquennoy
84b51461e9 Merge pull request #1597 from rgrr/remove_static_from_process_c
Removed some unnecessary statics in do_event() and process_post().
2016-06-03 14:16:14 +02:00
Oliver Schmidt
ae0c5f0dd0 Make use of new cl65 option --print-target-path.
The new cl65 option --print-target-path allows to get rid of CC65_HOME altogether.
2016-06-03 13:30:25 +02:00
Simon Duquennoy
5097842cba Merge pull request #1688 from tsparber/fix-rssi-scanner
Fixed rssi-scanner example
2016-06-03 10:12:02 +02:00
Simon Duquennoy
f5f6d54d59 Merge pull request #1698 from bthebaudeau/fix-21-large-rpl-timeout
21-large-rpl: Avoid frequent timeout in Travis CI
2016-06-03 10:10:58 +02:00
Simon Duquennoy
3c9593f3ab Merge pull request #1692 from pablocorbalan/unicast-sent-cb
RIME: Extend unicast example to include a sent callback.
2016-06-03 10:10:36 +02:00
Benoît Thébaudeau
77f93c3b5a 21-large-rpl: Avoid frequent timeout in Travis CI
With a timeout set to 40 min, this test often failed at about 95% of the
script, causing many spurious pull request test failures. Increase the
timeout to 50 min.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2016-06-02 22:56:59 +02:00
Simon Duquennoy
26bf33c762 Merge pull request #1550 from thomas-ha/tsch-cc2538-port
Port of TSCH for CC2538
2016-06-02 21:33:55 +02:00
Antonio Lignan
b60c22e84a Merge pull request #1701 from alignan/pull/fix-temp-nordic-ppa
Fix broken nrf52dk Travis build
2016-06-02 12:02:50 +02:00
Antonio Lignan
7dd2f1144b Disabled rtimer redefinition, removed outdated address print and timer-test from regression tests 2016-06-02 10:50:22 +02:00
Antonio Lignan
8cd075f3e5 Moved regression test to new placeholder 2016-06-02 10:02:32 +02:00
Antonio Lignan
688f4aefe0 Updates ARM toolchain to latest launchpad embedded version 2016-06-02 09:32:24 +02:00
Antonio Lignan
34af72c047 Merge pull request #1609 from simonduq/pr/net-debug
Added net-debug.[ch] to provide debug functions even in the non-IP case
2016-06-01 23:52:34 +02:00
Antonio Lignan
6fc4e2535c Merge pull request #1665 from g-oikonomou/contrib/cc26xx-bsl
Consolidate .upload for all CC26xx/CC13xx boards and add login make target
2016-06-01 23:37:29 +02:00
Antonio Lignan
c742d07803 Merge pull request #1695 from alignan/pull/fix-remote-pinout
Fixed CC2538/PIC labels being swapped
2016-06-01 23:34:42 +02:00
Antonio Lignan
acf13a4e0d Merge pull request #1606 from OpenMote/master
Adapted OpenMote-CC2538 sensor drivers to Contiki sensor API.
2016-06-01 23:15:27 +02:00
Antonio Lignan
9e1c378919 Merge pull request #1469 from wbober/nrf52dk-pr
Add support for nRF52 DK platform
2016-06-01 23:11:39 +02:00
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
4334990e16 Merge pull request #1686 from bthebaudeau/unified-cfs-coffee-examples
Unified CFS/Coffee examples
2016-06-01 22:00:13 +02:00
thomas-ha
8a7b1f07d1 add cc2538dk 2016-06-01 17:58:57 +02:00
thomas-ha
e537a2ea92 Add CC2538DK 2016-06-01 16:01:58 +02:00
Antonio Lignan
429699d421 Merge pull request #1666 from g-oikonomou/contrib/cc1310-lp
Add support for the CC1310 LaunchPad (LAUNCHXL-CC1310)
2016-06-01 15:41:44 +02:00
Antonio Lignan
10601b2e5c Fixed CC2538/PIC labels being swapped 2016-06-01 14:28:53 +02:00
Marco Casaroli
03ca795bd6 fix ipv6 http socket host handling as in RFC2732 2016-06-01 09:26:12 -03:00
Pere Tuset
2b3cab18f4 Run uncrustify through ADXL346 driver. 2016-06-01 11:11:21 +02:00
Pablo Corbalán
101575fbe2 RIME: Extend unicast example to include a sent callback.
This PR simply adds a packet sent callback to the unicast connection used in the example. Every time a packet is sent the callback is called and prints the linkaddr_t dest, the MAC status of the message sent, and the link layer number of transmissions of the packet. This can be used to compute link quality estimations.
2016-06-01 00:35:49 +01:00
Benoît Thébaudeau
5b3432547e cfs-coffee: examples: Add support for CC2538
Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2016-06-01 00:19:52 +02:00
Benoît Thébaudeau
0079b78966 zoul: Make it possible to override COFFEE_CONF_SIZE
The projects need to be able to override it with project-conf.h.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2016-05-30 23:05:14 +02:00
Benoît Thébaudeau
09a7566e01 cc2538: coffee: Add default micro-log configuration
Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2016-05-30 23:05:14 +02:00
Benoît Thébaudeau
bd961d1cd3 cc2538: Fix possible linker script breakage
The conditional definitions in project-conf.h depending on
CONTIKI_TARGET_<TARGET_NAME> were ignored at link time, which broke the
linker script if it used these definitions, so the flashed applications
could crash or malfunction.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2016-05-30 23:05:14 +02:00
Benoît Thébaudeau
6df2b91a31 test-coffee: Fix the garbage collection test
This test could sometimes fail because of a lack of free contiguous
pages in the file system. Fix this by removing the created files at the
end of each test. Besides, the test files do not have to be removed at
the beginning of each test since the file system is initially formatted.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2016-05-30 23:05:13 +02:00
Benoît Thébaudeau
003b4b0d63 test-coffee: Fix the file modification test
The r variable was used instead of i to fill the buffer, resulting in
the end of the test loop after only a single iteration. The file was not
even closed at the end of each iteration although it is opened at the
beginning of each iteration, so the available file descriptors would
very quickly be exhausted.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2016-05-30 23:05:13 +02:00
Benoît Thébaudeau
150b9fbd8b test-coffee: Fix test filenames
The filenames were mixed up between some of the tests, thus breaking the
purpose of these tests.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2016-05-30 23:05:13 +02:00
Benoît Thébaudeau
76429e4f0e test-coffee: Fix numbering of test failure cases
Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2016-05-30 23:05:13 +02:00
Benoît Thébaudeau
5d227b92a3 test-cfs: Fix possible test failure after reboot
Remove the file at the beginning of the test, before opening it for
writing, in order to start the test with an empty file system, not only
after flashing the test, but also following every reboot.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2016-05-30 23:05:12 +02:00
Antonio Lignan
e23c175699 cfs-coffee: examples: Fix coding style 2016-05-30 23:05:12 +02:00
Antonio Lignan
4ed5c50a4e Make CFS and Coffee examples platform-independent
Move the CFS and Coffee examples from sky to a common cfs-coffee folder
in order to have unified examples for multiple platforms.
2016-05-30 23:05:12 +02:00
Benoît Thébaudeau
d70c75914a cfs-coffee: Fix build warning
Fix this build warning, which is generated if micro logs are enabled:

In file included from ../../core/cfs/cfs-coffee.c:59:0:
../../core/cfs/cfs-coffee.c: In function 'read_log_page':
../../cpu/cc2538/./cfs-coffee-arch.h:145:24: warning: passing argument 1 of 'cfs_coffee_arch_read' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
   cfs_coffee_arch_read((buf), (size), (offset))
                        ^
../../core/cfs/cfs-coffee.c:757:3: note: in expansion of macro 'COFFEE_READ'
   COFFEE_READ(lp->buf, lp->size, base);
   ^
../../cpu/cc2538/./cfs-coffee-arch.h:176:6: note: expected 'void *' but argument is of type 'const char *'
 void cfs_coffee_arch_read(void *buf, unsigned int size, cfs_offset_t offset);
      ^

COFFEE_READ() needs to write to lp->buf, so the target type of this
pointer cannot be qualified as "const".

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2016-05-30 23:05:11 +02:00
Nicolas Tsiftes
2ad6d18c9d Merge pull request #1652 from gebart/pr/lwm2m-accept
oma-lwm2m: Use Accept header to determine writer object
2016-05-30 15:33:08 +02:00
Antonio Lignan
334e38339e
Fixed rssi-scanner example 2016-05-30 10:53:20 +02:00
Joakim Nohlgård
e8edb6b1a0 oma-lwm2m: Add JSON writer 2016-05-28 07:55:54 +02:00
Joakim Nohlgård
9832b356ba oma-lwm2m: Use Accept header to determine the writer object for the content 2016-05-28 07:55:27 +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
Kitty(chun hua) Jiang
f5919a2a45 fix the bug about chalemeon raw hdrsize 2016-05-25 10:28:47 +08:00
George Oikonomou
3a34b1f695 Merge pull request #1531 from bkozak-scanimetrics/cc26xx_cc13xx_lpm_fixes
Fixed numerous bugs in CC26xx-CC13xx lpm
2016-05-24 16:45:20 +01:00