From 6385bf41aa879e692e5eeca1aec41ef483b87253 Mon Sep 17 00:00:00 2001 From: Frank Date: Sat, 17 Dec 2022 17:45:39 +0100 Subject: [PATCH] posxt-merge fixing small update, to preserve MM-specific parts. --- wled00/cfg.cpp | 2 +- wled00/set.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wled00/cfg.cpp b/wled00/cfg.cpp index d40b44f2..a12f1667 100644 --- a/wled00/cfg.cpp +++ b/wled00/cfg.cpp @@ -208,7 +208,7 @@ bool deserializeConfig(JsonObject doc, bool fromFS) { if (((buttonType[s] == BTN_TYPE_ANALOG) || (buttonType[s] == BTN_TYPE_ANALOG_INVERTED)) && (digitalPinToAnalogChannel(btnPin[s]) < 0)) { // not an ADC analog pin - DEBUG_PRINTF("PIN ALLOC error: GPIO%d for analog button #%d is not an analog pin!\n", btnPin[s], s); + USER_PRINTF("PIN ALLOC error: GPIO%d for analog button #%d is not an analog pin!\n", btnPin[s], s); // WLEDMM btnPin[s] = -1; pinManager.deallocatePin(pin,PinOwner::Button); } diff --git a/wled00/set.cpp b/wled00/set.cpp index 0369e2e3..3b50f5d2 100644 --- a/wled00/set.cpp +++ b/wled00/set.cpp @@ -174,7 +174,7 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage) if (((buttonType[i] == BTN_TYPE_ANALOG) || (buttonType[i] == BTN_TYPE_ANALOG_INVERTED)) && (digitalPinToAnalogChannel(btnPin[i]) < 0)) { // not an ADC analog pin - if (btnPin[i] >= 0) DEBUG_PRINTF("PIN ALLOC error: GPIO%d for analog button #%d is not an analog pin!\n", btnPin[i], i); + if (btnPin[i] >= 0) USER_PRINTF("PIN ALLOC error: GPIO%d for analog button #%d is not an analog pin!\n", btnPin[i], i); // WLEDMM btnPin[i] = -1; pinManager.deallocatePin(hw_btn_pin,PinOwner::Button); }