Commit graph

414 commits

Author SHA1 Message Date
Harald Pichler 918b20f3cf set loop to 30 2017-03-18 20:42:47 +01:00
Harald Pichler 2942868799 bugfix format 2017-03-03 11:45:46 +01:00
Harald Pichler 362eadd821 bugfix format 2017-03-03 11:40:13 +01:00
Harald Pichler 14baf5df6c bugfix format 2017-03-03 11:37:09 +01:00
Harald Pichler c954d22d81 bugfix format 2017-03-03 11:29:32 +01:00
Harald Pichler f36183f2b5 Merge branch 'master' of https://github.com/osdomotics/osd-contiki 2017-03-03 11:26:28 +01:00
Harald Pichler 314c46b91a bugfix format 2017-03-03 11:24:32 +01:00
Harald Pichler 6af70ee511 bugfix warning -Wwrite-strings 2017-03-03 11:21:43 +01:00
Harald Pichler 7000323c74 bugfix format 2017-03-03 11:17:33 +01:00
Harald Pichler ae6375d900 add humidity resource, bugfix pressure string variable 2017-02-24 10:28:35 +01:00
Harald Pichler 2137a12971 Merge branch 'master' of https://github.com/osdomotics/osd-contiki 2017-02-24 10:07:20 +01:00
Harald Pichler 4151c09e2c cleanup code 2017-02-23 22:36:32 +01:00
Harald Pichler 6677fac2ab bugfix use bmp280 and not bme280 2017-02-23 22:22:40 +01:00
Harald Pichler 8e07bab71f initial upload 2017-02-23 16:48:37 +01:00
Harald Pichler 85f3814f67 add i2c address 2017-02-23 08:59:49 +01:00
Harald Pichler 42dee52e65 initial upload 2017-02-23 08:49:02 +01:00
Harald Pichler 352f078be7 initial upload 2017-02-22 14:53:05 +01:00
Harald Pichler 5ea65cab08 temperature convert time is to short set from 50ms to 60ms 2017-02-21 20:06:15 +01:00
Harald Pichler 201a8174c6 print buffer text and hex format 2017-02-01 16:17:48 +01:00
Harald Pichler 6a9b6ae77b initial upload 2017-02-01 11:26:50 +01:00
Harald Pichler 9fb2352b08 bugfix buffer overflow 2017-02-01 10:28:02 +01:00
Harald Pichler 1ec48fcf37 bugfix repalce the same tag 2016-12-16 13:03:44 +01:00
Harald Pichler 0812b89909 bugfix only one event if pressed 2016-12-09 15:59:22 +01:00
Harald Pichler d41197e1e7 add button code 2016-12-08 22:22:56 +01:00
Harald Pichler 52c26d31c4 initial upload 2016-12-07 09:20:49 +01:00
Harald Pichler 5fc05b102b add sencond button 2016-12-07 09:18:10 +01:00
Harald Pichler 95b8c2683e cleanup examples 2016-12-06 21:37:58 +01:00
Harald Pichler 994badaef9 cleanup code 2016-12-06 21:37:03 +01:00
Harald Pichler 353cfe723c initial upload 2016-12-06 21:32:33 +01:00
Harald Pichler 4f7476c084 bugfix type 2016-12-04 15:49:14 +01:00
Harald Pichler f8a399d346 initial upload 2016-12-04 15:47:40 +01:00
Harald Pichler 9f40b0734c add rfid resources 2016-11-14 11:13:07 +01:00
Harald Pichler 1398ff0de6 print date to serial1 2016-11-09 15:39:24 +01:00
Harald Pichler d2a1f8937e add coap resoure ip 2016-11-06 16:17:16 +01:00
Harald Pichler d8bb685989 bugfix post led/RGB 2016-11-05 19:34:07 +01:00
Harald Pichler 646bb077ef move res_red .. to resources folder 2016-11-04 08:40:58 +01:00
Harald Pichler d66e402cad bugfix linker problem mix c cpp function 2016-11-03 16:20:22 +01:00
Harald Pichler 5ea437c170 initial upload 2016-11-03 15:46:00 +01:00
Harald Pichler 20820a11e0 move rgb resource to resource folder 2016-11-03 11:27:42 +01:00
Harald Pichler d2a650f514 cleanup code 2016-11-03 08:38:21 +01:00
Harald Pichler 79b69334df cleanup code 2016-11-03 08:11:42 +01:00
Harald Pichler 17520dc4e0 add resource res_rgb 2016-10-27 14:17:26 +02:00
Harald Pichler e6dbb8c3f2 Merge branch 'master' into osd
Conflicts:
	examples/osd/triggerbaord/sketch.pde
2016-10-26 17:03:37 +02:00
Harald Pichler 8891a0ec44 reduce power consumtion 2016-10-19 09:45:45 +02:00
Harald Pichler b7b3f0a33a add mcusleep set parameter to save energie 2016-10-19 08:32:21 +02:00
Harald Pichler ed1ae480f1 initial uplaod 2016-10-17 08:24:14 +02:00
Harald Pichler fd37296cdf more range, we have power 2016-10-17 08:22:38 +02:00
Harald Pichler 3b28df58da eliminate c++ string warnings 2016-10-17 08:20:16 +02:00
Harald Pichler 47760c57e6 add parameter to save more power 2016-10-16 22:08:18 +02:00
Harald Pichler a152a30958 add mac layer security 2016-10-13 12:41:02 +02:00
Harald Pichler e4ab78369e initial upload 2016-10-13 12:36:53 +02:00
Harald Pichler 8f5a033c48 move arduino app code to project 2016-10-12 10:16:41 +02:00
Harald Pichler 548bf32990 initial upload 2016-10-12 10:02:59 +02:00
Harald Pichler 9226facda8 remove warnings 2016-10-02 22:49:22 +02:00
Harald Pichler fa11a55a45 initial upload 2016-10-02 22:35:56 +02:00
Harald Pichler 5d76c0a6af add rgb resource 2016-10-02 22:32:58 +02:00
Harald Pichler cfca07489d coap client test 2016-09-27 18:13:03 +02:00
Harald Pichler 8302b1f762 bugfix constrain return value 2016-09-27 17:03:15 +02:00
Harald Pichler ee5cd039a1 add ChainableLED 2016-09-27 09:51:26 +02:00
Harald Pichler a37fd79426 disable mcusleep 2016-09-26 21:06:14 +02:00
Harald Pichler 916bebd102 reduce power consumtion 2016-09-26 21:04:05 +02:00
Harald Pichler 2fd23f99ed config as hostnode, add coap client 2016-09-20 21:49:52 +02:00
Harald Pichler 8b1745214c bugfix answear speed 2016-09-20 21:22:11 +02:00
Harald Pichler 28f2b2caa8 add coap client function 2016-09-20 21:20:34 +02:00
Harald Pichler c663bb527e add UIP_CONF_ROUTER to project.conf 2016-09-16 14:12:37 +02:00
Harald Pichler 34a9135f83 activate reciver on 2016-09-01 09:34:57 +02:00
Harald c7de6343d9 Merge pull request #5 from piccaso/max-age
Triggerboard: set max-age header
2016-08-24 07:54:13 +02:00
Flo eeb90bab77 gets rid of 'deprecated conversion from string constant to char*' 2016-08-24 00:59:47 +02:00
Harald Pichler ec34b8640c bugfix dallas remove first space 2016-08-23 20:51:21 +02:00
Flo 3af0cc460c set max-age header 2016-08-22 22:53:01 +02:00
Harald Pichler 0190c261e2 use led1_on 2016-08-22 22:15:41 +02:00
Harald Pichler 8b887ca429 add button led bled to project 2016-08-20 14:09:44 +02:00
Harald Pichler 1d2447d69d add noncorsec section 2016-08-18 17:30:39 +02:00
Harald Pichler 6c7dc58574 make it more flexible to user in other projects 2016-08-16 11:13:57 +02:00
Harald Pichler cf40f59843 add pin status 2016-08-15 20:22:49 +02:00
Harald Pichler c42a75d9d6 optimize power consumtion 2016-08-11 23:49:45 +02:00
Harald Pichler 542a921e3f initial uplaod 2016-08-11 14:04:29 +02:00
Harald Pichler 8402b1c151 initial upload, add button 2016-08-03 21:58:02 +02:00
Harald Pichler e534bcaa25 bugfix dht11 config 2016-07-04 20:26:06 +02:00
Harald Pichler 978ef63002 cleanup debugpronts 2016-06-28 14:08:38 +02:00
Harald Pichler dfd8fdec4a initial upload 2016-05-20 11:18:19 +02:00
Harald Pichler 9a2494583d bugfix compile error tostrf 2016-05-20 09:11:11 +02:00
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
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 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
Harald Pichler b8c5ee0e2b add Test code 2016-01-28 17:08:56 +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
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
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
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
harald 0c3eeed1bf add leds 2016-01-19 14:01:28 +01:00
Harald Pichler c2f9c584b9 at init set buzzer to low,at adc vonversion stop shedular dutycycle 2016-01-15 15:56:55 +01:00
Harald Pichler 836a483f7e bugfix dallas coap resource 2016-01-06 21:39:35 +01:00
Harald Pichler d484585e39 bugfix scale 2015-12-22 06:37:40 +01:00
Harald Pichler c493bc6618 initial upload 2015-11-29 22:34:24 +01:00
Harald Pichler ba9d4ed578 add dallas ds1820 external sensor 2015-11-29 22:31:59 +01:00
Harald Pichler 67ed80e9fe move defines to servo.h 2015-11-28 18:45:15 +01:00
Harald Pichler 9b9958fb43 initial upload 2015-11-20 14:08:43 +01:00
Harald Pichler fd24ecd26e add index and struct for messured values 2015-10-11 15:30:30 +02:00
Harald Pichler e8471445ed add struct for sensors, add sketch.h 2015-10-11 15:22:49 +02:00
Harald Pichler 0a4938243e cleanup resources 2015-10-08 21:14:43 +02:00
Harald Pichler 4ff973a0cc mult. DS18B20 Temp demo 2015-10-07 16:14:00 +02:00
Harald Pichler 1a309e6632 bugfix project conf, do not sleep git add project-conf.h 2015-09-21 16:09:28 +02:00
Harald Pichler a2e70d49f3 remove first space from converted string 2015-09-16 10:31:52 +02:00
Harald Pichler 6b41f23d59 make mcusleep variable, use mcusleepcycle 2015-09-15 09:52:06 +02:00
Harald Pichler 7404e75213 bugfix float resources, save energy enabled 2015-09-14 16:55:18 +02:00
Harald Pichler e3ffbe36c8 bugfix printf and float 2015-09-14 10:51:16 +02:00
Harald Pichler 617d42663c add htu21d sensor and resources and set mesure inteval to 10 seconds 2015-09-11 21:41:24 +02:00
Ralf Schlatterbeck 7f09f96e88 Fix compile error
Wire.h is a C++ include-file and may not be within 'extern "C"'.
2015-09-11 15:10:28 +02:00
Harald Pichler 910dc981b5 initial upload 2015-09-04 14:04:11 +02:00
Harald Pichler 72c6c2c492 bugfix add status led 2015-05-21 22:14:39 +02:00
Harald Pichler 82d03d0ebf bugfix no framer 2015-05-15 20:59:59 +02:00
Harald Pichler b2847f4756 add coap18 2015-04-29 15:58:42 +02:00
Harald Pichler b97d6878c0 add coap18 2015-04-28 20:56:52 +02:00
Harald Pichler a1423c28fc add coap18 2015-04-28 19:53:43 +02:00
Harald Pichler 12fe0d8442 change to coap18 2015-04-22 14:18:10 +02:00
David Rabel 65c50195c4 ressource handlers for servos corrected 2015-04-03 15:46:05 +02:00
David Rabel 0980393d22 Fix servo example 2015-04-03 14:31:25 +02:00
David Rabel 3ba9009f50 Use servo instead of t4-servo 2015-04-03 14:29:52 +02:00
Harald Pichler 0097d192be move dht11 define to project.conf 2015-03-23 13:03:32 +01:00
Harald Pichler 9dd81946d3 add coap 18 2015-02-10 20:16:51 +01:00
Harald Pichler c30493e535 add Buzzer 2015-02-05 13:44:05 +01:00
Ralf Schlatterbeck 451e2df0f5 Fix IP-Address output (endianness!) 2015-01-27 16:41:30 +01:00
Ralf Schlatterbeck 5ff9b7c989 Don't re-init coap connection 2015-01-27 16:04:07 +01:00
Ralf Schlatterbeck 058ae7bae3 Alleged race-condition was a bug in receiver
Handling put-requests was missing a trailing \0 in the parsed string.
2015-01-27 10:43:03 +01:00