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

8735 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Matthias Kovatsch a8653f1a70 Fixed stimer issues due to core changes for older Erbium versions. 2013-06-19 15:59:45 +02:00
Matthias Kovatsch 75b958bb03 Added CoAP ping support. 2013-06-19 15:27:23 +02:00
Matthias Kovatsch bad066abad Fixed RPL configuration according to core changes. 2013-06-19 15:27:22 +02:00
Matthias Kovatsch c61dd6135e Updated Erbium (Er) examples and removed unsupported static routing module. 2013-06-19 15:27:21 +02:00
Matthias Kovatsch 5e18efa10c Updated copyright information. 2013-06-19 15:27:20 +02:00
Matthias Kovatsch 78e3a75b9c Updated buffer definition macro due to core changes. 2013-06-19 15:27:04 +02:00
Matthias Kovatsch 3048126ff1 Limited observe clock to 24 bits. 2013-06-19 14:45:57 +02:00
Matthias Kovatsch 56f877b633 Fixed option header bug for large deltas. 2013-06-19 14:45:20 +02:00
George Oikonomou 4340b86649 Merge pull request #270 from pabigot/push/trickle-example 
examples/trickle-library: correct probability expression
 2013-06-19 05:12:39 -07:00
Oliver Schmidt af93e5fbd9 Merge pull request #274 from oliverschmidt/master 
Made use of Atari XL shadow RAM.
 2013-06-18 13:38:08 -07:00
Oliver Schmidt b90a1e2417 Made use of Atari XL shadow RAM. 
The new Atari XL target allows cc65 programs to make use of
the shadow RAM. This allows to turn aon all features of the
web browser - and will allow for additional improvements to
come :-)
 2013-06-18 22:36:58 +02:00
Oliver Schmidt 61b8f4b58c Merge pull request #273 from oliverschmidt/master 
Removed some more old RCS tags from the Contiki source tree.
 2013-06-18 12:30:15 -07:00
Oliver Schmidt 16590095f7 Removed some more old RCS tags from the Contiki source tree. 2013-06-18 19:19:37 +02:00
Fredrik Österlind e3e981f412 Merge pull request #271 from pabigot/push/cooja-zoom 
Push/cooja zoom
 2013-06-18 04:57:28 -07:00
Peter A. Bigot 09812fe5df cooja TimeLine: support mouse wheel zoom 
Add listener that zooms based on mouse wheel.  The zoom center is the
mouse position, which alleviates the pressure to touch pabigot/contikix#4.

Closes pabigot/contikix#5

Signed-off-by: Peter A. Bigot <pab@pabigot.com>
 2013-06-17 13:12:47 -05:00
Peter A. Bigot e6a69d29bd cooja TimeLine: zoom keystroke failure 
The + typed character can only be generated on English keyboards by
shift-equals, resulting in a failure to recognize ctrl-plus because of
the unexpected shift modifier.  Adapt by supporting English and Spanish
keyboards, as well as number pad keys.

Closes pabigot/contikix#2

Reference: http://forums.oracle.com/thread/1356291
Signed-off-by: Peter A. Bigot <pab@pabigot.com>
 2013-06-17 13:12:47 -05:00
Peter A. Bigot 0c373a8bee cooja TimeLine: refactor zoom infrastructure 
Refactor common code into private functions.  Abstract to support zoom
to level or exact value.

There should be no behavioral change as a result of this patch except:

 * zooms are consistently filtered to be in the valid range (those from
   configuration parameters formerly had been used directly);
 * the correct centerTime is used for zoomOutAction when
   mousePixelPositionX is positive

Supports pabigot/contikix#5

Signed-off-by: Peter A. Bigot <pab@pabigot.com>
 2013-06-17 13:12:31 -05:00