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

9058 commits

This branch
This branch
All branches
Author SHA1 Message Date
Benoît Thébaudeau
42c287f363 cc2538: lpm: Fix build for LPM_CONF_ENABLE == 0 
lpm.c needs to #include lpm.h in order to get the definition of
lpm_periph_permit_pm1_func_t, which made the replacement macros conflict with
the function definitions for the LPM_CONF_ENABLE == 0 case. This change fixes
this issue by #if-ing out the code in lpm.c in that case. Also, the replacement
macro for lpm_register_peripheral() was missing in that case, which is fixed
here.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
 2014-01-28 20:21:06 +01:00
Oliver Schmidt
e10d462931 Merge pull request #545 from ADVANSEE/cc2538-lib-link 
cc2538: Fix library linkage
 2014-01-28 06:37:49 -08:00
Benoît Thébaudeau
a562acb160 cc2538: Fix library linkage 
If a project needs to use some libraries at link stage, then the corresponding
linker options (e.g. '-lm') have to be passed after any .o file depending on
these libraries. Hence, LDFLAGS cannot be used to add such options when invoking
$(LD) in Makefile.cc2538, or it should be moved to the correct location.
Instead, this change adds TARGET_LIBFILES to the correct location, like most
other Contiki targets.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
 2014-01-28 14:32:30 +01:00
Mariano Alvira
4738a4b340 Merge pull request #540 from hexluthor/rl78-fixes2 
More fixes for the RL78 / EVAL-ADF7xxxMB4Z platform
 2014-01-27 08:06:46 -08:00
Fredrik Österlind
f6c6ef9b54 Merge pull request #532 from darki2002/Plugin_sim 
Stopped to load plugins depending on simulations if there is no simulation
 2014-01-27 07:31:19 -08:00
Fredrik Österlind
a369611fe7 Merge pull request #544 from drakkar-lig/cooja-compile-error 
Cooja compile error
 2014-01-27 07:14:14 -08:00
Martin Heusse
9eabbe02ad Adds encoding attribute utf-8 arg to cooja compile command 2014-01-27 15:14:34 +01:00
Ian Martin
f3cc607101 eval-adf7xxxmb4z: Use the nullrdc driver instead of sicslowmac. 2014-01-26 17:40:31 -05:00
Adam Dunkels
b6c4f50bea Merge pull request #538 from cskiraly/collect-fixes 
collect: making some protocol parameters configurable by COLLECT_CONF_
 2014-01-26 14:23:08 -08:00
Adam Dunkels
17d48c6d7a Merge pull request #504 from adamdunkels/push/ping-reply-api 
A ping reply API
 2014-01-26 14:03:21 -08:00
Nicolas Tsiftes
2e27bdda79 Merge pull request #541 from drakkar-lig/degug-compile-error 
Fix compilation error when DEBUG enabled in core/net/mac/framer-nullmac....
 2014-01-25 07:09:25 -08:00
Martin Heusse
662eb4db14 Fix compilation error when DEBUG enabled in core/net/mac/framer-nullmac.c 2014-01-24 20:23:26 +01:00
Ian Martin
935322665e rl78: Attempt to locate the IAR installation automatically and instruct the user how to specify IAR_PATH if it cannot be found. 2014-01-24 12:50:43 -05:00
Ian Martin
ed4edab461 eval-adf7xxxmb4z: Corrections to the platform README, update URLs to point to the mainline Contiki. 2014-01-24 12:49:16 -05:00
Ian Martin
ffa0147920 rl78: Rename CORE to RL78_CORE to avoid a conflict with Contiki's CORE variable. 2014-01-24 11:49:47 -05:00
Oliver Schmidt
0258c413cc Merge pull request #539 from oliverschmidt/master 
Added more flexibility to webbrowser -> wget forwarding.
 2014-01-24 08:08:08 -08:00
Oliver Schmidt
1f4613383f Added more flexibility to webbrowser -> wget forwarding. 
- Up to now the CTK program handler was necessary to start wget and forward the URL. Now alternatively the webbrowser uses the underlying OS to exec wget.

- Up to now windowed CTK was necessary to display the acknowledge dialog. Now alternatively the webbrowser displays the acknowledge text and buttons right in the webpage area.

- For now the targets 'win32' and 'c64' make use of the new capabilities.
 2014-01-24 16:09:30 +01:00
Oliver Schmidt
33304c0f5f Merge pull request #537 from oliverschmidt/master 
Added cmdline args support to wget example.
 2014-01-24 05:20:47 -08:00
Csaba Kiraly
d1822b5880 collect: making some protocol parameters configurable by COLLECT_CONF_ style defines 
TTL (which has a rather low default of 15), MAC level retransmissions,
overall number of retransmissions, and the header bits dedicated to these
were all fixed in the collect.h and collect.c, without a simple way to
override them.
Extracted these as COLLECT_CONF_ parameters, keeping defaults as they were
before.

Signed-off-by: Csaba Kiraly <kiraly@disi.unitn.it>
 2014-01-24 12:53:16 +01:00
Oliver Schmidt
64ce68f004 Added cmdline args support to wget example. 2014-01-24 12:44:23 +01:00
Oliver Schmidt
8baf2d7b42 Merge pull request #536 from oliverschmidt/master 
Copied 'contiki_arg[c|v]' from 'native' to the other desktop targets.
 2014-01-24 03:41:42 -08:00
Oliver Schmidt
fc983e2e79 Copied 'contiki_arg[c|v]' from 'native' to the other desktop targets. 
- On the retro targets support for 'contiki_arg[c|v]' is optional as accesing arg[c|v] is rather expensive.
 2014-01-24 11:56:40 +01:00
Mariano Alvira
3724c01637 Merge pull request #534 from hexluthor/rl78-fixes 
UART-related fixes for Renesas RL78
 2014-01-23 13:45:52 -08:00
Ian Martin
1b61f1bb7b Add cpu/rl78/dev/uart1.h because some examples rely on it. 2014-01-22 18:42:24 -05:00
Ian Martin
a897426410 Increase the default baudrate to 38400 bps for RL78. 2014-01-22 18:42:18 -05:00
Ian Martin
00468a3f53 Fix buggy UART baudrate calculation in the RL78 UART driver. 2014-01-22 18:41:55 -05:00
Nicolas Tsiftes
2e69d024a5 Merge pull request #505 from adamdunkels/push/fix-the-fix-that-fixes-the-fix 
Fix the bug in the IPv6 bugfix
 2014-01-21 13:35:49 -08:00
Adam Dunkels
c8c7c4ae3a Add comments to the #else and #endifs to make it clearer to what #ifdef they belong. 2014-01-21 20:58:31 +01:00
Sebastian Schinabeck
86320d74ed Stopped to load plugins depending on simulations if there is no simulation 2014-01-21 15:02:46 +01:00
Oliver Schmidt
792d60f03e Merge pull request #522 from oliverschmidt/master 
Added mouse support for the Atari.
 2014-01-20 14:26:52 -08:00
Oliver Schmidt
510678bed0 Added mouse support for the Atari. 2014-01-20 22:51:40 +01:00
Oliver Schmidt
38cadabebb Merge pull request #521 from oliverschmidt/master 
Add somewhat more support to use different mouse drivers.
 2014-01-17 15:39:28 -08:00
Oliver Schmidt
a24865de72 Add somewhat more support to use different mouse drivers. 
- The default mouse driver is now always named 'contiki.mou'.
- Alternative mouse drivers are present in the disk images.
- Users can select their mouse driver by renaming the files.
 2014-01-17 23:45:59 +01:00
Oliver Schmidt
9c8302b56c Merge pull request #520 from oliverschmidt/master 
Fixed some of the targets broken by changing the UIP_CONF_LLH_LEN default.
 2014-01-17 14:11:49 -08:00
Oliver Schmidt
fb20cf5ee6 Added UIP_CONF_LLH_LEN. 2014-01-17 22:07:03 +01:00
Mariano Alvira
03e0c02fab Merge pull request #510 from hexluthor/adf7023-rl78 
Add support for ADF7023 sub-GHz radio from Analog Devices and RL78 series MCU from Renesas
 2014-01-16 05:24:14 -08:00
Ian Martin
7d3053bbc5 Remove hyphen from preprocessor symbol to fix compiler warning. 2014-01-10 16:31:05 -05:00
Ian Martin
85b439e33a Add eval-adf7xxxmb4z platform makefile. 2014-01-10 15:03:38 -05:00
Ian Martin
174d4dd80c Adds support for ADF7023 sub-GHz radio from Analog Devices and RL78 series MCU from Renesas. 
This example platform for this port is the EVAL-ADF7XXXMB4Z w/ radio
daughter cards:

    http://www.analog.com/en/evaluation/eval-adf7023/eb.html

See the platform readme for usage and platform information:

    https://github.com/contiki-os/contiki/tree/master/platform/eval-adf7xxxmb4z/readme.md

All files provided by Analog Devices for this port are released under
the same license as Contiki and copyright Analog Devices Inc. per
agreement between Redwire Consulting, LLC and Analog Devices Inc. (SOW 08122013)
 2014-01-04 18:56:51 -05:00
Ian Martin
e90af44ca7 Merge ADF7023 driver from https://github.com/analogdevicesinc/no-OS 2014-01-04 17:38:26 -05:00
Ian Martin
6d36c83513 Merge SPI driver from https://github.com/analogdevicesinc/no-OS 2014-01-04 17:38:26 -05:00
Ian Martin
6a88905f9d Merge UART driver from https://github.com/msalov/rl78-samples-R5F100SLAFB 2014-01-04 17:38:26 -05:00
Ian Martin
d0abf415e7 Merge RL78 files from https://sourceware.org/git/?p=newlib.git 2014-01-04 17:38:26 -05:00
Dragos Bogdan
cfd554dc24 Move files. 2014-01-04 17:27:52 -05:00
Dragos Bogdan
fb64cb5e4c Uncrustify. 2014-01-04 17:27:51 -05:00
Dragos Bogdan
94d5d384e0 Move files. 2014-01-04 17:27:29 -05:00
Dragos Bogdan
1667c4f0de Uncrustify. 2014-01-04 17:27:29 -05:00
Maxim Salov
2668b17f52 Move files. 2014-01-04 17:27:24 -05:00
Maxim Salov
096ff72bd9 Uncrustify. 2014-01-04 17:27:24 -05:00
DJ Delorie
5115554247 Move/rename files. 2014-01-04 17:27:23 -05:00