Jan/WLED_MM_Infinity
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/ac_main' into mdev

Browse Source
This commit is contained in:
Ewoud
2023-01-02 21:05:03 +01:00
parent a3c2f4a0ec 8e208bc76d
commit 4409ceb3ec
37 changed files with 4740 additions and 4253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wled00/wled.cpp
View File

@@ -162,7 +162,7 @@ void WLED::loop()
bool aligned = strip.checkSegmentAlignment(); //see if old segments match old bus(ses)
busses.removeAll();
uint32_t mem = 0;
for (uint8_t i = 0; i < WLED_MAX_BUSSES; i++) {
for (uint8_t i = 0; i < WLED_MAX_BUSSES+WLED_MIN_VIRTUAL_BUSSES; i++) {
if (busConfigs[i] == nullptr) break;
mem += BusManager::memUsage(*busConfigs[i]);
if (mem <= MAX_LED_MEMORY) {
@@ -662,7 +662,7 @@ bool WLED::initEthernet()
} else {
DEBUG_PRINT(F("initE: Failing due to invalid eth_clk_mode ("));
DEBUG_PRINT(es.eth_clk_mode);
DEBUG_PRINTLN(F(")"));
DEBUG_PRINTLN(")");
return false;
}