Commit graph

11439 commits

Author SHA1 Message Date
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
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
Pere Tuset 2b3cab18f4 Run uncrustify through ADXL346 driver. 2016-06-01 11:11:21 +02: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
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
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
Antonio Lignan 6306c79128 Merge pull request #1674 from alignan/pull/fix-button-typo
Fixed typo in button definition
2016-05-24 10:53:28 +02:00
Antonio Lignan de64ed3975 Fixed typo 2016-05-24 10:50:20 +02:00
Nicolas Tsiftes 562a33aa16 Merge pull request #1670 from gebart/pr/lwm2m-decimal-point
oma-lwm2m: Handle text/plain floatfix numbers without decimal point
2016-05-23 15:22:35 +02:00
Simon Duquennoy a7ce256309 Merge pull request #1672 from simonduq/pr/orchestra-fixes
Various Orchestra fixes
2016-05-22 14:37:34 +02:00
Simon Duquennoy 0418ee7446 Merge pull request #36 from yatch/pr-orchestra-add-null-checks
Add NULL checks into new_time_source of orchestra-rule-eb-per-time-source.c
2016-05-21 19:30:19 +02:00
Yasuyuki Tanaka bc54f8bac3 Orchestra: add NULL checks into new_time_source (eb-per-time-source) 2016-05-21 13:43:42 +02:00
Joakim Nohlgård 99c77bda8c oma-lwm2m: Handle text/plain floatfix numbers without decimal point
Fixes bug: If no decimal point is present then the entire number is
treated as the decimal part instead of the integer part
2016-05-21 09:48:06 +02:00
Simon Duquennoy c7694e4dbd Orchestra: fix orchestra-rule-eb-per-time-source to handle hash collisions 2016-05-20 13:51:24 +02:00
Simon Duquennoy 7e8d042609 Orchestra: fix bug in new_time_source 2016-05-20 13:40:50 +02:00
Simon Duquennoy 287b4767e3 Orchestra: handle case where ORCHESTRA_UNICAST_PERIOD is smaller than the network size 2016-05-20 13:40:20 +02:00
Nicolas Tsiftes 366231f601 Merge pull request #1660 from yatch/pr-fix-wpcapslip-path
Fix the path for wpcapslip in testscript for Instant Contiki
2016-05-19 13:14:18 +02:00
Atis Elsts b608b837c2 Add login target to Makefile.cc26xx-cc13xx 2016-05-18 22:10:56 +01:00
George Oikonomou c5bea81bb6 Merge pull request #1530 from herjulf/avr-rss2
Adding AtMegaXXRFR2 support and avr-rss2 platform
2016-05-15 20:38:50 +01:00
Robert Olsson 958dcf06f7 Remove wsnbridge. Let's focus sniffing efforts on sensniff. 2016-05-15 17:43:09 +02:00
Robert Olsson 17eb0afbe2 Removed failing regression test for avr-rss2 platform 2016-05-15 16:38:52 +02:00
Robert Olsson a11cfa10b4 Removed unneeded file for avr-rss2 sniffer 2016-05-15 16:36:19 +02:00
Robert Olsson 868f100366 Fix compilation warning in co2_sa_kxx-sensor.c 2016-05-15 16:23:29 +02:00
Robert Olsson 18876a1fae Adding CRC valid check in rf230bb radios registermaps 2016-05-15 14:15:46 +02:00
Robert Olsson d331d39e93 Correct paths when moving examples for regession tests 2016-05-14 22:48:09 +02:00
George Oikonomou 80efd730ae Extend the flash driver to support the MX25R1635F
According to the CC1310LP design files, the flash on it is the same as the flash on the CC2650 LP (MX25R8035F 8Mbit). However, the flash on some CC1310 LPs reportedly identifies itself as the 16Mbit one (MX25R1635F). Instruction sets are identical, we simply need to tell the driver to recognise this part's Device ID.
2016-05-14 20:34:08 +01:00
George Oikonomou 18f67dade2 Compile-test CC1310 LaunchPad sources 2016-05-14 20:32:17 +01:00