From 89040a3a245faa97df7dbb9c332182ba822a6f61 Mon Sep 17 00:00:00 2001 From: Will Tatam Date: Fri, 20 Jan 2023 20:16:22 +0000 Subject: [PATCH] Add new Audio Responsive Ramp palette --- wled00/FX_fcn.cpp | 5 +++-- wled00/const.h | 2 +- wled00/palettes.h | 1 + wled00/util.cpp | 8 +++++++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp index 10df295f..c3e6ce8c 100644 --- a/wled00/FX_fcn.cpp +++ b/wled00/FX_fcn.cpp @@ -295,7 +295,8 @@ CRGBPalette16 &Segment::loadPalette(CRGBPalette16 &targetPalette, uint8_t pal) { case 12: //Rainbow stripe colors targetPalette = RainbowStripeColors_p; break; case 71: //WLEDMM netmindz ar palette +1 - case 72: //WLEDMM netmindz ar palette +1 + case 72: //WLEDMM netmindz ar palette +2 + case 73: //WLEDMM netmindz ar palette +3 targetPalette.loadDynamicGradientPalette(getAudioPalette(pal)); break; default: //progmem palettes if (pal>245) { @@ -1959,5 +1960,5 @@ const char JSON_palette_names[] PROGMEM = R"=====([ "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", "Semi Blue","Pink Candy","Red Reaf","Aqua Flash","Yelblu Hot","Lite Light","Red Flash","Blink Red","Red Shift","Red Tide", -"Candy2","Audio Responsive Ratio","Audio Responsive Hue" +"Candy2","Audio Responsive Ratio","Audio Responsive Hue","Audio Responsive Ramp" ])====="; diff --git a/wled00/const.h b/wled00/const.h index e85c474d..f14bf5ed 100644 --- a/wled00/const.h +++ b/wled00/const.h @@ -5,7 +5,7 @@ * Readability defines and their associated numerical values + compile-time constants */ -#define GRADIENT_PALETTE_COUNT 60 //WLEDMM netmindz ar palette +2 +#define GRADIENT_PALETTE_COUNT 61 //WLEDMM netmindz ar palette +3 //Defaults #define DEFAULT_CLIENT_SSID "Your_Network" diff --git a/wled00/palettes.h b/wled00/palettes.h index 0fa94f5c..038eb4db 100644 --- a/wled00/palettes.h +++ b/wled00/palettes.h @@ -918,6 +918,7 @@ const byte* const gGradientPalettes[] PROGMEM = { // Palette contents not actually used as built on the fly, just here to create menu option audio_responsive_gp, //71-58 AudioResponsive WLEDMM netmindz ar palette - placeholder1 audio_responsive_gp, //72-59 AudioResponsive WLEDMM netmindz ar palette - placeholder2 + audio_responsive_gp, //73-60 AudioResponsive WLEDMM netmindz ar palette - placeholder3 }; #endif diff --git a/wled00/util.cpp b/wled00/util.cpp index 72eb3b26..3aecb176 100644 --- a/wled00/util.cpp +++ b/wled00/util.cpp @@ -535,5 +535,11 @@ CRGB getCRGBForBand(int x, uint8_t *fftResult, int pal) { hsv = CHSV(fftResult[b], 255, map(fftResult[b], 0, 255, 30, 255)); // pick hue hsv2rgb_rainbow(hsv, value); // convert to R,G,B } + else if(pal == 73) { + int b = map(x, 0, 255, 0, 8); // convert palette position to lower half of freq band + hsv = CHSV(uint8_t(fftResult[b]), 255, x); + hsv2rgb_rainbow(hsv, value); // convert to R,G,B + } + return value; -} \ No newline at end of file +} \ No newline at end of file