simongehrig/McLighting
1
0
Fork 0
Code Issues 3 Pull Requests Projects Releases Wiki Activity

Code Cleanup

Browse Source 
Code Cleanup
This commit is contained in:
BPoH_Voodoo
2019-02-17 12:16:38 +01:00
parent 5d51311cf3
commit 98c486606b
17 changed files with 399 additions and 3353 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Arduino/McLighting/McLighting.ino
+60 -68
View File
@@ -1,5 +1,6 @@
#include "definitions.h" #include "definitions.h"
#include "version.h" #include "version.h"
// *************************************************************************** // ***************************************************************************
// Load libraries for: WebServer / WiFiManager / WebSockets // Load libraries for: WebServer / WiFiManager / WebSockets
// *************************************************************************** // ***************************************************************************
@@ -73,7 +74,6 @@
ESPAsyncE131 e131(END_UNIVERSE - START_UNIVERSE + 1); ESPAsyncE131 e131(END_UNIVERSE - START_UNIVERSE + 1);
#endif #endif
// *************************************************************************** // ***************************************************************************
// Instanciate HTTP(80) / WebSockets(81) Server // Instanciate HTTP(80) / WebSockets(81) Server
// *************************************************************************** // ***************************************************************************
@@ -88,8 +88,8 @@ ESP8266HTTPUpdateServer httpUpdater;
// *************************************************************************** // ***************************************************************************
// Load libraries / Instanciate WS2812FX library // Load libraries / Instanciate WS2812FX library
// *************************************************************************** // ***************************************************************************
// https://github.com/kitesurfer1404/WS2812FX
#include "WS2812FX.h" #include <WS2812FX.h> // https://github.com/kitesurfer1404/WS2812FX
#ifdef RGBW #ifdef RGBW
WS2812FX strip = WS2812FX(NUMLEDS, PIN, NEO_GRBW + NEO_KHZ800); WS2812FX strip = WS2812FX(NUMLEDS, PIN, NEO_GRBW + NEO_KHZ800);
@@ -688,9 +688,6 @@ DBG_OUTPUT_PORT.println("Starting....");
stateOn = true; stateOn = true;
if(!ha_send_data.active()) ha_send_data.once(5, tickerSendState); if(!ha_send_data.active()) ha_send_data.once(5, tickerSendState);
#endif #endif
#ifdef ENABLE_STATE_SAVE_SPIFFS
if(!spiffs_save_state.active()) spiffs_save_state.once(3, tickerSpiffsSaveState);
#endif
getStatusJSON(); getStatusJSON();
}); });
@@ -703,10 +700,8 @@ DBG_OUTPUT_PORT.println("Starting....");
}); });
server.on("/set_speed", []() { server.on("/set_speed", []() {
if (server.arg("d").toInt() >= 0) { getArgs();
ws2812fx_speed = server.arg("d").toInt(); mode = SETSPEED;
ws2812fx_speed = constrain(ws2812fx_speed, 0, 255);
strip.setSpeed(convertSpeed(ws2812fx_speed));
#ifdef ENABLE_MQTT #ifdef ENABLE_MQTT
mqtt_client.publish(mqtt_outtopic, String(String("OK ?") + String(ws2812fx_speed)).c_str()); mqtt_client.publish(mqtt_outtopic, String(String("OK ?") + String(ws2812fx_speed)).c_str());
#endif #endif
@@ -716,8 +711,6 @@ DBG_OUTPUT_PORT.println("Starting....");
#ifdef ENABLE_HOMEASSISTANT #ifdef ENABLE_HOMEASSISTANT
if(!ha_send_data.active()) ha_send_data.once(5, tickerSendState); if(!ha_send_data.active()) ha_send_data.once(5, tickerSendState);
#endif #endif
}
getStatusJSON(); getStatusJSON();
}); });
@@ -764,16 +757,13 @@ DBG_OUTPUT_PORT.println("Starting....");
#ifdef ENABLE_HOMEASSISTANT #ifdef ENABLE_HOMEASSISTANT
stateOn = false; stateOn = false;
#endif #endif
#ifdef ENABLE_STATE_SAVE_SPIFFS
if(!spiffs_save_state.active()) spiffs_save_state.once(3, tickerSpiffsSaveState);
#endif
}); });
server.on("/auto", []() { server.on("/auto", []() {
#ifdef ENABLE_TV #ifdef ENABLE_TV
exit_func = true; exit_func = true;
#endif #endif
mode = AUTO; handleAutoStart();
getArgs(); getArgs();
getStatusJSON(); getStatusJSON();
#ifdef ENABLE_MQTT #ifdef ENABLE_MQTT
@@ -785,9 +775,6 @@ DBG_OUTPUT_PORT.println("Starting....");
#ifdef ENABLE_HOMEASSISTANT #ifdef ENABLE_HOMEASSISTANT
stateOn = false; stateOn = false;
#endif #endif
#ifdef ENABLE_STATE_SAVE_SPIFFS
if(!spiffs_save_state.active()) spiffs_save_state.once(3, tickerSpiffsSaveState);
#endif
}); });
server.on("/all", []() { server.on("/all", []() {
@@ -808,9 +795,6 @@ DBG_OUTPUT_PORT.println("Starting....");
#ifdef ENABLE_HOMEASSISTANT #ifdef ENABLE_HOMEASSISTANT
stateOn = true; stateOn = true;
#endif #endif
#ifdef ENABLE_STATE_SAVE_SPIFFS
if(!spiffs_save_state.active()) spiffs_save_state.once(3, tickerSpiffsSaveState);
#endif
}); });
#ifdef ENABLE_LEGACY_ANIMATIONS #ifdef ENABLE_LEGACY_ANIMATIONS
@@ -830,9 +814,6 @@ DBG_OUTPUT_PORT.println("Starting....");
#ifdef ENABLE_HOMEASSISTANT #ifdef ENABLE_HOMEASSISTANT
stateOn = true; stateOn = true;
#endif #endif
#ifdef ENABLE_STATE_SAVE_SPIFFS
if(!spiffs_save_state.active()) spiffs_save_state.once(3, tickerSpiffsSaveState);
#endif
}); });
server.on("/rainbow", []() { server.on("/rainbow", []() {
@@ -851,9 +832,6 @@ DBG_OUTPUT_PORT.println("Starting....");
#ifdef ENABLE_HOMEASSISTANT #ifdef ENABLE_HOMEASSISTANT
stateOn = true; stateOn = true;
#endif #endif
#ifdef ENABLE_STATE_SAVE_SPIFFS
if(!spiffs_save_state.active()) spiffs_save_state.once(3, tickerSpiffsSaveState);
#endif
}); });
server.on("/rainbowCycle", []() { server.on("/rainbowCycle", []() {
@@ -872,9 +850,6 @@ DBG_OUTPUT_PORT.println("Starting....");
#ifdef ENABLE_HOMEASSISTANT #ifdef ENABLE_HOMEASSISTANT
stateOn = true; stateOn = true;
#endif #endif
#ifdef ENABLE_STATE_SAVE_SPIFFS
if(!spiffs_save_state.active()) spiffs_save_state.once(3, tickerSpiffsSaveState);
#endif
}); });
server.on("/theaterchase", []() { server.on("/theaterchase", []() {
@@ -893,9 +868,6 @@ DBG_OUTPUT_PORT.println("Starting....");
#ifdef ENABLE_HOMEASSISTANT #ifdef ENABLE_HOMEASSISTANT
stateOn = true; stateOn = true;
#endif #endif
#ifdef ENABLE_STATE_SAVE_SPIFFS
if(!spiffs_save_state.active()) spiffs_save_state.once(3, tickerSpiffsSaveState);
#endif
}); });
server.on("/twinkleRandom", []() { server.on("/twinkleRandom", []() {
@@ -914,9 +886,6 @@ DBG_OUTPUT_PORT.println("Starting....");
#ifdef ENABLE_HOMEASSISTANT #ifdef ENABLE_HOMEASSISTANT
stateOn = true; stateOn = true;
#endif #endif
#ifdef ENABLE_STATE_SAVE_SPIFFS
if(!spiffs_save_state.active()) spiffs_save_state.once(3, tickerSpiffsSaveState);
#endif
}); });
server.on("/theaterchaseRainbow", []() { server.on("/theaterchaseRainbow", []() {
@@ -935,9 +904,6 @@ DBG_OUTPUT_PORT.println("Starting....");
#ifdef ENABLE_HOMEASSISTANT #ifdef ENABLE_HOMEASSISTANT
stateOn = true; stateOn = true;
#endif #endif
#ifdef ENABLE_STATE_SAVE_SPIFFS
if(!spiffs_save_state.active()) spiffs_save_state.once(3, tickerSpiffsSaveState);
#endif
}); });
#endif #endif
@@ -957,9 +923,6 @@ DBG_OUTPUT_PORT.println("Starting....");
#ifdef ENABLE_HOMEASSISTANT #ifdef ENABLE_HOMEASSISTANT
stateOn = true; stateOn = true;
#endif #endif
#ifdef ENABLE_STATE_SAVE_SPIFFS
if(!spiffs_save_state.active()) spiffs_save_state.once(3, tickerSpiffsSaveState);
#endif
}); });
#endif #endif
@@ -978,9 +941,6 @@ DBG_OUTPUT_PORT.println("Starting....");
#ifdef ENABLE_HOMEASSISTANT #ifdef ENABLE_HOMEASSISTANT
stateOn = true; stateOn = true;
#endif #endif
#ifdef ENABLE_STATE_SAVE_SPIFFS
if(!spiffs_save_state.active()) spiffs_save_state.once(3, tickerSpiffsSaveState);
#endif
}); });
#endif #endif
@@ -1003,9 +963,6 @@ DBG_OUTPUT_PORT.println("Starting....");
stateOn = true; stateOn = true;
if(!ha_send_data.active()) ha_send_data.once(5, tickerSendState); if(!ha_send_data.active()) ha_send_data.once(5, tickerSendState);
#endif #endif
#ifdef ENABLE_STATE_SAVE_SPIFFS
if(!spiffs_save_state.active()) spiffs_save_state.once(3, tickerSpiffsSaveState);
#endif
}); });
#ifdef HTTP_OTA #ifdef HTTP_OTA
@@ -1023,9 +980,9 @@ DBG_OUTPUT_PORT.println("Starting....");
// Choose one to begin listening for E1.31 data // Choose one to begin listening for E1.31 data
// if (e131.begin(E131_UNICAST)) // Listen via Unicast // if (e131.begin(E131_UNICAST)) // Listen via Unicast
if (e131.begin(E131_MULTICAST, START_UNIVERSE, END_UNIVERSE)) // Listen via Multicast if (e131.begin(E131_MULTICAST, START_UNIVERSE, END_UNIVERSE)) // Listen via Multicast
Serial.println(F("Listening for data...")); DBG_OUTPUT_PORT.println(F("Listening for data..."));
else else
Serial.println(F("*** e131.begin failed ***")); DBG_OUTPUT_PORT.println(F("*** e131.begin failed ***"));
#endif #endif
#ifdef ENABLE_STATE_SAVE_SPIFFS #ifdef ENABLE_STATE_SAVE_SPIFFS
@@ -1097,6 +1054,31 @@ void loop() {
#endif #endif
// Simple statemachine that handles the different modes // Simple statemachine that handles the different modes
if (mode == OFF) {
if(strip.isRunning()) strip.stop(); //should clear memory
#ifdef ENABLE_STATE_SAVE_SPIFFS
if(!spiffs_save_state.active()) spiffs_save_state.once(3, tickerSpiffsSaveState);
#endif
}
#ifdef ENABLE_TV
if (mode == TV) {
#ifdef ENABLE_STATE_SAVE_SPIFFS
if(!spiffs_save_state.active()) spiffs_save_state.once(3, tickerSpiffsSaveState);
#endif
if(!strip.isRunning()) strip.start();
tv();
}
#endif
#ifdef ENABLE_E131
if (mode == E131) {
#ifdef ENABLE_STATE_SAVE_SPIFFS
if(!spiffs_save_state.active()) spiffs_save_state.once(3, tickerSpiffsSaveState);
#endif
handleE131();
}
#endif
if (mode == SET_MODE) { if (mode == SET_MODE) {
DBG_OUTPUT_PORT.printf("SET_MODE: %d %d\n", ws2812fx_mode, mode); DBG_OUTPUT_PORT.printf("SET_MODE: %d %d\n", ws2812fx_mode, mode);
strip.setMode(ws2812fx_mode); strip.setMode(ws2812fx_mode);
@@ -1104,24 +1086,29 @@ void loop() {
prevmode = SET_MODE; prevmode = SET_MODE;
mode = SETCOLOR; mode = SETCOLOR;
} }
if (mode == OFF) {
if(strip.isRunning()) strip.stop(); //should clear memory
// mode = HOLD;
}
if (mode == SETCOLOR) { if (mode == SETCOLOR) {
strip.setColor(main_color.red, main_color.green, main_color.blue, main_color.white); strip.setColor(main_color.red, main_color.green, main_color.blue, main_color.white);
mode = (prevmode == SET_MODE) ? SETSPEED : prevmode; mode = (prevmode == SET_MODE) ? SETSPEED : prevmode;
if (mode == HOLD) strip.trigger(); if (mode == HOLD) strip.trigger();
#ifdef ENABLE_STATE_SAVE_SPIFFS
if(!spiffs_save_state.active()) spiffs_save_state.once(3, tickerSpiffsSaveState);
#endif
} }
if (mode == SETSPEED) { if (mode == SETSPEED) {
strip.setSpeed(convertSpeed(ws2812fx_speed)); strip.setSpeed(convertSpeed(ws2812fx_speed));
mode = (prevmode == SET_MODE) ? BRIGHTNESS : prevmode; mode = (prevmode == SET_MODE) ? BRIGHTNESS : prevmode;
if (mode == HOLD) strip.trigger(); if (mode == HOLD) strip.trigger();
#ifdef ENABLE_STATE_SAVE_SPIFFS
if(!spiffs_save_state.active()) spiffs_save_state.once(3, tickerSpiffsSaveState);
#endif
} }
if (mode == BRIGHTNESS) { if (mode == BRIGHTNESS) {
strip.setBrightness(brightness); strip.setBrightness(brightness);
mode = (prevmode == SET_MODE) ? HOLD : prevmode; mode = (prevmode == SET_MODE) ? HOLD : prevmode;
if (mode == HOLD) strip.trigger(); if (mode == HOLD) strip.trigger();
#ifdef ENABLE_STATE_SAVE_SPIFFS
if(!spiffs_save_state.active()) spiffs_save_state.once(3, tickerSpiffsSaveState);
#endif
} }
#ifdef ENABLE_LEGACY_ANIMATIONS #ifdef ENABLE_LEGACY_ANIMATIONS
if (mode == WIPE) { if (mode == WIPE) {
@@ -1129,59 +1116,64 @@ void loop() {
strip.setMode(FX_MODE_COLOR_WIPE); strip.setMode(FX_MODE_COLOR_WIPE);
strip.trigger(); strip.trigger();
mode = HOLD; mode = HOLD;
#ifdef ENABLE_STATE_SAVE_SPIFFS
if(!spiffs_save_state.active()) spiffs_save_state.once(3, tickerSpiffsSaveState);
#endif
} }
if (mode == RAINBOW) { if (mode == RAINBOW) {
strip.setMode(FX_MODE_RAINBOW); strip.setMode(FX_MODE_RAINBOW);
strip.trigger(); strip.trigger();
mode = HOLD; mode = HOLD;
#ifdef ENABLE_STATE_SAVE_SPIFFS
if(!spiffs_save_state.active()) spiffs_save_state.once(3, tickerSpiffsSaveState);
#endif
} }
if (mode == RAINBOWCYCLE) { if (mode == RAINBOWCYCLE) {
strip.setMode(FX_MODE_RAINBOW_CYCLE); strip.setMode(FX_MODE_RAINBOW_CYCLE);
strip.trigger(); strip.trigger();
mode = HOLD; mode = HOLD;
#ifdef ENABLE_STATE_SAVE_SPIFFS
if(!spiffs_save_state.active()) spiffs_save_state.once(3, tickerSpiffsSaveState);
#endif
} }
if (mode == THEATERCHASE) { if (mode == THEATERCHASE) {
//strip.setColor(main_color.red, main_color.green, main_color.blue, main_color.white); //strip.setColor(main_color.red, main_color.green, main_color.blue, main_color.white);
strip.setMode(FX_MODE_THEATER_CHASE); strip.setMode(FX_MODE_THEATER_CHASE);
strip.trigger(); strip.trigger();
mode = HOLD; mode = HOLD;
#ifdef ENABLE_STATE_SAVE_SPIFFS
if(!spiffs_save_state.active()) spiffs_save_state.once(3, tickerSpiffsSaveState);
#endif
} }
if (mode == TWINKLERANDOM) { if (mode == TWINKLERANDOM) {
//strip.setColor(main_color.red, main_color.green, main_color.blue, main_color.white); //strip.setColor(main_color.red, main_color.green, main_color.blue, main_color.white);
strip.setMode(FX_MODE_TWINKLE_RANDOM); strip.setMode(FX_MODE_TWINKLE_RANDOM);
strip.trigger(); strip.trigger();
mode = HOLD; mode = HOLD;
#ifdef ENABLE_STATE_SAVE_SPIFFS
if(!spiffs_save_state.active()) spiffs_save_state.once(3, tickerSpiffsSaveState);
#endif
} }
if (mode == THEATERCHASERAINBOW) { if (mode == THEATERCHASERAINBOW) {
strip.setMode(FX_MODE_THEATER_CHASE_RAINBOW); strip.setMode(FX_MODE_THEATER_CHASE_RAINBOW);
strip.trigger(); strip.trigger();
mode = HOLD; mode = HOLD;
} #ifdef ENABLE_STATE_SAVE_SPIFFS
if(!spiffs_save_state.active()) spiffs_save_state.once(3, tickerSpiffsSaveState);
#endif #endif
#ifdef ENABLE_E131
if (mode == E131) {
handleE131();
} }
#endif #endif
if (mode == HOLD || mode == CUSTOM) { if (mode == HOLD || mode == CUSTOM) {
if(!strip.isRunning()) strip.start();
#ifdef ENABLE_TV #ifdef ENABLE_TV
if (exit_func) { if (exit_func) {
exit_func = false; exit_func = false;
} }
#endif #endif
if(!strip.isRunning()) strip.start();
if (prevmode == SET_MODE) prevmode = HOLD; if (prevmode == SET_MODE) prevmode = HOLD;
} }
#ifdef ENABLE_TV
if (mode == TV) {
if(!strip.isRunning()) strip.start();
tv();
}
#endif
// Only for modes with WS2812FX functionality // Only for modes with WS2812FX functionality
#ifdef ENABLE_TV #ifdef ENABLE_TV
if (mode != TV && mode != CUSTOM) { if (mode != TV && mode != CUSTOM) {
Arduino/McLighting/WS2812FX.cpp
-1613
View File
File diff suppressed because it is too large Load Diff
Arduino/McLighting/WS2812FX.h
-613
View File
@@ -1,613 +0,0 @@
/*
WS2812FX.h - Library for WS2812 LED effects.
Harm Aldick - 2016
www.aldick.org
FEATURES
* A lot of blinken modes and counting
* WS2812FX can be used as drop-in replacement for Adafruit NeoPixel Library
NOTES
* Uses the Adafruit NeoPixel library. Get it here:
https://github.com/adafruit/Adafruit_NeoPixel
LICENSE
The MIT License (MIT)
Copyright (c) 2016 Harm Aldick
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
CHANGELOG
2016-05-28 Initial beta release
2016-06-03 Code cleanup, minor improvements, new modes
2016-06-04 2 new fx, fixed setColor (now also resets _mode_color)
2017-02-02 added external trigger functionality (e.g. for sound-to-light)
*/
#ifndef WS2812FX_h
#define WS2812FX_h
#define FSH(x) (__FlashStringHelper*)(x)
#include <Adafruit_NeoPixel.h>
#define DEFAULT_BRIGHTNESS (uint8_t)50
#define DEFAULT_MODE (uint8_t)0
#define DEFAULT_SPEED (uint16_t)1000
#define DEFAULT_COLOR (uint32_t)0xFF0000
#if defined(ESP8266) || defined(ESP32)
//#pragma message("Compiling for ESP")
#define SPEED_MIN (uint16_t)2
#else
//#pragma message("Compiling for Arduino")
#define SPEED_MIN (uint16_t)10
#endif
#define SPEED_MAX (uint16_t)65535
#define BRIGHTNESS_MIN (uint8_t)0
#define BRIGHTNESS_MAX (uint8_t)255
/* each segment uses 36 bytes of SRAM memory, so if you're application fails because of
insufficient memory, decreasing MAX_NUM_SEGMENTS may help */
#define MAX_NUM_SEGMENTS 10
#define NUM_COLORS 3 /* number of colors per segment */
#define MAX_CUSTOM_MODES 4
#define SEGMENT _segments[_segment_index]
#define SEGMENT_RUNTIME _segment_runtimes[_segment_index]
#define SEGMENT_LENGTH (SEGMENT.stop - SEGMENT.start + 1)
// some common colors
#define RED (uint32_t)0xFF0000
#define GREEN (uint32_t)0x00FF00
#define BLUE (uint32_t)0x0000FF
#define WHITE (uint32_t)0xFFFFFF
#define BLACK (uint32_t)0x000000
#define YELLOW (uint32_t)0xFFFF00
#define CYAN (uint32_t)0x00FFFF
#define MAGENTA (uint32_t)0xFF00FF
#define PURPLE (uint32_t)0x400080
#define ORANGE (uint32_t)0xFF3000
#define PINK (uint32_t)0xFF1493
#define ULTRAWHITE (uint32_t)0xFFFFFFFF
#define DARK(c) (uint32_t)((c >> 4) & 0x0f0f0f0f)
// segment options
// bit 7: reverse animation
// bits 4-6: fade rate (0-7)
// bit 3: gamma correction
// bits 1-2: size
// bits 0: TBD
#define NO_OPTIONS (uint8_t)B00000000
#define REVERSE (uint8_t)B10000000
#define IS_REVERSE ((SEGMENT.options & REVERSE) == REVERSE)
#define FADE_XFAST (uint8_t)B00010000
#define FADE_FAST (uint8_t)B00100000
#define FADE_MEDIUM (uint8_t)B00110000
#define FADE_SLOW (uint8_t)B01000000
#define FADE_XSLOW (uint8_t)B01010000
#define FADE_XXSLOW (uint8_t)B01100000
#define FADE_GLACIAL (uint8_t)B01110000
#define FADE_RATE ((SEGMENT.options >> 4) & 7)
#define GAMMA (uint8_t)B00001000
#define IS_GAMMA ((SEGMENT.options & GAMMA) == GAMMA)
#define SIZE_SMALL (uint8_t)B00000000
#define SIZE_MEDIUM (uint8_t)B00000010
#define SIZE_LARGE (uint8_t)B00000100
#define SIZE_XLARGE (uint8_t)B00000110
#define SIZE_OPTION ((SEGMENT.options >> 1) & 3)
// segment runtime options (aux_param2)
#define FRAME (uint8_t)B10000000
#define SET_FRAME (SEGMENT_RUNTIME.aux_param2 |= FRAME)
#define CLR_FRAME (SEGMENT_RUNTIME.aux_param2 &= ~FRAME)
#define CYCLE (uint8_t)B01000000
#define SET_CYCLE (SEGMENT_RUNTIME.aux_param2 |= CYCLE)
#define CLR_CYCLE (SEGMENT_RUNTIME.aux_param2 &= ~CYCLE)
#define MODE_COUNT (sizeof(_names)/sizeof(_names[0]))
#define FX_MODE_STATIC 0
#define FX_MODE_BLINK 1
#define FX_MODE_BREATH 2
#define FX_MODE_COLOR_WIPE 3
#define FX_MODE_COLOR_WIPE_INV 4
#define FX_MODE_COLOR_WIPE_REV 5
#define FX_MODE_COLOR_WIPE_REV_INV 6
#define FX_MODE_COLOR_WIPE_RANDOM 7
#define FX_MODE_RANDOM_COLOR 8
#define FX_MODE_SINGLE_DYNAMIC 9
#define FX_MODE_MULTI_DYNAMIC 10
#define FX_MODE_RAINBOW 11
#define FX_MODE_RAINBOW_CYCLE 12
#define FX_MODE_SCAN 13
#define FX_MODE_DUAL_SCAN 14
#define FX_MODE_FADE 15
#define FX_MODE_THEATER_CHASE 16
#define FX_MODE_THEATER_CHASE_RAINBOW 17
#define FX_MODE_RUNNING_LIGHTS 18
#define FX_MODE_TWINKLE 19
#define FX_MODE_TWINKLE_RANDOM 20
#define FX_MODE_TWINKLE_FADE 21
#define FX_MODE_TWINKLE_FADE_RANDOM 22
#define FX_MODE_SPARKLE 23
#define FX_MODE_FLASH_SPARKLE 24
#define FX_MODE_HYPER_SPARKLE 25
#define FX_MODE_STROBE 26
#define FX_MODE_STROBE_RAINBOW 27
#define FX_MODE_MULTI_STROBE 28
#define FX_MODE_BLINK_RAINBOW 29
#define FX_MODE_CHASE_WHITE 30
#define FX_MODE_CHASE_COLOR 31
#define FX_MODE_CHASE_RANDOM 32
#define FX_MODE_CHASE_RAINBOW 33
#define FX_MODE_CHASE_FLASH 34
#define FX_MODE_CHASE_FLASH_RANDOM 35
#define FX_MODE_CHASE_RAINBOW_WHITE 36
#define FX_MODE_CHASE_BLACKOUT 37
#define FX_MODE_CHASE_BLACKOUT_RAINBOW 38
#define FX_MODE_COLOR_SWEEP_RANDOM 39
#define FX_MODE_RUNNING_COLOR 40
#define FX_MODE_RUNNING_RED_BLUE 41
#define FX_MODE_RUNNING_RANDOM 42
#define FX_MODE_LARSON_SCANNER 43
#define FX_MODE_COMET 44
#define FX_MODE_FIREWORKS 45
#define FX_MODE_FIREWORKS_RANDOM 46
#define FX_MODE_MERRY_CHRISTMAS 47
#define FX_MODE_FIRE_FLICKER 48
#define FX_MODE_FIRE_FLICKER_SOFT 49
#define FX_MODE_FIRE_FLICKER_INTENSE 50
#define FX_MODE_CIRCUS_COMBUSTUS 51
#define FX_MODE_HALLOWEEN 52
#define FX_MODE_BICOLOR_CHASE 53
#define FX_MODE_TRICOLOR_CHASE 54
#define FX_MODE_ICU 55
#define FX_MODE_CUSTOM 56 // keep this for backward compatiblity
#define FX_MODE_CUSTOM_0 56 // custom modes need to go at the end
#define FX_MODE_CUSTOM_1 57
#define FX_MODE_CUSTOM_2 58
#define FX_MODE_CUSTOM_3 59
// create GLOBAL names to allow WS2812FX to compile with sketches and other libs that store strings
// in PROGMEM (get rid of the "section type conflict with __c" errors once and for all. Amen.)
const char name_0[] PROGMEM = "Static";
const char name_1[] PROGMEM = "Blink";
const char name_2[] PROGMEM = "Breath";
const char name_3[] PROGMEM = "Color Wipe";
const char name_4[] PROGMEM = "Color Wipe Inverse";
const char name_5[] PROGMEM = "Color Wipe Reverse";
const char name_6[] PROGMEM = "Color Wipe Reverse Inverse";
const char name_7[] PROGMEM = "Color Wipe Random";
const char name_8[] PROGMEM = "Random Color";
const char name_9[] PROGMEM = "Single Dynamic";
const char name_10[] PROGMEM = "Multi Dynamic";
const char name_11[] PROGMEM = "Rainbow";
const char name_12[] PROGMEM = "Rainbow Cycle";
const char name_13[] PROGMEM = "Scan";
const char name_14[] PROGMEM = "Dual Scan";
const char name_15[] PROGMEM = "Fade";
const char name_16[] PROGMEM = "Theater Chase";
const char name_17[] PROGMEM = "Theater Chase Rainbow";
const char name_18[] PROGMEM = "Running Lights";
const char name_19[] PROGMEM = "Twinkle";
const char name_20[] PROGMEM = "Twinkle Random";
const char name_21[] PROGMEM = "Twinkle Fade";
const char name_22[] PROGMEM = "Twinkle Fade Random";
const char name_23[] PROGMEM = "Sparkle";
const char name_24[] PROGMEM = "Flash Sparkle";
const char name_25[] PROGMEM = "Hyper Sparkle";
const char name_26[] PROGMEM = "Strobe";
const char name_27[] PROGMEM = "Strobe Rainbow";
const char name_28[] PROGMEM = "Multi Strobe";
const char name_29[] PROGMEM = "Blink Rainbow";
const char name_30[] PROGMEM = "Chase White";
const char name_31[] PROGMEM = "Chase Color";
const char name_32[] PROGMEM = "Chase Random";
const char name_33[] PROGMEM = "Chase Rainbow";
const char name_34[] PROGMEM = "Chase Flash";
const char name_35[] PROGMEM = "Chase Flash Random";
const char name_36[] PROGMEM = "Chase Rainbow White";
const char name_37[] PROGMEM = "Chase Blackout";
const char name_38[] PROGMEM = "Chase Blackout Rainbow";
const char name_39[] PROGMEM = "Color Sweep Random";
const char name_40[] PROGMEM = "Running Color";
const char name_41[] PROGMEM = "Running Red Blue";
const char name_42[] PROGMEM = "Running Random";
const char name_43[] PROGMEM = "Larson Scanner";
const char name_44[] PROGMEM = "Comet";
const char name_45[] PROGMEM = "Fireworks";
const char name_46[] PROGMEM = "Fireworks Random";
const char name_47[] PROGMEM = "Merry Christmas";
const char name_48[] PROGMEM = "Fire Flicker";
const char name_49[] PROGMEM = "Fire Flicker (soft)";
const char name_50[] PROGMEM = "Fire Flicker (intense)";
const char name_51[] PROGMEM = "Circus Combustus";
const char name_52[] PROGMEM = "Halloween";
const char name_53[] PROGMEM = "Bicolor Chase";
const char name_54[] PROGMEM = "Tricolor Chase";
const char name_55[] PROGMEM = "ICU";
const char name_56[] PROGMEM = "Custom 0"; // custom modes need to go at the end
const char name_57[] PROGMEM = "Custom 1";
const char name_58[] PROGMEM = "Custom 2";
const char name_59[] PROGMEM = "Custom 3";
static const __FlashStringHelper* _names[] = {
FSH(name_0),
FSH(name_1),
FSH(name_2),
FSH(name_3),
FSH(name_4),
FSH(name_5),
FSH(name_6),
FSH(name_7),
FSH(name_8),
FSH(name_9),
FSH(name_10),
FSH(name_11),
FSH(name_12),
FSH(name_13),
FSH(name_14),
FSH(name_15),
FSH(name_16),
FSH(name_17),
FSH(name_18),
FSH(name_19),
FSH(name_20),
FSH(name_21),
FSH(name_22),
FSH(name_23),
FSH(name_24),
FSH(name_25),
FSH(name_26),
FSH(name_27),
FSH(name_28),
FSH(name_29),
FSH(name_30),
FSH(name_31),
FSH(name_32),
FSH(name_33),
FSH(name_34),
FSH(name_35),
FSH(name_36),
FSH(name_37),
FSH(name_38),
FSH(name_39),
FSH(name_40),
FSH(name_41),
FSH(name_42),
FSH(name_43),
FSH(name_44),
FSH(name_45),
FSH(name_46),
FSH(name_47),
FSH(name_48),
FSH(name_49),
FSH(name_50),
FSH(name_51),
FSH(name_52),
FSH(name_53),
FSH(name_54),
FSH(name_55),
FSH(name_56),
FSH(name_57),
FSH(name_58),
FSH(name_59)
};
class WS2812FX : public Adafruit_NeoPixel {
typedef uint16_t (WS2812FX::*mode_ptr)(void);
// segment parameters
public:
typedef struct Segment { // 20 bytes
uint16_t start;
uint16_t stop;
uint16_t speed;
uint8_t mode;
uint8_t options;
uint32_t colors[NUM_COLORS];
} segment;
// segment runtime parameters
typedef struct Segment_runtime { // 16 bytes
unsigned long next_time;
uint32_t counter_mode_step;
uint32_t counter_mode_call;
uint8_t aux_param; // auxilary param (usually stores a color_wheel index)
uint8_t aux_param2; // auxilary param (usually stores bitwise options)
uint16_t aux_param3; // auxilary param (usually stores a segment index)
} segment_runtime;
WS2812FX(uint16_t n, uint8_t p, neoPixelType t) : Adafruit_NeoPixel(n, p, t) {
_mode[FX_MODE_STATIC] = &WS2812FX::mode_static;
_mode[FX_MODE_BLINK] = &WS2812FX::mode_blink;
_mode[FX_MODE_COLOR_WIPE] = &WS2812FX::mode_color_wipe;
_mode[FX_MODE_COLOR_WIPE_INV] = &WS2812FX::mode_color_wipe_inv;
_mode[FX_MODE_COLOR_WIPE_REV] = &WS2812FX::mode_color_wipe_rev;
_mode[FX_MODE_COLOR_WIPE_REV_INV] = &WS2812FX::mode_color_wipe_rev_inv;
_mode[FX_MODE_COLOR_WIPE_RANDOM] = &WS2812FX::mode_color_wipe_random;
_mode[FX_MODE_RANDOM_COLOR] = &WS2812FX::mode_random_color;
_mode[FX_MODE_SINGLE_DYNAMIC] = &WS2812FX::mode_single_dynamic;
_mode[FX_MODE_MULTI_DYNAMIC] = &WS2812FX::mode_multi_dynamic;
_mode[FX_MODE_RAINBOW] = &WS2812FX::mode_rainbow;
_mode[FX_MODE_RAINBOW_CYCLE] = &WS2812FX::mode_rainbow_cycle;
_mode[FX_MODE_SCAN] = &WS2812FX::mode_scan;
_mode[FX_MODE_DUAL_SCAN] = &WS2812FX::mode_dual_scan;
_mode[FX_MODE_FADE] = &WS2812FX::mode_fade;
_mode[FX_MODE_THEATER_CHASE] = &WS2812FX::mode_theater_chase;
_mode[FX_MODE_THEATER_CHASE_RAINBOW] = &WS2812FX::mode_theater_chase_rainbow;
_mode[FX_MODE_TWINKLE] = &WS2812FX::mode_twinkle;
_mode[FX_MODE_TWINKLE_RANDOM] = &WS2812FX::mode_twinkle_random;
_mode[FX_MODE_TWINKLE_FADE] = &WS2812FX::mode_twinkle_fade;
_mode[FX_MODE_TWINKLE_FADE_RANDOM] = &WS2812FX::mode_twinkle_fade_random;
_mode[FX_MODE_SPARKLE] = &WS2812FX::mode_sparkle;
_mode[FX_MODE_FLASH_SPARKLE] = &WS2812FX::mode_flash_sparkle;
_mode[FX_MODE_HYPER_SPARKLE] = &WS2812FX::mode_hyper_sparkle;
_mode[FX_MODE_STROBE] = &WS2812FX::mode_strobe;
_mode[FX_MODE_STROBE_RAINBOW] = &WS2812FX::mode_strobe_rainbow;
_mode[FX_MODE_MULTI_STROBE] = &WS2812FX::mode_multi_strobe;
_mode[FX_MODE_BLINK_RAINBOW] = &WS2812FX::mode_blink_rainbow;
_mode[FX_MODE_CHASE_WHITE] = &WS2812FX::mode_chase_white;
_mode[FX_MODE_CHASE_COLOR] = &WS2812FX::mode_chase_color;
_mode[FX_MODE_CHASE_RANDOM] = &WS2812FX::mode_chase_random;
_mode[FX_MODE_CHASE_RAINBOW] = &WS2812FX::mode_chase_rainbow;
_mode[FX_MODE_CHASE_FLASH] = &WS2812FX::mode_chase_flash;
_mode[FX_MODE_CHASE_FLASH_RANDOM] = &WS2812FX::mode_chase_flash_random;
_mode[FX_MODE_CHASE_RAINBOW_WHITE] = &WS2812FX::mode_chase_rainbow_white;
_mode[FX_MODE_CHASE_BLACKOUT] = &WS2812FX::mode_chase_blackout;
_mode[FX_MODE_CHASE_BLACKOUT_RAINBOW] = &WS2812FX::mode_chase_blackout_rainbow;
_mode[FX_MODE_COLOR_SWEEP_RANDOM] = &WS2812FX::mode_color_sweep_random;
_mode[FX_MODE_RUNNING_COLOR] = &WS2812FX::mode_running_color;
_mode[FX_MODE_RUNNING_RED_BLUE] = &WS2812FX::mode_running_red_blue;
_mode[FX_MODE_RUNNING_RANDOM] = &WS2812FX::mode_running_random;
_mode[FX_MODE_LARSON_SCANNER] = &WS2812FX::mode_larson_scanner;
_mode[FX_MODE_COMET] = &WS2812FX::mode_comet;
_mode[FX_MODE_FIREWORKS] = &WS2812FX::mode_fireworks;
_mode[FX_MODE_FIREWORKS_RANDOM] = &WS2812FX::mode_fireworks_random;
_mode[FX_MODE_MERRY_CHRISTMAS] = &WS2812FX::mode_merry_christmas;
_mode[FX_MODE_FIRE_FLICKER] = &WS2812FX::mode_fire_flicker;
_mode[FX_MODE_FIRE_FLICKER_SOFT] = &WS2812FX::mode_fire_flicker_soft;
_mode[FX_MODE_FIRE_FLICKER_INTENSE] = &WS2812FX::mode_fire_flicker_intense;
_mode[FX_MODE_CIRCUS_COMBUSTUS] = &WS2812FX::mode_circus_combustus;
_mode[FX_MODE_HALLOWEEN] = &WS2812FX::mode_halloween;
_mode[FX_MODE_BICOLOR_CHASE] = &WS2812FX::mode_bicolor_chase;
_mode[FX_MODE_TRICOLOR_CHASE] = &WS2812FX::mode_tricolor_chase;
// if flash memory is constrained (I'm looking at you Arduino Nano), replace modes
// that use a lot of flash with mode_static (reduces flash footprint by about 2100 bytes)
#ifdef REDUCED_MODES
_mode[FX_MODE_BREATH] = &WS2812FX::mode_static;
_mode[FX_MODE_RUNNING_LIGHTS] = &WS2812FX::mode_static;
_mode[FX_MODE_ICU] = &WS2812FX::mode_static;
#else
_mode[FX_MODE_BREATH] = &WS2812FX::mode_breath;
_mode[FX_MODE_RUNNING_LIGHTS] = &WS2812FX::mode_running_lights;
_mode[FX_MODE_ICU] = &WS2812FX::mode_icu;
#endif
_mode[FX_MODE_CUSTOM_0] = &WS2812FX::mode_custom_0;
_mode[FX_MODE_CUSTOM_1] = &WS2812FX::mode_custom_1;
_mode[FX_MODE_CUSTOM_2] = &WS2812FX::mode_custom_2;
_mode[FX_MODE_CUSTOM_3] = &WS2812FX::mode_custom_3;
brightness = DEFAULT_BRIGHTNESS + 1; // Adafruit_NeoPixel internally offsets brightness by 1
_running = false;
_num_segments = 1;
_segments[0].mode = DEFAULT_MODE;
_segments[0].colors[0] = DEFAULT_COLOR;
_segments[0].start = 0;
_segments[0].stop = n - 1;
_segments[0].speed = DEFAULT_SPEED;
resetSegmentRuntimes();
}
void
// timer(void),
init(void),
service(void),
start(void),
stop(void),
pause(void),
resume(void),
strip_off(void),
fade_out(void),
setMode(uint8_t m),
setMode(uint8_t seg, uint8_t m),
setOptions(uint8_t seg, uint8_t o),
setCustomMode(uint16_t (*p)()),
setCustomShow(void (*p)()),
setSpeed(uint16_t s),
setSpeed(uint8_t seg, uint16_t s),
increaseSpeed(uint8_t s),
decreaseSpeed(uint8_t s),
setColor(uint8_t r, uint8_t g, uint8_t b),
setColor(uint8_t r, uint8_t g, uint8_t b, uint8_t w),
setColor(uint32_t c),
setColor(uint8_t seg, uint32_t c),
setColors(uint8_t seg, uint32_t* c),
setBrightness(uint8_t b),
increaseBrightness(uint8_t s),
decreaseBrightness(uint8_t s),
setLength(uint16_t b),
increaseLength(uint16_t s),
decreaseLength(uint16_t s),
trigger(void),
setNumSegments(uint8_t n),
setSegment(uint8_t n, uint16_t start, uint16_t stop, uint8_t mode, uint32_t color, uint16_t speed, bool reverse),
setSegment(uint8_t n, uint16_t start, uint16_t stop, uint8_t mode, uint32_t color, uint16_t speed, uint8_t options),
setSegment(uint8_t n, uint16_t start, uint16_t stop, uint8_t mode, const uint32_t colors[], uint16_t speed, bool reverse),
setSegment(uint8_t n, uint16_t start, uint16_t stop, uint8_t mode, const uint32_t colors[], uint16_t speed, uint8_t options),
resetSegments(),
resetSegmentRuntimes(),
resetSegmentRuntime(uint8_t),
setPixelColor(uint16_t n, uint32_t c),
setPixelColor(uint16_t n, uint8_t r, uint8_t g, uint8_t b),
setPixelColor(uint16_t n, uint8_t r, uint8_t g, uint8_t b, uint8_t w),
copyPixels(uint16_t d, uint16_t s, uint16_t c),
show(void);
boolean
isRunning(void),
isTriggered(void),
isFrame(void),
isFrame(uint8_t),
isCycle(void),
isCycle(uint8_t);
uint8_t
random8(void),
random8(uint8_t),
getMode(void),
getMode(uint8_t),
getModeCount(void),
setCustomMode(const __FlashStringHelper* name, uint16_t (*p)()),
setCustomMode(uint8_t i, const __FlashStringHelper* name, uint16_t (*p)()),
getNumSegments(void),
get_random_wheel_index(uint8_t),
getOptions(uint8_t);
uint16_t
random16(void),
random16(uint16_t),
getSpeed(void),
getSpeed(uint8_t),
getLength(void),
getNumBytes(void);
uint32_t
color_wheel(uint8_t),
getColor(void),
getColor(uint8_t),
intensitySum(void);
uint32_t* getColors(uint8_t);
uint32_t* intensitySums(void);
const __FlashStringHelper* getModeName(uint8_t m);
WS2812FX::Segment* getSegment(void);
WS2812FX::Segment* getSegment(uint8_t);
WS2812FX::Segment* getSegments(void);
WS2812FX::Segment_runtime* getSegmentRuntime(void);
WS2812FX::Segment_runtime* getSegmentRuntime(uint8_t);
WS2812FX::Segment_runtime* getSegmentRuntimes(void);
// mode helper functions
uint16_t
blink(uint32_t, uint32_t, bool strobe),
color_wipe(uint32_t, uint32_t, bool),
twinkle(uint32_t, uint32_t),
twinkle_fade(uint32_t),
chase(uint32_t, uint32_t, uint32_t),
running(uint32_t, uint32_t),
fireworks(uint32_t),
fire_flicker(int),
tricolor_chase(uint32_t, uint32_t, uint32_t),
scan(uint32_t, uint32_t, bool);
uint32_t
color_blend(uint32_t, uint32_t, uint8_t);
// builtin modes
uint16_t
mode_static(void),
mode_blink(void),
mode_blink_rainbow(void),
mode_strobe(void),
mode_strobe_rainbow(void),
mode_color_wipe(void),
mode_color_wipe_inv(void),
mode_color_wipe_rev(void),
mode_color_wipe_rev_inv(void),
mode_color_wipe_random(void),
mode_color_sweep_random(void),
mode_random_color(void),
mode_single_dynamic(void),
mode_multi_dynamic(void),
mode_breath(void),
mode_fade(void),
mode_scan(void),
mode_dual_scan(void),
mode_theater_chase(void),
mode_theater_chase_rainbow(void),
mode_rainbow(void),
mode_rainbow_cycle(void),
mode_running_lights(void),
mode_twinkle(void),
mode_twinkle_random(void),
mode_twinkle_fade(void),
mode_twinkle_fade_random(void),
mode_sparkle(void),
mode_flash_sparkle(void),
mode_hyper_sparkle(void),
mode_multi_strobe(void),
mode_chase_white(void),
mode_chase_color(void),
mode_chase_random(void),
mode_chase_rainbow(void),
mode_chase_flash(void),
mode_chase_flash_random(void),
mode_chase_rainbow_white(void),
mode_chase_blackout(void),
mode_chase_blackout_rainbow(void),
mode_running_color(void),
mode_running_red_blue(void),
mode_running_random(void),
mode_larson_scanner(void),
mode_comet(void),
mode_fireworks(void),
mode_fireworks_random(void),
mode_merry_christmas(void),
mode_halloween(void),
mode_fire_flicker(void),
mode_fire_flicker_soft(void),
mode_fire_flicker_intense(void),
mode_circus_combustus(void),
mode_bicolor_chase(void),
mode_tricolor_chase(void),
mode_icu(void),
mode_custom_0(void),
mode_custom_1(void),
mode_custom_2(void),
mode_custom_3(void);
private:
uint16_t _rand16seed;
uint16_t (*customModes[MAX_CUSTOM_MODES])(void) {
[]{ return (uint16_t)1000; },
[]{ return (uint16_t)1000; },
[]{ return (uint16_t)1000; },
[]{ return (uint16_t)1000; }
};
void (*customShow)(void) = NULL;
boolean
_running,
_triggered;
mode_ptr _mode[MODE_COUNT]; // SRAM footprint: 4 bytes per element
uint8_t _segment_index = 0;
uint8_t _num_segments = 1;
segment _segments[MAX_NUM_SEGMENTS] = { // SRAM footprint: 20 bytes per element
// start, stop, speed, mode, options, color[]
{ 0, 7, DEFAULT_SPEED, FX_MODE_STATIC, NO_OPTIONS, {DEFAULT_COLOR}}
};
segment_runtime _segment_runtimes[MAX_NUM_SEGMENTS]; // SRAM footprint: 16 bytes per element
};
#endif
Arduino/McLighting/colormodes.h
+2 -1
View File
@@ -55,7 +55,8 @@ void tv() {
if(currentMillis-previousMillis > interval) if(currentMillis-previousMillis > interval)
{ {
previousMillis = currentMillis; previousMillis = currentMillis;
interval = random(750,4001);//Adjusts the interval for more/less frequent random light changes //interval = random(750,4001);//Adjusts the interval for more/less frequent random light changes
interval = random(1000-(ws2812fx_speed*2),5001-(ws2812fx_speed*8));
twitch = random(40,100);// Twitch provides motion effect but can be a bit much if too high twitch = random(40,100);// Twitch provides motion effect but can be a bit much if too high
dipCount = dipCount++; dipCount = dipCount++;
} }
Arduino/McLighting/custom/BlockDissolve.h
-68
View File
@@ -1,68 +0,0 @@
/*
Custom effect that changes random pixels to transition between colors
Keith Lord - 2018
LICENSE
The MIT License (MIT)
Copyright (c) 2018 Keith Lord
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sub-license, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
CHANGELOG
2018-08-19 initial version
*/
#ifndef BlockDissolve_h
#define BlockDissolve_h
#include <WS2812FX.h>
extern WS2812FX ws2812fx;
uint16_t blockDissolve(void) {
WS2812FX::Segment* seg = ws2812fx.getSegment();
WS2812FX::Segment_runtime* segrt = ws2812fx.getSegmentRuntime();
int seglen = seg->stop - seg->start + 1;
uint32_t color = seg->colors[segrt->aux_param];
ws2812fx.setPixelColor(seg->start, color);
// get the decimated color after setPixelColor() has mangled it
// in accordance to the brightness setting
uint32_t desColor = ws2812fx.getPixelColor(seg->start);
for(uint16_t i=0; i<seglen; i++) {
int index = seg->start + ws2812fx.random16(seglen);
if(ws2812fx.getPixelColor(index) != desColor) {
ws2812fx.setPixelColor(index, color);
return seg->speed;
}
}
for(uint16_t i=seg->start; i<seg->stop; i++) {
ws2812fx.setPixelColor(i, color);
}
segrt->aux_param = (segrt->aux_param + 1) % NUM_COLORS;
return seg->speed;
}
#endif
Arduino/McLighting/custom/DualLarson.h
-67
View File
@@ -1,67 +0,0 @@
/*
Custom effect that creates two Larson scanners moving in opposite directions.
If you set the REVERSE option, an offset will be added to the comet after each
cycle (so if the LEDs are arranged in a circle, the animation will appear to
"walk" around the circle.)
Keith Lord - 2018
LICENSE
The MIT License (MIT)
Copyright (c) 2018 Keith Lord
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sub-license, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
CHANGELOG
2018-02-26 initial version
*/
#ifndef DualLarson_h
#define DualLarson_h
#include <WS2812FX.h>
extern WS2812FX ws2812fx;
uint16_t dualLarson(void) {
WS2812FX::Segment* seg = ws2812fx.getSegment(); // get the current segment
WS2812FX::Segment_runtime* segrt = ws2812fx.getSegmentRuntime();
int seglen = seg->stop - seg->start + 1;
static int16_t offset = 0;
int8_t dir = segrt->aux_param ? -1 : 1;
segrt->aux_param3 += dir;
ws2812fx.fade_out();
int16_t segIndex = (segrt->aux_param3 + offset) % seglen;
ws2812fx.setPixelColor(seg->start + segIndex, seg->colors[0]);
ws2812fx.setPixelColor(seg->stop - segIndex, seg->colors[2]);
if(segrt->aux_param3 >= (seg->stop - seg->start) || segrt->aux_param3 <= 0) {
segrt->aux_param = !segrt->aux_param;
if(seg->options & REVERSE) offset = (offset + 1) % seglen;
}
return (seg->speed / (seglen * 2));
}
#endif
Arduino/McLighting/custom/MultiComet.h
-70
View File
@@ -1,70 +0,0 @@
/*
Custom effect that creates random comets
Keith Lord - 2018
LICENSE
The MIT License (MIT)
Copyright (c) 2018 Keith Lord
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sub-license, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
CHANGELOG
2018-02-26 initial version
*/
#ifndef MultiComet_h
#define MultiComet_h
#include <WS2812FX.h>
extern WS2812FX ws2812fx;
uint16_t multiComet(void) {
WS2812FX::Segment* seg = ws2812fx.getSegment(); // get the current segment
int seglen = seg->stop - seg->start + 1;
bool isReverse = (seg->options & REVERSE) == REVERSE;
ws2812fx.fade_out();
static int16_t comets[] = {UINT16_MAX, UINT16_MAX, UINT16_MAX, UINT16_MAX, UINT16_MAX, UINT16_MAX};
static int8_t numComets = sizeof(comets)/sizeof(comets[0]);
for(uint8_t i=0; i < numComets; i++) {
if(comets[i] < seglen) {
if(isReverse) {
ws2812fx.setPixelColor(seg->stop - comets[i], i % 2 ? seg->colors[0] : seg->colors[2]);
} else {
ws2812fx.setPixelColor(seg->start + comets[i], i % 2 ? seg->colors[0] : seg->colors[2]);
}
comets[i]++;
} else {
if(!random(seglen)) {
comets[i] = 0;
}
}
}
return (seg->speed / seglen);
}
#endif
Arduino/McLighting/custom/Oscillate.h
-84
View File
@@ -1,84 +0,0 @@
/*
Custom effect that creates three color spans that oscillate back and forth.
Keith Lord - 2018
LICENSE
The MIT License (MIT)
Copyright (c) 2018 Keith Lord
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sub-license, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
CHANGELOG
2018-07-26 initial version
*/
#ifndef Oscillate_h
#define Oscillate_h
#include <WS2812FX.h>
extern WS2812FX ws2812fx;
typedef struct Oscillator {
int16_t pos;
int8_t size;
int8_t dir;
int8_t speed;
} oscillator;
uint16_t oscillate(void) {
WS2812FX::Segment* seg = ws2812fx.getSegment(); // get the current segment
int seglen = seg->stop - seg->start + 1;
static oscillator oscillators[NUM_COLORS] = {
{seglen/4, seglen/8, 1, 1},
{seglen/4*2, seglen/8, -1, 1},
{seglen/4*3, seglen/8, 1, 2}
};
for(int8_t i=0; i < sizeof(oscillators)/sizeof(oscillators[0]); i++) {
oscillators[i].pos += oscillators[i].dir * oscillators[i].speed;
if((oscillators[i].dir == -1) && (oscillators[i].pos <= 0)) {
oscillators[i].pos = 0;
oscillators[i].dir = 1;
oscillators[i].speed = random(1, 3);
}
if((oscillators[i].dir == 1) && (oscillators[i].pos >= (seglen - 1))) {
oscillators[i].pos = seglen - 1;
oscillators[i].dir = -1;
oscillators[i].speed = random(1, 3);
}
}
for(int16_t i=0; i < seglen; i++) {
uint32_t color = BLACK;
for(int8_t j=0; j < sizeof(oscillators)/sizeof(oscillators[0]); j++) {
if(i >= oscillators[j].pos - oscillators[j].size && i <= oscillators[j].pos + oscillators[j].size) {
color = (color == BLACK) ? seg->colors[j] : ws2812fx.color_blend(color, seg->colors[j], 128);
}
}
ws2812fx.setPixelColor(seg->start + i, color);
}
return(seg->speed / 8);
}
#endif
Arduino/McLighting/custom/Popcorn.h
-94
View File
@@ -1,94 +0,0 @@
/*
Custom effect that looks like popcorn.
The 'popcorn' is color[0] and the background color is color[1].
If color[0] is the same as color[1], the 'popcorn' will be a random color.
Keith Lord - 2018
LICENSE
The MIT License (MIT)
Copyright (c) 2018 Keith Lord
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sub-license, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
CHANGELOG
2018-11-13 initial version
*/
#ifndef Popcorn_h
#define Popcorn_h
#include <WS2812FX.h>
#define MAX_NUM_POPCORN 10
#define GRAVITY 0.1
extern WS2812FX ws2812fx;
typedef struct Kernel {
float position;
float velocity;
int32_t color;
} kernel;
uint16_t popcorn(void) {
WS2812FX::Segment* seg = ws2812fx.getSegment(); // get the current segment
uint16_t seglen = seg->stop - seg->start + 1;
uint32_t popcornColor = seg->colors[0];
uint32_t bgColor = seg->colors[1];
if(popcornColor == bgColor) popcornColor = ws2812fx.color_wheel(ws2812fx.random8());
bool isReverse = (seg->options & REVERSE) != 0;
static kernel popcorn[MAX_NUM_POPCORN];
static float coeff = 0.0f;
if(coeff == 0.0f) { // calculate the velocity coeff once (the secret sauce)
coeff = pow((float)seglen, 0.5223324f) * 0.3944296f;
}
// reset all LEDs to background color
for(uint16_t i=seg->start; i <= seg->stop; i++) {
ws2812fx.setPixelColor(i, bgColor);
}
uint16_t ledIndex;
for(int8_t i=0; i < MAX_NUM_POPCORN; i++) {
bool isActive = popcorn[i].position >= 0.0f;
if(isActive) { // if kernel is active, update its position
popcorn[i].position += popcorn[i].velocity;
popcorn[i].velocity -= GRAVITY;
ledIndex = isReverse ? seg->stop - popcorn[i].position : seg->start + popcorn[i].position;
if(ledIndex >= seg->start && ledIndex <= seg->stop) ws2812fx.setPixelColor(ledIndex, popcorn[i].color);
} else { // if kernel is inactive, randomly pop it
if(ws2812fx.random8() < 2) { // POP!!!
popcorn[i].position = 0.0f;
popcorn[i].velocity = coeff * (random(66, 100) / 100.0f);
popcorn[i].color = popcornColor;
ledIndex = isReverse ? seg->stop : seg->start;
ws2812fx.setPixelColor(ledIndex, popcorn[i].color);
}
}
}
return(seg->speed / seglen);
}
#endif
Arduino/McLighting/custom/Rain.h
-66
View File
@@ -1,66 +0,0 @@
/*
Custom effect that combines the fireworks effect and running effect
to produce a rain-like effect. Depending on the size of your LED strip, you
may want to play with the FADE and SIZE options.
The background color is black, unless you use a FADE_RATE other then DEFAULT,
in which case the background color is color[1].
The color of the rain is either color[0] or color[2] (chosen randomly), unless
color[0]==color[1], in which case the rain is a random color.
Keith Lord - 2018
LICENSE
The MIT License (MIT)
Copyright (c) 2018 Keith Lord
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sub-license, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
CHANGELOG
2018-12-14 initial version
*/
#ifndef Rain_h
#define Rain_h
#include <WS2812FX.h>
extern WS2812FX ws2812fx;
uint16_t rain(void) {
WS2812FX::Segment* seg = ws2812fx.getSegment(); // get the current segment
uint16_t seglen = seg->stop - seg->start + 1;
uint32_t rainColor = (ws2812fx.random8() & 1) == 0 ? seg->colors[0] : seg->colors[2];
if(seg->colors[0] == seg->colors[1]) rainColor = ws2812fx.color_wheel(ws2812fx.random8());
ws2812fx.fireworks(rainColor);
// shift everything two pixels
bool isReverse = (seg->options & REVERSE) != 0;
if(isReverse) {
ws2812fx.copyPixels(seg->start + 2, seg->start, seglen - 2);
} else {
ws2812fx.copyPixels(seg->start, seg->start + 2, seglen - 2);
}
return(seg->speed / seglen);
}
#endif
Arduino/McLighting/custom/RainbowLarson.h
-67
View File
@@ -1,67 +0,0 @@
/*
Custom effect that creates a Larson Scanner with rainbow colors
It has two modes:
1) if the segment options parameter is set to NO_OPTIONS, then
the rainbow of colors span the 'comet'.
2) if the segment options parameter is set to a FADE option
(e.g. FADE_MEDIUM), then the rainbow of colors span the segment
and the 'comet' merely shows the colors at that point in the segment.
Keith Lord - 2018
LICENSE
The MIT License (MIT)
Copyright (c) 2018 Keith Lord
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sub-license, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
CHANGELOG
2018-08-26 initial version
*/
#ifndef RainbowLarson_h
#define RainbowLarson_h
#include <WS2812FX.h>
extern WS2812FX ws2812fx;
uint16_t rainbowLarson(void) {
WS2812FX::Segment* seg = ws2812fx.getSegment(); // get the current segment
int seglen = seg->stop - seg->start + 1;
static int16_t index = 0, dir = 1, cnt = 0;
index += dir;
ws2812fx.fade_out();
if(seg->options == NO_OPTIONS) {
ws2812fx.setPixelColor(seg->start + index, ws2812fx.color_wheel((cnt++ % 8) * 32));
} else {
ws2812fx.setPixelColor(seg->start + index, ws2812fx.color_wheel((index * 256) / seglen));
}
if(index >= (seg->stop - seg->start) || index <= 0) dir = -dir;
return (seg->speed / (seglen * 2));
}
#endif
Arduino/McLighting/custom/RandomChase.h
-54
View File
@@ -1,54 +0,0 @@
/*
Custom effect that creates a random chase effect
Keith Lord - 2018
LICENSE
The MIT License (MIT)
Copyright (c) 2018 Keith Lord
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sub-license, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
CHANGELOG
2018-02-26 initial version
*/
#ifndef RandomChase_h
#define RandomChase_h
#include <WS2812FX.h>
extern WS2812FX ws2812fx;
uint16_t randomChase(void) {
WS2812FX::Segment* seg = ws2812fx.getSegment();
for(uint16_t i=seg->stop; i>seg->start; i--) {
ws2812fx.setPixelColor(i, ws2812fx.getPixelColor(i-1));
}
uint32_t color = ws2812fx.getPixelColor(seg->start + 1);
int r = random(6) != 0 ? (color >> 16 & 0xFF) : random(256);
int g = random(6) != 0 ? (color >> 8 & 0xFF) : random(256);
int b = random(6) != 0 ? (color & 0xFF) : random(256);
ws2812fx.setPixelColor(seg->start, r, g, b);
return seg->speed;
}
#endif
Arduino/McLighting/custom/TriFade.h
-83
View File
@@ -1,83 +0,0 @@
/*
Custom effect that fades between three colors. You can add the TRIFADE_BLACK option
in the setSegment() call to fade to black between each color.
Keith Lord - 2018
LICENSE
The MIT License (MIT)
Copyright (c) 2018 Keith Lord
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sub-license, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
CHANGELOG
2018-07-26 initial version
*/
#ifndef TriFade_h
#define TriFade_h
#define TRIFADE_BLACK (uint8_t)0x80
#include <WS2812FX.h>
extern WS2812FX ws2812fx;
uint16_t triFade(void) {
WS2812FX::Segment* seg = ws2812fx.getSegment(); // get the current segment
uint8_t options = seg->options;
bool trifade_black = (options & TRIFADE_BLACK) == TRIFADE_BLACK;
static int count = 0;
static uint32_t color1 = 0, color2 = 0;
if(count == 0) {
color1 = seg->colors[0];
color2 = trifade_black ? BLACK : seg->colors[1];
} else if(count == 256) {
color1 = trifade_black ? BLACK : seg->colors[1];
color2 = trifade_black ? seg->colors[1] : seg->colors[2];
} else if(count == 512) {
color1 = trifade_black ? seg->colors[1] : seg->colors[2];
color2 = trifade_black ? BLACK : seg->colors[0];
} else if(count == 768) {
color1 = trifade_black ? BLACK : seg->colors[0];
color2 = trifade_black ? seg->colors[2] : seg->colors[1];
} else if(count == 1024) {
color1 = trifade_black ? seg->colors[2] : seg->colors[1];
color2 = trifade_black ? BLACK : seg->colors[2];
} else if(count == 1280) {
color1 = trifade_black ? BLACK: seg->colors[2];
color2 = seg->colors[0];
}
uint32_t color = ws2812fx.color_blend(color1, color2, count % 256);
for(uint16_t i=seg->start; i <= seg->stop; i++) {
ws2812fx.setPixelColor(i, color);
}
count += 4;
if(count >= 1536) count = 0;
return (seg->speed / 128);
}
#endif
Arduino/McLighting/custom/VUMeter.h
-80
View File
@@ -1,80 +0,0 @@
/*
Custom effect that mimics a multiband VU meter
Keith Lord - 2018
LICENSE
The MIT License (MIT)
Copyright (c) 2018 Keith Lord
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sub-license, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
CHANGELOG
2018-08-21 initial version
*/
#ifndef VUMeter_h
#define VUMeter_h
#include <WS2812FX.h>
#ifndef NUM_BANDS
#define NUM_BANDS 2
#endif
// set USE_RANDOM_DATA to false in the line below if vuMeterBands[] is populated
// by an external data source. otherwise random data will be used for the effect.
#ifndef USE_RANDOM_DATA
#define USE_RANDOM_DATA true
#endif
extern WS2812FX ws2812fx;
uint8_t vuMeterBands[NUM_BANDS]; // global VU meter band amplitude data (range 0-255)
uint16_t vuMeter(void) {
WS2812FX::Segment* seg = ws2812fx.getSegment();
uint16_t seglen = seg->stop - seg->start + 1;
uint16_t bandSize = seglen / NUM_BANDS;
for(uint8_t i=0; i<NUM_BANDS; i++) {
#if USE_RANDOM_DATA
int randomData = vuMeterBands[i] + ws2812fx.random8(32) - ws2812fx.random8(32);
vuMeterBands[i] = (randomData < 0 || randomData > 255) ? 128 : randomData;
#endif
uint8_t scaledBand = (vuMeterBands[i] * bandSize) / 256;
for(uint16_t j=0; j<bandSize; j++) {
uint16_t index = seg->start + (i * bandSize) + j;
if(j <= scaledBand) {
if(j < bandSize - 4) ws2812fx.setPixelColor(index, seg->colors[0]);
else if(j < bandSize - 2) ws2812fx.setPixelColor(index, seg->colors[1]);
else ws2812fx.setPixelColor(index, seg->colors[2]);
} else {
ws2812fx.setPixelColor(index, BLACK);
}
}
}
return seg->speed;
}
#endif
Arduino/McLighting/definitions.h
+1 -1
View File
@@ -149,7 +149,7 @@ LEDState main_color = { 255, 0, 0, 0 }; // Store the "main color" of the strip
#define ENABLE_STATE_SAVE_SPIFFS // If defined, saves state on SPIFFS #define ENABLE_STATE_SAVE_SPIFFS // If defined, saves state on SPIFFS
//#define ENABLE_STATE_SAVE_EEPROM // If defined, save state on reboot //#define ENABLE_STATE_SAVE_EEPROM // If defined, save state on reboot
char beforeauto_state[36]; // Keeps the state representation before auto mode char beforeoffauto_state[36]; // Keeps the state representation before auto mode
#ifdef ENABLE_STATE_SAVE_EEPROM #ifdef ENABLE_STATE_SAVE_EEPROM
char current_state[36]; // Keeps the current state representation char current_state[36]; // Keeps the current state representation
char last_state[36]; // Save the last state as string representation char last_state[36]; // Save the last state as string representation
Arduino/McLighting/request_handlers.h
+35 -23
View File
@@ -67,7 +67,6 @@ void getArgs() {
main_color.white = server.arg("w").toInt(); main_color.white = server.arg("w").toInt();
} }
} }
if ((server.arg("s") != "") && (server.arg("s").toInt() >= 0) && (server.arg("s").toInt() <= 255)) { if ((server.arg("s") != "") && (server.arg("s").toInt() >= 0) && (server.arg("s").toInt() <= 255)) {
ws2812fx_speed = constrain(server.arg("s").toInt(), 0, 255); ws2812fx_speed = constrain(server.arg("s").toInt(), 0, 255);
} }
@@ -117,7 +116,6 @@ uint16_t convertSpeed(uint8_t mcl_speed) {
return ws2812_speed; return ws2812_speed;
} }
// *************************************************************************** // ***************************************************************************
// Handler functions for WS and MQTT // Handler functions for WS and MQTT
// *************************************************************************** // ***************************************************************************
@@ -139,20 +137,15 @@ void handleSetMainColor(uint8_t * mypayload) {
void handleSetAllMode(uint8_t * mypayload) { void handleSetAllMode(uint8_t * mypayload) {
// decode rgb data // decode rgb data
uint32_t rgb = (uint32_t) strtoul((const char *) &mypayload[1], NULL, 16); uint32_t rgb = (uint32_t) strtoul((const char *) &mypayload[1], NULL, 16);
main_color.white = ((rgb >> 24) & 0xFF); main_color.white = ((rgb >> 24) & 0xFF);
main_color.red = ((rgb >> 16) & 0xFF); main_color.red = ((rgb >> 16) & 0xFF);
main_color.green = ((rgb >> 8) & 0xFF); main_color.green = ((rgb >> 8) & 0xFF);
main_color.blue = ((rgb >> 0) & 0xFF); main_color.blue = ((rgb >> 0) & 0xFF);
DBG_OUTPUT_PORT.printf("WS: Set all leds to main color: R: [%u] G: [%u] B: [%u] W: [%u]\n", main_color.red, main_color.green, main_color.blue, main_color.white); DBG_OUTPUT_PORT.printf("WS: Set all leds to main color: R: [%u] G: [%u] B: [%u] W: [%u]\n", main_color.red, main_color.green, main_color.blue, main_color.white);
#ifdef ENABLE_TV #ifdef ENABLE_TV
exit_func = true; exit_func = true;
#endif #endif
ws2812fx_mode = FX_MODE_STATIC; ws2812fx_mode = FX_MODE_STATIC;
#ifdef ENABLE_TV
exit_func = true;
#endif
mode = SET_MODE; mode = SET_MODE;
} }
@@ -179,8 +172,6 @@ void handleSetSingleLED(uint8_t * mypayload, uint8_t firstChar = 0) {
DBG_OUTPUT_PORT.printf("rgb.red: [%s] rgb.green: [%s] rgb.blue: [%s] rgb.white: [%s]\n", redhex, greenhex, bluehex, whitehex); DBG_OUTPUT_PORT.printf("rgb.red: [%s] rgb.green: [%s] rgb.blue: [%s] rgb.white: [%s]\n", redhex, greenhex, bluehex, whitehex);
DBG_OUTPUT_PORT.printf("rgb.red: [%i] rgb.green: [%i] rgb.blue: [%i] rgb.white: [%i]\n", strtol(redhex, NULL, 16), strtol(greenhex, NULL, 16), strtol(bluehex, NULL, 16), strtol(whitehex, NULL, 16)); DBG_OUTPUT_PORT.printf("rgb.red: [%i] rgb.green: [%i] rgb.blue: [%i] rgb.white: [%i]\n", strtol(redhex, NULL, 16), strtol(greenhex, NULL, 16), strtol(bluehex, NULL, 16), strtol(whitehex, NULL, 16));
DBG_OUTPUT_PORT.printf("WS: Set single led [%i] to [%i] [%i] [%i] [%i] (%s)!\n", led, ledstates[led].red, ledstates[led].green, ledstates[led].blue, ledstates[led].white, mypayload); DBG_OUTPUT_PORT.printf("WS: Set single led [%i] to [%i] [%i] [%i] [%i] (%s)!\n", led, ledstates[led].red, ledstates[led].green, ledstates[led].blue, ledstates[led].white, mypayload);
strip.setPixelColor(led, ledstates[led].red, ledstates[led].green, ledstates[led].blue, ledstates[led].white); strip.setPixelColor(led, ledstates[led].red, ledstates[led].green, ledstates[led].blue, ledstates[led].white);
strip.show(); strip.show();
} }
@@ -237,6 +228,9 @@ void handleRangeDifferentColors(uint8_t * mypayload) {
} }
void setModeByStateString(String saved_state_string) { void setModeByStateString(String saved_state_string) {
#ifdef ENABLE_TV
exit_func = true;
#endif
String str_mode = getValue(saved_state_string, '|', 1); String str_mode = getValue(saved_state_string, '|', 1);
mode = static_cast<MODE>(str_mode.toInt()); mode = static_cast<MODE>(str_mode.toInt());
String str_ws2812fx_mode = getValue(saved_state_string, '|', 2); String str_ws2812fx_mode = getValue(saved_state_string, '|', 2);
@@ -266,6 +260,7 @@ void setModeByStateString(String saved_state_string) {
strip.setSpeed(convertSpeed(ws2812fx_speed)); strip.setSpeed(convertSpeed(ws2812fx_speed));
strip.setBrightness(brightness); strip.setBrightness(brightness);
strip.setColor(main_color.red, main_color.green, main_color.blue, main_color.white); strip.setColor(main_color.red, main_color.green, main_color.blue, main_color.white);
strip.trigger();
} }
void handleSetNamedMode(String str_mode) { void handleSetNamedMode(String str_mode) {
@@ -486,7 +481,7 @@ void handleAutoStart() {
#ifdef ENABLE_TV #ifdef ENABLE_TV
exit_func = true; exit_func = true;
#endif #endif
sprintf(beforeauto_state, "STA|%2d|%3d|%3d|%3d|%3d|%3d|%3d|%3d", mode, strip.getMode(), ws2812fx_speed, brightness, main_color.red, main_color.green, main_color.blue, main_color.white); sprintf(beforeoffauto_state, "STA|%2d|%3d|%3d|%3d|%3d|%3d|%3d|%3d", mode, strip.getMode(), ws2812fx_speed, brightness, main_color.red, main_color.green, main_color.blue, main_color.white);
mode = AUTO; mode = AUTO;
autoCount = 0; autoCount = 0;
autoTick(); autoTick();
@@ -495,9 +490,11 @@ void handleAutoStart() {
} }
void handleAutoStop() { void handleAutoStop() {
if (mode==AUTO) {
autoTicker.detach(); autoTicker.detach();
strip.stop(); strip.stop();
setModeByStateString(beforeauto_state); setModeByStateString(beforeoffauto_state);
}
} }
void Dbg_Prefix(bool mqtt, uint8_t num) { void Dbg_Prefix(bool mqtt, uint8_t num) {
@@ -525,9 +522,6 @@ void checkpayload(uint8_t * payload, bool mqtt = false, uint8_t num = 0) {
stateOn = true; stateOn = true;
if(!ha_send_data.active()) ha_send_data.once(5, tickerSendState); if(!ha_send_data.active()) ha_send_data.once(5, tickerSendState);
#endif #endif
#ifdef ENABLE_STATE_SAVE_SPIFFS
if(!spiffs_save_state.active()) spiffs_save_state.once(3, tickerSpiffsSaveState);
#endif
} }
// ? ==> Set speed // ? ==> Set speed
@@ -866,18 +860,23 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t lenght
//char modeName[30]; //char modeName[30];
//strncpy_P(modeName, (PGM_P)strip.getModeName(strip.getMode()), sizeof(modeName)); // copy from progmem //strncpy_P(modeName, (PGM_P)strip.getModeName(strip.getMode()), sizeof(modeName)); // copy from progmem
#if defined(ENABLE_E131) and defined(ENABLE_HOMEASSISTANT) #if defined(ENABLE_HOMEASSISTANT)
if (mode == E131) if (mode == OFF){
root["effect"] = "OFF";
} else {
if (mode == TV){
root["effect"] = "TV";
} else {
if (mode == E131){
root["effect"] = "E131"; root["effect"] = "E131";
else } else {
root["effect"] = strip.getModeName(strip.getMode());
#else
root["effect"] = strip.getModeName(strip.getMode()); root["effect"] = strip.getModeName(strip.getMode());
}
}
}
#endif #endif
char buffer[measureJson(root) + 1]; char buffer[measureJson(root) + 1];
serializeJson(root, buffer, sizeof(buffer)); serializeJson(root, buffer, sizeof(buffer));
#ifdef ENABLE_MQTT #ifdef ENABLE_MQTT
mqtt_client.publish(mqtt_ha_state_out.c_str(), buffer, true); mqtt_client.publish(mqtt_ha_state_out.c_str(), buffer, true);
DBG_OUTPUT_PORT.printf("MQTT: Send [%s]: %s\n", mqtt_ha_state_out.c_str(), buffer); DBG_OUTPUT_PORT.printf("MQTT: Send [%s]: %s\n", mqtt_ha_state_out.c_str(), buffer);
@@ -923,6 +922,7 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t lenght
main_color.red = (uint8_t) color["r"]; main_color.red = (uint8_t) color["r"];
main_color.green = (uint8_t) color["g"]; main_color.green = (uint8_t) color["g"];
main_color.blue = (uint8_t) color["b"]; main_color.blue = (uint8_t) color["b"];
main_color.white = (uint8_t) color["w"];
prevmode = mode; prevmode = mode;
mode = SETCOLOR; mode = SETCOLOR;
} }
@@ -1060,9 +1060,15 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t lenght
for (uint8_t i = 0; i < strip.getModeCount(); i++) { for (uint8_t i = 0; i < strip.getModeCount(); i++) {
effect_list.add(strip.getModeName(i)); effect_list.add(strip.getModeName(i));
} }
#if defined(ENABLE_E131) and defined(MQTT_HOME_ASSISTANT_SUPPORT) #ifdef MQTT_HOME_ASSISTANT_SUPPORT
effect_list.add("OFF");
#ifdef ENABLE_TV
effect_list.add("TV");
#endif
#ifdef ENABLE_E131
effect_list.add("E131"); effect_list.add("E131");
#endif #endif
#endif
char buffer[measureJson(json) + 1]; char buffer[measureJson(json) + 1];
serializeJson(json, buffer, sizeof(buffer)); serializeJson(json, buffer, sizeof(buffer));
mqtt_client.publish(String("homeassistant/light/" + String(HOSTNAME) + "/config").c_str(), buffer, true); mqtt_client.publish(String("homeassistant/light/" + String(HOSTNAME) + "/config").c_str(), buffer, true);
@@ -1147,9 +1153,15 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t lenght
for (uint8_t i = 0; i < strip.getModeCount(); i++) { for (uint8_t i = 0; i < strip.getModeCount(); i++) {
effect_list.add(strip.getModeName(i)); effect_list.add(strip.getModeName(i));
} }
#if defined(ENABLE_E131) and defined(MQTT_HOME_ASSISTANT_SUPPORT) #ifdef MQTT_HOME_ASSISTANT_SUPPORT
effect_list.add("OFF");
#ifdef ENABLE_TV
effect_list.add("TV");
#endif
#ifdef ENABLE_E131
effect_list.add("E131"); effect_list.add("E131");
#endif #endif
#endif
char buffer[measureJson(json) + 1]; char buffer[measureJson(json) + 1];
serializeJson(json, buffer, sizeof(buffer)); serializeJson(json, buffer, sizeof(buffer));
DBG_OUTPUT_PORT.println(buffer); DBG_OUTPUT_PORT.println(buffer);