osd-contiki/examples/osd/maclayertest/project-conf.h

107 lines
3.4 KiB
C
Raw Normal View History

2013-06-11 16:07:54 +02:00
/*
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
* Copyright (c) 2013, Matthias Kovatsch
2013-06-11 16:07:54 +02:00
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the Institute nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
*
*/
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
#ifndef PROJECT_ERBIUM_CONF_H_
#define PROJECT_ERBIUM_CONF_H_
2013-06-11 16:07:54 +02:00
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
#define PLATFORM_HAS_INFO 1
2013-06-11 16:07:54 +02:00
#define PLATFORM_HAS_BATTERY 1
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
#define PLATFORM_HAS_DS1820 1
#define PLATFORM_HAS_DHT11HUM 1
//#define PLATFORM_HAS_DHT11TEMP 1
#define PLATFORM_HAS_LEDS 1
2013-06-11 16:07:54 +02:00
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
/* Some platforms have weird includes. */
#undef IEEE802154_CONF_PANID
2013-06-11 16:07:54 +02:00
/* Disabling RDC for demo purposes. Core updates often require more memory. */
/* For projects, optimize memory and enable RDC again. */
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
// #undef NETSTACK_CONF_RDC
2013-06-11 16:07:54 +02:00
//#define NETSTACK_CONF_RDC nullrdc_driver
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
/* Increase rpl-border-router IP-buffer when using more than 64. */
#undef REST_MAX_CHUNK_SIZE
2013-06-11 16:07:54 +02:00
#define REST_MAX_CHUNK_SIZE 64
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
/* Estimate your header size, especially when using Proxy-Uri. */
/*
#undef COAP_MAX_HEADER_SIZE
#define COAP_MAX_HEADER_SIZE 70
*/
/* The IP buffer size must fit all other hops, in particular the border router. */
#undef UIP_CONF_BUFFER_SIZE
#define UIP_CONF_BUFFER_SIZE 256
2013-06-11 16:07:54 +02:00
/* Multiplies with chunk size, be aware of memory constraints. */
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
#undef COAP_MAX_OPEN_TRANSACTIONS
#define COAP_MAX_OPEN_TRANSACTIONS 4
2013-06-11 16:07:54 +02:00
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
/* Must be <= open transaction number, default is COAP_MAX_OPEN_TRANSACTIONS-1. */
/*
#undef COAP_MAX_OBSERVERS
#define COAP_MAX_OBSERVERS 2
*/
/* Filtering .well-known/core per query can be disabled to save space. */
/*
#undef COAP_LINK_FORMAT_FILTERING
#define COAP_LINK_FORMAT_FILTERING 0
*/
/* Save some memory for the sky platform. */
/*
#undef NBR_TABLE_CONF_MAX_NEIGHBORS
#define NBR_TABLE_CONF_MAX_NEIGHBORS 10
#undef UIP_CONF_MAX_ROUTES
#define UIP_CONF_MAX_ROUTES 10
*/
2013-06-11 16:07:54 +02:00
/* Reduce 802.15.4 frame queue to save RAM. */
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
/*
2013-06-11 16:07:54 +02:00
#undef QUEUEBUF_CONF_NUM
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
#define QUEUEBUF_CONF_NUM 4
*/
/*
#undef SICSLOWPAN_CONF_FRAG
#define SICSLOWPAN_CONF_FRAG 1
*/
/* For Debug: Dont allow MCU sleeping between channel checks */
#undef RDC_CONF_MCU_SLEEP
#define RDC_CONF_MCU_SLEEP 0
2013-06-11 16:07:54 +02:00
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
#endif /* PROJECT_ERBIUM_CONF_H_ */