From 541265ee79b544a5aef74913fb90cdbee437c1bc Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Thu, 27 Feb 2020 14:17:37 +0100 Subject: [PATCH 1/3] cc2538-bsl.py: use python3 support for python2 has ended and the script works just as well with python3. --- dist/tools/cc2538-bsl/cc2538-bsl.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/tools/cc2538-bsl/cc2538-bsl.py b/dist/tools/cc2538-bsl/cc2538-bsl.py index 1421b66c6b..e53881c55f 100755 --- a/dist/tools/cc2538-bsl/cc2538-bsl.py +++ b/dist/tools/cc2538-bsl/cc2538-bsl.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright (c) 2014, Jelmer Tiete . # All rights reserved. From bf96e97e34da8d75dcaa50ea20c87e0549567885 Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Thu, 27 Feb 2020 14:18:49 +0100 Subject: [PATCH 2/3] boards/openmote-b: extend doc.txt about flashing To flash the board the intelhex python package needs to be installed. Add a note about it to the documentation. --- boards/openmote-b/doc.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/boards/openmote-b/doc.txt b/boards/openmote-b/doc.txt index 89a10e23c5..b9c1d35276 100644 --- a/boards/openmote-b/doc.txt +++ b/boards/openmote-b/doc.txt @@ -40,6 +40,15 @@ RIOT support flashing with USB by default. You may have to specify the flashing port with `PORT_DEV= make flash` +The flash tool needs to convert the generated Hex file to RAW format. +For this it needs to have the intelhex library installed. + + apt install python3-intelhex + +or + + pip3 install intelhex + ### Flashing via JTAG To be able to flash the board via JTAG you need to install Seggers JLinkExe From 961b333ea696517e6dc10c0d54c76b535f5dbc38 Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Thu, 27 Feb 2020 14:19:53 +0100 Subject: [PATCH 3/3] boards/openmote-b: add saul config Hook up the GPIOs and the si7006 sensor to SAUL. --- boards/openmote-b/Makefile.dep | 5 ++ boards/openmote-b/include/gpio_params.h | 71 +++++++++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 boards/openmote-b/include/gpio_params.h diff --git a/boards/openmote-b/Makefile.dep b/boards/openmote-b/Makefile.dep index dd120c6dfa..13aa44f144 100644 --- a/boards/openmote-b/Makefile.dep +++ b/boards/openmote-b/Makefile.dep @@ -1,3 +1,8 @@ +ifneq (,$(filter saul_default,$(USEMODULE))) + USEMODULE += saul_gpio + USEMODULE += si7006 +endif + ifneq (,$(filter gnrc_netdev_default,$(USEMODULE))) USEMODULE += netif USEMODULE += cc2538_rf diff --git a/boards/openmote-b/include/gpio_params.h b/boards/openmote-b/include/gpio_params.h new file mode 100644 index 0000000000..3d3dd24c02 --- /dev/null +++ b/boards/openmote-b/include/gpio_params.h @@ -0,0 +1,71 @@ +/* + * 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 boards_openmote-b + * @{ + * + * @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, + .flags = SAUL_GPIO_INVERTED + }, + { + .name = "LED(green)", + .pin = LED1_PIN, + .mode = GPIO_OUT, + .flags = SAUL_GPIO_INVERTED + }, + { + .name = "LED(yellow)", + .pin = LED2_PIN, + .mode = GPIO_OUT, + .flags = SAUL_GPIO_INVERTED + }, + { + .name = "LED(orange)", + .pin = LED3_PIN, + .mode = GPIO_OUT, + .flags = SAUL_GPIO_INVERTED + }, + { + .name = "Button(SW0)", + .pin = BTN0_PIN, + .mode = BTN0_MODE, + .flags = SAUL_GPIO_INVERTED + }, +}; + +#ifdef __cplusplus +} +#endif + +#endif /* GPIO_PARAMS_H */ +/** @} */