Ralf Schlatterbeck
28cb276c70
Merge branch 'osd'
...
Conflicts:
apps/arduino/arduino-process.c
apps/arduino/arduino-process.h
apps/json-resource/generic_resource.c
apps/json-resource/generic_resource.h
apps/time/Makefile.time
apps/time/resource_gmtime.c
apps/time/resource_timestamp.c
apps/time/time.c
apps/time/time_resource.h
core/dev/leds.c
core/lib/petsciiconv.c
core/net/ip/resolv.c
core/net/ip/slipdev.c
core/net/ip/tcpip.c
core/net/ipv4/uip.c
core/net/ipv6/uip-ds6.c
core/net/mac/contikimac/contikimac.c
core/net/mac/frame802154.h
core/net/mac/framer-802154.c
core/net/mac/nullrdc.c
core/net/rpl/rpl-dag.c
core/net/rpl/rpl-ext-header.c
core/net/rpl/rpl-icmp6.c
core/net/rpl/rpl-mrhof.c
core/net/rpl/rpl-of0.c
core/net/rpl/rpl-timers.c
core/net/rpl/rpl.c
cpu/avr/Makefile.avr
cpu/avr/dev/lanc111.c
cpu/avr/radio/rf230bb/halbb.c
dev/arduino/arduino-compat.h
examples/osd/.gitignore
examples/osd/arduino-dooralert/Makefile
examples/osd/arduino-dooralert/flash.sh
examples/osd/arduino-dooralert/run.sh
examples/osd/arduino-dooralert/sketch.pde
examples/osd/arduino-merkurboard/Makefile
examples/osd/arduino-merkurboard/README.md
examples/osd/arduino-merkurboard/flash.sh
examples/osd/arduino-merkurboard/project-conf.h
examples/osd/arduino-merkurboard/run.sh
examples/osd/arduino-plantobserving/Makefile
examples/osd/arduino-plantobserving/flash.sh
examples/osd/arduino-plantobserving/project-conf.h
examples/osd/arduino-plantobserving/run.sh
examples/osd/arduino-plantobserving/sketch.pde
examples/osd/arduino-roomalert/Makefile
examples/osd/arduino-roomalert/flash.sh
examples/osd/arduino-roomalert/run.sh
examples/osd/arduino-roomalert/sketch.pde
examples/osd/arduino-sketch/Makefile
examples/osd/arduino-sketch/flash.sh
examples/osd/arduino-sketch/led_pwm.h
examples/osd/arduino-sketch/resource_led_pwm.c
examples/osd/arduino-sketch/run.sh
examples/osd/arduino-sketch/sketch.pde
examples/osd/arduino-wateralert/Makefile
examples/osd/arduino-wateralert/flash.sh
examples/osd/arduino-wateralert/run.sh
examples/osd/arduino-wateralert/sketch.pde
examples/osd/climate/Makefile
examples/osd/climate/er-example-server.c
examples/osd/climate/flash.sh
examples/osd/climate/project-conf.h
examples/osd/climate/run.sh
examples/osd/climate/server-only.csc
examples/osd/climate2/Makefile
examples/osd/climate2/er-example-server.c
examples/osd/climate2/flash.sh
examples/osd/climate2/project-conf.h
examples/osd/climate2/run.sh
examples/osd/climate2/server-only.csc
examples/osd/dual-rgbw-actor/Makefile
examples/osd/dual-rgbw-actor/flash.sh
examples/osd/dual-rgbw-actor/run.sh
examples/osd/dual-rgbw-actor/server-client.csc
examples/osd/dual-rgbw-actor/server-only.csc
examples/osd/embedd-vm-merkurboard/Makefile
examples/osd/embedd-vm-merkurboard/embedd-vm-server.c
examples/osd/embedd-vm-merkurboard/flash.sh
examples/osd/embedd-vm-merkurboard/run.sh
examples/osd/embedd-vm-merkurboard/server-only.csc
examples/osd/er-rest-example-merkurboard/Makefile
examples/osd/er-rest-example-merkurboard/README.md
examples/osd/er-rest-example-merkurboard/er-example-client.c
examples/osd/er-rest-example-merkurboard/er-example-server.c
examples/osd/er-rest-example-merkurboard/er-plugtest-server.c
examples/osd/er-rest-example-merkurboard/flash.sh
examples/osd/er-rest-example-merkurboard/flashclient.sh
examples/osd/er-rest-example-merkurboard/project-conf.h
examples/osd/er-rest-example-merkurboard/run.sh
examples/osd/er-rest-example-merkurboard/runclient.sh
examples/osd/er-rest-example-merkurboard/server-client.csc
examples/osd/light-actor/Makefile
examples/osd/light-actor/er-example-server.c
examples/osd/light-actor/flash.sh
examples/osd/light-actor/pcintkey.c
examples/osd/light-actor/project-conf.h
examples/osd/light-actor/run.sh
examples/osd/light-actor/server-only.csc
examples/osd/light-shutter-control/Makefile
examples/osd/light-shutter-control/flash.sh
examples/osd/light-shutter-control/pcintkey.c
examples/osd/light-shutter-control/run.sh
examples/osd/light-shutter-control/server-only.csc
examples/osd/merkurboard/Makefile
examples/osd/merkurboard/README.md
examples/osd/merkurboard/er-example-client.c
examples/osd/merkurboard/er-example-server.c
examples/osd/merkurboard/er-plugtest-server.c
examples/osd/merkurboard/flash.sh
examples/osd/merkurboard/flashclient.sh
examples/osd/merkurboard/project-conf.h
examples/osd/merkurboard/run.sh
examples/osd/merkurboard/runclient.sh
examples/osd/native-border-router/Makefile
examples/osd/native-border-router/border-router-cmds.c
examples/osd/native-border-router/border-router-cmds.h
examples/osd/native-border-router/border-router-rdc.c
examples/osd/native-border-router/border-router.c
examples/osd/native-border-router/border-router.h
examples/osd/native-border-router/project-conf.h
examples/osd/native-border-router/slip-config.c
examples/osd/native-border-router/slip-dev.c
examples/osd/native-border-router/tun-bridge.c
examples/osd/pingtheplug/Makefile
examples/osd/pingtheplug/er-example-server.c
examples/osd/pingtheplug/flash.sh
examples/osd/pingtheplug/pcintkey.c
examples/osd/pingtheplug/run.sh
examples/osd/pingtheplug/server-only.csc
examples/osd/pir-sensor/Makefile
examples/osd/pir-sensor/flash.sh
examples/osd/pir-sensor/run.sh
examples/osd/pir-sensor/server-client.csc
examples/osd/pir-sensor/server-only.csc
examples/osd/powerbox/Makefile
examples/osd/powerbox/er-example-server.c
examples/osd/powerbox/flash.sh
examples/osd/powerbox/run.sh
examples/osd/powerbox/server-only.csc
examples/osd/pwm-example/Makefile
examples/osd/pwm-example/er-example-server.c
examples/osd/pwm-example/flash.sh
examples/osd/pwm-example/led_pwm.h
examples/osd/pwm-example/resource_led_pwm.c
examples/osd/pwm-example/run.sh
examples/osd/rpl-border-router/Makefile
examples/osd/rpl-border-router/border-router.c
examples/osd/rpl-border-router/flash.sh
examples/osd/rpl-border-router/project-conf.h
examples/osd/rpl-border-router/run.sh
examples/osd/rpl-border-router/slip-bridge.c
examples/osd/runall.sh
examples/osd/servo-sensor/Makefile
examples/osd/servo-sensor/er-example-server.c
examples/osd/servo-sensor/flash.sh
examples/osd/servo-sensor/project-conf.h
examples/osd/servo-sensor/run.sh
examples/osd/servo-sensor/server-client.csc
examples/osd/servo-sensor/server-only.csc
examples/osd/slip-radio/Makefile
examples/osd/slip-radio/flash.sh
examples/osd/slip-radio/no-framer.c
examples/osd/slip-radio/project-conf.h
examples/osd/slip-radio/run.sh
examples/osd/slip-radio/slip-net.c
examples/osd/slip-radio/slip-radio-cc2420.c
examples/osd/slip-radio/slip-radio-sky-sensors.c
examples/osd/slip-radio/slip-radio.c
examples/osd/slip-radio/slip-radio.h
examples/osd/wallclock-time/Makefile
examples/osd/wallclock-time/flash.sh
examples/osd/wallclock-time/run.sh
examples/osd/wirelessplug/Makefile
examples/osd/wirelessplug/flash.sh
examples/osd/wirelessplug/run.sh
examples/osd/wirelessplug/server-client.csc
examples/osd/wirelessplug/server-only.csc
platform/avr-atmega128rfa1/apps/raven-lcd-interface/raven-lcd.c
platform/avr-raven/apps/raven-lcd-interface/raven-lcd.c
tools/tunslip6.c
2016-08-12 22:04:56 +02:00
Harald Pichler
8402b1c151
initial upload, add button
2016-08-03 21:58:02 +02:00
Harald Pichler
3c8e91d74e
cleanup confilicrts
2016-06-28 16:37:16 +02:00
Simon Duquennoy
c3ea1f9fc6
Orchestra: added support for RPL non-storing mode
2016-06-08 14:03:24 +02:00
Simon Duquennoy
6c946319d9
Merge pull request #1667 from alignan/pull/at-driver
...
AT driver (master) and example
2016-06-04 22:47:24 +02:00
Joakim Nohlgård
e8edb6b1a0
oma-lwm2m: Add JSON writer
2016-05-28 07:55:54 +02:00
Joakim Nohlgård
9832b356ba
oma-lwm2m: Use Accept header to determine the writer object for the content
2016-05-28 07:55:27 +02:00
Nicolas Tsiftes
562a33aa16
Merge pull request #1670 from gebart/pr/lwm2m-decimal-point
...
oma-lwm2m: Handle text/plain floatfix numbers without decimal point
2016-05-23 15:22:35 +02:00
Yasuyuki Tanaka
bc54f8bac3
Orchestra: add NULL checks into new_time_source (eb-per-time-source)
2016-05-21 13:43:42 +02:00
Joakim Nohlgård
99c77bda8c
oma-lwm2m: Handle text/plain floatfix numbers without decimal point
...
Fixes bug: If no decimal point is present then the entire number is
treated as the decimal part instead of the integer part
2016-05-21 09:48:06 +02:00
Simon Duquennoy
c7694e4dbd
Orchestra: fix orchestra-rule-eb-per-time-source to handle hash collisions
2016-05-20 13:51:24 +02:00
Simon Duquennoy
7e8d042609
Orchestra: fix bug in new_time_source
2016-05-20 13:40:50 +02:00
Simon Duquennoy
287b4767e3
Orchestra: handle case where ORCHESTRA_UNICAST_PERIOD is smaller than the network size
2016-05-20 13:40:20 +02:00
Antonio Lignan
2b30370b42
AT driver (master) and example
2016-05-15 12:19:04 +02:00
Nicolas Tsiftes
98fcac15cd
Merge pull request #1651 from gebart/pr/lwm2m-json-sv-bv
...
oma-lwm2m: Use sv for string value, bv for boolean
2016-05-12 17:01:16 +02:00
Joakim Nohlgård
22e9ccadf7
ipso-temperature: Use "Cel" for degrees celsius
...
Like the IPSO documentation says
2016-05-04 19:21:56 +02:00
Joakim Nohlgård
cb729b0785
oma-lwm2m: Use sv for string value, bv for boolean
...
Like the OMA docs specify
2016-05-04 19:15:01 +02:00
Nicolas Tsiftes
fb5f0f66dd
Removed Deluge and associated test files.
2016-04-21 13:24:16 +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
Simon Duquennoy
a15be9e518
Merge pull request #1438 from jkent/jsonparse
...
jsonparse: multiple improvements
2016-03-11 14:23:17 +01:00
Joakim Nohlgård
4ff571beb2
apps/er-coap/er-coap-separate.h: fix warning: function declaration isn't a prototype
2016-03-02 07:12:33 +01:00
Joakim Nohlgård
9159903f5a
apps/er-coap/er-coap-transactions.h: fix warning: function declaration isn't a prototype
2016-03-02 07:12:31 +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
98e4451518
Merge branch 'contiki' into osd
2016-02-25 08:18:55 +01:00
Antonio Lignan
4d4930921e
Fixes error when processes name are not used
2016-02-22 16:02:06 +01:00
Simon Duquennoy
b53a1569d9
Merge pull request #1439 from jkent/jsontree
...
jsontree: new features
2016-02-20 12:49:07 +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
Simon Duquennoy
fa078381cf
Fix compiler warnings in shell
2016-02-03 18:01:25 +01:00
zq301
d36eab3750
Update shell-vars.c
2016-01-25 09:35:49 +08:00
zq301
e7c26c57db
Update shell-vars.c
2016-01-25 09:35:15 +08:00
zq301
915facad22
a memory overflow in shell-vars.c
...
" sprintf(numbuf, "0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x",...)" . the formatted data wrote to "numbuf" is 39 bytes, but numbuf is 32 bytes.
2016-01-24 14:39:48 +08:00
Simon Duquennoy
c792f5cf4b
Merge pull request #1409 from nfi/oma-lwm2m-ipso
...
Implementation of OMA LWM2M Engine / IPSO Objects
2016-01-17 10:20:33 +01:00
Harald Pichler
428131e8a8
use dynamic sleep for loop
2016-01-06 21:57:29 +01:00
Jeff Kent
7dc1581631
jsonparse: multiple improvements
...
* input string now can be any json value type
* syntax handling completed
* stack is now used more efficiently for objects
* implemented atomic values true, false, and null
* jsonparse_copy_value now handles escapes
2015-12-28 09:47:12 -06:00
Jeff Kent
a65d566dee
jsontree: add int pointer types
2015-12-28 09:45:29 -06:00
Jeff Kent
bcc7d0a1eb
jsontree: add uint type
2015-12-28 09:45:23 -06:00
Jeff Kent
fcc87ddce8
jsontree: add JSONTREE_CONF_PRETTY option
2015-12-28 09:45:09 -06:00
Joakim Eriksson
a90ff6691a
fixed leds control to work with red,green and blue LED - tested with remote.
2015-12-21 13:02:34 +01:00
Atis Elsts
d79ce957a1
Adaptive time synchronization for TSCH
2015-12-07 11:51:41 +01:00
Simon Duquennoy
7eabf8d391
TSCH: latest update from https://github.com/EIT-ICT-RICH/contiki
2015-12-04 15:21:58 +01:00
Simon Duquennoy
27da5b8ab5
Orchestra: typo
2015-12-04 15:21:57 +01:00
Simon Duquennoy
bc1e27cab7
Added Orchestra, an autonomous scheduler for TSCH exploiting the local RPL state to maintain slotframes and links
2015-12-04 15:21:54 +01:00
Niclas Finne
3dd11603a7
Implementation of OMA LWM2M Engine / IPSO Objects
2015-12-02 15:40:05 +01:00
Simon Duquennoy
ebc8d9fb1c
Merge pull request #1344 from tsparber/fix-doxygen
...
doxygen: Fixed all warnings
2015-11-30 22:07:15 +01:00
Tommy Sparber
938a425949
Cleanup trailing spaces and convert tabs to spaces
...
This commit removes trailing spaces and converts
tabs to spaces in all files affected by fix-doxygen PR.
2015-11-18 11:09:43 +11:00
Tommy Sparber
938d17576b
doxygen: Fix many warnings
...
This commit fixes nearly all of the reported doxygen warnings.
I tried to not clutter the log with removed trailing spaces.
Removed whitespace and converted tab/spaces for all files affected by this commit
are in a separate branch.
2015-11-18 11:07:58 +11:00
Simon Duquennoy
b5141f165c
www.c: Explicitly declare itoa as it is non-standard and not necessarily in stdlib.h
2015-11-10 14:38:22 +01:00
