Commit Graph

8515 Commits

Author SHA1 Message Date
Jelmer Tiete
8b61492152 first implementation for tlc59116 on z1 2013-06-24 15:17:52 +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
Peter A. Bigot
eecb2c6183 examples/trickle-library: correct probability expression
Documented intent is to update with probability 1/NEW_TOKEN_PROB where
NEW_TOKEN_PROB is 0x80.  The current implementation updates with probability
1/2.  Update NEW_TOKEN_PROB and the expression to keep existing behavior
while correcting the calculation.

Signed-off-by: Peter A. Bigot <pab@pabigot.com>
2013-06-17 13:03:37 -05:00
Oliver Schmidt
807293ab6d Merge pull request #267 from oliverschmidt/master
Removed some more old RCS tags from the Contiki source tree.
2013-06-13 06:55:47 -07:00
Oliver Schmidt
79bb5ea73f Removed some more old RCS tags from the Contiki source tree. 2013-06-13 15:54:26 +02:00
Nicolas Tsiftes
f47f4a470c Merge pull request #265 from mkovatsc/cygwin-minimal-net
Fixing minimal-net for Cygwin.
2013-06-06 10:33:50 -07:00
Matthias Kovatsch
58dd33b145 Fixing minimal-net for Cygwin. 2013-06-06 19:04:11 +02:00
Oliver Schmidt
1418dd7cae Merge pull request #263 from oliverschmidt/master
Another small addition for 'Atari XL'.
2013-06-02 14:39:43 -07:00
Oliver Schmidt
cbce31cb59 Another small addition for platform 'Atari XL'. 2013-06-02 23:36:28 +02:00
Oliver Schmidt
bfc8f4bae4 Merge pull request #261 from oliverschmidt/master
Added platform 'Atari XL'.
2013-06-01 13:50:31 -07:00
Oliver Schmidt
d636d7110f Added platform 'Atari XL'.
Don't be afraid, I'm not trying to have more retro platforms than "real" platforms ;-)
The platform 'atarixl' will replace the platform 'atari'. However I need both for some
transition period.
2013-06-01 22:49:00 +02:00
Oliver Schmidt
98f48a4ce1 Merge pull request #260 from oliverschmidt/master
Removed obsolete file.
2013-06-01 13:40:33 -07:00
Oliver Schmidt
c138dc758a Removed obsolete file.
I wrote:
> Moved from last cc65 release (2.13.3) to recent cc65 snapshot (2.13.9).
> [...]
> Atari:
> - The builtin linker config allows to override the start addr so there no more need for a custom linker config.
> [...]
However I didn't actually remove the custom linker config not needed anymore.
2013-06-01 22:38:45 +02:00
Adam Dunkels
95224c8def Merge pull request #258 from karlp/pulls/dead-examples-1
[examples] Remove broken example with no clear purpose
2013-05-25 05:14:58 -07:00
Karl Palsson
c3ce5ab63a [examples] Remove broken example with no clear purpose
This example didn't compile, had no actual code changes in the last ~6
years, had no documentation explaining it's purpose, and insufficient
code comments to provide a useful example.  Removing it in favour of
fewer, but clearer, examples, that are easier to keep maintained.
2013-05-25 11:44:22 +00:00
Adam Dunkels
09f30e875d Bugfix: when a CSMA callback is received, we should remove the packet
that was transmitted and not just the first packet that happens to be on
the output queue.
2013-05-25 12:13:07 +02:00
Adam Dunkels
03ce7c65cf Allow platform makefiles to specify APPS to be used, by defining a PLATFORMAPPS variable. 2013-05-25 12:10:28 +02:00
Adam Dunkels
ee64780cb6 Allow proactive probing interval to be configured 2013-05-25 12:10:27 +02:00
Adam Dunkels
c9de0e49be Added a number of default options for ContikiMAC, and allow them to be overridden with contiki-conf.h configuration options 2013-05-25 12:10:27 +02:00
Adam Dunkels
0b882cd516 Telnetd improvement: allow specifying a maximum silence time and kill the connection after that time. This is to avoid the telnet connection getting stuck forever if the connecting host reboots. 2013-05-25 12:10:26 +02:00