deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
11398 commits 6 branches 13 tags 80 MiB
Commit graph

11398 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
fd15934235 Merge pull request #1663 from pablocorbalan/cc2650-lp 
Add upload script to Makefile.launchpad
 2016-05-14 16:05:23 +01:00
Antonio Lignan
171f02a75a Merge pull request #1644 from jdede/setBaudrate 
Do not use setBaudrate
 2016-05-14 16:27:59 +02:00
Robert Olsson
3c19e870f1 Moving the avr-rss2 platform examples to the global examples 
location as suggested by the maintainers.
 2016-05-14 12:05:19 +02:00
Pablo Corbalán
5bc158fa75 Add upload script to Makefile.launchpad 2016-05-13 23:06:33 +01:00
Yasuyuki Tanaka
633bf09f6d Fix the path for wpcapslip in testscript for Instant Contiki 2016-05-12 21:15:40 +02:00
Nicolas Tsiftes
98fcac15cd Merge pull request #1651 from gebart/pr/lwm2m-json-sv-bv 
oma-lwm2m: Use sv for string value, bv for boolean
 2016-05-12 17:01:16 +02:00
Nicolas Tsiftes
eeff8bf970 Merge pull request #1656 from STclab/pr/platform-readme-update 
Update to stm32nucleo-spirit1 platform README file.
 2016-05-12 16:49:16 +02:00
Nicolas Tsiftes
8f41f2a66d Merge pull request #1657 from tscheffl/ravenusb_IPv6_fix 
Fix for IPv6 compilation and linkage errors
 2016-05-12 16:15:44 +02:00
Thomas
4870f9e8f3 Fix for IPv6 compilation and linkage errors 
Two errors have been spotted, when IPv6 is enabled in the ravenusb
Project-Makefile:
#CONTIKI_NO_NET=1
CONTIKI_WITH_IPV6=1

The compile error results from a variable name mismatch in cdc_task.c
The variable 'r' is undeclared and should be renamed to 'route'

The linker also fails with 'undefined references'
This has been mediated by adding 'core/net' to Modules in the
Project-Makefile.
 2016-05-09 18:18:28 +02:00
Marco Grella
d9fd19eb2f Update to stm32nucleo-spirit1 platform README file. 2016-05-05 16:44:07 +02:00
Antonio Lignan
e3d5b745e7 Merge pull request #1653 from gebart/pr/ipso-temperature-cel 
ipso-temperature: Use "Cel" for degrees celsius
 2016-05-04 22:13:13 +02:00
Joakim Nohlgård
22e9ccadf7 ipso-temperature: Use "Cel" for degrees celsius 
Like the IPSO documentation says
 2016-05-04 19:21:56 +02:00
Joakim Nohlgård
cb729b0785 oma-lwm2m: Use sv for string value, bv for boolean 
Like the OMA docs specify
 2016-05-04 19:15:01 +02:00
Simon Duquennoy
2a1da5dbad Merge pull request #1646 from jdede/fix-putchar-ipv4 
Fix putchar include when using IPv4
 2016-05-04 14:41:18 +02:00
Simon Duquennoy
087470546a Merge pull request #1645 from jdede/z1-fix-include 
Fix broken include
 2016-05-04 14:39:29 +02:00
Jens Dede
7f80b1ad57 Remove include of stdio.h 2016-05-04 11:12:37 +02:00
Nicolas Tsiftes
617465e465 Merge pull request #1626 from gebart/pr/cfs-readonly-seek 
core/cfs: Disallow seeking past the end of a file unless it is writable
 2016-05-03 12:52:11 +02:00
Simon Duquennoy
896c58cd98 Merge pull request #1647 from yatch/pr-rpl-regression-substr-fix 
Resolve script errors raised during the RPL regression tests on Ubuntu 14.04
 2016-05-03 10:28:59 +02:00
Joakim Nohlgård
19550f9f7f core/cfs: Disallow seeking past the end of a file if it is not writable 2016-05-03 07:10:35 +02:00
Jens Dede
59afae85e2 Use if instead of ifdef. Is more contiki standard-compliant 2016-05-02 22:34:58 +02:00
Jens Dede
119291d083 Fix putchar include when using IPv4 2016-05-02 19:13:26 +02:00
Jens Dede
43fb479c9d Fix broken include 2016-05-02 18:57:48 +02:00
Jens Dede
cd7885ae76 do not use setBaudrate 2016-05-02 18:48:16 +02:00
Yasuyuki Tanaka
37b2d9f600 Replace the '+' operator with String.prototype.concat() 2016-05-02 18:18:12 +02:00
Nicolas Tsiftes
0e9234dce6 Merge pull request #1636 from frank-freihube-rmcan-com/fixTrailingZeros 
Trailing zeros in file leading to unexpected file length get set in destination buffer
 2016-05-02 13:52:13 +02:00
Fredrik Österlind
5c2a0e2652 Merge pull request #1638 from joakimeriksson/cooja-message-list-fix 
Fixing Cooja message list to avoid any Swing components when headless
 2016-05-02 10:23:13 +02:00