Skip to content

Commit bb6f84d

Browse files
committed
pin summary: don't report "fake" conflicts with same owner
sometimes happens in debug mode. GPIO | Assigned to | Info --------|-----------------------|------------ i/o 1 debug output !! Conflict with debug output !! Serial TX
1 parent 2b34b30 commit bb6f84d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

wled00/pin_manager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ String PinManagerClass::getPinConflicts(int gpio) {
270270
if ((gpio == 0xFF) || (gpio < 0)) return(F("")); // explicitly allow -1 as a no-op
271271
if (!isPinOk(gpio, false)) return(F("")); // invalid GPIO
272272

273-
if (ownerConflict[gpio] == PinOwner::None) {
273+
if ((ownerConflict[gpio] == PinOwner::None) || (ownerTag[gpio] == ownerConflict[gpio])) { // no conflict, or "fake" conflict with current owner
274274
return(F("")); // no conflict fot this GPIO
275275
} else { // found previous conflic!
276276
return String("!! Conflict with ") + getOwnerText(ownerConflict[gpio]) + String(" !!");

0 commit comments

Comments
 (0)