Geschwindigkeit einstellbar

Show progress for OTA via Neopixels

See merge request !2

.vscode/c_cpp_properties.json

@@ -0,0 +1,163 @@
+{
+    "WARNING": "This file was generated by the PlatformIO extension. Changes to this file will be lost when it is regenerated.",
+    "configurations": [
+        {
+            "name": "Mac",
+            "includePath": [
+                "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/tools/sdk/include",
+                "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/tools/sdk/lwip/include",
+                "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/cores/esp8266",
+                "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/variants/d1_mini",
+                "/Users/dukat/Documents/Arduino/Homie/esp-wemos-schild/.piolibdeps/ArduinoJson_ID64",
+                "/Users/dukat/Documents/Arduino/Homie/esp-wemos-schild/.piolibdeps/Bounce2_ID1106",
+                "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266WiFi/src",
+                "/Users/dukat/Documents/Arduino/Homie/esp-wemos-schild/.piolibdeps/ESPAsyncTCP_ID305/src",
+                "/Users/dukat/Documents/Arduino/Homie/esp-wemos-schild/.piolibdeps/AsyncMqttClient_ID346/src",
+                "/Users/dukat/Documents/Arduino/Homie/esp-wemos-schild/.piolibdeps/Adafruit NeoPixel_ID28",
+                "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/Ticker",
+                "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/DNSServer/src",
+                "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266WebServer/src",
+                "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266HTTPClient/src",
+                "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266mDNS",
+                "/Users/dukat/Documents/Arduino/Homie/esp-wemos-schild/.piolibdeps/homie-esp8266/src",
+                "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/ArduinoOTA",
+                "/Users/dukat/Documents/Arduino/Homie/esp-wemos-schild/esp-wemos-schild",
+                "/Users/dukat/Documents/Arduino/Homie/esp-wemos-schild/.piolibdeps/Adafruit NeoPixel_ID28",
+                "/Users/dukat/Documents/Arduino/Homie/esp-wemos-schild/.piolibdeps/ArduinoJson_ID64",
+                "/Users/dukat/Documents/Arduino/Homie/esp-wemos-schild/.piolibdeps/ArduinoJson_ID64",
+                "/Users/dukat/Documents/Arduino/Homie/esp-wemos-schild/.piolibdeps/AsyncMqttClient_ID346/src",
+                "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266WiFi/src",
+                "/Users/dukat/Documents/Arduino/Homie/esp-wemos-schild/.piolibdeps/ESPAsyncTCP_ID305/src",
+                "/Users/dukat/Documents/Arduino/Homie/esp-wemos-schild/.piolibdeps/AsyncMqttClient_ID346/src",
+                "/Users/dukat/Documents/Arduino/Homie/esp-wemos-schild/.piolibdeps/Bounce2_ID1106",
+                "/Users/dukat/Documents/Arduino/Homie/esp-wemos-schild/.piolibdeps/Bounce2_ID1106",
+                "/Users/dukat/Documents/Arduino/Homie/esp-wemos-schild/.piolibdeps/ESPAsyncTCP_ID305/src",
+                "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266WiFi/src",
+                "/Users/dukat/Documents/Arduino/Homie/esp-wemos-schild/.piolibdeps/ESPAsyncTCP_ID305/src",
+                "/Users/dukat/Documents/Arduino/Homie/esp-wemos-schild/.piolibdeps/homie-esp8266/src",
+                "/Users/dukat/Documents/Arduino/Homie/esp-wemos-schild/.piolibdeps/ArduinoJson_ID64",
+                "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266WiFi/src",
+                "/Users/dukat/Documents/Arduino/Homie/esp-wemos-schild/.piolibdeps/ESPAsyncTCP_ID305/src",
+                "/Users/dukat/Documents/Arduino/Homie/esp-wemos-schild/.piolibdeps/AsyncMqttClient_ID346/src",
+                "/Users/dukat/Documents/Arduino/Homie/esp-wemos-schild/.piolibdeps/Bounce2_ID1106",
+                "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/Ticker",
+                "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/DNSServer/src",
+                "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266WebServer/src",
+                "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266HTTPClient/src",
+                "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266mDNS",
+                "/Users/dukat/Documents/Arduino/Homie/esp-wemos-schild/.piolibdeps/homie-esp8266/src",
+                "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/ArduinoOTA",
+                "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/DNSServer/src",
+                "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/EEPROM",
+                "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266AVRISP/src",
+                "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266HTTPClient/src",
+                "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266HTTPUpdateServer/src",
+                "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266SSDP",
+                "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266WebServer/src",
+                "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266WiFi/src",
+                "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266WiFiMesh/src",
+                "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266httpUpdate/src",
+                "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266mDNS",
+                "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/Ethernet/src",
+                "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/GDBStub/src",
+                "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/Hash/src",
+                "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/SD/src",
+                "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/SPI",
+                "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/Servo/src",
+                "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/SoftwareSerial",
+                "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/TFT_Touch_Shield_V2",
+                "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/Ticker",
+                "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/Wire",
+                "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/esp8266/src",
+                "/Users/dukat/.platformio/packages/toolchain-xtensa/xtensa-lx106-elf/include",
+                "/Users/dukat/.platformio/packages/toolchain-xtensa/lib/gcc/xtensa-lx106-elf/4.8.2/include",
+                "/Users/dukat/.platformio/packages/toolchain-xtensa/lib/gcc/xtensa-lx106-elf/4.8.2/include-fixed"
+            ],
+            "defines": [
+                "ARDUINO=20300",
+                "LWIP_OPEN_SRC",
+                "F_CPU=80000000L",
+                "__ets__",
+                "ICACHE_FLASH",
+                "PLATFORMIO=30300",
+                "ESP8266",
+                "ARDUINO_ARCH_ESP8266",
+                "ESP8266_WEMOS_D1MINI"
+            ],
+            "browse": {
+                "path": [
+                    "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/tools/sdk/include",
+                    "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/tools/sdk/lwip/include",
+                    "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/cores/esp8266",
+                    "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/variants/d1_mini",
+                    "/Users/dukat/Documents/Arduino/Homie/esp-wemos-schild/.piolibdeps/ArduinoJson_ID64",
+                    "/Users/dukat/Documents/Arduino/Homie/esp-wemos-schild/.piolibdeps/Bounce2_ID1106",
+                    "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266WiFi/src",
+                    "/Users/dukat/Documents/Arduino/Homie/esp-wemos-schild/.piolibdeps/ESPAsyncTCP_ID305/src",
+                    "/Users/dukat/Documents/Arduino/Homie/esp-wemos-schild/.piolibdeps/AsyncMqttClient_ID346/src",
+                    "/Users/dukat/Documents/Arduino/Homie/esp-wemos-schild/.piolibdeps/Adafruit NeoPixel_ID28",
+                    "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/Ticker",
+                    "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/DNSServer/src",
+                    "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266WebServer/src",
+                    "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266HTTPClient/src",
+                    "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266mDNS",
+                    "/Users/dukat/Documents/Arduino/Homie/esp-wemos-schild/.piolibdeps/homie-esp8266/src",
+                    "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/ArduinoOTA",
+                    "/Users/dukat/Documents/Arduino/Homie/esp-wemos-schild/esp-wemos-schild",
+                    "/Users/dukat/Documents/Arduino/Homie/esp-wemos-schild/.piolibdeps/Adafruit NeoPixel_ID28",
+                    "/Users/dukat/Documents/Arduino/Homie/esp-wemos-schild/.piolibdeps/ArduinoJson_ID64",
+                    "/Users/dukat/Documents/Arduino/Homie/esp-wemos-schild/.piolibdeps/ArduinoJson_ID64",
+                    "/Users/dukat/Documents/Arduino/Homie/esp-wemos-schild/.piolibdeps/AsyncMqttClient_ID346/src",
+                    "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266WiFi/src",
+                    "/Users/dukat/Documents/Arduino/Homie/esp-wemos-schild/.piolibdeps/ESPAsyncTCP_ID305/src",
+                    "/Users/dukat/Documents/Arduino/Homie/esp-wemos-schild/.piolibdeps/AsyncMqttClient_ID346/src",
+                    "/Users/dukat/Documents/Arduino/Homie/esp-wemos-schild/.piolibdeps/Bounce2_ID1106",
+                    "/Users/dukat/Documents/Arduino/Homie/esp-wemos-schild/.piolibdeps/Bounce2_ID1106",
+                    "/Users/dukat/Documents/Arduino/Homie/esp-wemos-schild/.piolibdeps/ESPAsyncTCP_ID305/src",
+                    "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266WiFi/src",
+                    "/Users/dukat/Documents/Arduino/Homie/esp-wemos-schild/.piolibdeps/ESPAsyncTCP_ID305/src",
+                    "/Users/dukat/Documents/Arduino/Homie/esp-wemos-schild/.piolibdeps/homie-esp8266/src",
+                    "/Users/dukat/Documents/Arduino/Homie/esp-wemos-schild/.piolibdeps/ArduinoJson_ID64",
+                    "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266WiFi/src",
+                    "/Users/dukat/Documents/Arduino/Homie/esp-wemos-schild/.piolibdeps/ESPAsyncTCP_ID305/src",
+                    "/Users/dukat/Documents/Arduino/Homie/esp-wemos-schild/.piolibdeps/AsyncMqttClient_ID346/src",
+                    "/Users/dukat/Documents/Arduino/Homie/esp-wemos-schild/.piolibdeps/Bounce2_ID1106",
+                    "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/Ticker",
+                    "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/DNSServer/src",
+                    "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266WebServer/src",
+                    "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266HTTPClient/src",
+                    "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266mDNS",
+                    "/Users/dukat/Documents/Arduino/Homie/esp-wemos-schild/.piolibdeps/homie-esp8266/src",
+                    "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/ArduinoOTA",
+                    "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/DNSServer/src",
+                    "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/EEPROM",
+                    "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266AVRISP/src",
+                    "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266HTTPClient/src",
+                    "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266HTTPUpdateServer/src",
+                    "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266SSDP",
+                    "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266WebServer/src",
+                    "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266WiFi/src",
+                    "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266WiFiMesh/src",
+                    "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266httpUpdate/src",
+                    "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266mDNS",
+                    "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/Ethernet/src",
+                    "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/GDBStub/src",
+                    "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/Hash/src",
+                    "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/SD/src",
+                    "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/SPI",
+                    "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/Servo/src",
+                    "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/SoftwareSerial",
+                    "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/TFT_Touch_Shield_V2",
+                    "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/Ticker",
+                    "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/Wire",
+                    "/Users/dukat/.platformio/packages/framework-arduinoespressif8266/libraries/esp8266/src",
+                    "/Users/dukat/.platformio/packages/toolchain-xtensa/xtensa-lx106-elf/include",
+                    "/Users/dukat/.platformio/packages/toolchain-xtensa/lib/gcc/xtensa-lx106-elf/4.8.2/include",
+                    "/Users/dukat/.platformio/packages/toolchain-xtensa/lib/gcc/xtensa-lx106-elf/4.8.2/include-fixed"
+                ],
+                "limitSymbolsToIncludedHeaders": false,
+                "databaseFilename": "${workspaceRoot}/.vscode/browse.vc.db"
+            }
+        }
+    ]
+}

Readme.md

@@ -12,15 +12,9 @@ Homie Schild Firmware
 |`device_id`/strip/clear|Clears the pixels strip|yes|any value is possible|
 |`device_id`/strip/length|Set the strip length|yes|Possible values: 0 - length|
 
-### Motion sensor
-|Topic    |Descriptions  |settable   |Values   |
-|---------|--------------|:---------:|---------|
-|`device_id`/sensor/motion|Activated on motion|no|true or false|
-
-
 ## Color
 To convert RGB value use the following bash code:
-```bash
+```shell
 function rgbToColor {   
   echo $(( $(($1<<16)) + $(($2<<8)) + $(($3))  ));
 }
@@ -30,16 +24,17 @@ function colorToRGB {
   echo "Green:  $(($1>>8&0xff))"
   echo "Blue:   $(($1&0xff))"
 }
+
 ```
 #### Example
 RGB Value to color uint32_t
-```bash
+```shell
   bash$ rgbToColor 155 230 32
   10216992
   bash$
 ```
 uint32_t to RGB values
-```bash
+```shell
   bash$ colorToRGB 10216992
   Red:    155
   Green:  230
@@ -48,20 +43,39 @@ uint32_t to RGB values
 ```
 
 ## Effects
-* scanner
+* **scanner**
 Shows the moving larson scanner eye known form *Battlestar Galactica* and *Knight Rider*. The used effect color can be specified by *color_0*
-* randomscanner
+* **randomscanner**
 This is the same scanner then the scanner above but uses an alternating color pattern
-* rainbowcycle
+* **rainbowcycle**
 Shows a cycling rainbown on the LED strip
-* theaterchase
+* **theaterchase**
 Shows an color chasing LED strip.
 You can specify the color by set *color_0* and *color_1*  
-* fade
+* **bvb**
+Shows an color chasing LED strip.
+It is predefined with yellow and black (off)
+* **fade**
 Fades from effect color_0 to effect_color_1
-* randomfade
+* **randomfade**
 Fades thru an alternating color pattern
-* none
+* **random**
+Set the color of each pixel randomly, once
+* **smooth**
+Smooth transitions, created for pixelprojektor
+* **plasma**
+Plasma animation, created for pixelprojektor
+* **fire**
+Yellow-Orange-red flicker fire effect
+* **fireworks**
+(Beta) Works best on very long stripes, this one is a bit short (30 LEDs)
+* **drop**
+Water drop effect
+* **scannerrandom**
+Like randomscanner, but randomly changes directions
+* **ring**
+Water drop effect with expanding "ring"
+* **none**
 Stop all effects
 
 ## Effect colors
@@ -77,11 +91,11 @@ The effect color has to be set after the effect.
 
 ##### color_0
 This color will be used for the following effects:
-* scanner
+* *scanner*
-* theaterchase
+* *theaterchase*
-* fade
+* *fade*
 
 ##### color_1
 This color will be used for the following effects:
-* theaterchase
+* *theaterchase*
-* fade
+* *fade*

esp-wemos-schild/NeoPatterns.h

@@ -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:
+  public:
-NeoPatterns(uint16_t pixels, uint8_t pin, uint8_t type, void (*callback)());
+    NeoPatterns(uint16_t pixels, uint8_t pin, uint8_t type, void (*callback)(), void (*callbackDebug)(String));
 
-void Update();
 
-void Reverse();
+    void Update();
-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 SetColor1(uint32_t color);
+    void Reverse();
-void SetColor2(uint32_t color);
+    void None(uint8_t interval = 40);
-//Utilities
+    void RainbowCycle(uint8_t interval, direction dir = FORWARD);
-void ColorSet(uint32_t color);
+    void RainbowCycleUpdate();
-uint8_t Red(uint32_t color);
+    void TheaterChase(uint32_t color1, uint32_t color2, uint8_t interval, direction dir = FORWARD);
-uint8_t Green(uint32_t color);
+    void TheaterChaseUpdate();
-uint8_t Blue(uint32_t color);
+    void BVBChase(uint32_t color1, uint32_t color2, uint8_t interval, direction dir = FORWARD);
-uint32_t Wheel(byte WheelPos);
+    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);
+    void setInterval(uint8_t interval);
 
-// Member Variables:
+#define EXPLOSION_SIZE_MIN 5
-pattern ActivePattern;       // which pattern is running
+#define EXPLOSION_SIZE_MAX 10
-direction Direction;         // direction to run the pattern
+    // 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
 
-unsigned long Interval;       // milliseconds between updates
+    uint32_t maxRocketID = 0;
-unsigned long lastUpdate;     // last update of position
+    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;
 
-uint32_t Color1, Color2;      // What colors are in use
+  private:
-uint16_t TotalSteps;      // total number of steps in the pattern
+    std::vector <Rocket> rocket_arr;
-uint16_t Index;      // current step within the pattern
+    std::vector <Particle> particle_arr;
 
-byte wPos;
+    // Member Variables:
-bool colorful;
+    pattern ActivePattern;       // which pattern is running
+    pattern SavedPattern;
+    direction Direction;         // direction to run the pattern
+    direction SavedDirection;
 
-uint32_t DimColor(uint32_t color);
+    unsigned long Interval;       // milliseconds between updates
-void Increment();
+    unsigned long SavedInterval;
-void (*OnComplete)();      // Callback on completion of pattern
+    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

esp-wemos-schild/Particle.cpp

@@ -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;
+}
+
+
+
+
+

esp-wemos-schild/Particle.h

@@ -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

esp-wemos-schild/Rocket.cpp

@@ -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;
+}
+

esp-wemos-schild/Rocket.h

@@ -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

esp-wemos-schild/data/homie/config.json

@@ -2,11 +2,11 @@
   "name": "Homie CTDO Schild",
   "device_id": "schild",
   "wifi": {
-    "ssid": "Nudel",
+    "ssid": "CTDO-IoT",
-    "password": "Unser WLAN ist sicher!"
+    "password": "12345678"
   },
   "mqtt": {
-    "host": "prometheus.local",
+    "host": "raum.ctdo.de",
     "port": 1883,
     "auth": false
   },

esp-wemos-schild/esp-wemos-schild.ino

@@ -4,158 +4,223 @@
 #include <ArduinoOTA.h>
 #include <Adafruit_NeoPixel.h>
 #include "NeoPatterns.h"
+#include <math.h>
 
 #define PIN            D1
-#define SENSOR         D3
+#define NUMPIXELS      30
-#define NUMPIXELS      144
 
+#define FW_NAME "esp-schild"
+#define FW_VERSION "1.0.4"
 
+HomieNode homieNode("strip", "strip");
 
-bool lastSensorValue = false;
+void StripComplete() {
-
-void StripComplete(){
   return;
 }
 
-NeoPatterns pixels = NeoPatterns(NUMPIXELS, PIN, NEO_GRB + NEO_KHZ800,&StripComplete);
+void DebugOutput(String value) {
+  homieNode.setProperty("DEBUG").send(value);
+}
 
-HomieNode stripNode("strip", "strip");
+NeoPatterns strip = NeoPatterns(NUMPIXELS, PIN, NEO_GRB + NEO_KHZ800, &StripComplete, &DebugOutput);
-HomieNode sensorNode("sensor", "sensor");
-Bounce debouncer = Bounce();
 
-
+bool onSetColor(const HomieRange& range, const String& value) {
-bool onSetColor(const HomieRange& range, const String& value){
   if (!range.isRange || range.index < 0 || range.index > 1) {
     return false;
   }
-        switch(range.index) {
+  switch (range.index) {
     case 0:
-                pixels.SetColor1(value.toInt());
+      strip.SetColor1(value.toInt());
       break;
     case 1:
-                pixels.SetColor2(value.toInt());
+      strip.SetColor2(value.toInt());
       break;
   }
-        stripNode.setProperty("color_" + String(range.index)).send(value);
+  homieNode.setProperty("color_" + String(range.index)).send(value);
 }
 
-
+bool onSetPixel(const HomieRange& range, const String& value) {
-
+  if (!range.isRange) {
-
+    strip.None();
-bool onSetPixel(const HomieRange& range, const String& value){
+    strip.ColorSet(value.toInt());
-        if(!range.isRange) {
+    homieNode.setProperty("pixel").send(value);
-                pixels.None();
-                pixels.ColorSet(value.toInt());
-                stripNode.setProperty("pixel").send(value);
     return true;
   }
-        if (range.index < 0 || range.index > pixels.numPixels()-1) {
+  if (range.index < 0 || range.index > strip.numPixels() - 1) {
     return false;
   }
-        pixels.None();
+  strip.None();
-        pixels.setPixelColor(range.index, value.toInt());
+  strip.setPixelColor(range.index, value.toInt());
-        pixels.show();
+  strip.show();
-        stripNode.setProperty("pixel_" + String(range.index)).send(value);
+  homieNode.setProperty("pixel_" + String(range.index)).send(value);
 }
 
-bool onSetBrightness(const HomieRange& range, const String& value){
+bool onSetBrightness(const HomieRange& range, const String& value) {
-        long brightness= value.toInt();
+  long brightness = value.toInt();
   if (brightness < 0 || brightness > 255) {
     return false;
   }
-        pixels.setBrightness(brightness);
+  strip.setBrightness(brightness);
-        pixels.show();
+  strip.show();
-        stripNode.setProperty("brightness").send(value);
+  homieNode.setProperty("brightness").send(value);
 }
 
-bool onSetEffect(const HomieRange& range, const String& value){
+
+bool onSetSpeed(const HomieRange& range, const String& value) {
+  long speed = value.toInt();
+  if (speed < 0 || speed > 255) {
+    return false;
+  }
+  strip.setInterval(speed);
+  strip.show();
+  homieNode.setProperty("speed").send(value);
+}
+
+bool onSetEffect(const HomieRange& range, const String& value) {
   String effect = value;
   effect.toLowerCase();
-        if(effect == "scanner") {
+  if (effect == "scanner") {
-                pixels.Scanner(pixels.Color(255, 0, 0));
+    strip.Scanner(strip.Color(255, 0, 0));
   }
-        else if(effect == "randomscanner") {
+  else if (effect == "randomscanner") {
-                pixels.Scanner(pixels.Color(255, 0, 0), 40, true);
+    strip.Scanner(strip.Color(255, 0, 0), 4, true);
   }
-        else if(effect == "rainbowcycle") {
+  else if (effect == "larsonspiral") {
-                pixels.RainbowCycle(50);
+    strip.Scanner(strip.Color(255, 0, 0), 40, true, true);
   }
-        else if(effect == "theaterchase") {
+  else if (effect == "rainbowcycle") {
-                pixels.TheaterChase(pixels.Color(255, 0, 0), pixels.Color(0,0,255), 100);
+    strip.RainbowCycle(50);
   }
-        else if(effect == "fade") {
+  else if (effect == "theaterchase" || effect == "chase") {
-                pixels.Fade(pixels.Color(255, 0, 0), pixels.Color(0,0,255), 200, 100);
+    strip.TheaterChase(strip.Color(255, 0, 0), strip.Color(0, 0, 255), 50);
   }
-        else if(effect == "randomfade") {
+  else if (effect == "bvb") {
-                pixels.RandomFade();
+    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 {
-                pixels.None();
+      strip.None();
+      digitalWrite(PIN, LOW); // D4 ist auch gleichzeitig der LED-Pin, daher abschalten... (TODO: TEST: FIXME)
     }
-        stripNode.setProperty("effect").send(value);
+  }
+  homieNode.setProperty("effect").send(value);
 }
 
-bool onSetClear(const HomieRange& range, const String& value){
+
-        pixels.None();
+bool onSetClear(const HomieRange& range, const String& value) {
-        pixels.clear();
+  strip.None();
-        pixels.show();
+  strip.clear();
-        stripNode.setProperty("clear").send(value);
+  strip.show();
+  homieNode.setProperty("clear").send(value);
 }
 
-bool onSetLength(const HomieRange& range, const String& value){
+bool onSetLength(const HomieRange& range, const String& value) {
-        pixels.None();
+  strip.None();
-        pixels.clear();
+  strip.clear();
-        pixels.show();
+  strip.show();
   int newLength = value.toInt();
-        if(newLength > 0) {
+  if (newLength > 0) {
-                pixels.updateLength(newLength);
+    strip.updateLength(newLength);
   }
-        stripNode.setProperty("length").send(value);
+  homieNode.setProperty("length").send(value);
 }
 
 void loopHandler() {
-        pixels.Update();
+  strip.Update();
-
-        bool sensorValue = debouncer.read();
-        if (Homie.isConfigured() && Homie.isConnected() && sensorValue != lastSensorValue) {
-                sensorNode.setProperty("motion").send(sensorValue ? "true" : "false");
-                lastSensorValue = sensorValue;
-        }
-
 }
 
 void setup() {
   Serial.begin(115200);
 
-        debouncer.attach(SENSOR,INPUT);
+  Homie_setFirmware(FW_NAME, FW_VERSION);
-        debouncer.interval(50);
+  Homie_setBrand(FW_NAME);
-
-        Homie_setFirmware("schild", "1.0.0");
   Homie.setLoopFunction(loopHandler);
 
-        stripNode.advertiseRange("pixel", 0, NUMPIXELS-1).settable(onSetPixel);
+  homieNode.advertiseRange("pixel", 0, NUMPIXELS - 1).settable(onSetPixel);
-        stripNode.advertiseRange("color", 0, 1).settable(onSetColor);
+  homieNode.advertiseRange("color", 0, 1).settable(onSetColor);
-        stripNode.advertise("brightness").settable(onSetBrightness);
+  homieNode.advertise("brightness").settable(onSetBrightness);
-        stripNode.advertise("effect").settable(onSetEffect);
+  homieNode.advertise("speed").settable(onSetSpeed);
-        stripNode.advertise("clear").settable(onSetClear);
+  homieNode.advertise("effect").settable(onSetEffect);
-        stripNode.advertise("length").settable(onSetLength);
+  homieNode.advertise("clear").settable(onSetClear);
+  homieNode.advertise("length").settable(onSetLength);
 
-        sensorNode.advertise("motion");
+  strip.begin();
-
+  strip.clear();
-        pixels.begin();
+  strip.setBrightness(30);
-        pixels.clear();
+  strip.show();
-        pixels.setBrightness(64);
-        pixels.show();
 
   Homie.setup();
 
+
   ArduinoOTA.setHostname(Homie.getConfiguration().deviceId);
-        ArduinoOTA.setPassword((const char *)"ctdo2342");
+  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();
-        debouncer.update();
   ArduinoOTA.handle();
 }

esp-wemos-schild/speedup.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+mosquitto_pub -h raum.ctdo.de -t 'homie/schild/strip/speed/set' -m '5'
+

platformio.ini

@@ -16,8 +16,8 @@ framework=arduino
 ;upload_port = /dev/tty.wchusbserial410
 ;upload_speed = 921600
 
-;upload_port = 5ccf7f1db369.local
+upload_port = 5ccf7f1db369.local
-upload_port = schild.local
+#upload_port = schild.local
 upload_flags = --auth=ctdo2342