partial merge of upstream/main
* leaving out DotStarHspi5MhzMethod, as we are still on NPB 2.6.9 for eth boards * leaving out the index.css/index.css changes, as I'm not sure how to merge this. @ewoudwijma we need to merge the JS and CSS parts when you are back; I'll stay with our MM version for now.
This commit is contained in:
@@ -775,10 +775,10 @@ byte PinManagerClass::allocateLedc(byte channels)
|
||||
if (ca >= channels) { //enough free channels
|
||||
byte in = (i + 1) - ca;
|
||||
for (byte j = 0; j < ca; j++) {
|
||||
byte b = in + j;
|
||||
byte by = b >> 3;
|
||||
byte bi = b - 8*by;
|
||||
bitWrite(ledcAlloc[by], bi, true);
|
||||
byte bChan = in + j;
|
||||
byte byChan = bChan >> 3;
|
||||
byte biChan = bChan - 8*byChan;
|
||||
bitWrite(ledcAlloc[byChan], biChan, true);
|
||||
}
|
||||
return in;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user