From 1d9a3c566811ab86cc4eacd1a6e3402f5af42a11 Mon Sep 17 00:00:00 2001 From: George Oikonomou Date: Sun, 29 Oct 2017 01:26:08 +0000 Subject: [PATCH] Move sky-specific example code to separate sub-dir --- examples/slip-radio/project-conf.h | 10 +---- examples/slip-radio/sky/Makefile.sky | 3 ++ .../slip-radio/{ => sky}/slip-radio-cc2420.c | 0 .../{ => sky}/slip-radio-sky-sensors.c | 0 examples/slip-radio/sky/target-conf.h | 43 +++++++++++++++++++ 5 files changed, 48 insertions(+), 8 deletions(-) create mode 100644 examples/slip-radio/sky/Makefile.sky rename examples/slip-radio/{ => sky}/slip-radio-cc2420.c (100%) rename examples/slip-radio/{ => sky}/slip-radio-sky-sensors.c (100%) create mode 100644 examples/slip-radio/sky/target-conf.h diff --git a/examples/slip-radio/project-conf.h b/examples/slip-radio/project-conf.h index cd3e66a24..89e135a42 100644 --- a/examples/slip-radio/project-conf.h +++ b/examples/slip-radio/project-conf.h @@ -39,14 +39,8 @@ #define CMD_CONF_OUTPUT slip_radio_cmd_output -/* add the cmd_handler_cc2420 + some sensors if TARGET_SKY */ -#ifdef CONTIKI_TARGET_SKY -#define CMD_CONF_HANDLERS slip_radio_cmd_handler,cmd_handler_cc2420 -#define SLIP_RADIO_CONF_SENSORS slip_radio_sky_sensors -/* add the cmd_handler_rf230 if TARGET_NOOLIBERRY. Other RF230 platforms can be added */ -#elif CONTIKI_TARGET_NOOLIBERRY -#define CMD_CONF_HANDLERS slip_radio_cmd_handler,cmd_handler_rf230 -#else +/* Default CMD handlers if the target did not specify them */ +#ifndef CMD_CONF_HANDLERS #define CMD_CONF_HANDLERS slip_radio_cmd_handler #endif diff --git a/examples/slip-radio/sky/Makefile.sky b/examples/slip-radio/sky/Makefile.sky new file mode 100644 index 000000000..90917c0f3 --- /dev/null +++ b/examples/slip-radio/sky/Makefile.sky @@ -0,0 +1,3 @@ +PROJECT_SOURCEFILES += slip-radio-cc2420.c slip-radio-sky-sensors.c + +CFLAGS += -DTARGET_CONF_PATH=\"target-conf.h\" diff --git a/examples/slip-radio/slip-radio-cc2420.c b/examples/slip-radio/sky/slip-radio-cc2420.c similarity index 100% rename from examples/slip-radio/slip-radio-cc2420.c rename to examples/slip-radio/sky/slip-radio-cc2420.c diff --git a/examples/slip-radio/slip-radio-sky-sensors.c b/examples/slip-radio/sky/slip-radio-sky-sensors.c similarity index 100% rename from examples/slip-radio/slip-radio-sky-sensors.c rename to examples/slip-radio/sky/slip-radio-sky-sensors.c diff --git a/examples/slip-radio/sky/target-conf.h b/examples/slip-radio/sky/target-conf.h new file mode 100644 index 000000000..08fa66512 --- /dev/null +++ b/examples/slip-radio/sky/target-conf.h @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2017, George Oikonomou - http://www.spd.gr + * 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 copyright holder 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 COPYRIGHT HOLDERS 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 + * COPYRIGHT HOLDER 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. + */ +/*---------------------------------------------------------------------------*/ +#ifndef TARGET_CONF_H_ +#define TARGET_CONF_H_ +/*---------------------------------------------------------------------------*/ +#define QUEUEBUF_CONF_NUM 4 +#define UIP_CONF_BUFFER_SIZE 140 + +#define CMD_CONF_HANDLERS slip_radio_cmd_handler,cmd_handler_cc2420 +#define SLIP_RADIO_CONF_SENSORS slip_radio_sky_sensors +#define UART1_CONF_RX_WITH_DMA 1 +/*---------------------------------------------------------------------------*/ +#endif /* TARGET_CONF_H_ */ +/*---------------------------------------------------------------------------*/