Effekte aktualisiert

This commit is contained in:
starcalc 2018-10-23 21:02:55 +02:00
parent 3cb8f1cb20
commit 8e5e358da4
7 changed files with 1527 additions and 359 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,59 +1,178 @@
#ifndef NEOPATTERNS_H
#define NEOPATTERNS_H
#include <Adafruit_NeoPixel.h>
#include <math.h>
#include <vector>
#include <algorithm> // std::remove
#include "Rocket.h"
#include "Particle.h"
// class Rocket;
// class Particle;
// Ideas
// Drop (Middle high, than to both sides diming out)
#define MAX_DROPS 10
#define MAX_RINGS 1
// Two or more chasers
// Chaser changing direction randomly
// Pattern types supported:
enum pattern { NONE, RAINBOW_CYCLE, THEATER_CHASE, COLOR_WIPE, SCANNER, FADE, RANDOM_FADE };
enum pattern { NONE, RAINBOW_CYCLE, THEATER_CHASE, COLOR_WIPE, SCANNER, FADE, RANDOM_FADE, SMOOTH, RANDOM_FADE_SINGLE, PLASMA, FILL, RANDOM, FIRE, FIREWORKS, DROP, RINGS, SCANNER_RANDOM, BVB };
// Patern directions supported:
enum direction { FORWARD, REVERSE };
class NeoPatterns : public Adafruit_NeoPixel
{
public:
NeoPatterns(uint16_t pixels, uint8_t pin, uint8_t type, void (*callback)());
public:
NeoPatterns(uint16_t pixels, uint8_t pin, uint8_t type, void (*callback)(), void (*callbackDebug)(String));
void Update();
void Reverse();
void None();
void RainbowCycle(uint8_t interval, direction dir = FORWARD);
void RainbowCycleUpdate();
void TheaterChase(uint32_t color1, uint32_t color2, uint8_t interval, direction dir = FORWARD);
void TheaterChaseUpdate();
void ColorWipe(uint32_t color, uint8_t interval, direction dir = FORWARD);
void ColorWipeUpdate();
void Scanner(uint32_t color1, uint8_t interval = 40,bool colorful = false);
void ScannerUpdate();
void Fade(uint32_t color1, uint32_t color2, uint16_t steps, uint8_t interval, direction dir = FORWARD);
void FadeUpdate();
void RandomFade(uint8_t interval = 100);
void RandomFadeUpdate();
void Update();
void SetColor1(uint32_t color);
void SetColor2(uint32_t color);
//Utilities
void ColorSet(uint32_t color);
uint8_t Red(uint32_t color);
uint8_t Green(uint32_t color);
uint8_t Blue(uint32_t color);
uint32_t Wheel(byte WheelPos);
void Reverse();
void None(uint8_t interval = 40);
void RainbowCycle(uint8_t interval, direction dir = FORWARD);
void RainbowCycleUpdate();
void TheaterChase(uint32_t color1, uint32_t color2, uint8_t interval, direction dir = FORWARD);
void TheaterChaseUpdate();
void BVBChase(uint32_t color1, uint32_t color2, uint8_t interval, direction dir = FORWARD);
void BVBChaseUpdate();
void ColorWipe(uint32_t color, uint8_t interval, direction dir = FORWARD);
void ColorWipeUpdate();
void Scanner(uint32_t color1 = 16711680, uint8_t interval = 40, bool colorful = false, bool spiral = false);
void ScannerUpdate();
void ScannerRandom(uint32_t color1 = 16711680, uint8_t interval = 40, bool colorful = false, bool spiral = false);
void ScannerRandomUpdate();
void Fade(uint32_t color1, uint32_t color2, uint16_t steps, uint8_t interval, direction dir = FORWARD);
void FadeUpdate();
void RandomFade(uint8_t interval = 100);
void RandomFadeUpdate();
void RandomFadeSingle(uint8_t interval = 100, uint8_t speed = 5);
void RandomFadeSingleUpdate();
void Fire(uint8_t interval = 100);
void FireUpdate();
void Fireworks();
void FireworksUpdate();
void explosion(int pos, float rocketspeed);
void Drop(uint8_t interval = 100);
void DropUpdate();
void Rings(uint8_t interval = 100);
void RingsUpdate();
void RandomBuffer();
void Random();
void Smooth(uint8_t wheelSpeed = 16, uint8_t smoothing = 80, uint8_t strength = 50, uint8_t interval = 40);
void SmoothUpdate();
void Plasma(float phase = 0, float phaseIncrement = 0.03, float colorStretch = 0.3, uint8_t interval = 60); // 0.08 and 0.11
void PlasmaUpdate();
private:
void SetColor1(uint32_t color);
void SetColor2(uint32_t color);
//Utilities
void ColorSet(uint32_t color);
void ColorSetParameters(String parameters);
uint8_t Red(uint32_t color);
uint8_t Green(uint32_t color);
uint8_t Blue(uint32_t color);
uint32_t Wheel(byte WheelPos);
uint32_t Wheel(byte WheelPos, float brightness);
uint8_t numToSpiralPos(int num);
uint8_t xyToPos(int x, int y);
uint8_t numToPos(int num);
uint8_t getAverage(uint8_t array[], uint8_t i, int x, int y);
uint32_t parseColor(String value);
// Member Variables:
pattern ActivePattern; // which pattern is running
direction Direction; // direction to run the pattern
unsigned long Interval; // milliseconds between updates
unsigned long lastUpdate; // last update of position
#define EXPLOSION_SIZE_MIN 5
#define EXPLOSION_SIZE_MAX 10
// 60 LED Strip: 50, 100, 0.985 is a good choice (with Interval = 25)
// Start 0, with maximum speed (100), the rocket should explode at the LATEST at position 50 (of 60). (Which is 10 pixels before maximum)
// #define EXPLOSION_SPEED 0.25f
// #define ROCKET_SPEED_MIN 50
// ROCKET_SPEED_MAX should not be >100, as this would skip LEDs.
// #define ROCKET_SPEED_MAX 100
// #define ROCKET_SLOWDOWN 0.985f
#define ROCKET_LAUNCH_TIMEOUT_MIN 1000
#define ROCKET_LAUNCH_TIMEOUT_MAX 3000
uint32_t Color1, Color2; // What colors are in use
uint16_t TotalSteps; // total number of steps in the pattern
uint16_t Index; // current step within the pattern
uint32_t maxRocketID = 0;
uint32_t maxParticleID = 0;
uint32_t currentRocketMillis = 0;
uint32_t rocketTimeout;
float explosion_speed = 0.25f;
uint8_t rocket_speed_min = 50;
uint8_t rocket_speed_max = 100;
double rocket_slowdown = 0.985f;
byte wPos;
bool colorful;
private:
std::vector <Rocket> rocket_arr;
std::vector <Particle> particle_arr;
uint32_t DimColor(uint32_t color);
void Increment();
void (*OnComplete)(); // Callback on completion of pattern
// Member Variables:
pattern ActivePattern; // which pattern is running
pattern SavedPattern;
direction Direction; // direction to run the pattern
direction SavedDirection;
unsigned long Interval; // milliseconds between updates
unsigned long SavedInterval;
unsigned long lastUpdate; // last update of position
uint32_t Color1, Color2; // What colors are in use
uint32_t SavedColor1;
uint16_t TotalSteps; // total number of steps in the pattern
uint16_t SavedTotalSteps;
uint16_t Index; // current step within the pattern
uint16_t SavedIndex;
uint8_t Every; // Turn every "Every" pixel in Color1/Color2
byte wPos;
bool colorful;
bool spiral;
uint8_t wPosSlow;
uint8_t WheelSpeed;
uint8_t Smoothing;
uint8_t Strength;
uint8_t movingPoint_x;
uint8_t movingPoint_y;
uint8_t *pixelR;
uint8_t *pixelG;
uint8_t *pixelB;
uint8_t *pixelR_buffer;
uint8_t *pixelG_buffer;
uint8_t *pixelB_buffer;
// Drops
uint8_t *drop;
uint8_t *dropBrightness;
// Rings
uint8_t *ring;
uint8_t *ringBrightness;
uint8_t *ringDistance;
uint8_t FontChar;
float PlasmaPhase;
float SavedPlasmaPhase;
float PlasmaPhaseIncrement;
float SavedPlasmaPhaseIncrement;
float PlasmaColorStretch;
float SavedPlasmaColorStretch;
uint32_t DimColor(uint32_t color);
void Increment();
void (*OnComplete)(); // Callback on completion of pattern
void (*OnDebugOutput)(String); // Callback on completion of pattern
// Convenient 2D point structure
struct Point {
float x;
float y;
};
};
#endif

View File

@ -0,0 +1,48 @@
#include "Particle.h"
#include "NeoPatterns.h"
Particle::Particle() // Particle::Particle(NeoPatterns * parent)
{
_pos = 0;
// _id = parent->maxParticleID;
// parent->maxParticleID++;
} //Default constructor.
Particle::Particle(NeoPatterns * parent, float pos, float speed, uint8_t hue, float brightness, float decay )
{
_id = parent->maxParticleID;
parent->maxParticleID++;
_pos = pos;
_speed = speed;
_hue = hue;
_brightness = brightness;
_decay = decay;
_parent = parent;
}
bool Particle::operator==(const Particle &p) const {
return (p._id == _id);
}
void Particle::update()
{
_pos += _speed;
_speed *= 0.96;
_brightness *= _decay;
if (_pos > _parent->numPixels()) {
_pos = 0;
}
_parent->setPixelColor((int)_pos, _parent->Wheel(_hue, _brightness));
}
float Particle::brightness()
{
return _brightness;
}

View File

@ -0,0 +1,25 @@
#ifndef PARTICLE_H
#define PARTICLE_H
#include <Adafruit_NeoPixel.h>
class NeoPatterns; // Forward declaration
class Particle
{
public:
Particle(NeoPatterns * parent, float pos, float speed, uint8_t hue, float brightness, float decay = 0.95);
Particle();
bool operator==(const Particle &p) const;
void update();
int _id;
float brightness();
private:
float _pos;
float _speed;
float _brightness;
float _decay;
uint8_t _hue;
NeoPatterns * _parent;
};
#endif

View File

@ -0,0 +1,62 @@
#include "Rocket.h"
#include "NeoPatterns.h"
Rocket::Rocket()
{
// _id = maxRocketID;
// maxRocketID++;
_pos = 0;
_speed = 1;
_lastbright = 1;
}
Rocket::Rocket(NeoPatterns *parent, float pos, float rocketspeed, float rocket_slowdown)
{
_parent = parent;
_id = _parent->maxRocketID;
_parent->maxRocketID++;
_rocket_slowdown = rocket_slowdown;
_iteration = 0;
Serial.print("Rocket: ");
Serial.print(_id);
Serial.print(" ");
Serial.print(pos);
Serial.print(" ");
Serial.println(rocketspeed);
_pos = pos;
_speed = rocketspeed;
}
bool Rocket::operator==(const Rocket &r) const {
return (r._id == _id);
}
void Rocket::update()
{
_iteration++;
_pos += _speed;
_speed *= _rocket_slowdown; // 0.97
_parent->setPixelColor(_pos, _parent->Color(50, 32, 0));
}
// Schweif mit Sparkle
int Rocket::pos()
{
return _pos;
}
float Rocket::rocketspeed()
{
return _speed;
}
int Rocket::id()
{
return _id;
}
uint16_t Rocket::iteration()
{
return _iteration;
}

29
esp-wemos-schild/Rocket.h Normal file
View File

@ -0,0 +1,29 @@
#ifndef ROCKET_H
#define ROCKET_H
#include <Adafruit_NeoPixel.h>
class NeoPatterns; // Forward declaration
class Rocket
{
public:
int _id;
Rocket(NeoPatterns *parent, float pos, float rocketspeed, float rocket_slowdown);
Rocket();
bool operator==(const Rocket &r) const;
void update();
int pos();
float rocketspeed();
int id();
uint16_t iteration();
private:
float _pos;
float _speed;
int _lastbright;
float _rocket_slowdown;
uint16_t _iteration;
NeoPatterns * _parent;
};
#endif

View File

@ -4,148 +4,211 @@
#include <ArduinoOTA.h>
#include <Adafruit_NeoPixel.h>
#include "NeoPatterns.h"
#include <math.h>
#define PIN D1
#define NUMPIXELS 80
#define NUMPIXELS 30
#define FW_NAME "esp-schild"
#define FW_VERSION "1.0.1"
#define FW_VERSION "1.0.3"
void StripComplete(){
return;
HomieNode homieNode("strip", "strip");
void StripComplete() {
return;
}
NeoPatterns pixels = NeoPatterns(NUMPIXELS, PIN, NEO_GRB + NEO_KHZ800,&StripComplete);
HomieNode stripNode("strip", "strip");
bool onSetColor(const HomieRange& range, const String& value){
if (!range.isRange || range.index < 0 || range.index > 1) {
return false;
}
switch(range.index) {
case 0:
pixels.SetColor1(value.toInt());
break;
case 1:
pixels.SetColor2(value.toInt());
break;
}
stripNode.setProperty("color_" + String(range.index)).send(value);
void DebugOutput(String value) {
homieNode.setProperty("DEBUG").send(value);
}
bool onSetPixel(const HomieRange& range, const String& value){
if(!range.isRange) {
pixels.None();
pixels.ColorSet(value.toInt());
stripNode.setProperty("pixel").send(value);
return true;
}
if (range.index < 0 || range.index > pixels.numPixels()-1) {
return false;
}
pixels.None();
pixels.setPixelColor(range.index, value.toInt());
pixels.show();
stripNode.setProperty("pixel_" + String(range.index)).send(value);
NeoPatterns strip = NeoPatterns(NUMPIXELS, PIN, NEO_GRB + NEO_KHZ800, &StripComplete, &DebugOutput);
bool onSetColor(const HomieRange& range, const String& value) {
if (!range.isRange || range.index < 0 || range.index > 1) {
return false;
}
switch (range.index) {
case 0:
strip.SetColor1(value.toInt());
break;
case 1:
strip.SetColor2(value.toInt());
break;
}
homieNode.setProperty("color_" + String(range.index)).send(value);
}
bool onSetBrightness(const HomieRange& range, const String& value){
long brightness= value.toInt();
if (brightness < 0 || brightness > 255) {
return false;
}
pixels.setBrightness(brightness);
pixels.show();
stripNode.setProperty("brightness").send(value);
bool onSetPixel(const HomieRange& range, const String& value) {
if (!range.isRange) {
strip.None();
strip.ColorSet(value.toInt());
homieNode.setProperty("pixel").send(value);
return true;
}
if (range.index < 0 || range.index > strip.numPixels() - 1) {
return false;
}
strip.None();
strip.setPixelColor(range.index, value.toInt());
strip.show();
homieNode.setProperty("pixel_" + String(range.index)).send(value);
}
bool onSetEffect(const HomieRange& range, const String& value){
String effect = value;
effect.toLowerCase();
if(effect == "scanner") {
pixels.Scanner(pixels.Color(255, 0, 0));
}
else if(effect == "randomscanner") {
pixels.Scanner(pixels.Color(255, 0, 0), 40, true);
}
else if(effect == "rainbowcycle") {
pixels.RainbowCycle(50);
}
else if(effect == "theaterchase") {
pixels.TheaterChase(pixels.Color(255, 0, 0), pixels.Color(0,0,255), 100);
}
else if(effect == "fade") {
pixels.Fade(pixels.Color(255, 0, 0), pixels.Color(0,0,255), 200, 100);
}
else if(effect == "randomfade") {
pixels.RandomFade();
}
else {
pixels.None();
}
stripNode.setProperty("effect").send(value);
bool onSetBrightness(const HomieRange& range, const String& value) {
long brightness = value.toInt();
if (brightness < 0 || brightness > 255) {
return false;
}
strip.setBrightness(brightness);
strip.show();
homieNode.setProperty("brightness").send(value);
}
bool onSetClear(const HomieRange& range, const String& value){
pixels.None();
pixels.clear();
pixels.show();
stripNode.setProperty("clear").send(value);
bool onSetEffect(const HomieRange& range, const String& value) {
String effect = value;
effect.toLowerCase();
if (effect == "scanner") {
strip.Scanner(strip.Color(255, 0, 0));
}
else if (effect == "randomscanner") {
strip.Scanner(strip.Color(255, 0, 0), 4, true);
}
else if (effect == "larsonspiral") {
strip.Scanner(strip.Color(255, 0, 0), 40, true, true);
}
else if (effect == "rainbowcycle") {
strip.RainbowCycle(50);
}
else if (effect == "theaterchase" || effect == "chase") {
strip.TheaterChase(strip.Color(255, 0, 0), strip.Color(0, 0, 255), 50);
}
else if (effect == "bvb") {
strip.BVBChase(strip.Color(255, 185, 0), strip.Color(0, 0, 0), 50);
}
else if (effect == "fade") {
strip.Fade(strip.Color(255, 0, 0), strip.Color(0, 0, 255), 200, 100);
}
else if (effect == "randomfade") {
strip.RandomFade();
}
else if (effect == "random") {
strip.Random();
}
else if (effect == "smooth") { //example: smooth|[wheelspeed]|[smoothing]|[strength] wheelspeed=1-255, smoothing=0-100, strength=1-255
strip.Smooth(16, 80, 50, 40);
}
else if (effect == "plasma") {
strip.Plasma();
}
else if (effect == "fire") {
strip.Fire();
}
else if (effect == "fireworks") {
strip.Fireworks();
}
else if (effect == "drop") {
strip.Drop();
}
else if (effect == "scannerrandom") {
strip.ScannerRandom(strip.Color(255, 0, 0), 4, true);
}
else if (effect == "ring") {
strip.Rings();
} else {
// Test whether command with parameters was sent
int sep = value.indexOf("|");
String command = value.substring(0, sep);
String parameters = value.substring(sep + 1);
if (command.equals("fill")) {
strip.ColorSetParameters(parameters);
}
else if (command.equals("randomfade")) {
int sepparam = parameters.indexOf("|");
int p1 = parameters.substring(0, sepparam).toInt();
if (p1 <= 0) {
p1 = 5;
}
strip.RandomFadeSingle(p1);
}
else if (command.equals("randomscanner")) {
int sepparam = parameters.indexOf("|");
int p1 = parameters.substring(0, sepparam).toInt();
if (p1 <= 0) {
p1 = 5;
}
homieNode.setProperty("effect").send(String(p1));
strip.Scanner(strip.Color(255, 0, 0), p1, true);
}
else {
strip.None();
digitalWrite(PIN, LOW); // D4 ist auch gleichzeitig der LED-Pin, daher abschalten... (TODO: TEST: FIXME)
}
}
homieNode.setProperty("effect").send(value);
}
bool onSetLength(const HomieRange& range, const String& value){
pixels.None();
pixels.clear();
pixels.show();
int newLength = value.toInt();
if(newLength > 0) {
pixels.updateLength(newLength);
}
stripNode.setProperty("length").send(value);
bool onSetClear(const HomieRange& range, const String& value) {
strip.None();
strip.clear();
strip.show();
homieNode.setProperty("clear").send(value);
}
bool onSetLength(const HomieRange& range, const String& value) {
strip.None();
strip.clear();
strip.show();
int newLength = value.toInt();
if (newLength > 0) {
strip.updateLength(newLength);
}
homieNode.setProperty("length").send(value);
}
void loopHandler() {
pixels.Update();
strip.Update();
}
void setup() {
Serial.begin(115200);
Serial.begin(115200);
Homie_setFirmware(FW_NAME, FW_VERSION);
Homie_setBrand(FW_NAME);
Homie.setLoopFunction(loopHandler);
Homie_setFirmware(FW_NAME, FW_VERSION);
Homie_setBrand(FW_NAME);
Homie.setLoopFunction(loopHandler);
stripNode.advertiseRange("pixel", 0, NUMPIXELS-1).settable(onSetPixel);
stripNode.advertiseRange("color", 0, 1).settable(onSetColor);
stripNode.advertise("brightness").settable(onSetBrightness);
stripNode.advertise("effect").settable(onSetEffect);
stripNode.advertise("clear").settable(onSetClear);
stripNode.advertise("length").settable(onSetLength);
homieNode.advertiseRange("pixel", 0, NUMPIXELS - 1).settable(onSetPixel);
homieNode.advertiseRange("color", 0, 1).settable(onSetColor);
homieNode.advertise("brightness").settable(onSetBrightness);
homieNode.advertise("effect").settable(onSetEffect);
homieNode.advertise("clear").settable(onSetClear);
homieNode.advertise("length").settable(onSetLength);
pixels.begin();
pixels.clear();
pixels.setBrightness(64);
pixels.show();
strip.begin();
strip.clear();
strip.setBrightness(30);
strip.show();
Homie.setup();
Homie.setup();
ArduinoOTA.setHostname(Homie.getConfiguration().deviceId);
// ArduinoOTA.setPassword((const char *)"ctdo2342");
ArduinoOTA.onStart([]() {
pixels.clear();
});
ArduinoOTA.onEnd([]() {
pixels.clear();
});
ArduinoOTA.onProgress([](unsigned int progress, unsigned int total) {
pixels.setPixelColor(progress / (total / NUMPIXELS), pixels.Color(100, 0, 0));
pixels.show();
});
ArduinoOTA.begin();
ArduinoOTA.setHostname(Homie.getConfiguration().deviceId);
ArduinoOTA.begin();
ArduinoOTA.onStart([]() {
strip.clear();
});
ArduinoOTA.onEnd([]() {
strip.clear();
});
ArduinoOTA.onProgress([](unsigned int progress, unsigned int total) {
strip.setPixelColor(progress / (total / NUMPIXELS), strip.Color(100, 0, 0));
strip.show();
});
ArduinoOTA.begin();
}
void loop() {
Homie.loop();
ArduinoOTA.handle();
Homie.loop();
ArduinoOTA.handle();
}