From a0b83f8195c4cc0a87f5bbf605e3d88ad3defe09 Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Wed, 21 Apr 2021 00:48:42 +0200 Subject: [PATCH] makefiles/tools/programmer: do not use programmer wrapper While nice at first, this causes more issues than it's worth for a slightly more pretty output. Hiding information from developers is not a good idea, especially when it comes to an often finicky programming step. While in theory error output should be caught, there are enough cases where the programmer will get stuck in a loop or require user input that hiding programmer output by default is a bad idea. --- makefiles/tools/programmer.inc.mk | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/makefiles/tools/programmer.inc.mk b/makefiles/tools/programmer.inc.mk index 7d0bce9872..b3e78613a8 100644 --- a/makefiles/tools/programmer.inc.mk +++ b/makefiles/tools/programmer.inc.mk @@ -5,24 +5,8 @@ ifeq (0,$(PROGRAMMER_QUIET)) PROGRAMMER_VERBOSE_OPT ?= --verbose endif -# When multiple debuggers are connected then pyocd shows an interactive -# UI to select the user interface to flash, with the python wrapper this -# is lost and will also cause the wrapper to hang waiting for user input. -# As long as a similar functionality is not provided by the wrapper -# then disable it for pyocd. -PROGRAMMER_WRAPPER_BLACKLIST ?= pyocd - -# Don't use the programmer wrapper for the CI (where speed and verbose output -# are important) -ifneq (1,$(RIOT_CI_BUILD)) - ifneq (,$(filter $(PROGRAMMER),$(PROGRAMMER_WRAPPER_BLACKLIST))) - USE_PROGRAMMER_WRAPPER_SCRIPT ?= 0 - else - USE_PROGRAMMER_WRAPPER_SCRIPT ?= 1 - endif -else - USE_PROGRAMMER_WRAPPER_SCRIPT ?= 0 -endif +# Don't use the programmer wrapper +USE_PROGRAMMER_WRAPPER_SCRIPT ?= 0 ifeq (1,$(USE_PROGRAMMER_WRAPPER_SCRIPT)) PROGRAMMER_FLASH ?= @$(RIOTTOOLS)/programmer/programmer.py \