From c4f248d51cc796b09b5db463e4c2b0e5c46ac823 Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Mon, 23 Mar 2020 20:30:14 +0100 Subject: [PATCH 1/6] drivers/dose: fix declaration of signal() --- drivers/dose/dose.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/dose/dose.c b/drivers/dose/dose.c index 440c5aee18..65c1b103bf 100644 --- a/drivers/dose/dose.c +++ b/drivers/dose/dose.c @@ -36,7 +36,7 @@ static dose_signal_t state_transit_blocked(dose_t *ctx, dose_signal_t signal); static dose_signal_t state_transit_idle(dose_t *ctx, dose_signal_t signal); static dose_signal_t state_transit_recv(dose_t *ctx, dose_signal_t signal); static dose_signal_t state_transit_send(dose_t *ctx, dose_signal_t signal); -static void state(dose_t *ctx, uint8_t src); +static void state(dose_t *ctx, dose_signal_t src); static void _isr_uart(void *arg, uint8_t c); static void _isr_gpio(void *arg); static void _isr_xtimer(void *arg); From b775475d1b9debe34efd5a8863f1efce736d66eb Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Mon, 23 Mar 2020 18:08:13 +0100 Subject: [PATCH 2/6] tests/driver_netdev_common: add compile-test for netif drivers --- tests/driver_at86rf215/Makefile | 23 +-------------- tests/driver_at86rf215/main.c | 40 +------------------------- tests/driver_netdev_common/Makefile | 28 ++++++++++++++++++ tests/driver_netdev_common/Makefile.ci | 17 +++++++++++ tests/driver_netdev_common/main.c | 39 +++++++++++++++++++++++++ 5 files changed, 86 insertions(+), 61 deletions(-) mode change 100644 => 120000 tests/driver_at86rf215/main.c create mode 100644 tests/driver_netdev_common/Makefile create mode 100644 tests/driver_netdev_common/Makefile.ci create mode 100644 tests/driver_netdev_common/main.c diff --git a/tests/driver_at86rf215/Makefile b/tests/driver_at86rf215/Makefile index 9fd605967f..6a5eddcad6 100644 --- a/tests/driver_at86rf215/Makefile +++ b/tests/driver_at86rf215/Makefile @@ -1,28 +1,7 @@ BOARD ?= openmote-b -include ../Makefile.tests_common - -# Modules to include: -USEMODULE += shell -USEMODULE += shell_commands -USEMODULE += ps # the radio driver to test USEMODULE += at86rf215 GNRC_NETIF_NUMOF ?= 2 -# gnrc is a meta module including all required, basic gnrc networking modules -USEMODULE += gnrc - -# automatically initialize the network interface -USEMODULE += auto_init_gnrc_netif - -# shell command to send L2 packets with a simple string -USEMODULE += gnrc_txtsnd - -# the application dumps received packets to stdout -USEMODULE += gnrc_pktdump - -include $(RIOTBASE)/Makefile.include - -# Set a custom channel if needed -include $(RIOTMAKE)/default-radio-settings.inc.mk +include ../driver_netdev_common/Makefile diff --git a/tests/driver_at86rf215/main.c b/tests/driver_at86rf215/main.c deleted file mode 100644 index 66cc2bd986..0000000000 --- a/tests/driver_at86rf215/main.c +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (C) 2020 ML!PA Consulting GmbH - * - * This file is subject to the terms and conditions of the GNU Lesser - * General Public License v2.1. See the file LICENSE in the top level - * directory for more details. - */ - -/** - * @ingroup tests - * @{ - * - * @file - * @brief Test application for network device drivers - * - * @author Benjamin Valentin - * @} - */ - -#include "thread.h" -#include "shell.h" -#include "shell_commands.h" - -#include "net/gnrc/pktdump.h" -#include "net/gnrc.h" - -int main(void) -{ - /* enable pktdump output */ - gnrc_netreg_entry_t dump = GNRC_NETREG_ENTRY_INIT_PID(GNRC_NETREG_DEMUX_CTX_ALL, - gnrc_pktdump_pid); - gnrc_netreg_register(GNRC_NETTYPE_UNDEF, &dump); - - /* start the shell */ - char line_buf[SHELL_DEFAULT_BUFSIZE]; - shell_run(NULL, line_buf, SHELL_DEFAULT_BUFSIZE); - - return 0; -} diff --git a/tests/driver_at86rf215/main.c b/tests/driver_at86rf215/main.c new file mode 120000 index 0000000000..a3f88db08e --- /dev/null +++ b/tests/driver_at86rf215/main.c @@ -0,0 +1 @@ +../driver_netdev_common/main.c \ No newline at end of file diff --git a/tests/driver_netdev_common/Makefile b/tests/driver_netdev_common/Makefile new file mode 100644 index 0000000000..afc439312a --- /dev/null +++ b/tests/driver_netdev_common/Makefile @@ -0,0 +1,28 @@ +include ../Makefile.tests_common + +# Modules to include: +USEMODULE += shell +USEMODULE += shell_commands +USEMODULE += ps + +# allow to use a smaller packet buffer in low-PDU drivers +ifdef GNRC_PKTBUF_SIZE + CFLAGS += -DGNRC_PKTBUF_SIZE=$(GNRC_PKTBUF_SIZE) +endif + +# gnrc is a meta module including all required, basic gnrc networking modules +USEMODULE += gnrc + +# automatically initialize the network interface +USEMODULE += auto_init_gnrc_netif + +# shell command to send L2 packets with a simple string +USEMODULE += gnrc_txtsnd + +# the application dumps received packets to stdout +USEMODULE += gnrc_pktdump + +include $(RIOTBASE)/Makefile.include + +# Set a custom channel if needed +include $(RIOTMAKE)/default-radio-settings.inc.mk diff --git a/tests/driver_netdev_common/Makefile.ci b/tests/driver_netdev_common/Makefile.ci new file mode 100644 index 0000000000..f183d55718 --- /dev/null +++ b/tests/driver_netdev_common/Makefile.ci @@ -0,0 +1,17 @@ +BOARD_INSUFFICIENT_MEMORY := \ + arduino-duemilanove \ + arduino-leonardo \ + arduino-mega2560 \ + arduino-uno \ + atmega328p \ + i-nucleo-lrwan1 \ + nucleo-f030r8 \ + nucleo-f031k6 \ + nucleo-f042k6 \ + nucleo-l031k6 \ + nucleo-l053r8 \ + stm32f030f4-demo \ + stm32f0discovery \ + stm32l0538-disco \ + waspmote-pro \ + # diff --git a/tests/driver_netdev_common/main.c b/tests/driver_netdev_common/main.c new file mode 100644 index 0000000000..66cc2bd986 --- /dev/null +++ b/tests/driver_netdev_common/main.c @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2020 ML!PA Consulting GmbH + * + * This file is subject to the terms and conditions of the GNU Lesser + * General Public License v2.1. See the file LICENSE in the top level + * directory for more details. + */ + +/** + * @ingroup tests + * @{ + * + * @file + * @brief Test application for network device drivers + * + * @author Benjamin Valentin + * @} + */ + +#include "thread.h" +#include "shell.h" +#include "shell_commands.h" + +#include "net/gnrc/pktdump.h" +#include "net/gnrc.h" + +int main(void) +{ + /* enable pktdump output */ + gnrc_netreg_entry_t dump = GNRC_NETREG_ENTRY_INIT_PID(GNRC_NETREG_DEMUX_CTX_ALL, + gnrc_pktdump_pid); + gnrc_netreg_register(GNRC_NETTYPE_UNDEF, &dump); + + /* start the shell */ + char line_buf[SHELL_DEFAULT_BUFSIZE]; + shell_run(NULL, line_buf, SHELL_DEFAULT_BUFSIZE); + + return 0; +} From e02dffe5f8252e8967c943ed824df4ddd7289276 Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Mon, 23 Mar 2020 18:45:19 +0100 Subject: [PATCH 3/6] tests/driver_mrf24j40: add compile-test for mrf24j40 --- tests/driver_mrf24j40/Makefile | 4 ++++ tests/driver_mrf24j40/Makefile.ci | 16 ++++++++++++++++ tests/driver_mrf24j40/main.c | 1 + 3 files changed, 21 insertions(+) create mode 100644 tests/driver_mrf24j40/Makefile create mode 100644 tests/driver_mrf24j40/Makefile.ci create mode 120000 tests/driver_mrf24j40/main.c diff --git a/tests/driver_mrf24j40/Makefile b/tests/driver_mrf24j40/Makefile new file mode 100644 index 0000000000..bfcf1c8067 --- /dev/null +++ b/tests/driver_mrf24j40/Makefile @@ -0,0 +1,4 @@ +# the radio driver to test +USEMODULE = mrf24j40md + +include ../driver_netdev_common/Makefile diff --git a/tests/driver_mrf24j40/Makefile.ci b/tests/driver_mrf24j40/Makefile.ci new file mode 100644 index 0000000000..7b6a49c3a0 --- /dev/null +++ b/tests/driver_mrf24j40/Makefile.ci @@ -0,0 +1,16 @@ +BOARD_INSUFFICIENT_MEMORY := \ + arduino-duemilanove \ + arduino-leonardo \ + arduino-mega2560 \ + arduino-uno \ + atmega328p \ + i-nucleo-lrwan1 \ + nucleo-f031k6 \ + nucleo-f042k6 \ + nucleo-l031k6 \ + nucleo-l053r8 \ + stm32f030f4-demo \ + stm32f0discovery \ + stm32l0538-disco \ + waspmote-pro \ + # diff --git a/tests/driver_mrf24j40/main.c b/tests/driver_mrf24j40/main.c new file mode 120000 index 0000000000..a3f88db08e --- /dev/null +++ b/tests/driver_mrf24j40/main.c @@ -0,0 +1 @@ +../driver_netdev_common/main.c \ No newline at end of file From f71226c01691fb519395b0d73ca9319fbc4d4856 Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Mon, 23 Mar 2020 18:46:57 +0100 Subject: [PATCH 4/6] tests/driver_dose: add compile-test for DOSE --- tests/driver_dose/Makefile | 4 ++++ tests/driver_dose/Makefile.ci | 21 +++++++++++++++++++++ tests/driver_dose/main.c | 1 + 3 files changed, 26 insertions(+) create mode 100644 tests/driver_dose/Makefile create mode 100644 tests/driver_dose/Makefile.ci create mode 120000 tests/driver_dose/main.c diff --git a/tests/driver_dose/Makefile b/tests/driver_dose/Makefile new file mode 100644 index 0000000000..4f91014003 --- /dev/null +++ b/tests/driver_dose/Makefile @@ -0,0 +1,4 @@ +# the driver to test +USEMODULE = dose + +include ../driver_netdev_common/Makefile diff --git a/tests/driver_dose/Makefile.ci b/tests/driver_dose/Makefile.ci new file mode 100644 index 0000000000..2bfb79fe6c --- /dev/null +++ b/tests/driver_dose/Makefile.ci @@ -0,0 +1,21 @@ +BOARD_INSUFFICIENT_MEMORY := \ + arduino-duemilanove \ + arduino-leonardo \ + arduino-mega2560 \ + arduino-uno \ + atmega328p \ + i-nucleo-lrwan1 \ + msb-430 \ + msb-430h \ + nucleo-f030r8 \ + nucleo-f031k6 \ + nucleo-f042k6 \ + nucleo-f303k8 \ + nucleo-f334r8 \ + nucleo-l031k6 \ + nucleo-l053r8 \ + stm32f030f4-demo \ + stm32f0discovery \ + stm32l0538-disco \ + waspmote-pro \ + # diff --git a/tests/driver_dose/main.c b/tests/driver_dose/main.c new file mode 120000 index 0000000000..a3f88db08e --- /dev/null +++ b/tests/driver_dose/main.c @@ -0,0 +1 @@ +../driver_netdev_common/main.c \ No newline at end of file From 732cd51a52b2a4bf4a069e3fa7ad87c8aab02b0e Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Tue, 24 Mar 2020 13:54:22 +0100 Subject: [PATCH 5/6] tests/driver_xbee: use common netdev test --- tests/driver_xbee/Makefile | 16 ++---------- tests/driver_xbee/main.c | 53 +------------------------------------- 2 files changed, 3 insertions(+), 66 deletions(-) mode change 100644 => 120000 tests/driver_xbee/main.c diff --git a/tests/driver_xbee/Makefile b/tests/driver_xbee/Makefile index 7c0ccc329b..73ee157281 100644 --- a/tests/driver_xbee/Makefile +++ b/tests/driver_xbee/Makefile @@ -1,18 +1,6 @@ -include ../Makefile.tests_common - USEMODULE += xbee -USEMODULE += gnrc_txtsnd -USEMODULE += auto_init_gnrc_netif -USEMODULE += gnrc_pktdump -USEMODULE += shell -USEMODULE += shell_commands # No need of big buffer for this test -CFLAGS += -DGNRC_PKTBUF_SIZE=512 +GNRC_PKTBUF_SIZE=512 -# add current directory to the include path. Putting it in CFLAGS will make -# it go to the beginning, before the standard includes. -# That way xbee_params.h get's included and auto configuration can pick it up. -CFLAGS += -I$(CURDIR) - -include $(RIOTBASE)/Makefile.include +include ../driver_netdev_common/Makefile diff --git a/tests/driver_xbee/main.c b/tests/driver_xbee/main.c deleted file mode 100644 index 06b0ca4acf..0000000000 --- a/tests/driver_xbee/main.c +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (C) 2015 Freie Universität Berlin - * - * This file is subject to the terms and conditions of the GNU Lesser - * General Public License v2.1. See the file LICENSE in the top level - * directory for more details. - */ - -/** - * @ingroup tests - * @{ - * - * @file - * @brief Test application for Xbee S1 network device driver - * - * @author Hauke Petersen - * - * @} - */ - -#include - -#include "shell.h" -#include "shell_commands.h" -#include "net/gnrc.h" -#include "net/gnrc/pktdump.h" - -/** - * @brief Maybe you are a golfer?! - */ -int main(void) -{ - gnrc_netreg_entry_t dump = GNRC_NETREG_ENTRY_INIT_PID(GNRC_NETREG_DEMUX_CTX_ALL, - gnrc_pktdump_pid); - - puts("Xbee S1 device driver test"); - - /* initialize and register pktdump */ - if (gnrc_pktdump_pid <= KERNEL_PID_UNDEF) { - puts("Error starting pktdump thread"); - return -1; - } - gnrc_netreg_register(GNRC_NETTYPE_UNDEF, &dump); - - /* start the shell */ - puts("Initialization OK, starting shell now"); - - char line_buf[SHELL_DEFAULT_BUFSIZE]; - shell_run(NULL, line_buf, SHELL_DEFAULT_BUFSIZE); - - return 0; -} diff --git a/tests/driver_xbee/main.c b/tests/driver_xbee/main.c new file mode 120000 index 0000000000..a3f88db08e --- /dev/null +++ b/tests/driver_xbee/main.c @@ -0,0 +1 @@ +../driver_netdev_common/main.c \ No newline at end of file From 3ec0acde8a89117bff0ce8a02e69fc2f6a45d917 Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Sat, 28 Mar 2020 19:23:19 +0100 Subject: [PATCH 6/6] tests/driver_w5100: add compile-test for w5100 --- tests/driver_w5100/Makefile | 4 ++++ tests/driver_w5100/Makefile.ci | 21 +++++++++++++++++++++ tests/driver_w5100/main.c | 1 + 3 files changed, 26 insertions(+) create mode 100644 tests/driver_w5100/Makefile create mode 100644 tests/driver_w5100/Makefile.ci create mode 120000 tests/driver_w5100/main.c diff --git a/tests/driver_w5100/Makefile b/tests/driver_w5100/Makefile new file mode 100644 index 0000000000..ef251dd235 --- /dev/null +++ b/tests/driver_w5100/Makefile @@ -0,0 +1,4 @@ +# the driver to test +USEMODULE = w5100 + +include ../driver_netdev_common/Makefile diff --git a/tests/driver_w5100/Makefile.ci b/tests/driver_w5100/Makefile.ci new file mode 100644 index 0000000000..2bfb79fe6c --- /dev/null +++ b/tests/driver_w5100/Makefile.ci @@ -0,0 +1,21 @@ +BOARD_INSUFFICIENT_MEMORY := \ + arduino-duemilanove \ + arduino-leonardo \ + arduino-mega2560 \ + arduino-uno \ + atmega328p \ + i-nucleo-lrwan1 \ + msb-430 \ + msb-430h \ + nucleo-f030r8 \ + nucleo-f031k6 \ + nucleo-f042k6 \ + nucleo-f303k8 \ + nucleo-f334r8 \ + nucleo-l031k6 \ + nucleo-l053r8 \ + stm32f030f4-demo \ + stm32f0discovery \ + stm32l0538-disco \ + waspmote-pro \ + # diff --git a/tests/driver_w5100/main.c b/tests/driver_w5100/main.c new file mode 120000 index 0000000000..a3f88db08e --- /dev/null +++ b/tests/driver_w5100/main.c @@ -0,0 +1 @@ +../driver_netdev_common/main.c \ No newline at end of file