align with upstream buildenv and librararies
* esp8266 core 4.1.0 * esp32 "V4" core 5.2.0 * neopixelbus 2.7.5 * use NeoPixelBusLg * Make SPI bus speed user configurable * adjust MM buildEnv to match upstream https://github.com/Aircoookie/WLED/pull/3144 https://github.com/Aircoookie/WLED/pull/3173
This commit is contained in:
@@ -196,7 +196,7 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {
|
||||
ledType |= refresh << 7; // hack bit 7 to indicate strip requires off refresh
|
||||
uint8_t AWmode = elm[F("rgbwm")] | autoWhiteMode;
|
||||
if (fromFS) {
|
||||
BusConfig bc = BusConfig(ledType, pins, start, length, colorOrder, reversed, skipFirst, AWmode); //WLEDMM to do bus , freqkHz
|
||||
BusConfig bc = BusConfig(ledType, pins, start, length, colorOrder, reversed, skipFirst, AWmode, freqkHz);
|
||||
mem += BusManager::memUsage(bc);
|
||||
if (mem <= MAX_LED_MEMORY) if (busses.add(bc) == -1) break; // finalization will be done in WLED::beginStrip()
|
||||
} else {
|
||||
@@ -802,7 +802,7 @@ void serializeConfig() {
|
||||
ins["type"] = bus->getType() & 0x7F;
|
||||
ins["ref"] = bus->isOffRefreshRequired();
|
||||
ins[F("rgbwm")] = bus->getAutoWhiteMode();
|
||||
// ins[F("freq")] = bus->getFrequency(); WLEDMM to do bus
|
||||
ins[F("freq")] = bus->getFrequency();
|
||||
}
|
||||
|
||||
JsonArray hw_com = hw.createNestedArray(F("com"));
|
||||
|
||||
Reference in New Issue
Block a user