diff --git a/platformio.ini b/platformio.ini
index 7340c576..9df10889 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -264,6 +264,7 @@ board_build.ldscript = ${common.ldscript_4m1m}
build_unflags = ${common.build_unflags}
build_flags = ${common.build_flags_esp8266} -D WLED_RELEASE_NAME=ESP8266
lib_deps = ${esp8266.lib_deps}
+monitor_filters = esp8266_exception_decoder
[env:esp8266_2m]
board = esp_wroom_02
diff --git a/usermods/audioreactive/audio_reactive.h b/usermods/audioreactive/audio_reactive.h
index bd3b6ec1..e5bda203 100644
--- a/usermods/audioreactive/audio_reactive.h
+++ b/usermods/audioreactive/audio_reactive.h
@@ -24,7 +24,7 @@
// #define MIC_LOGGER // MIC sampling & sound input debugging (serial plotter)
// #define FFT_SAMPLING_LOG // FFT result debugging
// #define SR_DEBUG // generic SR DEBUG messages
-// #define NO_MIC_LOGGER // exclude MIC_LOGGER from SR_DEBUG
+
#ifdef SR_DEBUG
#define DEBUGSR_PRINT(x) Serial.print(x)
@@ -103,6 +103,7 @@ static void autoResetPeak(void); // peak auto-reset function
////////////////////
// Begin FFT Code //
////////////////////
+
#ifdef UM_AUDIOREACTIVE_USE_NEW_FFT
// lib_deps += https://github.com/kosme/arduinoFFT#develop @ 1.9.2
#define FFT_SPEED_OVER_PRECISION // enables use of reciprocals (1/x etc), and an a few other speedups
@@ -135,7 +136,6 @@ static float windowWeighingFactors[samplesFFT] = {0.0f};
#endif
// Try and normalize fftBin values to a max of 4096, so that 4096/16 = 256.
-// Oh, and bins 0,1,2 are no good, so we'll zero them out.
static float fftCalc[NUM_GEQ_CHANNELS] = {0.0f};
static float fftAvg[NUM_GEQ_CHANNELS] = {0.0f}; // Calculated frequency channel results, with smoothing (used if dynamics limiter is ON)
#ifdef SR_DEBUG
@@ -172,7 +172,7 @@ static float fftAddAvg(int from, int to) {
return result / float(to - from + 1);
}
-// FFT main code
+// FFT main task
void FFTcode(void * parameter)
{
DEBUGSR_PRINT("FFT started on core: "); DEBUGSR_PRINTLN(xPortGetCoreID());
@@ -417,6 +417,10 @@ static void autoResetPeak(void) {
}
+////////////////////
+// usermod class //
+////////////////////
+
//class name. Use something descriptive and leave the ": public Usermod" part :)
class AudioReactive : public Usermod {
@@ -533,6 +537,10 @@ class AudioReactive : public Usermod {
static const char UDP_SYNC_HEADER_v1[];
// private methods
+
+ ////////////////////
+ // Debug support //
+ ////////////////////
void logAudio()
{
#ifdef MIC_LOGGER
@@ -604,6 +612,10 @@ class AudioReactive : public Usermod {
} // logAudio()
+ //////////////////////
+ // Audio Processing //
+ //////////////////////
+
/*
* A "PI controller" multiplier to automatically adjust sound sensitivity.
*
@@ -698,7 +710,7 @@ class AudioReactive : public Usermod {
last_soundAgc = soundAgc;
} // agcAvg()
-
+ // post-processing and filtering of MIC sample (micDataReal) from FFTcode()
void getSample()
{
float sampleAdj; // Gain adjusted sample value
@@ -793,6 +805,26 @@ class AudioReactive : public Usermod {
}
+ //////////////////////
+ // UDP Sound Sync //
+ //////////////////////
+
+ // try to establish UDP sound sync connection
+ void connectUDPSoundSync(void) {
+ // This function tries to establish a UDP sync connection if needed
+ // necessary as we also want to transmit in "AP Mode", but the standard "connected()" callback only reacts on STA connection
+ static unsigned long last_connection_attempt = 0;
+
+ if ((audioSyncPort <= 0) || ((audioSyncEnabled & 0x03) == 0)) return; // Sound Sync not enabled
+ if (udpSyncConnected) return; // already connected
+ if (!(apActive || interfacesInited)) return; // neither AP nor other connections availeable
+ if (millis() - last_connection_attempt < 15000) return; // only try once in 15 seconds
+
+ // if we arrive here, we need a UDP connection but don't have one
+ last_connection_attempt = millis();
+ connected(); // try to start UDP
+ }
+
void transmitAudioData()
{
if (!udpSyncConnected) return;
@@ -820,12 +852,10 @@ class AudioReactive : public Usermod {
return;
} // transmitAudioData()
-
static bool isValidUdpSyncVersion(const char *header) {
return strncmp_P(header, PSTR(UDP_SYNC_HEADER), 6) == 0;
}
-
bool receiveAudioData() // check & process new data. return TRUE in case that new audio data was received.
{
if (!udpSyncConnected) return false;
@@ -875,6 +905,10 @@ class AudioReactive : public Usermod {
}
+ //////////////////////
+ // usermod functions//
+ //////////////////////
+
public:
//Functions called by WLED or other usermods
@@ -967,6 +1001,7 @@ class AudioReactive : public Usermod {
disableSoundProcessing = true;
}
+ if (enabled) connectUDPSoundSync();
initDone = true;
}
@@ -977,6 +1012,11 @@ class AudioReactive : public Usermod {
*/
void connected()
{
+ if (udpSyncConnected) { // clean-up: if open, close old UDP sync connection
+ udpSyncConnected = false;
+ fftUdp.stop();
+ }
+
if (audioSyncPort > 0 && (audioSyncEnabled & 0x03)) {
#ifndef ESP8266
udpSyncConnected = fftUdp.beginMulticast(IPAddress(239, 0, 0, 1), audioSyncPort);
@@ -1079,6 +1119,8 @@ class AudioReactive : public Usermod {
autoResetPeak(); // auto-reset sample peak after strip minShowDelay
if (!udpSyncConnected) udpSamplePeak = false; // reset UDP samplePeak while UDP is unconnected
+ connectUDPSoundSync(); // ensure we have a connection - if needed
+
// UDP Microphone Sync - receive mode
if ((audioSyncEnabled & 0x02) && udpSyncConnected) {
// Only run the audio listener code if we're in Receive mode
@@ -1196,6 +1238,10 @@ class AudioReactive : public Usermod {
}
+ ////////////////////////////
+ // Settings and Info Page //
+ ////////////////////////////
+
/*
* addToJsonInfo() can be used to add custom entries to the /json/info part of the JSON API.
* Creating an "u" object allows you to add custom key/value pairs to the Info section of the WLED web UI.
@@ -1317,6 +1363,10 @@ class AudioReactive : public Usermod {
infoArr.add(fftTime-sampleTime);
infoArr.add("ms");
#endif
+
+ // add a small horizontal line, for better readability
+ infoArr = user.createNestedArray(F("
"));
+ infoArr.add(F("
"));
}
}
diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index ce64582c..1cd05f98 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -3470,9 +3470,9 @@ static const char _data_FX_MODE_DRIP[] PROGMEM = "Drip@Gravity,# of drips;!,!;!;
typedef struct Tetris {
float pos;
float speed;
- uint32_t col;
- uint16_t aux0; // 2D-fication of SEGENV.aux0 (brick size)
- uint16_t aux1; // 2D-fication of SEGENV.aux1 (stack size)
+ uint8_t col; // color index
+ uint16_t brick; // brick size in pixels
+ uint16_t stack; // stack size in pixels
uint32_t step; // 2D-fication of SEGENV.step (state)
} tetris;
@@ -3491,7 +3491,7 @@ uint16_t mode_tetrix(void) {
static void runStrip(size_t stripNr, Tetris *drop) {
// initialize dropping on first call or segment full
if (SEGENV.call == 0) {
- drop->aux1 = 0; // reset brick stack size
+ drop->stack = 0; // reset brick stack size
drop->step = 0;
//for (int i=0; ispeed = float(SEGLEN * FRAMETIME) / float(speed); // set speed
drop->pos = SEGLEN; // start at end of segment (no need to subtract 1)
- drop->col = SEGMENT.color_from_palette(random8(0,15)<<4,false,false,0); // limit color choices so there is enough HUE gap
+ drop->col = random8(0,15)<<4; // limit color choices so there is enough HUE gap
drop->step = 1; // drop state (0 init, 1 forming, 2 falling)
- drop->aux0 = (SEGMENT.intensity ? (SEGMENT.intensity>>5)+1 : random8(1,5)) * (1+(SEGLEN>>6)); // size of brick
+ drop->brick = (SEGMENT.intensity ? (SEGMENT.intensity>>5)+1 : random8(1,5)) * (1+(SEGLEN>>6)); // size of brick
}
if (drop->step == 1) { // forming
@@ -3516,24 +3516,27 @@ uint16_t mode_tetrix(void) {
}
if (drop->step == 2) { // falling
- if (drop->pos > drop->aux1) { // fall until top of stack
+ if (drop->pos > drop->stack) { // fall until top of stack
drop->pos -= drop->speed; // may add gravity as: speed += gravity
- if (uint16_t(drop->pos) < drop->aux1) drop->pos = drop->aux1;
- for (int i=int(drop->pos); ipos)+drop->aux0 ? drop->col : SEGCOLOR(1));
+ if (uint16_t(drop->pos) < drop->stack) drop->pos = drop->stack;
+ for (int i=int(drop->pos); ipos)+drop->brick ? SEGMENT.color_from_palette(drop->col, false, false, 0) : SEGCOLOR(1);
+ SEGMENT.setPixelColor(i | int((stripNr+1)<<16), col);
+ }
} else { // we hit bottom
drop->step = 0; // proceed with next brick, go back to init
- drop->aux1 += drop->aux0; // increase the stack size
- if (drop->aux1 >= SEGLEN) drop->step = millis() + 2000; // fade out stack
+ drop->stack += drop->brick; // increase the stack size
+ if (drop->stack >= SEGLEN) drop->step = millis() + 2000; // fade out stack
}
}
- if (drop->step > 2) {
- drop->aux0 = 0; // reset brick size (no more growing)
+ if (drop->step > 2) { // fade strip
+ drop->brick = 0; // reset brick size (no more growing)
if (drop->step > millis()) {
// allow fading of virtual strip
- for (int i=0; iaux1 = 0; // reset brick stack size
+ drop->stack = 0; // reset brick stack size
drop->step = 0; // proceed with next brick
}
}
@@ -6254,7 +6257,7 @@ uint16_t mode_gravcentric(void) { // Gravcentric. By Andrew
return FRAMETIME;
} // mode_gravcentric()
-static const char _data_FX_MODE_GRAVCENTRIC[] PROGMEM = "Gravcentric@Rate of fall,Sensitivity;!;!;ix=128,mp12=2,ssim=0,1d,vo"; // Circle, Beatsin
+static const char _data_FX_MODE_GRAVCENTRIC[] PROGMEM = "Gravcentric@Rate of fall,Sensitivity;!;!;ix=128,mp12=3,ssim=0,1d,vo"; // Corner, Beatsin
///////////////////////
@@ -6390,7 +6393,7 @@ uint16_t mode_midnoise(void) { // Midnoise. By Andrew Tuline.
return FRAMETIME;
} // mode_midnoise()
-static const char _data_FX_MODE_MIDNOISE[] PROGMEM = "Midnoise@Fade rate,Maximum length;,!;!;ix=128,mp12=2,ssim=0,1d,vo"; // Circle, Beatsin
+static const char _data_FX_MODE_MIDNOISE[] PROGMEM = "Midnoise@Fade rate,Maximum length;,!;!;ix=128,mp12=1,ssim=0,1d,vo"; // Bar, Beatsin
//////////////////////
@@ -6515,7 +6518,7 @@ uint16_t mode_plasmoid(void) { // Plasmoid. By Andrew Tuline.
}
float volumeSmth = *(float*) um_data->u_data[0];
- SEGMENT.fadeToBlackBy(64);
+ SEGMENT.fadeToBlackBy(32);
plasmoip->thisphase += beatsin8(6,-4,4); // You can change direction and speed individually.
plasmoip->thatphase += beatsin8(7,-4,4); // Two phase values to make a complex pattern. By Andrew Tuline.
@@ -6667,7 +6670,8 @@ uint16_t mode_blurz(void) { // Blurz. By Andrew Tuline.
SEGENV.aux0 = 0;
}
- SEGMENT.fade_out(SEGMENT.speed);
+ int fadeoutDelay = (256 - SEGMENT.speed) / 32;
+ if ((fadeoutDelay <= 1 ) || ((SEGENV.call % fadeoutDelay) == 0)) SEGMENT.fade_out(SEGMENT.speed);
SEGENV.step += FRAMETIME;
if (SEGENV.step > SPEED_FORMULA_L) {
@@ -6735,7 +6739,9 @@ uint16_t mode_freqmap(void) { // Map FFT_MajorPeak to SEGLEN.
float my_magnitude = *(float*) um_data->u_data[5] / 4.0f;
if (FFT_MajorPeak < 1) FFT_MajorPeak = 1; // log10(0) is "forbidden" (throws exception)
- SEGMENT.fade_out(SEGMENT.speed);
+ if (SEGENV.call == 0) SEGMENT.fill(BLACK);
+ int fadeoutDelay = (256 - SEGMENT.speed) / 32;
+ if ((fadeoutDelay <= 1 ) || ((SEGENV.call % fadeoutDelay) == 0)) SEGMENT.fade_out(SEGMENT.speed);
int locn = (log10f((float)FFT_MajorPeak) - 1.78f) * (float)SEGLEN/(MAX_FREQ_LOG10 - 1.78f); // log10 frequency range is from 1.78 to 3.71. Let's scale to SEGLEN.
if (locn < 1) locn = 0; // avoid underflow
@@ -6750,7 +6756,7 @@ uint16_t mode_freqmap(void) { // Map FFT_MajorPeak to SEGLEN.
return FRAMETIME;
} // mode_freqmap()
-static const char _data_FX_MODE_FREQMAP[] PROGMEM = "Freqmap@Fade rate,Starting color;,!;!;mp12=2,ssim=0,1d,fr"; // Circle, Beatsin
+static const char _data_FX_MODE_FREQMAP[] PROGMEM = "Freqmap@Fade rate,Starting color;,!;!;mp12=0,ssim=0,1d,fr"; // Pixels, Beatsin
///////////////////////
@@ -6805,7 +6811,7 @@ uint16_t mode_freqmatrix(void) { // Freqmatrix. By Andreas Plesch
return FRAMETIME;
} // mode_freqmatrix()
-static const char _data_FX_MODE_FREQMATRIX[] PROGMEM = "Freqmatrix@Time delay,Sound effect,Low bin,High bin,Sensivity;;;mp12=0,ssim=0,1d,fr"; // Pixels, Beatsin
+static const char _data_FX_MODE_FREQMATRIX[] PROGMEM = "Freqmatrix@Time delay,Sound effect,Low bin,High bin,Sensivity;;;mp12=3,ssim=0,1d,fr"; // Corner, Beatsin
//////////////////////
@@ -6826,7 +6832,10 @@ uint16_t mode_freqpixels(void) { // Freqpixel. By Andrew Tuline.
if (FFT_MajorPeak < 1) FFT_MajorPeak = 1; // log10(0) is "forbidden" (throws exception)
uint16_t fadeRate = 2*SEGMENT.speed - SEGMENT.speed*SEGMENT.speed/255; // Get to 255 as quick as you can.
- SEGMENT.fade_out(fadeRate);
+
+ if (SEGENV.call == 0) SEGMENT.fill(BLACK);
+ int fadeoutDelay = (256 - SEGMENT.speed) / 64;
+ if ((fadeoutDelay <= 1 ) || ((SEGENV.call % fadeoutDelay) == 0)) SEGMENT.fade_out(fadeRate);
for (int i=0; i < SEGMENT.intensity/32+1; i++) {
uint16_t locn = random16(0,SEGLEN);
@@ -6958,7 +6967,7 @@ uint16_t mode_gravfreq(void) { // Gravfreq. By Andrew Tuline.
return FRAMETIME;
} // mode_gravfreq()
-static const char _data_FX_MODE_GRAVFREQ[] PROGMEM = "Gravfreq@Rate of fall,Sensivity;,!;!;ix=128,mp12=2,ssim=0,1d,fr"; // Circle, Beatsin
+static const char _data_FX_MODE_GRAVFREQ[] PROGMEM = "Gravfreq@Rate of fall,Sensivity;,!;!;ix=128,mp12=0,ssim=0,1d,fr"; // Pixels, Beatsin
//////////////////////
@@ -6972,7 +6981,10 @@ uint16_t mode_noisemove(void) { // Noisemove. By: Andrew Tuli
}
uint8_t *fftResult = (uint8_t*)um_data->u_data[2];
- SEGMENT.fade_out(224); // Just in case something doesn't get faded.
+ if (SEGENV.call == 0) SEGMENT.fill(BLACK);
+ //SEGMENT.fade_out(224); // Just in case something doesn't get faded.
+ int fadeoutDelay = (256 - SEGMENT.speed) / 96;
+ if ((fadeoutDelay <= 1 ) || ((SEGENV.call % fadeoutDelay) == 0)) SEGMENT.fadeToBlackBy(4+ SEGMENT.speed/4);
uint8_t numBins = map(SEGMENT.intensity,0,255,0,16); // Map slider to fftResult bins.
for (int i=0; iu_data[4];
float my_magnitude = *(float*) um_data->u_data[5] / 16.0f;
- SEGMENT.fadeToBlackBy(64); // Just in case something doesn't get faded.
+ if (SEGENV.call == 0) SEGMENT.fill(BLACK);
+ SEGMENT.fadeToBlackBy(16); // Just in case something doesn't get faded.
float frTemp = FFT_MajorPeak;
uint8_t octCount = 0; // Octave counter.
uint8_t volTemp = 0;
- if (my_magnitude > 32) volTemp = 255; // We need to squelch out the background noise.
+ volTemp = 32.0f + my_magnitude * 1.5f; // brightness = volume (overflows are handled in next lines)
+ if (my_magnitude < 48) volTemp = 0; // We need to squelch out the background noise.
+ if (my_magnitude > 144) volTemp = 255; // everything above this is full brightness
while ( frTemp > 249 ) {
octCount++; // This should go up to 5.
@@ -7020,7 +7035,7 @@ uint16_t mode_rocktaves(void) { // Rocktaves. Same note from eac
return FRAMETIME;
} // mode_rocktaves()
-static const char _data_FX_MODE_ROCKTAVES[] PROGMEM = "Rocktaves@;,!;!;mp12=0,ssim=0,1d,fr"; // Pixels, Beatsin
+static const char _data_FX_MODE_ROCKTAVES[] PROGMEM = "Rocktaves@;,!;!;mp12=1,ssim=0,1d,fr"; // Bar, Beatsin
///////////////////////
@@ -7104,7 +7119,9 @@ uint16_t mode_2DGEQ(void) { // By Will Tatam. Code reduction by Ewoud Wijma.
rippleTime = true;
}
- SEGMENT.fadeToBlackBy(SEGMENT.speed);
+ if (SEGENV.call == 0) SEGMENT.fill(BLACK);
+ int fadeoutDelay = (256 - SEGMENT.speed) / 64;
+ if ((fadeoutDelay <= 1 ) || ((SEGENV.call % fadeoutDelay) == 0)) SEGMENT.fadeToBlackBy(SEGMENT.speed);
for (int x=0; x < cols; x++) {
uint8_t band = map(x, 0, cols-1, 0, NUM_BANDS - 1);
diff --git a/wled00/FX.h b/wled00/FX.h
index c7f0d9b7..38539a9d 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -357,26 +357,21 @@ typedef struct Segment {
union {
uint16_t options; //bit pattern: msb first: [transposed mirrorY reverseY] transitional (tbd) paused needspixelstate mirrored on reverse selected
struct {
- bool selected : 1; // 0 : selected
- bool reverse : 1; // 1 : reversed
- bool on : 1; // 2 : is On
- bool mirror : 1; // 3 : mirrored
- bool pxs : 1; // 4 : indicates that the effect does not use FRAMETIME or needs getPixelColor (?)
- bool freeze : 1; // 5 : paused/frozen
- bool reset : 1; // 6 : indicates that Segment runtime requires reset
- bool transitional: 1; // 7 : transitional (there is transition occuring)
- bool reverse_y : 1; // 8 : reversed Y (2D)
- bool mirror_y : 1; // 9 : mirrored Y (2D)
- bool transpose : 1; // 10 : transposed (2D, swapped X & Y)
- uint8_t map1D2D : 3; // 11-13 : mapping for 1D effect on 2D (0-use as strip, 1-expand vertically, 2-circular/arc, 3-rectangular/corner, ...)
- uint8_t soundSim : 2; // 14-15 : 0-3 sound simulation types
+ bool selected : 1; // 0 : selected
+ bool reverse : 1; // 1 : reversed
+ bool on : 1; // 2 : is On
+ bool mirror : 1; // 3 : mirrored
+ bool freeze : 1; // 4 : paused/frozen
+ bool reset : 1; // 5 : indicates that Segment runtime requires reset
+ bool transitional: 1; // 6 : transitional (there is transition occuring)
+ bool reverse_y : 1; // 7 : reversed Y (2D)
+ bool mirror_y : 1; // 8 : mirrored Y (2D)
+ bool transpose : 1; // 9 : transposed (2D, swapped X & Y)
+ uint8_t map1D2D : 3; // 10-12 : mapping for 1D effect on 2D (0-use as strip, 1-expand vertically, 2-circular/arc, 3-rectangular/corner, ...)
+ uint8_t soundSim : 3; // 13-15 : 0-7 sound simulation types
};
};
uint8_t grouping, spacing;
- //struct {
- // uint8_t grouping : 4; // maximum 15 pixels in a group
- // uint8_t spacing : 4; // maximum 15 pixels per gap
- //};
uint8_t opacity;
uint32_t colors[NUM_COLORS];
uint8_t cct; //0==1900K, 255==10091K
@@ -418,17 +413,20 @@ typedef struct Segment {
// transition data, valid only if transitional==true, holds values during transition
struct Transition {
uint32_t _colorT[NUM_COLORS];
- uint8_t _briT; // temporary brightness
- uint8_t _cctT; // temporary CCT
- CRGBPalette16 _palT; // temporary palette
- uint8_t _modeP; // previous mode/effect
+ uint8_t _briT; // temporary brightness
+ uint8_t _cctT; // temporary CCT
+ CRGBPalette16 _palT; // temporary palette
+ uint8_t _modeP; // previous mode/effect
+ //uint16_t _aux0, _aux1; // previous mode/effect runtime data
+ //uint32_t _step, _call; // previous mode/effect runtime data
+ //byte *_data; // previous mode/effect runtime data
uint32_t _start;
uint16_t _dur;
Transition(uint16_t dur=750) : _briT(255), _cctT(127), _palT(CRGBPalette16(CRGB::Black)), _modeP(FX_MODE_STATIC), _start(millis()), _dur(dur) {}
Transition(uint16_t d, uint8_t b, uint8_t c, const uint32_t *o) : _briT(b), _cctT(c), _palT(CRGBPalette16(CRGB::Black)), _modeP(FX_MODE_STATIC), _start(millis()), _dur(d) {
for (size_t i=0; i_briT = _briT;
- _t->_cctT = _cctT;
+ _t->_briT = _briT;
+ _t->_cctT = _cctT;
_t->_palT = _palT;
_t->_modeP = _modeP;
for (size_t i=0; i_colorT[i] = _colorT[i];
@@ -625,7 +625,7 @@ uint8_t Segment::differs(Segment& b) const {
if (stopY != b.stopY) d |= SEG_DIFFERS_BOUNDS;
//bit pattern: msb first: [transposed mirrorY reverseY] transitional (tbd) paused needspixelstate mirrored on reverse selected
- if ((options & 0b1111111100101110) != (b.options & 0b1111111100101110)) d |= SEG_DIFFERS_OPT;
+ if ((options & 0b1111111110011110) != (b.options & 0b1111111110011110)) d |= SEG_DIFFERS_OPT;
if ((options & 0x01) != (b.options & 0x01)) d |= SEG_DIFFERS_SEL;
for (uint8_t i = 0; i < NUM_COLORS; i++) if (colors[i] != b.colors[i]) d |= SEG_DIFFERS_COL;
@@ -1545,7 +1545,7 @@ const char JSON_mode_names[] PROGMEM = R"=====(["Mode names have moved"])=====";
const char JSON_palette_names[] PROGMEM = R"=====([
"Default","* Random Cycle","* Color 1","* Colors 1&2","* Color Gradient","* Colors Only","Party","Cloud","Lava","Ocean",
"Forest","Rainbow","Rainbow Bands","Sunset","Rivendell","Breeze","Red & Blue","Yellowout","Analogous","Splash",
-"Pastel","Sunset 2","Beech","Vintage","Departure","Landscape","Beach","Sherbet","Hult","Hult 64",
+"Pastel","Sunset 2","Beach","Vintage","Departure","Landscape","Beech","Sherbet","Hult","Hult 64",
"Drywet","Jul","Grintage","Rewhi","Tertiary","Fire","Icefire","Cyane","Light Pink","Autumn",
"Magenta","Magred","Yelmag","Yelblu","Orange & Teal","Tiamat","April Night","Orangery","C9","Sakura",
"Aurora","Atlantica","C9 2","C9 New","Temperature","Aurora 2","Retro Clown","Candy","Toxy Reaf","Fairy Reaf",
diff --git a/wled00/const.h b/wled00/const.h
index 377e7b35..c1676bc4 100644
--- a/wled00/const.h
+++ b/wled00/const.h
@@ -226,13 +226,12 @@
#define SEG_OPTION_REVERSED 1
#define SEG_OPTION_ON 2
#define SEG_OPTION_MIRROR 3 //Indicates that the effect will be mirrored within the segment
-#define SEG_OPTION_NONUNITY 4 //Indicates that the effect does not use FRAMETIME or needs getPixelColor
-#define SEG_OPTION_FREEZE 5 //Segment contents will not be refreshed
-#define SEG_OPTION_RESET 6 //Segment runtime requires reset
-#define SEG_OPTION_TRANSITIONAL 7
-#define SEG_OPTION_REVERSED_Y 8
-#define SEG_OPTION_MIRROR_Y 9
-#define SEG_OPTION_TRANSPOSED 10
+#define SEG_OPTION_FREEZE 4 //Segment contents will not be refreshed
+#define SEG_OPTION_RESET 5 //Segment runtime requires reset
+#define SEG_OPTION_TRANSITIONAL 6
+#define SEG_OPTION_REVERSED_Y 7
+#define SEG_OPTION_MIRROR_Y 8
+#define SEG_OPTION_TRANSPOSED 9
//Segment differs return byte
#define SEG_DIFFERS_BRI 0x01
diff --git a/wled00/data/index.js b/wled00/data/index.js
index e397d1d5..d8bbbdd1 100644
--- a/wled00/data/index.js
+++ b/wled00/data/index.js
@@ -653,8 +653,8 @@ function populateInfo(i)
}
}
var vcn = "Kuuhaku";
- if (i.ver.startsWith("0.13.")) vcn = "Toki";
- if (i.ver.includes("-bl")) vcn = "Ryujin";
+ if (i.ver.startsWith("0.14.")) vcn = "Hoshi";
+ if (i.ver.includes("-bl")) vcn = "Supāku";
if (i.cn) vcn = i.cn;
cn += `v${i.ver} "${vcn}"
@@ -714,7 +714,7 @@ function populateSegments(s)
}
let map2D = `Expand 1D FX