Skip to content

Commit 6385bf4

Browse files
committed
posxt-merge fixing
small update, to preserve MM-specific parts.
1 parent b052299 commit 6385bf4

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

wled00/cfg.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {
208208
if (((buttonType[s] == BTN_TYPE_ANALOG) || (buttonType[s] == BTN_TYPE_ANALOG_INVERTED)) && (digitalPinToAnalogChannel(btnPin[s]) < 0))
209209
{
210210
// not an ADC analog pin
211-
DEBUG_PRINTF("PIN ALLOC error: GPIO%d for analog button #%d is not an analog pin!\n", btnPin[s], s);
211+
USER_PRINTF("PIN ALLOC error: GPIO%d for analog button #%d is not an analog pin!\n", btnPin[s], s); // WLEDMM
212212
btnPin[s] = -1;
213213
pinManager.deallocatePin(pin,PinOwner::Button);
214214
}

wled00/set.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
174174
if (((buttonType[i] == BTN_TYPE_ANALOG) || (buttonType[i] == BTN_TYPE_ANALOG_INVERTED)) && (digitalPinToAnalogChannel(btnPin[i]) < 0))
175175
{
176176
// not an ADC analog pin
177-
if (btnPin[i] >= 0) DEBUG_PRINTF("PIN ALLOC error: GPIO%d for analog button #%d is not an analog pin!\n", btnPin[i], i);
177+
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
178178
btnPin[i] = -1;
179179
pinManager.deallocatePin(hw_btn_pin,PinOwner::Button);
180180
}

0 commit comments

Comments
 (0)