From 96c0533b4da53eea6384bcfb9773d6253abb873f Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Fri, 6 Nov 2020 14:38:35 +0100 Subject: [PATCH] boards/common/particle-mesh: default to stdio via CDC ACM The paricle mesh boards are all USB based, so default to stdio via CDC ACM for a more seamless user experience. --- boards/common/particle-mesh/Kconfig | 1 + boards/common/particle-mesh/Makefile.dep | 3 +++ boards/common/particle-mesh/Makefile.features | 1 + boards/common/particle-mesh/Makefile.include | 4 ---- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/boards/common/particle-mesh/Kconfig b/boards/common/particle-mesh/Kconfig index 57e55c0f4ea5..0ef67c872493 100644 --- a/boards/common/particle-mesh/Kconfig +++ b/boards/common/particle-mesh/Kconfig @@ -13,5 +13,6 @@ config BOARD_COMMON_PARTICLE_MESH select HAS_PERIPH_SPI select HAS_PERIPH_UART select HAS_PERIPH_USBDEV + select HAS_HIGHLEVEL_STDIO source "$(RIOTBOARD)/common/nrf52/Kconfig" diff --git a/boards/common/particle-mesh/Makefile.dep b/boards/common/particle-mesh/Makefile.dep index b03de54da5e9..94ce70d2aada 100644 --- a/boards/common/particle-mesh/Makefile.dep +++ b/boards/common/particle-mesh/Makefile.dep @@ -6,5 +6,8 @@ ifeq (1,$(PARTICLE_MONOFIRMWARE)) USEMODULE += usb_board_reset endif +# default to stdio over CDC ACM +include $(RIOTBOARD)/common/makefiles/stdio_cdc_acm.dep.mk + # include common nrf52 dependencies include $(RIOTBOARD)/common/nrf52/Makefile.dep diff --git a/boards/common/particle-mesh/Makefile.features b/boards/common/particle-mesh/Makefile.features index 41845e98d8dc..f477cd929069 100644 --- a/boards/common/particle-mesh/Makefile.features +++ b/boards/common/particle-mesh/Makefile.features @@ -8,5 +8,6 @@ FEATURES_PROVIDED += periph_uart FEATURES_PROVIDED += periph_usbdev # Various other features (if any) +FEATURES_PROVIDED += highlevel_stdio include $(RIOTBOARD)/common/nrf52/Makefile.features diff --git a/boards/common/particle-mesh/Makefile.include b/boards/common/particle-mesh/Makefile.include index 683ab4a97254..fd33a5d1b85b 100644 --- a/boards/common/particle-mesh/Makefile.include +++ b/boards/common/particle-mesh/Makefile.include @@ -2,10 +2,6 @@ BOARD_NRFANTENNA_DEFAULT ?= BUILTIN CFLAGS += -DBOARD_NRFANTENNA_DEFAULT=BOARD_NRFANTENNA_$(BOARD_NRFANTENNA_DEFAULT) -# set default port depending on operating system -PORT_LINUX ?= /dev/ttyUSB0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) - # add the common header files to the include path INCLUDES += -I$(RIOTBOARD)/common/particle-mesh/include