Update new pull with playlist and palette changes
This commit is contained in:
twlare
parent
04fe57cd70
commit
9802a7c4e2
@ -16,13 +16,13 @@ extra_configs =
|
|||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
|
|
||||||
# Travis CI binaries
|
# Travis CI binaries
|
||||||
default_envs = travis_esp8266, esp01, esp01_1m_ota, travis_esp32
|
; default_envs = travis_esp8266, esp01, esp01_1m_ota, travis_esp32
|
||||||
|
|
||||||
# Release binaries
|
# Release binaries
|
||||||
; default_envs = nodemcuv2, esp01, esp01_1m_ota, esp01_1m_full, esp32dev, custom_WS2801, custom_APA102, custom_LEDPIN_16, custom_LEDPIN_4, custom32_LEDPIN_16
|
; default_envs = nodemcuv2, esp01, esp01_1m_ota, esp01_1m_full, esp32dev, custom_WS2801, custom_APA102, custom_LEDPIN_16, custom_LEDPIN_4, custom32_LEDPIN_16
|
||||||
|
|
||||||
# Single binaries (uncomment your board)
|
# Single binaries (uncomment your board)
|
||||||
; default_envs = nodemcuv2
|
default_envs = nodemcuv2
|
||||||
; default_envs = esp01
|
; default_envs = esp01
|
||||||
; default_envs = esp01_1m_ota
|
; default_envs = esp01_1m_ota
|
||||||
; default_envs = esp01_1m_full
|
; default_envs = esp01_1m_full
|
||||||
|
|||||||
@ -30,6 +30,7 @@
|
|||||||
#include "NpbWrapper.h"
|
#include "NpbWrapper.h"
|
||||||
#include "const.h"
|
#include "const.h"
|
||||||
|
|
||||||
|
#define USE_FASTLED // Use FastLED library to output pixel data
|
||||||
#define FASTLED_INTERNAL //remove annoying pragma messages
|
#define FASTLED_INTERNAL //remove annoying pragma messages
|
||||||
#include "FastLED.h"
|
#include "FastLED.h"
|
||||||
|
|
||||||
@ -708,7 +709,9 @@ const char JSON_mode_names[] PROGMEM = R"=====([
|
|||||||
|
|
||||||
const char JSON_palette_names[] PROGMEM = R"=====([
|
const char JSON_palette_names[] PROGMEM = R"=====([
|
||||||
"Default","* Random Cycle","* Color 1","* Colors 1&2","* Color Gradient","* Colors Only","Party","Cloud","Lava","Ocean",
|
"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",
|
"Forest","Rainbow","Rainbow Bands",
|
||||||
|
"Red White & Blue", "Bellingham Flag",
|
||||||
|
"Sunset","Rivendell","Breeze","Red & Blue","Yellowout","Analogous","Splash",
|
||||||
"Pastel","Sunset 2","Beech","Vintage","Departure","Landscape","Beach","Sherbet","Hult","Hult 64",
|
"Pastel","Sunset 2","Beech","Vintage","Departure","Landscape","Beach","Sherbet","Hult","Hult 64",
|
||||||
"Drywet","Jul","Grintage","Rewhi","Tertiary","Fire","Icefire","Cyane","Light Pink","Autumn",
|
"Drywet","Jul","Grintage","Rewhi","Tertiary","Fire","Icefire","Cyane","Light Pink","Autumn",
|
||||||
"Magenta","Magred","Yelmag","Yelblu","Orange & Teal","Tiamat","April Night","Orangery","C9","Sakura",
|
"Magenta","Magred","Yelmag","Yelblu","Orange & Teal","Tiamat","April Night","Orangery","C9","Sakura",
|
||||||
|
|||||||
@ -27,6 +27,12 @@
|
|||||||
#include "FX.h"
|
#include "FX.h"
|
||||||
#include "palettes.h"
|
#include "palettes.h"
|
||||||
|
|
||||||
|
#define BASE_PALETTE_COUNT 15
|
||||||
|
|
||||||
|
#ifdef USE_FASTLED
|
||||||
|
CRGB* leds;
|
||||||
|
#endif
|
||||||
|
|
||||||
//enable custom per-LED mapping. This can allow for better effects on matrices or special displays
|
//enable custom per-LED mapping. This can allow for better effects on matrices or special displays
|
||||||
//#define WLED_CUSTOM_LED_MAPPING
|
//#define WLED_CUSTOM_LED_MAPPING
|
||||||
|
|
||||||
@ -65,6 +71,9 @@ void WS2812FX::init(bool supportWhite, uint16_t countPixels, bool skipFirst)
|
|||||||
_segments[0].stop = _length;
|
_segments[0].stop = _length;
|
||||||
|
|
||||||
setBrightness(_brightness);
|
setBrightness(_brightness);
|
||||||
|
#ifdef USE_FASTLED
|
||||||
|
leds = (CRGB*)bus->GetPixels(); // Pointer to NeoPixelBus led array
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void WS2812FX::service() {
|
void WS2812FX::service() {
|
||||||
@ -284,7 +293,12 @@ void WS2812FX::show(void) {
|
|||||||
bus->SetBrightness(_brightness);
|
bus->SetBrightness(_brightness);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef USE_FASTLED
|
||||||
|
FastLED.show();
|
||||||
|
#else
|
||||||
bus->Show();
|
bus->Show();
|
||||||
|
#endif
|
||||||
|
|
||||||
_lastShow = millis();
|
_lastShow = millis();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -311,7 +325,7 @@ uint8_t WS2812FX::getModeCount()
|
|||||||
|
|
||||||
uint8_t WS2812FX::getPaletteCount()
|
uint8_t WS2812FX::getPaletteCount()
|
||||||
{
|
{
|
||||||
return 13 + GRADIENT_PALETTE_COUNT;
|
return BASE_PALETTE_COUNT + GRADIENT_PALETTE_COUNT;
|
||||||
}
|
}
|
||||||
|
|
||||||
//TODO transitions
|
//TODO transitions
|
||||||
@ -794,8 +808,12 @@ void WS2812FX::handle_palette(void)
|
|||||||
targetPalette = RainbowColors_p; break;
|
targetPalette = RainbowColors_p; break;
|
||||||
case 12: //Rainbow stripe colors
|
case 12: //Rainbow stripe colors
|
||||||
targetPalette = RainbowStripeColors_p; break;
|
targetPalette = RainbowStripeColors_p; break;
|
||||||
|
case 13: // Red, White, and Blue
|
||||||
|
targetPalette = RedWhiteBlue_p; break;
|
||||||
|
case 14: // Bellingham flag
|
||||||
|
targetPalette = BhamFlag_p; break;
|
||||||
default: //progmem palettes
|
default: //progmem palettes
|
||||||
load_gradient_palette(paletteIndex -13);
|
load_gradient_palette(paletteIndex - BASE_PALETTE_COUNT);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (singleSegmentMode && paletteFade) //only blend if just one segment uses FastLED mode
|
if (singleSegmentMode && paletteFade) //only blend if just one segment uses FastLED mode
|
||||||
|
|||||||
@ -6,7 +6,18 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
// Autogenerated from wled00/data/usermod.htm, do not edit!!
|
// Autogenerated from wled00/data/usermod.htm, do not edit!!
|
||||||
const char PAGE_usermod[] PROGMEM = R"=====(<!DOCTYPE html><html><body>No usermod custom web page set.</body></html>)=====";
|
//const char PAGE_usermod[] PROGMEM = R"=====(<!DOCTYPE html><html><body>No usermod custom web page set.</body></html>)=====";
|
||||||
|
const char PAGE_usermod[] PROGMEM = R"=====(<!DOCTYPE html>
|
||||||
|
<html><head><meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<title>User Playlists</title></head>
|
||||||
|
<body>
|
||||||
|
Select Playlist<br>
|
||||||
|
<select onchange="location = this.value;">
|
||||||
|
<option value="/win&U0=0">None</option>
|
||||||
|
<option value="/win&U0=1">Red White Blue</option>
|
||||||
|
<option value="/win&U0=2">Pride</option>
|
||||||
|
</select>
|
||||||
|
</body></html>)=====";
|
||||||
|
|
||||||
|
|
||||||
// Autogenerated from wled00/data/msg.htm, do not edit!!
|
// Autogenerated from wled00/data/msg.htm, do not edit!!
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
#include "wled.h"
|
|
||||||
/*
|
/*
|
||||||
* This v1 usermod file allows you to add own functionality to WLED more easily
|
* This v1 usermod file allows you to add own functionality to WLED more easily
|
||||||
* See: https://github.com/Aircoookie/WLED/wiki/Add-own-functionality
|
* See: https://github.com/Aircoookie/WLED/wiki/Add-own-functionality
|
||||||
@ -9,11 +8,233 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
//Use userVar0 and userVar1 (API calls &U0=,&U1=, uint16_t)
|
//Use userVar0 and userVar1 (API calls &U0=,&U1=, uint16_t)
|
||||||
|
#include "wled.h"
|
||||||
|
#include "FX.h"
|
||||||
|
|
||||||
|
//#define DEVELOPMENT
|
||||||
|
#ifdef USE_FASTLED
|
||||||
|
#define LED_TYPE WS2812
|
||||||
|
#define COLOR_ORDER RGB // strip is GRB, NeoPixelBus uses different order in memory
|
||||||
|
#define PIN_SEG_0 5 // 4 = D4 on ESP8266 NodeMCU - Compatible with WLED
|
||||||
|
#define PIN_SEG_1 1 // D1 on ESP8266 NodeMCU
|
||||||
|
|
||||||
|
extern CRGB* leds;// = (CRGB*)bus->GetPixels(); // Pointer to NeoPixelBus led array
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// Installation configuration
|
||||||
|
#ifdef DEVELOPMENT
|
||||||
|
#define NUM_LEDS_SEG_0 16
|
||||||
|
#define NUM_LEDS_SEG_1 15
|
||||||
|
#define NUM_SEGMENTS 2
|
||||||
|
#else
|
||||||
|
#define NUM_LEDS_SEG_0 419//420 // really 419, but use 420 for balanced mirror effects
|
||||||
|
#define NUM_LEDS_SEG_1 298
|
||||||
|
#define NUM_SEGMENTS 2
|
||||||
|
#endif
|
||||||
|
#define NUM_LEDS (NUM_LEDS_SEG_0 + NUM_LEDS_SEG_1)
|
||||||
|
#define ARRAY_SIZE(A) (sizeof(A) / sizeof((A)[0]))
|
||||||
|
|
||||||
|
enum palette_t {
|
||||||
|
P_Default = 0,
|
||||||
|
P_Random_Cycle,
|
||||||
|
P_Color_1,
|
||||||
|
P_Colors_1_2,
|
||||||
|
P_Color_Gradient,
|
||||||
|
P_Colors_Only,
|
||||||
|
P_Party,
|
||||||
|
P_Cloud,
|
||||||
|
P_Lava,
|
||||||
|
P_Ocean,
|
||||||
|
P_Forest,
|
||||||
|
P_Rainbow,
|
||||||
|
P_Rainbow_Bands,
|
||||||
|
P_RedWhiteBlue,
|
||||||
|
P_BellinghamFlag,
|
||||||
|
P_Sunset_Real, //13-00 Sunset // Really BASE_PALETTE_COUNT, not "13"
|
||||||
|
P_es_rivendell_15, //14-01 Rivendell
|
||||||
|
P_es_ocean_breeze_036, //15-02 Breeze
|
||||||
|
P_rgi_15, //16-03 Red & Blue
|
||||||
|
P_retro2_16, //17-04 Yellowout
|
||||||
|
P_Analogous_1, //18-05 Analogous
|
||||||
|
P_es_pinksplash_08, //19-06 Splash
|
||||||
|
P_Sunset_Yellow, //20-07 Pastel
|
||||||
|
P_Another_Sunset, //21-08 Sunset2
|
||||||
|
P_Beech, //22-09 Beech
|
||||||
|
P_es_vintage_01, //23-10 Vintage
|
||||||
|
P_departure, //24-11 Departure
|
||||||
|
P_es_landscape_64, //25-12 Landscape
|
||||||
|
P_es_landscape_33, //26-13 Beach
|
||||||
|
P_rainbowsherbet, //27-14 Sherbet
|
||||||
|
P_gr65_hult, //28-15 Hult
|
||||||
|
P_gr64_hult, //29-16 Hult64
|
||||||
|
P_GMT_drywet, //30-17 Drywet
|
||||||
|
P_ib_jul01, //31-18 Jul
|
||||||
|
P_es_vintage_57, //32-19 Grintage
|
||||||
|
P_ib15, //33-20 Rewhi
|
||||||
|
P_Tertiary_01, //34-21 Tertiary
|
||||||
|
P_lava, //35-22 Fire
|
||||||
|
P_fierce_ice, //36-23 Icefire
|
||||||
|
P_Colorfull, //37-24 Cyane
|
||||||
|
P_Pink_Purple, //38-25 Light Pink
|
||||||
|
P_es_autumn_19, //39-26 Autumn
|
||||||
|
P_BlacK_Blue_Magenta_White, //40-27 Magenta
|
||||||
|
P_BlacK_Magenta_Red, //41-28 Magred
|
||||||
|
P_BlacK_Red_Magenta_Yellow, //42-29 Yelmag
|
||||||
|
P_Blue_Cyan_Yellow, //43-30 Yelblu
|
||||||
|
P_Orange_Teal, //44-31 Orange & Teal
|
||||||
|
P_Tiamat, //45-32 Tiamat
|
||||||
|
P_April_Night, //46-33 April Night
|
||||||
|
P_Orangery, //47-34 Orangery
|
||||||
|
P_C9, //48-35 C9
|
||||||
|
P_Sakura, //49-36 Sakura
|
||||||
|
P_Aurora, //50-37 Aurora
|
||||||
|
P_Atlantica, //51-38 Atlantica
|
||||||
|
};
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
// Segment physical parameters
|
||||||
|
uint16_t startLED; // first LED of segment in leds[] - 0..NUM_LEDS-1
|
||||||
|
uint16_t numLEDs; // number of LEDS in segment - 1..?
|
||||||
|
uint8_t segmentNum; // segment number
|
||||||
|
} Segment;
|
||||||
|
|
||||||
|
// Define the properties for each effect
|
||||||
|
typedef struct {
|
||||||
|
uint8_t mode; // effect number
|
||||||
|
uint8_t palette; // palette number
|
||||||
|
uint8_t speed;
|
||||||
|
uint8_t intensity;
|
||||||
|
bool reverse; // effect moves in reverse
|
||||||
|
bool mirror; // effect moves from center of segment
|
||||||
|
uint32_t colors[NUM_COLORS]; // color[0] is foreground or primary color
|
||||||
|
int16_t time; // length of time in seconds to display effect
|
||||||
|
} Effect;
|
||||||
|
|
||||||
|
const Effect playList[][NUM_SEGMENTS] = {//RedWhiteBlueplayList[][NUM_SEGMENTS] = {
|
||||||
|
{ { FX_MODE_CHASE_COLOR, P_RedWhiteBlue, 128, 128, false, false, {RED, WHITE, BLUE}, 15 },
|
||||||
|
{ FX_MODE_CHASE_COLOR, P_RedWhiteBlue, 128, 128, false, false, {RED, WHITE, BLUE}, 15 } },
|
||||||
|
{ { FX_MODE_CHASE_COLOR, P_RedWhiteBlue, 128, 128, true, false, {RED, WHITE, BLUE}, 15 }, // reverse
|
||||||
|
{ FX_MODE_CHASE_COLOR, P_RedWhiteBlue, 128, 128, true, false, {RED, WHITE, BLUE}, 15 } },
|
||||||
|
{ { FX_MODE_CHASE_COLOR, P_RedWhiteBlue, 128, 128, false, false, {RED, WHITE, BLUE}, 15 },
|
||||||
|
{ FX_MODE_CHASE_COLOR, P_RedWhiteBlue, 128, 128, false, true, {RED, WHITE, BLUE}, 15 } }, // mirror
|
||||||
|
{ { FX_MODE_CHASE_COLOR, P_RedWhiteBlue, 128, 128, true, false, {RED, WHITE, BLUE}, 15 }, // reverse
|
||||||
|
{ FX_MODE_CHASE_COLOR, P_RedWhiteBlue, 128, 128, true, true, {RED, WHITE, BLUE}, 15 } }, // mirror
|
||||||
|
|
||||||
|
{ { FX_MODE_COLORTWINKLE, P_RedWhiteBlue, 128, 128, false, false, {RED, WHITE, BLUE}, 30 },
|
||||||
|
{ FX_MODE_COLORTWINKLE, P_RedWhiteBlue, 128, 128, false, false, {RED, WHITE, BLUE}, 30 } },
|
||||||
|
|
||||||
|
{ { FX_MODE_COLORWAVES, P_RedWhiteBlue, 32, 255, false, false, {RED, WHITE, BLUE}, 30 },
|
||||||
|
{ FX_MODE_COLORWAVES, P_RedWhiteBlue, 32, 255, false, false, {RED, WHITE, BLUE}, 30 } },
|
||||||
|
{ { FX_MODE_COLORWAVES, P_RedWhiteBlue, 32, 255, false, false, {RED, WHITE, BLUE}, 30 },
|
||||||
|
{ FX_MODE_COLORWAVES, P_RedWhiteBlue, 32, 255, false, true, {RED, WHITE, BLUE}, 30 } }, // mirror
|
||||||
|
|
||||||
|
{ { FX_MODE_DYNAMIC, P_RedWhiteBlue, 192, 128, false, false, {RED, WHITE, BLUE}, 30 },
|
||||||
|
{ FX_MODE_DYNAMIC, P_RedWhiteBlue, 192, 128, false, false, {RED, WHITE, BLUE}, 30 } },
|
||||||
|
|
||||||
|
{ { FX_MODE_STATIC_PATTERN, P_RedWhiteBlue, 128, 128, false, false, {RED, WHITE, BLUE}, 30 },
|
||||||
|
{ FX_MODE_STATIC_PATTERN, P_RedWhiteBlue, 128, 128, false, false, {RED, WHITE, BLUE}, 30 } },
|
||||||
|
|
||||||
|
{ { FX_MODE_FILLNOISE8, P_RedWhiteBlue, 0, 128, false, false, {RED, WHITE, BLUE}, 30 },
|
||||||
|
{ FX_MODE_FILLNOISE8, P_RedWhiteBlue, 0, 128, false, false, {RED, WHITE, BLUE}, 30 } },
|
||||||
|
|
||||||
|
{ { FX_MODE_NOISE16_2, P_RedWhiteBlue, 64, 128, false, false, {RED, WHITE, BLUE}, 30 },
|
||||||
|
{ FX_MODE_NOISE16_2, P_RedWhiteBlue, 64, 128, false, false, {RED, WHITE, BLUE}, 30 } },
|
||||||
|
{ { FX_MODE_NOISE16_2, P_RedWhiteBlue, 64, 128, false, false, {RED, WHITE, BLUE}, 30 },
|
||||||
|
{ FX_MODE_NOISE16_2, P_RedWhiteBlue, 64, 128, false, true, {RED, WHITE, BLUE}, 30 } }, // mirror
|
||||||
|
|
||||||
|
{ { FX_MODE_NOISE16_3, P_RedWhiteBlue, 64, 128, false, false, {RED, WHITE, BLUE}, 30 },
|
||||||
|
{ FX_MODE_NOISE16_3, P_RedWhiteBlue, 64, 128, false, false, {RED, WHITE, BLUE}, 30 } },
|
||||||
|
|
||||||
|
{ { FX_MODE_NOISE16_4, P_RedWhiteBlue, 32, 128, false, false, {RED, WHITE, BLUE}, 30 },
|
||||||
|
{ FX_MODE_NOISE16_4, P_RedWhiteBlue, 32, 128, false, false, {RED, WHITE, BLUE}, 30 } },
|
||||||
|
|
||||||
|
{ { FX_MODE_TRI_STATIC_PATTERN, P_RedWhiteBlue, 128, 128, false, false, {RED, WHITE, BLUE}, 30 },
|
||||||
|
{ FX_MODE_TRI_STATIC_PATTERN, P_RedWhiteBlue, 128, 128, false, false, {RED, WHITE, BLUE}, 30 } },
|
||||||
|
|
||||||
|
{ { FX_MODE_PALETTE, P_RedWhiteBlue, 96, 128, false, false, {RED, WHITE, BLUE}, 30 },
|
||||||
|
{ FX_MODE_PALETTE, P_RedWhiteBlue, 96, 128, false, false, {RED, WHITE, BLUE}, 30 } }, // ? mirror
|
||||||
|
|
||||||
|
{ { FX_MODE_RAINBOW_CYCLE, P_RedWhiteBlue, 64, 128, false, false, {RED, WHITE, BLUE}, 30 },
|
||||||
|
{ FX_MODE_RAINBOW_CYCLE, P_RedWhiteBlue, 64, 128, false, false, {RED, WHITE, BLUE}, 30 } },
|
||||||
|
{ { FX_MODE_RAINBOW_CYCLE, P_RedWhiteBlue, 64, 128, false, false, {RED, WHITE, BLUE}, 30 },
|
||||||
|
{ FX_MODE_RAINBOW_CYCLE, P_RedWhiteBlue, 64, 128, false, true, {RED, WHITE, BLUE}, 30 } }, // mirror
|
||||||
|
|
||||||
|
{ { FX_MODE_TRICOLOR_CHASE, P_RedWhiteBlue, 192, 128, false, false, {RED, WHITE, BLUE}, 30 },
|
||||||
|
{ FX_MODE_TRICOLOR_CHASE, P_RedWhiteBlue, 192, 128, false, false, {RED, WHITE, BLUE}, 30 } }, // ? mirror
|
||||||
|
|
||||||
|
{ { FX_MODE_TWINKLECAT, P_RedWhiteBlue, 128, 255, false, false, {RED, WHITE, BLUE}, 30 },
|
||||||
|
{ FX_MODE_TWINKLECAT, P_RedWhiteBlue, 128, 255, false, false, {RED, WHITE, BLUE}, 30 } },
|
||||||
|
|
||||||
|
{ { FX_MODE_SPARKLE, P_RedWhiteBlue, 192, 128, false, false, {RED, WHITE, BLUE}, 30 },
|
||||||
|
{ FX_MODE_SPARKLE, P_RedWhiteBlue, 192, 128, false, false, {RED, WHITE, BLUE}, 30 } },
|
||||||
|
};
|
||||||
|
|
||||||
|
const Effect PrideplayList[][NUM_SEGMENTS] = {
|
||||||
|
{ { FX_MODE_PALETTE, P_Rainbow, 96, 128, false, false, {RED, WHITE, BLUE}, 30 },
|
||||||
|
{ FX_MODE_PALETTE, P_Rainbow, 96, 128, false, false, {RED, WHITE, BLUE}, 30 } }, // ? mirror
|
||||||
|
{ { FX_MODE_COLORTWINKLE, P_Rainbow, 128, 128, false, false, {RED, WHITE, BLUE}, 30 },
|
||||||
|
{ FX_MODE_COLORTWINKLE, P_Rainbow, 128, 128, false, false, {RED, WHITE, BLUE}, 30 } },
|
||||||
|
{ { FX_MODE_RAINBOW_CYCLE, P_Rainbow, 64, 128, false, false, {RED, WHITE, BLUE}, 30 },
|
||||||
|
{ FX_MODE_RAINBOW_CYCLE, P_Rainbow, 64, 128, false, false, {RED, WHITE, BLUE}, 30 } },
|
||||||
|
{ { FX_MODE_RAINBOW_CYCLE, P_Rainbow, 64, 128, false, false, {RED, WHITE, BLUE}, 30 },
|
||||||
|
{ FX_MODE_RAINBOW_CYCLE, P_Rainbow, 64, 128, false, true, {RED, WHITE, BLUE}, 30 } }, // mirror
|
||||||
|
{ { FX_MODE_TWINKLECAT, P_Rainbow, 128, 255, false, false, {RED, WHITE, BLUE}, 30 },
|
||||||
|
{ FX_MODE_TWINKLECAT, P_Rainbow, 128, 255, false, false, {RED, WHITE, BLUE}, 30 } },
|
||||||
|
{ { FX_MODE_NOISE16_2, P_Rainbow, 64, 128, false, false, {RED, WHITE, BLUE}, 30 },
|
||||||
|
{ FX_MODE_NOISE16_2, P_Rainbow, 64, 128, false, false, {RED, WHITE, BLUE}, 30 } },
|
||||||
|
{ { FX_MODE_NOISE16_2, P_Rainbow, 64, 128, false, false, {RED, WHITE, BLUE}, 30 },
|
||||||
|
{ FX_MODE_NOISE16_2, P_Rainbow, 64, 128, false, true, {RED, WHITE, BLUE}, 30 } }, // mirror
|
||||||
|
};
|
||||||
|
|
||||||
|
//const Effect[][] ListplayList[] = {
|
||||||
|
// RedWhiteBlueplayList, PrideplayList
|
||||||
|
//};
|
||||||
|
|
||||||
|
/*
|
||||||
|
const Effect playList[][NUM_SEGMENTS] = {
|
||||||
|
{ {FX_MODE_STATIC, P_Default, 128, 128, false, false, {RED, GREEN, BLUE}, 30 },
|
||||||
|
{FX_MODE_STATIC, P_Default, 128, 128, false, false, {GREEN, RED, BLUE}, 30 } },
|
||||||
|
{ {FX_MODE_RAINBOW, P_Color_Gradient, 128, 128, false, false, {RED, WHITE, BLUE}, 30 },
|
||||||
|
{FX_MODE_RAINBOW, P_Default, 255, 128, true, false, {WHITE, RED, BLUE}, 30 } },
|
||||||
|
};
|
||||||
|
*/
|
||||||
|
|
||||||
|
Segment segments[NUM_SEGMENTS];
|
||||||
|
//Effect [][NUM_SEGMENTS] playList;
|
||||||
|
|
||||||
//gets called once at boot. Do all initialization that doesn't depend on network here
|
//gets called once at boot. Do all initialization that doesn't depend on network here
|
||||||
void userSetup()
|
void userSetup()
|
||||||
{
|
{
|
||||||
|
// Force playlist to run on reboot
|
||||||
|
// should read from EEPROM
|
||||||
|
// userVar0 = 1;
|
||||||
|
|
||||||
|
// Initialize playlist segment configuration
|
||||||
|
segments[0].startLED = 0;
|
||||||
|
segments[0].numLEDs = NUM_LEDS_SEG_0;
|
||||||
|
segments[0].segmentNum = 0;
|
||||||
|
#if NUM_SEGMENTS > 1
|
||||||
|
segments[1].startLED = segments[0].numLEDs;
|
||||||
|
segments[1].numLEDs = NUM_LEDS_SEG_1;
|
||||||
|
segments[1].segmentNum = 1;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
if (ledCount < NUM_LEDS) {
|
||||||
|
ledCount = NUM_LEDS;
|
||||||
|
strip.init(useRGBW, ledCount, skipFirstLed);
|
||||||
|
}
|
||||||
|
|
||||||
|
for (byte s = 0; s < NUM_SEGMENTS; s++)
|
||||||
|
strip.setSegment(s, segments[s].startLED, segments[s].startLED + segments[s].numLEDs);
|
||||||
|
|
||||||
|
#ifdef USE_FASTLED
|
||||||
|
FastLED.addLeds<LED_TYPE,PIN_SEG_0,COLOR_ORDER>(leds, segments[0].startLED, segments[0].numLEDs);
|
||||||
|
#if NUM_SEGMENTS > 1
|
||||||
|
FastLED.addLeds<LED_TYPE,PIN_SEG_1,COLOR_ORDER>(leds, segments[1].startLED, segments[1].numLEDs);
|
||||||
|
#endif
|
||||||
|
FastLED.setCorrection(UncorrectedColor);//TypicalLEDStrip);
|
||||||
|
FastLED.setDither(DISABLE_DITHER);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
//gets called every time WiFi is (re-)connected. Initialize own network interfaces here
|
//gets called every time WiFi is (re-)connected. Initialize own network interfaces here
|
||||||
@ -25,5 +246,89 @@ void userConnected()
|
|||||||
//loop. You can use "if (WLED_CONNECTED)" to check for successful connection
|
//loop. You can use "if (WLED_CONNECTED)" to check for successful connection
|
||||||
void userLoop()
|
void userLoop()
|
||||||
{
|
{
|
||||||
|
static int16_t playListIndex = -1;
|
||||||
|
static uint32_t endTime = 0; // time when effect should end and advance to next effect
|
||||||
|
|
||||||
|
if (userVar0 == 0) // No user playlist selected
|
||||||
|
return;
|
||||||
|
|
||||||
|
uint32_t now = millis();
|
||||||
|
if (now < endTime)
|
||||||
|
return;
|
||||||
|
|
||||||
|
// playList = RedWhiteBlueplayList;
|
||||||
|
playListIndex++; // advance to next playlist entry
|
||||||
|
if (playListIndex == ARRAY_SIZE(playList))
|
||||||
|
playListIndex = 0;
|
||||||
|
|
||||||
|
DEBUG_PRINT(now);
|
||||||
|
DEBUG_PRINT(" >>>---playlist update--->>> ");
|
||||||
|
DEBUG_PRINTLN(playListIndex);
|
||||||
|
|
||||||
|
for (byte s = 0; s < NUM_SEGMENTS; s++) {
|
||||||
|
WS2812FX::Segment& seg = strip.getSegment(s);
|
||||||
|
seg.setOption(SEG_OPTION_ON, true);
|
||||||
|
seg.setOption(SEG_OPTION_SELECTED, true);
|
||||||
|
seg.setOption(SEG_OPTION_REVERSED, playList[playListIndex][s].reverse);
|
||||||
|
seg.setOption(SEG_OPTION_MIRROR, playList[playListIndex][s].mirror);
|
||||||
|
if (s == strip.getMainSegmentId()) { // special case for main segment (usually 0)
|
||||||
|
effectCurrent = playList[playListIndex][s].mode;
|
||||||
|
effectPalette = playList[playListIndex][s].palette;
|
||||||
|
effectSpeed = playList[playListIndex][s].speed;
|
||||||
|
effectIntensity = playList[playListIndex][s].intensity;
|
||||||
|
col[0] = playList[playListIndex][s].colors[0] >> 16 & 0xff;
|
||||||
|
col[1] = playList[playListIndex][s].colors[0] >> 8 & 0xff;
|
||||||
|
col[2] = playList[playListIndex][s].colors[0] & 0xff;
|
||||||
|
colSec[0] = playList[playListIndex][s].colors[1] >> 16 & 0xff;
|
||||||
|
colSec[1] = playList[playListIndex][s].colors[1] >> 8 & 0xff;
|
||||||
|
colSec[2] = playList[playListIndex][s].colors[1] & 0xff;
|
||||||
|
strip.setColor(2, playList[playListIndex][s].colors[2]);
|
||||||
|
} else {
|
||||||
|
seg.mode = playList[playListIndex][s].mode;
|
||||||
|
// ??? strip.setMode(s, 0); // force runtime reset
|
||||||
|
strip.setMode(s, seg.mode);
|
||||||
|
seg.palette = playList[playListIndex][s].palette;
|
||||||
|
seg.speed = playList[playListIndex][s].speed;
|
||||||
|
seg.intensity = playList[playListIndex][s].intensity;
|
||||||
|
for (byte c = 0; c < NUM_COLORS; c++)
|
||||||
|
seg.colors[c] = playList[playListIndex][s].colors[c];
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
colorUpdated(NOTIFIER_CALL_MODE_DIRECT_CHANGE);
|
||||||
|
endTime = now + (uint32_t)1000 * playList[playListIndex][0].time;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
led.cpp
|
||||||
|
Line 44: strip.setBrightness(val);
|
||||||
|
Line 51: strip.setColor(0, colT[0], colT[1], colT[2], colT[3]);
|
||||||
|
Line 52: strip.setColor(1, colSecT[0], colSecT[1], colSecT[2], colSecT[3]);
|
||||||
|
Line 92: bool fxChanged = strip.setEffectConfig(effectCurrent, effectSpeed, effectIntensity, effectPalette);
|
||||||
|
Line 154: strip.setTransitionMode(true);
|
||||||
|
Line 195: strip.setTransitionMode(false);
|
||||||
|
|
||||||
|
effectCurrent = EEPROM.read(i+10);
|
||||||
|
effectSpeed = EEPROM.read(i+11);
|
||||||
|
effectIntensity = EEPROM.read(i+16);
|
||||||
|
effectPalette = EEPROM.read(i+17);
|
||||||
|
|
||||||
|
json.cpp
|
||||||
|
WS2812FX::Segment& seg = strip.getSegment(id);
|
||||||
|
seg.setOption(SEG_OPTION_ON, elem["on"] | seg.getOption(SEG_OPTION_ON));
|
||||||
|
seg.setOption(SEG_OPTION_SELECTED, elem["sel"] | seg.getOption(SEG_OPTION_SELECTED));
|
||||||
|
seg.setOption(SEG_OPTION_REVERSED, elem["rev"] | seg.getOption(SEG_OPTION_REVERSED));
|
||||||
|
if (fx != seg.mode && fx < strip.getModeCount())
|
||||||
|
strip.setMode(id, fx);
|
||||||
|
seg.speed = elem["sx"] | seg.speed;
|
||||||
|
seg.intensity = elem["ix"] | seg.intensity;
|
||||||
|
seg.palette = elem["pal"] | seg.palette;
|
||||||
|
colorUpdated(noNotification ? NOTIFIER_CALL_MODE_NO_NOTIFY : NOTIFIER_CALL_MODE_DIRECT_CHANGE);
|
||||||
|
|
||||||
|
// WS2812FX::Segment& seg = strip.getSegment(0);
|
||||||
|
uint16_t grp = strip.getSegment(0).grouping;//seg.grouping;
|
||||||
|
uint16_t spc = strip.getSegment(0).spacing;//seg.spacing;
|
||||||
|
// strip.setSegment(id, start, stop, grp, spc);
|
||||||
|
strip.setSegment(0, 0, 100, grp, spc);
|
||||||
|
strip.setSegment(1, 100, 150, grp, spc);
|
||||||
|
|
||||||
|
*/
|
||||||
@ -284,6 +284,10 @@ void saveSettingsToEEPROM()
|
|||||||
} // last used: 2549. maybe leave a few bytes for future expansion and go on with 2600 kthxbye.
|
} // last used: 2549. maybe leave a few bytes for future expansion and go on with 2600 kthxbye.
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
//Usermod memory
|
||||||
|
//2551 - 2559 reserved for Usermods, usable by default
|
||||||
|
EEPROM.write(2551, userVar0);
|
||||||
|
|
||||||
commit();
|
commit();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -585,6 +589,8 @@ void loadSettingsFromEEPROM(bool first)
|
|||||||
|
|
||||||
//Usermod memory
|
//Usermod memory
|
||||||
//2551 - 2559 reserved for Usermods, usable by default
|
//2551 - 2559 reserved for Usermods, usable by default
|
||||||
|
userVar0 = EEPROM.read(2551);
|
||||||
|
|
||||||
//2560 - 2943 usable, NOT reserved (need to increase EEPSIZE accordingly, new WLED core features may override this section)
|
//2560 - 2943 usable, NOT reserved (need to increase EEPSIZE accordingly, new WLED core features may override this section)
|
||||||
//2944 - 3071 reserved for Usermods (need to increase EEPSIZE to 3072 in const.h)
|
//2944 - 3071 reserved for Usermods (need to increase EEPSIZE to 3072 in const.h)
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user