Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2024-12-23 16:29:34 +00:00
Code Issues Projects Releases Wiki Activity
8,539 Commits 1 Branch 17 Tags 75 MiB
500d9cc3e4
Commit Graph

8539 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Adam Dunkels
0a135eeba1 Merge pull request #214 from lebrush/tcp-uip-size 
Limit partially size of uip/tcpip stack when not using TCP at all
 2013-05-23 09:48:17 -07:00
Mariano Alvira
7773606249 Merge pull request #251 from sieben/gitignore 
Added *.testlog
 2013-05-22 07:06:28 -07:00
Rémy Léone
d5eb7e8149 Added *.testlog 2013-05-22 15:57:24 +02:00
Nicolas Tsiftes
ec222ac700 Merge pull request #250 from karlp/kill-bad-docs 
[docs] Remove outdated example-packet-drv
 2013-05-22 06:52:50 -07:00
Karl Palsson
7163e35050 [docs] Remove outdated example-packet-drv 
This example code is superseded by better examples in, for instance,
cc2538 and cc2420.

Fixes issue #208
 2013-05-22 12:04:29 +00:00
Adam Dunkels
0f135afb34 Merge pull request #218 from lebrush/rpl-mixed-network-bug 
Fixes bug a node not using RPL joins a network which does
 2013-05-22 00:26:06 -07:00
Adam Dunkels
d8236f9cc1 Merge pull request #248 from karlp/webserver-update 
[webserver] Update urls in default data
 2013-05-22 00:00:26 -07:00
Robert Quattlebaum
092c69b2fb Merge pull request #243 from darconeous/pull-requests/more-gitignore 
Added `*.orig`, `*~`, and `.DS_Store` to `.gitignore`.
 2013-05-21 18:03:15 -07:00
Robert Quattlebaum
36fbbe48aa Merge pull request #244 from darconeous/pull-requests/cpu-native-tapdev-ipv6-fix 
native/net/tapdev: Fix for new `UIP_CONF_IPV6` handling.
 2013-05-21 17:42:44 -07:00
Karl Palsson
2146ee1c84 [webserver] Update urls in default data 
Replace all links to sics.se with contiki.org
 2013-05-21 21:19:32 +00:00
Nicolas Tsiftes
ffd18aad82 Merge pull request #221 from lebrush/uip-ds6-notifications 
Make DS6 route notifications optional
 2013-05-21 07:10:31 -07:00
Oliver Schmidt
dd6f1c4824 Merge pull request #217 from lebrush/rime-memory 
Use memcpy, memcmp functions for the rime cmp and cpy
 2013-05-21 02:46:13 -07:00
lebrush
6eafa08313 Make DS6 route notifications optional. 2013-05-21 10:05:02 +02:00
lebrush
96a1a97736 Limit size of uip/tcpip stack when not using TCP at all. 2013-05-21 10:02:17 +02:00
lebrush
5bae5e6ffd Fixes imposibility of receiving data when a node not using RPL joins a network 
which does.

The RPL header is processed, declared invalid and the packet discarded. This
is fixed by this commit.
 2013-05-21 10:00:46 +02:00
lebrush
c2a7a25a9e Code style fixes 2013-05-21 09:50:30 +02:00
lebrush
26177387fc Use memcpy, memcmp functions for the rime compare and copy functions as they 
are already used all over contiki.
 2013-05-21 09:50:29 +02:00
Nicolas Tsiftes
a445c4020d Merge pull request #153 from darconeous/pull-requests/cpu-avr-bootloader 
avr/bootloader.c: Now compatible with bootloaders which always run first
 2013-05-20 05:49:13 -07:00
Nicolas Tsiftes
83c08bdf99 Merge pull request #219 from lebrush/sicslowpan-uip-debug 
Force sicslowpan to use uip-debug rather than an own system
 2013-05-20 04:59:20 -07:00
Nicolas Tsiftes
4b80ad9c89 Merge pull request #239 from darconeous/pull-requests/avr-ravenusb-rpl 
avr-ravenusb/cdc_task: Fix compile issues.
 2013-05-20 04:42:03 -07:00
Nicolas Tsiftes
9b3c704be5 Merge pull request #210 from joakimeriksson/master 
Fixed native border router to compile and have less packet loss (due to slip-dev bug).
 2013-05-20 04:39:36 -07:00
Robert Quattlebaum
09eec82d08 Merge pull request #134 from darconeous/pull-requests/cpu-avr-avrdude-mcu 
cpu/avr: Added "AVRDUDE_MCU" configuration parameter.
 2013-05-19 17:35:26 -07:00
Robert Quattlebaum
4e1e9f8812 Added *.orig, *~, and .DS_Store to .gitignore. 2013-05-19 17:30:02 -07:00
Robert Quattlebaum
9c70e0e5cc native/net/tapdev: Fix for new UIP_CONF_IPV6 handling. 2013-05-19 17:27:30 -07:00
Robert Quattlebaum
382308e6bf Merge pull request #242 from darconeous/pull-request/resolv-bad-nsec-fix 
resolv: Fix for bad NSEC record on announce
 2013-05-19 16:34:03 -07:00
Robert Quattlebaum
d0b99cc3cc resolv: Fix for bad NSEC record on announce 2013-05-19 16:09:50 -07:00