Commit graph

10046 commits

Author SHA1 Message Date
Harald Pichler a8e8f54342 Merge branch 'osd' of https://github.com/osdomotics/osd-contiki into osd 2015-01-16 14:19:15 +01:00
Harald Pichler 150aad4ad2 Merge branch 'contiki' into osd 2015-01-16 14:17:16 +01:00
Harald Pichler 007cf1dbe3 Merge branch 'contiki' into osd 2015-01-13 13:14:11 +01:00
Nicolas Tsiftes 7841eface3 Merge pull request #911 from cetic/pr-reset-dao-flag
Reset nopath_received flag when new DAO is received
2015-01-03 11:38:35 +01:00
Nicolas Tsiftes 79517eb477 Merge pull request #910 from cetic/pr-dio-suppr-disabling
Allow disabling of DIO suppression as required by RFC
2015-01-03 11:35:08 +01:00
Harald Pichler 2b8aeee115 save energy 2014-12-29 13:05:50 +01:00
Harald Pichler fb473237ce bugfix modules 2014-12-29 11:02:51 +01:00
Harald Pichler 9efc5d41c1 Merge branch 'contiki' into osd 2014-12-29 08:20:00 +01:00
Harald Pichler 365fe31b02 coap 18 2014-12-29 08:16:47 +01:00
Harald Pichler aaaa0aa138 cleanup code, batterie value Volt 2014-12-29 08:11:51 +01:00
Harald Pichler a8c87e3f54 read better values 2014-12-29 08:10:10 +01:00
Nicolas Tsiftes ebdcf0d6ed Merge pull request #919 from cetic/pr-ra-user-config
Make RA configuration parameters user configurable
2014-12-20 19:18:28 +01:00
Nicolas Tsiftes 1f13be10fc Merge pull request #908 from bbc2/fix-rndis-macro
usb/rndis: Add parentheses to an unsafe macro
2014-12-19 22:16:33 +01:00
Nicolas Tsiftes f2f49f18f5 Merge pull request #913 from cetic/pr-rpl-stats
Fix and add more RPL stats
2014-12-19 22:15:38 +01:00
Nicolas Tsiftes 7392721488 Merge pull request #916 from cetic/pr-fix-missing-return-value
Add missing return values in rpl_update_header_empty()
2014-12-19 22:14:10 +01:00
Laurent Deru f28e9587ed Make RA configuration parameters user configurable 2014-12-19 11:24:42 +01:00
Laurent Deru bb1e0c1cbc Add missing return values in rpl_update_header_empty() 2014-12-19 11:23:19 +01:00
Laurent Deru ccbfa388f6 Add more RPL stats 2014-12-19 10:51:03 +01:00
Laurent Deru 21253370b8 Reset nopath_received flag when new DAO is received 2014-12-19 10:49:56 +01:00
George Oikonomou 2750e43158 Merge pull request #926 from JelmerT/bugfix-cc2538-IVCTRL
[cc2538] Corrected ANA_REGS_IVCTRL register address value.
2014-12-19 09:38:11 +00:00
Jelmer Tiete b088326b5e Corrected the register offset value of ANA_REGS_IVCTRL. TI was using the address offset instead of the physical address in their header file. 2014-12-19 04:14:34 -05:00
Laurent Deru d540d2b5af Allow disabling of DIO suppression as required in RFC 2014-12-19 09:51:26 +01:00
Nicolas Tsiftes 7286c9a635 Merge pull request #924 from adamdunkels/pr/travis-fix
Fix current travis issue
2014-12-18 22:48:38 +01:00
Adam Dunkels e43c355eb0 Merge pull request #905 from adamdunkels/pr/tcp-socket-fix
Recent TCP socket change bugfix
2014-12-18 21:27:26 +01:00
Adam Dunkels 3a92b0552e Disable the ev-aducrf101mkxz compile tests as they currently break travis 2014-12-18 21:14:47 +01:00
Bertrand Bonnefoy-Claudet 9baa378c97 usb/rndis: Add parentheses to an unsafe macro 2014-12-12 19:17:46 +01:00
Harald Pichler df95393980 remove init pwm per default, switch moisture sensor on and off to save energy 2014-12-12 08:47:01 +01:00
Nicolas Tsiftes 057383bbec Merge pull request #902 from ljalves/master
rf230bb: Fix missing ')' and indentation.
2014-12-10 16:56:04 +01:00
Adam Dunkels 542738192f Bugfix: uip_mss() isn't set until the connection is connected, so we can't set it during socket registration 2014-12-10 09:48:19 +01:00
Luis Alves 1bddbae297 rf230bb: Fix missing ')' and indentation. 2014-12-09 22:06:12 +00:00
Harald Pichler 76ea945fd7 add power save mode RDC_CONF_PT_YIELD_OFF 2014-12-09 16:42:45 +01:00
Harald Pichler 248a1e3882 add leds and battery 2014-12-09 14:36:06 +01:00
Adam Dunkels 72679a819b Merge pull request #898 from g-oikonomou/tcp-rst-fix
Fill IPv6->Next-Hdr field for outgoing RSTs
2014-12-09 10:48:29 +01:00
Adam Dunkels ed1ae2eba4 Merge pull request #900 from g-oikonomou/cc253x-pan-id
Change the CC2530 and CC2538 default PAN ID to 0xABCD
2014-12-09 10:48:09 +01:00
Adam Dunkels ffc27061fe Correctly set the proto field for the case when tcp_send_noconn is called without tcp_send being called 2014-12-09 09:09:26 +00:00
Adam Dunkels 47ecc8b5a6 Merge pull request #899 from g-oikonomou/tcp-sock-max-seg
Allow specifying a max outgoing segment size per TCP socket
2014-12-09 08:15:30 +01:00
George Oikonomou 8fe5456588 Change default PAN ID for the CC2538DK platform to 0xABCD 2014-12-08 22:33:33 +00:00
George Oikonomou 73a133373a Change CC2530DK default PAN ID to 0xABCD and make it configurable by project-conf.h 2014-12-08 22:33:11 +00:00
George Oikonomou 99513f1889 Fill IPv6->Next-Hdr field for outgoing RSTs 2014-12-08 22:00:36 +00:00
George Oikonomou 0dbed5b919 Allow specifying a max outgoing segment size per TCP socket 2014-12-08 21:58:12 +00:00
Nicolas Tsiftes ce914b3173 Merge pull request #890 from simonduq/cleanup-packetbuf
Cleanup packetbuf: use rime attributes and addresses only when rime is e...
2014-12-08 18:20:41 +01:00
Harald Pichler a4b1e0138a add regression test 2014-12-07 22:43:57 +01:00
Harald Pichler cc0539ee90 remove unused examples 2014-12-07 21:55:43 +01:00
Harald Pichler fed6fe019c change to coap18 2014-12-07 21:39:46 +01:00
Harald Pichler 13aa2a1415 add coap18 2014-12-07 21:32:03 +01:00
Harald Pichler d6144bfebe cleanup makefile, add avr-size 2014-12-07 20:10:53 +01:00
Harald Pichler ed161d1905 NETSTACK_CONF_WITH_IPV6 2014-12-07 17:36:53 +01:00
Harald Pichler a02be51f08 Merge branch 'contiki' into osd 2014-12-07 15:24:00 +01:00
Nicolas Tsiftes b6b5c6efbb Merge pull request #894 from simonduq/ds6-fix
Fix conditional compilation directive in uip-ds6.c
2014-12-03 18:26:51 +01:00
Simon Duquennoy 984c8e007b Fix conditional compilation directive in uip-ds6.c 2014-12-03 17:32:42 +01:00