From 9ad41598653825e66162be0c766a55f4dd606ed9 Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Wed, 27 Jan 2021 19:54:00 +0100 Subject: [PATCH 1/4] boards/cc1352p-launchpad: fix BTN-1 definition BTN-1 is on pin 15, configuring pin 13 as input gets the board stuck at boot. --- boards/cc1352p-launchpad/include/board.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boards/cc1352p-launchpad/include/board.h b/boards/cc1352p-launchpad/include/board.h index db13fc6e43..93fcc62412 100644 --- a/boards/cc1352p-launchpad/include/board.h +++ b/boards/cc1352p-launchpad/include/board.h @@ -38,7 +38,7 @@ extern "C" { * @name On-board button configuration * @{ */ -#define BTN0_PIN GPIO_PIN(0, 13) +#define BTN0_PIN GPIO_PIN(0, 15) #define BTN0_MODE GPIO_IN_PU #define BTN1_PIN GPIO_PIN(0, 14) From 56dc904d3b6da2f1b1ee71ac7931169922521bdb Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Wed, 27 Jan 2021 19:53:42 +0100 Subject: [PATCH 2/4] boards/cc1352p-launchpad: add SAUL configuration --- boards/cc1352p-launchpad/Makefile.dep | 3 + .../cc1352p-launchpad/include/gpio_params.h | 63 +++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100644 boards/cc1352p-launchpad/Makefile.dep create mode 100644 boards/cc1352p-launchpad/include/gpio_params.h diff --git a/boards/cc1352p-launchpad/Makefile.dep b/boards/cc1352p-launchpad/Makefile.dep new file mode 100644 index 0000000000..5472bf8b8d --- /dev/null +++ b/boards/cc1352p-launchpad/Makefile.dep @@ -0,0 +1,3 @@ +ifneq (,$(filter saul_default,$(USEMODULE))) + USEMODULE += saul_gpio +endif diff --git a/boards/cc1352p-launchpad/include/gpio_params.h b/boards/cc1352p-launchpad/include/gpio_params.h new file mode 100644 index 0000000000..8b7ccca9c7 --- /dev/null +++ b/boards/cc1352p-launchpad/include/gpio_params.h @@ -0,0 +1,63 @@ +/* + * Copyright (C) 2021 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 boards_cc1352p_launchpad + * @{ + * + * @file + * @brief Board specific configuration of direct mapped GPIOs + * + * @author Benjamin Valentin + */ + +#ifndef GPIO_PARAMS_H +#define GPIO_PARAMS_H + +#include "board.h" +#include "saul/periph.h" + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * @brief GPIO pin configuration + */ +static const saul_gpio_params_t saul_gpio_params[] = +{ + { + .name = "LED(red)", + .pin = LED0_PIN, + .mode = GPIO_OUT, + }, + { + .name = "LED(green)", + .pin = LED1_PIN, + .mode = GPIO_OUT, + }, + { + .name = "Button(BTN-1)", + .pin = BTN0_PIN, + .mode = BTN0_MODE, + .flags = SAUL_GPIO_INVERTED + }, + { + .name = "Button(BTN-2)", + .pin = BTN1_PIN, + .mode = BTN1_MODE, + .flags = SAUL_GPIO_INVERTED + }, +}; + +#ifdef __cplusplus +} +#endif + +#endif /* GPIO_PARAMS_H */ +/** @} */ From f8543df54917e60738f45f92e30bf04908fd584b Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Wed, 27 Jan 2021 19:53:42 +0100 Subject: [PATCH 3/4] boards/cc1352-launchpad: add SAUL configuration --- boards/cc1352-launchpad/Makefile.dep | 3 + boards/cc1352-launchpad/include/gpio_params.h | 63 +++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100644 boards/cc1352-launchpad/Makefile.dep create mode 100644 boards/cc1352-launchpad/include/gpio_params.h diff --git a/boards/cc1352-launchpad/Makefile.dep b/boards/cc1352-launchpad/Makefile.dep new file mode 100644 index 0000000000..5472bf8b8d --- /dev/null +++ b/boards/cc1352-launchpad/Makefile.dep @@ -0,0 +1,3 @@ +ifneq (,$(filter saul_default,$(USEMODULE))) + USEMODULE += saul_gpio +endif diff --git a/boards/cc1352-launchpad/include/gpio_params.h b/boards/cc1352-launchpad/include/gpio_params.h new file mode 100644 index 0000000000..67191900ea --- /dev/null +++ b/boards/cc1352-launchpad/include/gpio_params.h @@ -0,0 +1,63 @@ +/* + * Copyright (C) 2021 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 boards_cc1352_launchpad + * @{ + * + * @file + * @brief Board specific configuration of direct mapped GPIOs + * + * @author Benjamin Valentin + */ + +#ifndef GPIO_PARAMS_H +#define GPIO_PARAMS_H + +#include "board.h" +#include "saul/periph.h" + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * @brief GPIO pin configuration + */ +static const saul_gpio_params_t saul_gpio_params[] = +{ + { + .name = "LED(red)", + .pin = LED0_PIN, + .mode = GPIO_OUT, + }, + { + .name = "LED(green)", + .pin = LED1_PIN, + .mode = GPIO_OUT, + }, + { + .name = "Button(BTN-1)", + .pin = BTN0_PIN, + .mode = BTN0_MODE, + .flags = SAUL_GPIO_INVERTED + }, + { + .name = "Button(BTN-2)", + .pin = BTN1_PIN, + .mode = BTN1_MODE, + .flags = SAUL_GPIO_INVERTED + }, +}; + +#ifdef __cplusplus +} +#endif + +#endif /* GPIO_PARAMS_H */ +/** @} */ From c10282d7a319f49413b3519a9391f316cce3d422 Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Wed, 27 Jan 2021 20:01:14 +0100 Subject: [PATCH 4/4] boards/cc1352-launchpad: fix BTN-1 definition same as for cc1352p-launchpad --- boards/cc1352-launchpad/include/board.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boards/cc1352-launchpad/include/board.h b/boards/cc1352-launchpad/include/board.h index 4079e09a18..d286fe411e 100644 --- a/boards/cc1352-launchpad/include/board.h +++ b/boards/cc1352-launchpad/include/board.h @@ -42,7 +42,7 @@ extern "C" { * @name On-board button configuration * @{ */ -#define BTN0_PIN GPIO_PIN(0, 13) +#define BTN0_PIN GPIO_PIN(0, 15) #define BTN0_MODE GPIO_IN_PU #define BTN1_PIN GPIO_PIN(0, 14)