jeans/WLED
jeans/WLED
1
0
Fork 0
mirror of https://github.com/wled/WLED.git synced 2025-07-21 01:36:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into usermod-libs-matrix

Browse Source
This commit is contained in:
Will Tatam 2025-06-28 14:38:28 +01:00
commit 5163fbf36b
5 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/pr-merge.yaml vendored
View File

@ -28,9 +28,6 @@
with: with:
ref: ${{ github.event.pull_request.head.sha }} # This is dangerous without the first access check ref: ${{ github.event.pull_request.head.sha }} # This is dangerous without the first access check
- name: Send Discord notification - name: Send Discord notification
shell: bash
env:
DISCORD_WEBHOOK_BETA_TESTERS: ${{ secrets.DISCORD_WEBHOOK_BETA_TESTERS }}
# if: github.event.pull_request.merged == true # if: github.event.pull_request.merged == true
run: | run: |
curl -H "Content-Type: application/json" -d '{"content": "Pull Request ${{ github.event.pull_request.number }} merged by ${{ github.actor }}"}' $DISCORD_WEBHOOK_BETA_TESTERS curl -H "Content-Type: application/json" -d '{"content": "Pull Request ${{ github.event.pull_request.number }} merged by ${{ github.actor }}"}' ${{ secrets.DISCORD_WEBHOOK_BETA_TESTERS }}

5
usermods/audioreactive/audio_reactive.cpp
View File

@ -65,11 +65,14 @@ static bool udpSyncConnected = false; // UDP connection status -> true i
// audioreactive variables // audioreactive variables
#ifdef ARDUINO_ARCH_ESP32 #ifdef ARDUINO_ARCH_ESP32
#ifndef SR_AGC // Automatic gain control mode
#define SR_AGC 0 // default mode = off
#endif
static float micDataReal = 0.0f; // MicIn data with full 24bit resolution - lowest 8bit after decimal point static float micDataReal = 0.0f; // MicIn data with full 24bit resolution - lowest 8bit after decimal point
static float multAgc = 1.0f; // sample * multAgc = sampleAgc. Our AGC multiplier static float multAgc = 1.0f; // sample * multAgc = sampleAgc. Our AGC multiplier
static float sampleAvg = 0.0f; // Smoothed Average sample - sampleAvg < 1 means "quiet" (simple noise gate) static float sampleAvg = 0.0f; // Smoothed Average sample - sampleAvg < 1 means "quiet" (simple noise gate)
static float sampleAgc = 0.0f; // Smoothed AGC sample static float sampleAgc = 0.0f; // Smoothed AGC sample
static uint8_t soundAgc = 0; // Automagic gain control: 0 - none, 1 - normal, 2 - vivid, 3 - lazy (config value) static uint8_t soundAgc = SR_AGC; // Automatic gain control: 0 - off, 1 - normal, 2 - vivid, 3 - lazy (config value)
#endif #endif
//static float volumeSmth = 0.0f; // either sampleAvg or sampleAgc depending on soundAgc; smoothed sample //static float volumeSmth = 0.0f; // either sampleAvg or sampleAgc depending on soundAgc; smoothed sample
static float FFT_MajorPeak = 1.0f; // FFT: strongest (peak) frequency static float FFT_MajorPeak = 1.0f; // FFT: strongest (peak) frequency

3
usermods/audioreactive/readme.md
View File

@ -60,8 +60,9 @@ You can use the following additional flags in your `build_flags`
* `-D SR_SQUELCH=x` : Default "squelch" setting (10) * `-D SR_SQUELCH=x` : Default "squelch" setting (10)
* `-D SR_GAIN=x` : Default "gain" setting (60) * `-D SR_GAIN=x` : Default "gain" setting (60)
* `-D SR_AGC=x` : (Only ESP32) Default "AGC (Automatic Gain Control)" setting (0): 0=off, 1=normal, 2=vivid, 3=lazy
* `-D I2S_USE_RIGHT_CHANNEL`: Use RIGHT instead of LEFT channel (not recommended unless you strictly need this). * `-D I2S_USE_RIGHT_CHANNEL`: Use RIGHT instead of LEFT channel (not recommended unless you strictly need this).
* `-D I2S_USE_16BIT_SAMPLES`: Use 16bit instead of 32bit for internal sample buffers. Reduces sampling quality, but frees some RAM ressources (not recommended unless you absolutely need this). * `-D I2S_USE_16BIT_SAMPLES`: Use 16bit instead of 32bit for internal sample buffers. Reduces sampling quality, but frees some RAM resources (not recommended unless you absolutely need this).
* `-D I2S_GRAB_ADC1_COMPLETELY`: Experimental: continuously sample analog ADC microphone. Only effective on ESP32. WARNING this *will* cause conflicts(lock-up) with any analogRead() call. * `-D I2S_GRAB_ADC1_COMPLETELY`: Experimental: continuously sample analog ADC microphone. Only effective on ESP32. WARNING this *will* cause conflicts(lock-up) with any analogRead() call.
* `-D MIC_LOGGER` : (debugging) Logs samples from the microphone to serial USB. Use with serial plotter (Arduino IDE) * `-D MIC_LOGGER` : (debugging) Logs samples from the microphone to serial USB. Use with serial plotter (Arduino IDE)
* `-D SR_DEBUG` : (debugging) Additional error diagnostics and debug info on serial USB. * `-D SR_DEBUG` : (debugging) Additional error diagnostics and debug info on serial USB.

8
wled00/FX.cpp
View File

@ -4818,7 +4818,7 @@ static const char _data_FX_MODE_WAVESINS[] PROGMEM = "Wavesins@!,Brightness vari
////////////////////////////// //////////////////////////////
// Flow Stripe // // Flow Stripe //
////////////////////////////// //////////////////////////////
// By: ldirko https://editor.soulmatelights.com/gallery/392-flow-led-stripe , modifed by: Andrew Tuline // By: ldirko https://editor.soulmatelights.com/gallery/392-flow-led-stripe , modifed by: Andrew Tuline, fixed by @DedeHai
uint16_t mode_FlowStripe(void) { uint16_t mode_FlowStripe(void) {
if (SEGLEN <= 1) return mode_static(); if (SEGLEN <= 1) return mode_static();
const int hl = SEGLEN * 10 / 13; const int hl = SEGLEN * 10 / 13;
@ -4826,16 +4826,16 @@ uint16_t mode_FlowStripe(void) {
uint32_t t = strip.now / (SEGMENT.intensity/8+1); uint32_t t = strip.now / (SEGMENT.intensity/8+1);
for (unsigned i = 0; i < SEGLEN; i++) { for (unsigned i = 0; i < SEGLEN; i++) {
int c = (abs((int)i - hl) / hl) * 127; int c = ((abs((int)i - hl) * 127) / hl);
c = sin8_t(c); c = sin8_t(c);
c = sin8_t(c / 2 + t); c = sin8_t(c / 2 + t);
byte b = sin8_t(c + t/8); byte b = sin8_t(c + t/8);
SEGMENT.setPixelColor(i, CHSV(b + hue, 255, 255)); SEGMENT.setPixelColor(i, SEGMENT.color_from_palette(b + hue, false, true, 3));
} }
return FRAMETIME; return FRAMETIME;
} // mode_FlowStripe() } // mode_FlowStripe()
static const char _data_FX_MODE_FLOWSTRIPE[] PROGMEM = "Flow Stripe@Hue speed,Effect speed;;"; static const char _data_FX_MODE_FLOWSTRIPE[] PROGMEM = "Flow Stripe@Hue speed,Effect speed;;!;pal=11";
#ifndef WLED_DISABLE_2D #ifndef WLED_DISABLE_2D

2
wled00/data/settings_leds.htm
View File

@ -353,7 +353,7 @@
}); });
const S2 = (oMaxB == 14) && (maxV == 4); const S2 = (oMaxB == 14) && (maxV == 4);
const S3 = (oMaxB == 14) && (maxV == 6); const S3 = (oMaxB == 14) && (maxV == 6);
if (oMaxB == 19 || S2 || S3) { // TODO: crude ESP32 & S2/S3 detection if (oMaxB == 32 || S2 || S3) { // TODO: crude ESP32 & S2/S3 detection
if (maxLC > 300 || dC <= 2) { if (maxLC > 300 || dC <= 2) {
d.Sf["PR"].checked = false; d.Sf["PR"].checked = false;
gId("prl").classList.add("hide"); gId("prl").classList.add("hide");