Commit graph

11447 commits

Author SHA1 Message Date
harald42
abc5db04b2 bugfix start i2c and printf 2016-05-18 08:17:47 +02:00
harald42
a95b0c9d46 add BH1750 sensor example 2016-05-17 16:43:11 +02:00
Harald Pichler
944f1b06d6 add led resource 2016-04-24 17:45:35 +02:00
Ralf Schlatterbeck
04bbba6c12 Multi-platform support, osd-merkur-{128,256}
Rename guhRF platform to osd-merkur-256, previous osd-merkur platform is
now osd-merkur-128. Also check that everything is consistent.
Add both platforms to the regression tests.
Move redundant files in platform dev directory of both platforms to
cpu/avr/dev. Note that this probably needs some rework. Already
discovered some inconsistency in io definitions of both devices in the
avr/io.h includes. Added a workaround in the obvious cases.
The platform makefiles now set correct parameters for bootloader and for
reading mac-address from flash memory.
Factor the flash programming into cpu/avr and platform/osd-merkur* and
rework *all* osd example makefiles to use the new settings. Also update
all the flash.sh and run.sh to use the new settings.
The suli ledstrip modules (and osd example) have also been removed.
2016-04-22 17:59:40 +02:00
Ralf Schlatterbeck
53dd2e5d16 Fix unused variable warning 2016-04-22 12:34:16 +02:00
Ralf Schlatterbeck
068f27d1c2 Fix integer overflow in RPL timeout expression 2016-04-22 12:31:21 +02:00
Boernsman
79df347afa added guhRF; added atmega256rfr2 support 2016-04-21 08:41:48 +02:00
harald42
9a3c6adf8d add mcu_sleep routines 2016-04-12 10:34:40 +02:00
Ralf Schlatterbeck
743245e230 Add 'x' prefix to time functions
.. to avoid name-clashes with (some) libraries. This now also should
make it work for the 'native' target (untested).
2016-03-29 17:48:59 +02:00
Ralf Schlatterbeck
b2a289924b Fix type of get_header_content_type parameter 2016-03-28 17:25:30 +02:00
harald42
f2af0c7329 change default channel from 26 to 25 2016-03-16 15:00:46 +01:00
harald42
682df76b79 add cputem to common resources and example 2016-03-03 10:32:38 +01:00
Harald Pichler
5a5ed6b990 cleanup code 2016-02-27 22:16:02 +01:00
Harald Pichler
6bdae7d9ec cleanup code 2016-02-27 22:14:56 +01:00
Harald Pichler
daf2191555 add arduino folder 2016-02-27 22:13:12 +01:00
Harald Pichler
de928cd14e cleanup code 2016-02-27 22:10:53 +01:00
Ralf Schlatterbeck
6b40e88ecb Add cron functionality 2016-02-26 17:30:16 +01:00
Ralf Schlatterbeck
c6165a3bcf Refactor GENERIC_RESOURCE macro
Now callback functions get the URI of the request, this allows to use a
single resource for multiple different URIs.
The is_json flag is now gone for the to-string function, instead the
macro has an is_str flag. If set this automagically produces quotes
around the string for json output.
Now from-string functions can return an error-code, 0 for success, -1
for error.
2016-02-26 17:13:48 +01:00
harald42
c7daa7c45d add linux documentaion 2016-02-25 13:58:07 +01:00
harald42
2df628aa4b bugfix native boarder router 2016-02-25 13:37:08 +01:00
harald42
9bb1f01905 update to new version 2016-02-25 13:25:24 +01:00
harald42
7d8254bd81 use uint32 for clock time 2016-02-25 09:32:21 +01:00
harald42
b462052bf5 CRLF will be replaced by LF 2016-02-25 08:20:41 +01:00
harald42
98e4451518 Merge branch 'contiki' into osd 2016-02-25 08:18:55 +01:00
harald42
e7f270cf37 crf replace by lf 2016-02-25 08:11:05 +01:00
harald42
a7b230a0b7 bugfix get macaddress 2016-02-24 08:29:24 +01:00
Harald Pichler
855bc65b8a initial upload 2016-02-23 20:32:53 +01:00
Harald Pichler
1e5163cbb3 bugfix remove testcode 2016-02-23 20:31:10 +01:00
George Oikonomou
93b9089164 Merge pull request #1504 from bthebaudeau/travis-force-aapcs-toolchain-version
travis: Force AAPCS toolchain version
2016-02-20 23:50:17 +00:00
Simon Duquennoy
b53a1569d9 Merge pull request #1439 from jkent/jsontree
jsontree: new features
2016-02-20 12:49:07 +01:00
Ralf Schlatterbeck
de6477efa8 Fix run.sh scripts to use jumptable of bootloader
Otherwise a crash results with a bootloader compiled with a newer AVR
toolchain (e.g. Debian Jessie). If you still have an ages-old bootloader
without a jump-table, as a short-term measure you can revert this change
in your run.sh. As a long-term fix we recommend you get your bootloader
updated!
2016-02-19 17:32:09 +01:00
Ralf Schlatterbeck
0068611b4d Implement localtime
Now we manage a timezone and daylight-savings aware version of
localtime. We parse UNIX timezone strings. The default (active after the
first call to localtime or localtime_r) is CET/CEST, the timezone of
Europe/Vienna. The wallclock-time osd-example demonstrates how to set a
different timezone via the timezone resource.

Note: After startup no timezone is set. So in this state querying the
timezone resource will return an empty string. After first call to
localtime (if not timezone has been set via the timezone resource) a
query to timezone will return the default timezone string for CET/CEST.

The string returned by the localtime and utc timezones now also includes
the timezone name.

New fields tm_gmtoff and tm_zone were added to the tm structure. These
are available in BSD systems and when setting special compiler
definitions on Linux.

Note: the timezone offset information in the tm structure (tm_gmtoff)
as well as in the tz structure returned by gettimeofday (tz_minuteswest)
may be wrong sign, this code is largely untested.
2016-02-18 09:55:07 +01:00
Antonio Lignan
0e17b98372 Merge pull request #1518 from Zolertia/pm10-remove-issue
Removed PM10 code lines from adc-sensors driver
2016-02-15 17:38:36 +01:00
Toni Lozano
2cbde75b02 Removed PM10 code lines from adc-sensors driver 2016-02-15 14:45:26 +01:00
Antonio Lignan
0dbed519a5 Merge pull request #1507 from Zolertia/remote-voc-test
Added VOC (iAQ-Core) drivers and test application
2016-02-15 12:21:32 +01:00
Aitor Mejias
cb1e7c2c45 Added VOC (iAQ-Core) drivers and test application 2016-02-15 11:00:48 +01:00
Antonio Lignan
4cd0e3ad35 Merge pull request #1516 from alignan/pull/weather-meter-contikimac
Weather meter: replaced rtimer by ctimer as it was breaking contikimac
2016-02-13 23:02:17 +01:00
Antonio Lignan
25ff850a43 Weather meter: replaced rtimer by ctimer as it was breaking contikimac 2016-02-13 22:33:05 +01:00
Antonio Lignan
c6ded00dc4 Merge pull request #1512 from alignan/pull/fix-z1-websense
Fix z1-websense example
2016-02-13 16:35:50 +01:00
Antonio Lignan
b2b573e9e7 Fix z1-websense example 2016-02-12 19:10:02 +01:00
Simon Duquennoy
99de563e8d Merge pull request #1503 from amitgeron/route_discovery_typo
Typo
2016-02-08 13:35:03 +01:00
Benoît Thébaudeau
910f7b1ac8 travis: Force AAPCS toolchain version
Make Travis CI use the GNU ARM Embedded toolchain version specified by
the READMEs, instead of automatically using the latest version provided
by the PPA. In this way, the READMEs will still be correct after a PPA
upgrade, and the version used by Contiki is under control.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2016-02-07 18:21:57 +01:00
Amit Geron
ba6419cc25 Typo
* route_discovery_expicit_open --> route_discovery_explicit_open
2016-02-07 11:58:31 +02:00
Simon Duquennoy
daa83ee3ef Merge pull request #1404 from amitgeron/route_discovery_channels
Add route_discovery_explicit_open()
2016-02-05 23:12:39 +01:00
Simon Duquennoy
5afdae1399 Merge pull request #1498 from alignan/pull/fix-ip64-warnings
Fix ip64 warnings and error
2016-02-05 23:02:39 +01:00
Benoît Thébaudeau
287092db42 Merge pull request #1486 from alignan/pull/cc2538-common
Unified cc2538 examples into single cc2538-common placeholder
2016-02-04 23:48:35 +01:00
Antonio Lignan
45c125949a Unified cc2538 examples into single cc2538-common placeholder 2016-02-04 17:26:11 +01:00
Nicolas Tsiftes
9b3e334c7d Merge pull request #1497 from simonduq/pr/shell-warnings
Fix compiler warnings in shell
2016-02-04 13:14:26 +01:00
Nicolas Tsiftes
4dce5f6765 Merge pull request #1494 from simonduq/pr/uip6-debug
Minor debug output fixes
2016-02-04 13:09:21 +01:00
Simon Duquennoy
ebdc536d61 Merge pull request #1496 from simonduq/pr/jn516x-serial-input
jn516x enable serial input whenever there is no fallback interface
2016-02-04 10:02:15 +01:00