Commit graph

1364 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Simon Duquennoy
658cf0d2cc Reworking jn516x default configuration and examples 2016-02-03 10:35:48 +01:00
Simon Duquennoy
15a5f27080 Adding TSCH to examples/jn516x/rpl 2016-02-01 13:38:53 +01:00
Harald Pichler
b8c5ee0e2b add Test code 2016-01-28 17:08:56 +01:00
Toni Lozano
1f6dafecb0 Modified ADC measurement of PM10 driver to include adc-zoul direct access 2016-01-26 17:55:48 +01:00
Antonio Lignan
8337843d69 Minor fixes 2016-01-26 09:45:43 +01:00
Harald Pichler
c09625704c add exponential 2016-01-25 22:39:52 +01:00
Harald Pichler
f2fe41017b add linear lookup 2016-01-25 20:48:30 +01:00
Harald Pichler
681c514a18 add coap resourcen rgb 2016-01-25 20:41:26 +01:00
Toni Lozano
31e6cc48ca Solved doxygen comments information from VAC, AAC and PM10 sensor files 2016-01-25 18:13:00 +01:00
Toni Lozano
42e1beb931 Added PM10 GP2Y1010AU0F sensor driver and demo test 2016-01-25 10:06:17 +01:00
Toni Lozano
4907842821 Added parameters of aac-sensor on adc-sensors file and adapted AAC and VAC test files for correct results 2016-01-25 10:05:43 +01:00
Toni Lozano
1fca3e810a Added PM10 and VAC parameters to adc_sensors driver 2016-01-25 10:04:25 +01:00
Harald Pichler
535194bcb4 add lookup table 2016-01-24 21:30:35 +01:00
Harald Pichler
44d4f855c6 add contiki combatibility 2016-01-24 16:04:37 +01:00
Harald Pichler
406d69a27c add RGBdriver 2016-01-23 17:49:51 +01:00
Antonio Lignan
246b01095f Ported Grove LCD with RGB backlight for the Zoul platforms 2016-01-23 15:52:29 +01:00
Harald Pichler
6fcdf21552 Merge branch 'osd' of https://github.com/osdomotics/osd-contiki into osd 2016-01-22 21:48:24 +01:00
Harald Pichler
c381f81f57 add experimental code netstack 2016-01-22 21:46:35 +01:00
Antonio Lignan
9a80c0098f Added zero-calibration function and added offset values to the structure 2016-01-22 16:58:46 +01:00
Antonio Lignan
426fa24e50 Clear interrupt and trigger callback if new data is generated 2016-01-22 16:58:46 +01:00
Antonio Lignan
f5b52e8094 Ported Grove's 3-axis gyroscope sensor (based on ITG-3200) 2016-01-22 16:58:46 +01:00
Antonio Lignan
6351462e89 Unified BMP180 and BMP085 drivers 2016-01-22 16:11:49 +01:00
root
e60fe15812 Merge branch 'osd' of https://github.com/osdomotics/osd-contiki into osd 2016-01-22 15:44:44 +01:00
Harald Pichler
fce1b561da initial upload 2016-01-22 15:41:55 +01:00