Commit graph

9215 commits

Author SHA1 Message Date
Oliver Schmidt e13d69cf41 Merge pull request #254 from LocutusOfBorg/fix-makefile
Fixed Makefile.include
2013-07-26 14:06:45 -07:00
Gianfranco Costamagna ed3ea39caf Added realclean and mostlyclean targets to Makefile.include 2013-07-26 22:21:43 +02:00
Mariano Alvira 5d19de3dbf Merge pull request #266 from ismb-pert/fix-mbxxx
mb851 platform is now the more generic mbxxx. STM32W_CPUREV environment variable is used to select the variant of STM32W to use.
2013-07-26 07:38:11 -07:00
Nicolas Tsiftes d228cb57a5 Merge pull request #301 from adamdunkels/hotfix-rpl-max-dio
RPL bugfix: don't ignore infinite rank DIOs
2013-07-26 06:48:26 -07:00
Adam Dunkels 500d9cc3e4 Merge pull request #300 from cetic/rpl-nopath-dao
RPL No-Path DAOs
2013-07-26 03:53:56 -07:00
Adam Dunkels 9ba5d9694c Merge pull request #299 from jdede/rpl-rm-neighbor
Default route not removed
2013-07-26 03:52:55 -07:00
Adam Dunkels 4913792d41 Minor code style fix 2013-07-26 12:38:43 +02:00
Adam Dunkels 512a339c50 Bugfix: DIOs with infinite ranks should not be ignored as they are used by RPL as a signal by nodes that have lost their routes. Instead of ignoring them, we should send out our latest information to let the node with infinite rank find their way into the network again. 2013-07-26 12:38:25 +02:00
Sébastien Dawans a05d635512 Improve readability of DAO output variables 2013-07-25 11:22:38 +02:00
Sébastien Dawans 0bd26d83c8 Ignore No-Path DAO if target is already reachable through a different route than the DAO sender 2013-07-25 11:21:04 +02:00
Sébastien Dawans c4a121bf18 No-Path DAO Propagation 2013-07-25 11:19:56 +02:00
Mariano Alvira 4108066f0a Merge pull request #294 from malvira/pr-mc1322x-uart-buf-size-conf
mc1322x: make uart buffer sizes configurable from contiki-conf.h
2013-07-23 16:23:37 -07:00
Nicolas Tsiftes 14a2483a48 Merge pull request #298 from alessandrelli/er-coap-13-token-fix
Fix for coap_get_header_token() always returning 0 when using CoAP draft v13
2013-07-23 14:35:25 -07:00
Nicolas Tsiftes 8f5941a4c9 Merge pull request #253 from JelmerT/feature-z1-tlc59116
TLC59116 I2C led driver for Zolertia Z1
2013-07-23 11:09:02 -07:00
Jens Dede 2f1bf730af Adapted comment 2013-07-23 20:01:10 +02:00
Simon Duquennoy defcc639ce Use no metric container when having MRHOF with ETX, as specified in RFC6719. Renamed rpl-of-etx to rpl-mrhof. 2013-07-23 19:36:38 +02:00
Nicolas Tsiftes f8edf41411 Merge pull request #291 from simonduq/na-config
Added a flag to optionally disable IPv6 NA/NS at compile time
2013-07-23 09:52:13 -07:00
Jens Dede 9dd5af78c8 fix: default routes are removed correctly if no DAG with preferred parent is available 2013-07-23 15:35:47 +02:00
Daniele Alessandrelli 9230c0a158 Fix for coap_get_header_token() always returning 0 and not retrieving the token when using CoAP draft v13.
Every reference to the old Token Option has been removed (in CoAP draft v13 the Token Option has been promoted to a field following the CoAP Header).
2013-07-22 19:36:01 +02:00
stefano pascali 36e7db42de Some little refactor 2013-07-19 16:15:55 +02:00
stefano pascali b43ce0f677 Travis-ci tweaks, added CPUREV to 01 regression test, needed by mbxxx platform 2013-07-12 17:07:04 +02:00
stefano pascali fcb09d5d30 Fixed mbxxx platform 2013-07-11 17:56:17 +02:00
Mariano Alvira 6307f3ff95 mc1322x: make uart buffer sizes configurable from contiki-conf.h 2013-07-04 14:09:40 -04:00
Robert Quattlebaum 10f64c0ce8 Merge pull request #292 from darconeous/pull-requests/settings-cc-inline-fix
settings: Correct a problem where sometimes CC_INLINE is not defined properly
2013-07-02 09:17:22 -07:00
Robert Quattlebaum 0308d3fcf0 settings: Correct a problem where sometimes CC_INLINE is not defined properly. 2013-07-02 08:46:03 -07:00
Simon Duquennoy 0e81b91fa6 Simplify periodic ds6 neighbor processing in case NA/NS is disabled. Strips out uip_nd6_ns_output from the binary. 2013-07-02 15:20:21 +02:00
Simon Duquennoy 1f38348cf9 Added a flag to optionally disable IPv6 NA/NS at compile time 2013-07-02 14:43:53 +02:00
Oliver Schmidt ad34b714cd Merge pull request #287 from oliverschmidt/master
The current cc65 build doesn't require this workaround anymore.
2013-06-27 15:38:48 -07:00
Oliver Schmidt fb1de74dc4 The current cc65 build doesn't require this workaround anymore. 2013-06-28 00:36:33 +02:00
Jelmer Tiete 4e0d5cf65e Corrected copyright holder. 2013-06-24 16:13:35 +02:00
Jelmer Tiete 9810bfbcfd contiki code style changes and copyright update + added source to ARCH instead of SOURCEFILES in platform Makefile 2013-06-24 15:17:52 +02:00
Jelmer Tiete 0a4a14aacb added tlc59116 datasheet url 2013-06-24 15:17:52 +02:00
Jelmer Tiete ed8be502db tlc59116 for zolertia, added 0 values at init and code clean-up 2013-06-24 15:17:52 +02:00
Jelmer Tiete cc2567b988 working tlc59116 implementation for z1 2013-06-24 15:17:52 +02:00
Jelmer Tiete 8b61492152 first implementation for tlc59116 on z1 2013-06-24 15:17:52 +02:00
Laurent Deru d1f12638b4 Bugfix: Corrected wireshark bad FCS errors in COOJA Pcap export 2013-06-24 13:18:03 +02:00
Nicolas Tsiftes f606322ae0 Merge pull request #276 from mkovatsc/er-coap-13
Erbium (Er) fixes and updates
2013-06-24 01:44:23 -07:00
Adam Dunkels 12fe704041 Merge pull request #281 from pabigot/feature/platform-led-override
core/dev/led: Allow platform to provide LED color map
2013-06-22 04:40:38 -07:00
Mariano Alvira 23b2df91cb Merge pull request #186 from errordeveloper/remove_make_targets_env_var_for_travis
[ci] Remove pointless `$MAKE_TARGETS`
2013-06-21 15:28:05 -07:00
Ilya Dmitrichenko 2ce2354c84 [ci] Remove pointless $MAKE_TARGETS -
1. there was an odd error when this environment variable wasn't set
    (`[: =: unary operator expected`)
2. this environment variable is not used anywhere else

Removing it makes the logic look much simpler - do make `cooja.jar`
if build type is any other then `compile`.
2013-06-21 18:10:54 +01:00
Peter A. Bigot 8439c1bb81 core/dev/led: Allow platform to provide LED color map 2013-06-21 11:34:48 -05:00
Adam Dunkels 2c6c9160cc Merge pull request #224 from JelmerT/hotfix-contikimac-inter-packet-interval
Hotfix contikimac inter packet interval
2013-06-21 04:33:38 -07:00
Jelmer Tiete cf894b8b95 changed inter packet interval to 0.4ms 2013-06-21 13:15:45 +02:00
Oliver Schmidt f06ee95883 Merge pull request #279 from pabigot/push/make-clean-all
Add support for subdirectories in CLEAN and for "make clean all"
2013-06-21 02:47:19 -07:00
Peter A. Bigot 5fc0575e99 Makefile.include: support make clean all
Historically $(OBJECTDIR) was created when Makefile.include is read.  A
consequence is that combining "clean" with "all" (or any other build
target) results in an error because the clean removes the object
directory that is required to exist when building dependencies.
Creating $(OBJECTDIR) on-demand ensures it is present when needed.

Removed creation of $(OBJECTDIR) on initial read, and added an order-only
dependency forcing its creation all Makefile* rules where the target is
explicitly or implicitly in $(OBJECTDIR).
2013-06-20 17:45:41 -05:00
Peter A. Bigot e6431d8fff Makefile.include: support extending CLEAN with directories
Use recursive remove for $(CLEAN) to support applications that extended it
with directories that should be removed.
2013-06-20 12:20:50 -05:00
Nicolas Tsiftes 7cc8f326f4 Merge pull request #257 from adamdunkels/hotfix-csma
CSMA bugfix
2013-06-20 01:49:48 -07:00
Adam Dunkels 4ac7512895 Temporarily disable large RPL network test until we get link-layer ACKs in Cooja 2013-06-20 10:12:54 +02:00
Nicolas Tsiftes 62292e17e7 Merge pull request #177 from adamdunkels/feature-config-improvements
Configurability updates
2013-06-20 01:08:00 -07:00
Matthias Kovatsch 9b56ffefa5 Fixed broken/unclear Ipv6 configuration with CFLAG. 2013-06-19 16:03:49 +02:00