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

8423 commits

This branch
This branch
All branches
Author SHA1 Message Date
Robert Quattlebaum 0d913d0d61 Merge pull request #234 from darconeous/pull-requests/platform-econotag-uip-rpl-override 
platform/econotag: Allow RPL and Router settings to be overridden.
 2013-05-19 12:01:22 -07:00
Mariano Alvira 95daf04770 Merge pull request #238 from malvira/pr-disable-sky-udp-test 
Travis: disable 02-sky-ipv6-udp test b/c it's still flaky
 2013-05-19 10:21:40 -07:00
Mariano Alvira f90736e7ed Travis: disable 02-sky-ipv6-udp test b/c it's still flaky even with 
the longer test time.
 2013-05-19 13:14:56 -04:00
Robert Quattlebaum 92b4f5fe59 platform/econotag: Allow RPL and Router settings to be overridden. 2013-05-19 08:21:18 -07:00
Mariano Alvira 5df586e09d Merge pull request #184 from g-oikonomou/bug-fixes/rimestats 
Rimestats Fix (#183)
 2013-05-19 07:45:22 -07:00
Mariano Alvira b83366b1ef Merge pull request #233 from malvira/pr-disable-netperf 
Travis: disable the netperf test because it is flaky
 2013-05-19 07:03:37 -07:00
Mariano Alvira 68acf28b04 Travis: disable the netperf test because it is flaky 2013-05-19 09:59:02 -04:00
Mariano Alvira 26d81d85a1 Merge pull request #228 from g-oikonomou/bug-fixes/uip-conf-ipv6 
Fix 8051 port builds to play nicely with #173
 2013-05-18 15:36:59 -07:00
Mariano Alvira 87a995374b Merge pull request #232 from malvira/pr-uip6-switch-temp-fix 
change default UIP_CONF_IPV6 back to 0. This is not a complete fix:
 2013-05-18 15:34:41 -07:00
Mariano Alvira 7b9d98c5e2 change default UIP_CONF_IPV6 back to 0. This is not a complete fix: 
see #227 for details. Will merge as it fixes build errors so Travis
can be useful agian.
 2013-05-18 18:30:10 -04:00
Mariano Alvira 251eaeee68 Merge pull request #231 from malvira/pr-remove-twitter 
Remove everything that depended on the now gone twitter APP.
 2013-05-18 15:28:38 -07:00
Mariano Alvira e24a50c1b2 Remove everything that depended on the now gone twitter APP. 2013-05-18 18:22:37 -04:00
Mariano Alvira c450887555 Merge pull request #230 from malvira/pr-travis-fixes 
Travis fixes
 2013-05-18 15:21:00 -07:00
Mariano Alvira e67c07468d Travis: sky-ipv6-udp test needs more time to complete 2013-05-18 18:14:14 -04:00
Mariano Alvira d662279bb4 Travis: disable flaky or failing tests 
* disable hello-world of cooja motes b/c it is flaky
* mark 04-sky-shell-download.csc test as failing. Not sure what
the problem is.
 2013-05-18 18:14:14 -04:00
Mariano Alvira 585dd3fdbd Travis: The test criteria for this test was too strict --- one or two 
packets get lost. Change the test to ensure that data comes back from
every node and we get at least 75 non-duplicate reports.
 2013-05-18 18:14:14 -04:00
Mariano Alvira d396832d48 Travis: Run java with -Xshared:on. The previous jvm had shared on by default and cooja 
requires this.
 2013-05-18 18:14:10 -04:00
Mariano Alvira fd6cc5f696 Travis: fix the download location for the arm/mc1322x toolchain 2013-05-18 18:12:32 -04:00
Mariano Alvira 1ef6112ac7 Travis: correct the name for the ipv6-apps test (travis.yml had the correct name 
--- this is why the test was failing)
 2013-05-18 18:11:59 -04:00
Mariano Alvira 3ea8cce948 Travis: Print out logs so that debugging travis is possible. 2013-05-18 18:11:45 -04:00
Robert Quattlebaum de7b4f325e Merge pull request #229 from darconeous/pull-requests/resolv-mdns-announce-alignment 
resolv: Fix for word alignment issues in `mdns_prep_host_announce_packet()`.
 2013-05-18 14:49:11 -07:00
Robert Quattlebaum 535e90343c Merge pull request #144 from darconeous/pull-requests/settings-for-all-targets 
core/lib/settings: Generalized settings manager to work on any platform
 2013-05-18 12:03:09 -07:00
Robert Quattlebaum 0bed4b17a2 resolv: Fix for word alignment issues in mdns_prep_host_announce_packet(). 2013-05-18 10:43:09 -07:00
Robert Quattlebaum 369591ec1a Merge pull request #130 from darconeous/pull-requests/cpu-native-eeprom 
cpu/native: Add file-backed simulated EEPROM to native cpu.
 2013-05-18 10:39:43 -07:00
Robert Quattlebaum b8c0f2de6c cpu/native: Add file-backed simulated EEPROM to native cpu. 
This patch removes a defunct EEPROM implementation from the native
platform and provides a new EEPROM implementation for the native cpu.
The previous implementation appears to be vestigal.

This is useful for testing code which uses the EEPROM without running
the code on the actual hardware.

By default the code will create a new temporary file as the EEPROM
backing, reinitializing each time. If you would like to preserve the
EEPROM contents or specify a specific EEPROM file to use, you can set the
`CONTIKI_EEPROM` environment variable to the name of the EEPROM file you
wish to use instead. If it already exists, its contents will be used.
If it does not already exist, it will be created and initialized by
filling it with `0xFF`---just like a real EEPROM.

A new example is also included, which was used to verify the correctness
of the implementation. It can easily be used to verify the EEPROM
implementations of other targets.
 2013-05-18 10:29:41 -07:00
George Oikonomou 13e29c7975 Fix 8051 port builds to play nicely with #173 2013-05-17 23:41:36 +01:00
Adam Dunkels 5af6540980 Merge pull request #197 from sieben/doxygen 
Update of doxygen.to 1.8.1.2 using doxygen -u
 2013-05-16 00:25:49 -07:00
Adam Dunkels 59a8df14a8 Merge pull request #189 from sieben/markdown 
Update to markdown
 2013-05-16 00:24:25 -07:00
Oliver Schmidt 223083d192 Merge pull request #216 from lebrush/printf-leftovers 
Corrects some leftover uncapitalized printfs
 2013-05-15 12:50:20 -07:00
lebrush 82d498f3a1 Removed undef 2013-05-15 16:25:34 +02:00
lebrush 071cfaf1cb Corrects some leftover uncapitalized printfs which may cause some platforms 
to crash.
 2013-05-15 12:21:15 +02:00
Oliver Schmidt 8451a4198d Merge pull request #209 from karlp/kill-twitter 
Replace twitter app with generic http-post-auth
 2013-05-10 07:42:16 -07:00
Karl Palsson 7345579ad6 Replace twitter app with generic http-post-auth 
Twitter removed http basic auth from the api in august 2010, but this
underlying code is a good example of doing http basic auth in contiki.

The app has been renamed, and some fixes applied to make it build
cleanly.
 2013-05-04 12:17:18 +00:00
Oliver Schmidt 96e85cc69a Merge pull request #203 from mmuman/cleanup-and-fixes-002 
Cleanup and fixes 002
 2013-04-22 04:51:44 -07:00
François Revol 95eb505345 win32: Fix cygwin build 
size_t is declared in sys/types.h
 2013-04-20 14:44:27 +02:00
François Revol b9774989a1 Add missing include 
Fix log_message() undefined warning.
 2013-04-20 14:43:37 +02:00
François Revol 7967779e6c tapdev: Fix using an uninitialized buffer 2013-04-20 14:42:19 +02:00
Adam Dunkels 424a7b2c8e Merge pull request #202 from g-oikonomou/cc2538-minor-fixes 
CC2538 IEEE address location and documentation fixes
 2013-04-17 07:48:57 -07:00
George Oikonomou 704309cfd4 Change the InfoPage Location of the IEEE address 2013-04-17 15:44:01 +01:00
George Oikonomou 8b5b2bd4d8 CC2538 Documentation typo and grammar fixes 2013-04-17 15:41:41 +01:00
Adam Dunkels c99b62f628 Merge pull request #199 from g-oikonomou/cc253x-cdc-acm-line-state-fix 
Improve handling of CDC ACM line state
 2013-04-17 07:37:25 -07:00
George Oikonomou 007e113ea9 Improve handling of CDC ACM line state 
- For the CC2538, simplify handling of USB_CDC_ACM_LINE_STATE
  events. Ignore the Carrier Control (RTS) bit when receiving
  a SET_CONTROL_LINE _STATE request, we are a full duplex device.
- Improve behaviour of the CC2531 USB stick when there is no
  process on the host to read IN data. Basically, we adopt the
  CC2538 approach and we only send data when a DTE is present
 2013-04-16 15:49:05 +01:00
Adam Dunkels 260b004b7e Merge pull request #194 from g-oikonomou/cc2538-forward 
New Platform: TI CC2538 Development Kit
 2013-04-15 05:38:57 -07:00
Rémy Léone 838ec3aa20 Update of doxygen.to 1.8.1.2 using doxygen -u 2013-04-14 16:36:05 +02:00
George Oikonomou 40f49948e6 New Platform: TI CC2538 Development Kit 
This commit adds cpu, platform and example files,
providing support for running Contiki on TI's cc2538 DK
 2013-04-06 21:07:31 +01:00
Rémy Léone 69d936d94a Update README.md 
Minor markdown => md renaming
 2013-04-03 14:52:27 +03:00
Oliver Schmidt d5d8de7372 Merge pull request #181 from mmuman/ctk-ncurses-try4 
TODOs:
- Check FreeBSD
- Adjust Makefile.target
 2013-03-31 14:36:30 -07:00
François Revol 476be8de7e ctk-curses: style fixes 
Thanks tools/contiki-indent
 2013-03-31 04:07:03 +02:00
François Revol a43601b2fc ctk-curses: WITH_GUI also on ftp example for native platform 2013-03-30 23:45:53 +01:00
François Revol 3633c52bcb ctk-curses: whitespace fixes 2013-03-30 23:34:18 +01:00