Commit graph

12739 commits

Author SHA1 Message Date
Harald Pichler
14baf5df6c bugfix format 2017-03-03 11:37:09 +01:00
Harald Pichler
c954d22d81 bugfix format 2017-03-03 11:29:32 +01:00
Harald Pichler
f36183f2b5 Merge branch 'master' of https://github.com/osdomotics/osd-contiki 2017-03-03 11:26:28 +01:00
Harald Pichler
314c46b91a bugfix format 2017-03-03 11:24:32 +01:00
Harald Pichler
6af70ee511 bugfix warning -Wwrite-strings 2017-03-03 11:21:43 +01:00
Harald Pichler
7000323c74 bugfix format 2017-03-03 11:17:33 +01:00
Harald Pichler
ae6375d900 add humidity resource, bugfix pressure string variable 2017-02-24 10:28:35 +01:00
Harald Pichler
2137a12971 Merge branch 'master' of https://github.com/osdomotics/osd-contiki 2017-02-24 10:07:20 +01:00
Harald Pichler
4151c09e2c cleanup code 2017-02-23 22:36:32 +01:00
Harald Pichler
6677fac2ab bugfix use bmp280 and not bme280 2017-02-23 22:22:40 +01:00
Harald Pichler
8e07bab71f initial upload 2017-02-23 16:48:37 +01:00
Harald Pichler
85f3814f67 add i2c address 2017-02-23 08:59:49 +01:00
Harald Pichler
42dee52e65 initial upload 2017-02-23 08:49:02 +01:00
Harald Pichler
352f078be7 initial upload 2017-02-22 14:53:05 +01:00
Harald Pichler
5ea65cab08 temperature convert time is to short set from 50ms to 60ms 2017-02-21 20:06:15 +01:00
Harald Pichler
201a8174c6 print buffer text and hex format 2017-02-01 16:17:48 +01:00
Harald Pichler
6a9b6ae77b initial upload 2017-02-01 11:26:50 +01:00
Harald Pichler
9fb2352b08 bugfix buffer overflow 2017-02-01 10:28:02 +01:00
Harald Pichler
2f8549aaae Merge branch 'contiki'
Conflicts:
	cpu/cc26xx-cc13xx/lib/cc13xxware
	cpu/cc26xx-cc13xx/lib/cc26xxware
2017-01-31 15:00:59 +01:00
Oliver Schmidt
8248f524f5 Merge pull request #2091 from oliverschmidt/master
Revert to static Ethernet driver for the ATARI.
2017-01-27 11:34:44 +01:00
Oliver Schmidt
a6472c8dd9 Revert to static Ethernet driver for the ATARI.
After all there's no momentum for a W5100-based Ethernet solution on the ATARI. So I revert to static linkage of the CS8900A driver as this improves program load times.
2017-01-27 00:18:25 +01:00
George Oikonomou
7b7781360f Merge pull request #2071 from g-oikonomou/bugfix/cc13xx/no-acks
Make the number of Prop Mode RX Buffers easy to configure
2017-01-21 00:17:49 +00:00
Nicolas Tsiftes
5eb2ac15ff Merge pull request #2073 from cetic/pr-fix-send-na
Fix semantic of UIP_ND6_SEND_NA and add UIP_ND6_SEND_NS
2017-01-20 13:18:43 +01:00
Nicolas Tsiftes
0cfda4c026 Merge pull request #2053 from cetic/pr-fix-dag-lifetime
Use RPL_DAG_LIFETIME when computing dag lifetime
2017-01-20 11:08:43 +01:00
Simon Duquennoy
d59bbcf86c Merge pull request #2080 from yatch/pr/tsch-reenable-regression-test
TSCH: re-enable TSCH regression tests
2017-01-19 16:53:21 +01:00
Yasuyuki Tanaka
2d44b47050 Print an entry for the root node as well as other entries 2017-01-19 14:36:59 +01:00
Yasuyuki Tanaka
651147df57 TSCH: Fix incorrect test criteria for regression-tests
The tests are recognized as success when a return value by
rpl_ns_num_nodes(), the number of entries in the nodelist, tells all the
routes for the nodes in the network are installed.

There are eight nodes in addition to one root node. Therefore, the value
for test success should not be eight but nine since we have to take into
account an nodelist entry for the root.
2017-01-19 14:35:37 +01:00
Yasuyuki Tanaka
ac937eda24 TSCH: re-enable TSCH regression tests with Cooja mote 2017-01-19 14:25:06 +01:00
Yasuyuki Tanaka
83f2382791 Orchestra: avoid a link error for nbr_routes 2017-01-19 13:55:08 +01:00
Nicolas Tsiftes
2e754c7832 Merge pull request #2063 from cetic/pr-ndp-config
Make all NDP configuration parameters user configurable
2017-01-17 08:22:52 +01:00
Nicolas Tsiftes
f80f673e21 Merge pull request #2062 from cetic/pr-add-defrt_list_head
Adding uip_ds6_defrt_list_head()
2017-01-17 08:21:50 +01:00
Laurent Deru
0fb597f2fa Use RPL_DAG_LIFETIME when computing dag lifetime 2017-01-16 16:56:22 +01:00
Laurent Deru
12c930893c Fix semantic of UIP_ND6_SEND_NA and add UIP_ND6_SEND_NS 2017-01-16 15:48:14 +01:00
Laurent Deru
63ac4d2a3d Adding uip_ds6_defrt_head() 2017-01-16 13:54:36 +01:00
Laurent Deru
88d0003b75 Make all NDP configuration parameters user configurable 2017-01-16 13:50:56 +01:00
Antonio Lignan
a7b5050382 Merge pull request #2047 from contiki-os/orion-update-motelist-string
Orion: update motelist string
2017-01-15 16:06:23 +01:00
George Oikonomou
5fb226f4c9 Make the count of prop mode RX buffers configurable 2017-01-15 12:31:09 +00:00
George Oikonomou
07de8b238b Easy manipulation of CC13xx Prop Mode RX buffers 2017-01-15 12:25:10 +00:00
George Oikonomou
ba12ed2cce Re-initialise RX buffers each time we turn the RF on 2017-01-15 12:24:30 +00:00
George Oikonomou
82fd325b7a Merge pull request #2069 from alignan/pull/light-example-verbatim
Explicitly specify light sensor model in example
2017-01-15 11:52:09 +00:00
Antonio Lignan
999b246fd2 Explicitly specify light sensor model in example 2017-01-14 22:57:08 +01:00
Antonio Lignan
3d40056f4f Merge pull request #2054 from cetic/pr-check-incoming-rank
Reject parents with invalid rank
2017-01-13 16:08:00 +01:00
Antonio Lignan
0fb4a68332 Merge pull request #2052 from cetic/pr-rpl-route-infinite-lifetime
Make RPL route lifetime RFC compliant
2017-01-13 16:07:09 +01:00
Laurent Deru
f9ffa252f6 Reject parents with invalid rank 2017-01-13 12:32:33 +01:00
Laurent Deru
d866e6bd34 Make RPL route lifetime RFC compliant 2017-01-13 10:54:06 +01:00
Antonio Lignan
10d54f228b Orion: update motelist string
Updates the expected motelist string
2017-01-12 11:23:20 +01:00
Nicolas Tsiftes
c1f11cfaa9 Merge pull request #2034 from Vinggui/patch-1
Fixing Avr-Zigbit Makefile not compiling.
2017-01-12 07:49:30 +01:00
Vinicius Guimaraes
5e05a951f2 Fixing Avr-Zigbit Makefile not compiling
Fixed two errors in Zigbit's makefile:
-Compiling "frame.c" here is not necessary (already done in radio's makefile) and brings up an error. Removing it.
-Fixed undefined reference to "link_stats_input_callback" in "../../core/net/ipv6/sicslowpan.c:1521". Module "core/net" was missing.
Compiling working now.
2017-01-11 15:56:20 -02:00
Simon Duquennoy
bb4f2e5678 Merge pull request #2043 from e120guru/master
Fixed rime-tsch sync problem in Cooja
2017-01-11 18:15:43 +01:00
Michael Karlsson
22d10ba03a Added Cooja target config to rime-tsch example 2017-01-11 16:35:16 +01:00