diff --git a/esp8266-fastled-iot-webserver.ino b/esp8266-fastled-iot-webserver.ino index 47a20e3a..636bd1ef 100644 --- a/esp8266-fastled-iot-webserver.ino +++ b/esp8266-fastled-iot-webserver.ino @@ -54,110 +54,110 @@ extern "C" { */ /*######################## MAIN CONFIG ########################*/ -#define LED_TYPE WS2812B // You might also use a WS2811 or any other strip that is Fastled compatible -#define DATA_PIN D3 // Be aware: the pin mapping might be different on boards like the NodeMCU -//#define CLK_PIN D5 // Only required when using 4-pin SPI-based LEDs -#define CORRECTION UncorrectedColor // If colors are weird use TypicalLEDStrip -#define COLOR_ORDER GRB // Change this if colors are swapped (in my case, red was swapped with green) -#define MILLI_AMPS 10000 // IMPORTANT: set the max milli-Amps of your power supply (4A = 4000mA) -#define VOLTS 5 // Voltage of the Power Supply +#define LED_TYPE WS2812B // You might also use a WS2811 or any other strip that is Fastled compatible +#define DATA_PIN D3 // Be aware: the pin mapping might be different on boards like the NodeMCU +//#define CLK_PIN D5 // Only required when using 4-pin SPI-based LEDs +#define CORRECTION UncorrectedColor // If colors are weird use TypicalLEDStrip +#define COLOR_ORDER GRB // Change this if colors are swapped (in my case, red was swapped with green) +#define MILLI_AMPS 10000 // IMPORTANT: set the max milli-Amps of your power supply (4A = 4000mA) +#define VOLTS 5 // Voltage of the Power Supply -//#define REMOVE_VISUALIZATION // remove the comment to completly disable all udp-based visualization patterns +//#define REMOVE_VISUALIZATION // remove the comment to completly disable all udp-based visualization patterns -#define HOSTNAME "LEDs" // Name that appears in your network, don't use whitespaces, use "-" instead +#define HOSTNAME "LEDs" // Name that appears in your network, don't use whitespaces, use "-" instead -#define DEVICE_TYPE 0 // The following types are available +#define DEVICE_TYPE 0 // The following types are available /* - 0: Generic LED-Strip: a regular LED-Strip without any special arrangement (and Infinity Mirror + Bottle Lighting Pad) - * Easiest: 5V WS2812B LED-Strip: https://s.click.aliexpress.com/e/_dZ1hCJ7 - * (Long Ranges) 12V WS2811 LED-Strip: https://s.click.aliexpress.com/e/_d7Ehe3L - * (High-Speed) 5V SK9822 LED-Strip: https://s.click.aliexpress.com/e/_d8pzc89 - * (Expensive) 5V APA102 LED-Strip: https://s.click.aliexpress.com/e/_Bf9wVZUD - * (Flexible) 5V WS2812 S LED-Strip: https://s.click.aliexpress.com/e/_d6XxPOH - * Wemos D1 Mini: https://s.click.aliexpress.com/e/_dTVGMGl - * 5V Power Supply: https://s.click.aliexpress.com/e/_dY5zCWt - * Solderless LED-Connector: https://s.click.aliexpress.com/e/_dV4rsjF - * 3D-Printed Wemos-D1 case: https://www.thingiverse.com/thing:3544576 - 1: LED-Matrix: With a flexible LED-Matrix you can display the audio like a Audio Visualizer - * Flexible WS2812 Matrix: https://s.click.aliexpress.com/e/_d84R5kp - * Wemos D1 Mini: https://s.click.aliexpress.com/e/_dTVGMGl - * 5V Power Supply: https://s.click.aliexpress.com/e/_dY5zCWt - 2: 3D-Printed 7-Segment Clock, display the time in a cool 7-segment style, syncs with a ntp of your choice - * unfortunatly the "thing's" description isn't updated yet to the new standalone system - * Project link, small version: https://www.thingiverse.com/thing:3117494 - * Project link, large version: https://www.thingiverse.com/thing:2968056 - 3: 3D-Printed Desk Lamp, a Lamp that reacts to sound for your desk - * Project link, twisted version: https://www.thingiverse.com/thing:4129249 - * Project link, round version: https://www.thingiverse.com/thing:3676533 - 4: 3D-Printed Nanoleafs, a Nanoleaf clone that can be made for cheap - * Project link: https://www.thingiverse.com/thing:3354082 - 5: 3D-Printed Animated RGB Logos - * Project link, Twenty-One-Pilots: https://www.thingiverse.com/thing:3523487 - * Project link, Thingiverse: https://www.thingiverse.com/thing:3531086 + 0: Generic LED-Strip: a regular LED-Strip without any special arrangement (and Infinity Mirror + Bottle Lighting Pad) + * Easiest: 5V WS2812B LED-Strip: https://s.click.aliexpress.com/e/_dZ1hCJ7 + * (Long Ranges) 12V WS2811 LED-Strip: https://s.click.aliexpress.com/e/_d7Ehe3L + * (High-Speed) 5V SK9822 LED-Strip: https://s.click.aliexpress.com/e/_d8pzc89 + * (Expensive) 5V APA102 LED-Strip: https://s.click.aliexpress.com/e/_Bf9wVZUD + * (Flexible) 5V WS2812 S LED-Strip: https://s.click.aliexpress.com/e/_d6XxPOH + * Wemos D1 Mini: https://s.click.aliexpress.com/e/_dTVGMGl + * 5V Power Supply: https://s.click.aliexpress.com/e/_dY5zCWt + * Solderless LED-Connector: https://s.click.aliexpress.com/e/_dV4rsjF + * 3D-Printed Wemos-D1 case: https://www.thingiverse.com/thing:3544576 + 1: LED-Matrix: With a flexible LED-Matrix you can display the audio like a Audio Visualizer + * Flexible WS2812 Matrix: https://s.click.aliexpress.com/e/_d84R5kp + * Wemos D1 Mini: https://s.click.aliexpress.com/e/_dTVGMGl + * 5V Power Supply: https://s.click.aliexpress.com/e/_dY5zCWt + 2: 3D-Printed 7-Segment Clock, display the time in a cool 7-segment style, syncs with a ntp of your choice + * unfortunatly the "thing's" description isn't updated yet to the new standalone system + * Project link, small version: https://www.thingiverse.com/thing:3117494 + * Project link, large version: https://www.thingiverse.com/thing:2968056 + 3: 3D-Printed Desk Lamp, a Lamp that reacts to sound for your desk + * Project link, twisted version: https://www.thingiverse.com/thing:4129249 + * Project link, round version: https://www.thingiverse.com/thing:3676533 + 4: 3D-Printed Nanoleafs, a Nanoleaf clone that can be made for cheap + * Project link: https://www.thingiverse.com/thing:3354082 + 5: 3D-Printed Animated RGB Logos + * Project link, Twenty-One-Pilots: https://www.thingiverse.com/thing:3523487 + * Project link, Thingiverse: https://www.thingiverse.com/thing:3531086 */ //---------------------------------------------------------------------------------------------------------// // Device Configuration: //---------------------------------------------------------------------------------------------------------// -#if DEVICE_TYPE == 0 // Generic LED-Strip - #define NUM_LEDS 24 - //#define NUM_LEDS 33 - //#define NUM_LEDS 183 - #define BAND_GROUPING 1 // Groups part of the band to save performance and network traffic -#elif DEVICE_TYPE == 1 // LED MATRIX - #define LENGTH 32 - #define HEIGHT 8 - //#define AddLogoVisualizers // (only 32x8) Adds Visualization patterns with logo (currently only HBz) -#elif DEVICE_TYPE == 2 // 7-Segment Clock - #define NTP_REFRESH_INTERVAL_SECONDS 600 // 10 minutes - const char* ntpServerName = "at.pool.ntp.org"; // Austrian ntp-timeserver - int t_offset = 0; // offset added to the time from the ntp server - const int NTP_PACKET_SIZE = 48; - #define NUM_LEDS 30 - #define Digit1 0 - #define Digit2 7 - #define Digit3 16 - #define Digit4 23 - // Values for the Big Clock: 58, 0, 14, 30, 44 - -#elif DEVICE_TYPE == 3 // Desk Lamp - #define LINE_COUNT 8 // Amount of led strip pieces - #define LEDS_PER_LINE 10 // Amount of led pixel per single led strip piece - -#elif DEVICE_TYPE == 4 // Nanoleafs - #define LEAFCOUNT 12 // Amount of triangles - #define PIXELS_PER_LEAF 12 // Amount of LEDs inside 1x Tringle - -#elif DEVICE_TYPE == 5 // Animated Logos - // Choose your logo below, remove the comment in front of your design - // Important: see "LOGO CONFIG" below - - //#define TWENTYONEPILOTS - #define THINGIVERSE +#if DEVICE_TYPE == 0 // Generic LED-Strip + #define NUM_LEDS 24 + //#define NUM_LEDS 33 + //#define NUM_LEDS 183 + #define BAND_GROUPING 1 // Groups part of the band to save performance and network traffic +#elif DEVICE_TYPE == 1 // LED MATRIX + #define LENGTH 32 + #define HEIGHT 8 + //#define AddLogoVisualizers // (only 32x8) Adds Visualization patterns with logo (currently only HBz) +#elif DEVICE_TYPE == 2 // 7-Segment Clock + #define NTP_REFRESH_INTERVAL_SECONDS 600 // 10 minutes + const char* ntpServerName = "at.pool.ntp.org"; // Austrian ntp-timeserver + int t_offset = 0; // offset added to the time from the ntp server + const int NTP_PACKET_SIZE = 48; + #define NUM_LEDS 30 + #define Digit1 0 + #define Digit2 7 + #define Digit3 16 + #define Digit4 23 + // Values for the Big Clock: 58, 0, 14, 30, 44 + +#elif DEVICE_TYPE == 3 // Desk Lamp + #define LINE_COUNT 8 // Amount of led strip pieces + #define LEDS_PER_LINE 10 // Amount of led pixel per single led strip piece + +#elif DEVICE_TYPE == 4 // Nanoleafs + #define LEAFCOUNT 12 // Amount of triangles + #define PIXELS_PER_LEAF 12 // Amount of LEDs inside 1x Tringle + +#elif DEVICE_TYPE == 5 // Animated Logos + // Choose your logo below, remove the comment in front of your design + // Important: see "LOGO CONFIG" below + + //#define TWENTYONEPILOTS + #define THINGIVERSE #endif //---------------------------------------------------------------------------------------------------------// // Feature Configuration: Enabled by removing the "//" in front of the define statements //---------------------------------------------------------------------------------------------------------// - //#define ACCESS_POINT_MODE // the esp8266 will create a wifi-access point instead of connecting to one, credentials must be in Secrets.h + //#define ACCESS_POINT_MODE // the esp8266 will create a wifi-access point instead of connecting to one, credentials must be in Secrets.h - //#define ENABLE_OTA_SUPPORT // requires ArduinoOTA - library, not working on esp's with 1MB memory (esp-01, Wemos D1 lite ...) - //#define OTA_PASSWORD "passwd123" // password that is required to update the esp's firmware wireless + //#define ENABLE_OTA_SUPPORT // requires ArduinoOTA - library, not working on esp's with 1MB memory (esp-01, Wemos D1 lite ...) + //#define OTA_PASSWORD "passwd123" // password that is required to update the esp's firmware wireless - //#define ENABLE_MULTICAST_DNS // allows to access the UI via "http://.local/", implemented by GitHub/WarDrake + //#define ENABLE_MULTICAST_DNS // allows to access the UI via "http://.local/", implemented by GitHub/WarDrake - #define RANDOM_AUTOPLAY_PATTERN // if enabled the next pattern for autoplay is choosen at random - #define AUTOPLAY_IGNORE_UDP_PATTERNS // remove visualization patterns from autoplay + #define RANDOM_AUTOPLAY_PATTERN // if enabled the next pattern for autoplay is choosen at random + #define AUTOPLAY_IGNORE_UDP_PATTERNS // remove visualization patterns from autoplay - //#define ENABLE_ALEXA_SUPPORT // Espalexa library required + //#define ENABLE_ALEXA_SUPPORT // Espalexa library required - //#define SOUND_SENSOR_SUPPORT // allows to control the leds using a physical sound-sensor, configuration below + //#define SOUND_SENSOR_SUPPORT // allows to control the leds using a physical sound-sensor, configuration below - //#define ENABLE_SERIAL_AMBILIGHT // allows to function as an ambilight behind a monitor by using data from usb-serial (integration of adalight) + //#define ENABLE_SERIAL_AMBILIGHT // allows to function as an ambilight behind a monitor by using data from usb-serial (integration of adalight) - //#define ENABLE_MQTT_SUPPORT // allows integration in homeassistant/googlehome/mqtt, - // mqtt server required, see MQTT Configuration for more, implemented by GitHub/WarDrake + //#define ENABLE_MQTT_SUPPORT // allows integration in homeassistant/googlehome/mqtt, + // mqtt server required, see MQTT Configuration for more, implemented by GitHub/WarDrake //---------------------------------------------------------------------------------------------------------// @@ -184,17 +184,17 @@ extern "C" { * */ #ifdef ENABLE_ALEXA_SUPPORT - #define ALEXA_DEVICE_NAME HOSTNAME - //#define AddAutoplayDevice ((String)HOSTNAME + (String)" Autoplay") - //#define AddStrobeDevice ((String)HOSTNAME + (String)" Strobe") - //#define AddSpecificPatternDeviceA ((String)HOSTNAME + (String)" Party") - //#define AddSpecificPatternDeviceB ((String)HOSTNAME + (String)" Chill") - //#define AddSpecificPatternDeviceC ((String)HOSTNAME + (String)" Rainbow") - //#define AddAudioDevice ((String)HOSTNAME + (String)" Audio") - //#define SpecificPatternA 37 // Parameter defines what pattern gets executed - //#define SpecificPatternB 12 // Parameter defines what pattern gets executed - //#define SpecificPatternC 0 // Parameter defines what pattern gets executed - //#define AudioPattern 44 // Parameter defines what pattern gets executed + #define ALEXA_DEVICE_NAME HOSTNAME + //#define AddAutoplayDevice ((String)HOSTNAME + (String)" Autoplay") + //#define AddStrobeDevice ((String)HOSTNAME + (String)" Strobe") + //#define AddSpecificPatternDeviceA ((String)HOSTNAME + (String)" Party") + //#define AddSpecificPatternDeviceB ((String)HOSTNAME + (String)" Chill") + //#define AddSpecificPatternDeviceC ((String)HOSTNAME + (String)" Rainbow") + //#define AddAudioDevice ((String)HOSTNAME + (String)" Audio") + //#define SpecificPatternA 37 // Parameter defines what pattern gets executed + //#define SpecificPatternB 12 // Parameter defines what pattern gets executed + //#define SpecificPatternC 0 // Parameter defines what pattern gets executed + //#define AudioPattern 44 // Parameter defines what pattern gets executed #endif // ENABLE_ALEXA_SUPPORT /*########## Alexa Configuration END ##########*/ @@ -204,15 +204,15 @@ extern "C" { /*######################## ANIMATED RGB LOGO CONFIG ########################*/ #ifdef TWENTYONEPILOTS - #define RING_LENGTH 24 // amount of pixels for the Ring (should be 24) - #define DOUBLE_STRIP_LENGTH 2 // amount of pixels used for the straight double line - #define DOT_LENGTH 1 // amount of pixels used for the dot - #define ITALIC_STRIP_LENGTH 2 // amount of pixels used for the - #define ANIMATION_NAME "Twenty One Pilots - Animated" // name for the Logo animation, displayed on the webserver - #define ANIMATION_NAME_STATIC "Twenty One Pilots - Static" // logo for the static logo, displayed on the webserver - #define ANIMATION_RING_DURATION 30 // longer values result into a longer loop duration - #define STATIC_RING_COLOR CRGB(222,255,5) // Color for the outer ring in static mode - #define STATIC_LOGO_COLOR CRGB(150,240,3) // Color for the inner logo in static mode + #define RING_LENGTH 24 // amount of pixels for the Ring (should be 24) + #define DOUBLE_STRIP_LENGTH 2 // amount of pixels used for the straight double line + #define DOT_LENGTH 1 // amount of pixels used for the dot + #define ITALIC_STRIP_LENGTH 2 // amount of pixels used for the + #define ANIMATION_NAME "Twenty One Pilots - Animated" // name for the Logo animation, displayed on the webserver + #define ANIMATION_NAME_STATIC "Twenty One Pilots - Static" // logo for the static logo, displayed on the webserver + #define ANIMATION_RING_DURATION 30 // longer values result into a longer loop duration + #define STATIC_RING_COLOR CRGB(222,255,5) // Color for the outer ring in static mode + #define STATIC_LOGO_COLOR CRGB(150,240,3) // Color for the inner logo in static mode /* Wiring order: The array below will determine the order of the wiring, @@ -225,75 +225,75 @@ if you have connected the ring first it should look like this: const int twpOffs */ // Syntax: { , , , }; // The values represent the zero-based index on the strip of the element - const int twpOffsets[] = { 5,0,2,3 }; + const int twpOffsets[] = { 5,0,2,3 }; #endif // TWENTYONEPILOTS #ifdef THINGIVERSE - #define RING_LENGTH 24 // amount of pixels for the Ring (should be 24) - #define HORIZONTAL_LENGTH 3 // amount of pixels used for the straight double line - #define VERTICAL_LENGTH 2 // amount of pixels used for the straight double line - #define ANIMATION_NAME "Thingiverse - Animated" // name for the Logo animation, displayed on the webserver - #define ANIMATION_NAME_STATIC "Thingiverse - Static" // logo for the static logo, displayed on the webserver - #define ANIMATION_RING_DURATION 30 // longer values result into a longer loop duration - #define STATIC_RING_COLOR CRGB(0,149,255) // Color for the outer ring in static mode - #define STATIC_LOGO_COLOR CRGB(0,149,255) // Color for the inner logo in static mode - #define RINGFIRST false // change this to if you have wired the ring first - #define HORIZONTAL_BEFORE_VERTICAL true // change this to if you have wired the horizontal strip before the vertical + #define RING_LENGTH 24 // amount of pixels for the Ring (should be 24) + #define HORIZONTAL_LENGTH 3 // amount of pixels used for the straight double line + #define VERTICAL_LENGTH 2 // amount of pixels used for the straight double line + #define ANIMATION_NAME "Thingiverse - Animated" // name for the Logo animation, displayed on the webserver + #define ANIMATION_NAME_STATIC "Thingiverse - Static" // logo for the static logo, displayed on the webserver + #define ANIMATION_RING_DURATION 30 // longer values result into a longer loop duration + #define STATIC_RING_COLOR CRGB(0,149,255) // Color for the outer ring in static mode + #define STATIC_LOGO_COLOR CRGB(0,149,255) // Color for the inner logo in static mode + #define RINGFIRST false // change this to if you have wired the ring first + #define HORIZONTAL_BEFORE_VERTICAL true // change this to if you have wired the horizontal strip before the vertical #endif // THINGIVERSE /*###################### ANIMATED RGB LOGO CONFIG END ######################*/ /*-------- SOUND SENSOR (LEGACY) --------*/ #ifdef SOUND_SENSOR_SUPPORT - #define SOUND_SENSOR_PIN A0 // An Analog sensor should be connected to an analog pin - #define SENSOR_TYPE 1 // 0: Dumb Sensors, 1: MAX4466 Sound Sensor, 2: MAX9814 Sound Sensor - // Values for MAX44666: - int16_t audioMinVol = 135; // minimal Voltage from Mic, higher Value = less sensitive - int16_t audioMaxVol = 145; // maximal Voltage from Mic, lower Value = more LED on with lower Volume + #define SOUND_SENSOR_PIN A0 // An Analog sensor should be connected to an analog pin + #define SENSOR_TYPE 1 // 0: Dumb Sensors, 1: MAX4466 Sound Sensor, 2: MAX9814 Sound Sensor + // Values for MAX44666: + int16_t audioMinVol = 135; // minimal Voltage from Mic, higher Value = less sensitive + int16_t audioMaxVol = 145; // maximal Voltage from Mic, lower Value = more LED on with lower Volume #endif /*------ SOUND SENSOR (LEGACY) END ------*/ /*######################## MQTT Configuration ########################*/ #ifdef ENABLE_MQTT_SUPPORT - const char* mqttServer = "homeassistant.local"; - const int mqttPort = 1883; - #if DEVICE_TYPE == 0 - #define MQTT_TOPIC "homeassistant/light/ledstrip" // MQTT Topic to Publish to for state and config (Home Assistant) - #define MQTT_TOPIC_SET "/set" // MQTT Topic to subscribe to for changes(Home Assistant) - #define MQTT_DEVICE_NAME "Ledstrip" - #elif DEVICE_TYPE == 1 - #define MQTT_TOPIC "homeassistant/light/ledmatrix" // MQTT Topic to Publish to for state and config (Home Assistant) - #define MQTT_TOPIC_SET "/set" // MQTT Topic to subscribe to for changes(Home Assistant) - #define MQTT_DEVICE_NAME "Led Matrix" - #elif DEVICE_TYPE == 2 - #define MQTT_TOPIC "homeassistant/light/7-segment-clock" // MQTT Topic to Publish to for state and config (Home Assistant) - #define MQTT_TOPIC_SET "/set" // MQTT Topic to subscribe to for changes(Home Assistant) - #define MQTT_DEVICE_NAME "7 Segment Clock" - #elif DEVICE_TYPE == 3 - #define MQTT_TOPIC "homeassistant/light/desklamp" // MQTT Topic to Publish to for state and config (Home Assistant) - #define MQTT_TOPIC_SET "/set" // MQTT Topic to subscribe to for changes(Home Assistant) - #define MQTT_DEVICE_NAME "Led Desk Lamp" - #elif DEVICE_TYPE == 4 - #define MQTT_TOPIC "homeassistant/light/nanoleafs" // MQTT Topic to Publish to for state and config (Home Assistant) - #define MQTT_TOPIC_SET "/set" // MQTT Topic to subscribe to for changes(Home Assistant) - #define MQTT_DEVICE_NAME "Nanoleafs" - #elif DEVICE_TYPE == 5 - #define MQTT_TOPIC "homeassistant/light/ledlogo" // MQTT Topic to Publish to for state and config (Home Assistant) - #define MQTT_TOPIC_SET "/set" // MQTT Topic to subscribe to for changes(Home Assistant) - #define MQTT_DEVICE_NAME "Animated Logo" - #endif - #define MQTT_UNIQUE_IDENTIFIER WiFi.macAddress() // A Unique Identifier for the device in Homeassistant (MAC Address used by default) - #define MQTT_MAX_PACKET_SIZE 512 - #define MQTT_MAX_TRANSFER_SIZE 512 - // For the user / password check the Secrets.h file and modify your settings in there. - // const char* mqttUser = "YourMqttUser"; - // const char* mqttPassword = "YourMqttUserPassword"; - - #include // Include the MQTT Library, must be installed via the library manager - #include - WiFiClient espClient; - PubSubClient mqttClient(espClient); + const char* mqttServer = "homeassistant.local"; + const int mqttPort = 1883; + #if DEVICE_TYPE == 0 + #define MQTT_TOPIC "homeassistant/light/ledstrip" // MQTT Topic to Publish to for state and config (Home Assistant) + #define MQTT_TOPIC_SET "/set" // MQTT Topic to subscribe to for changes(Home Assistant) + #define MQTT_DEVICE_NAME "Ledstrip" + #elif DEVICE_TYPE == 1 + #define MQTT_TOPIC "homeassistant/light/ledmatrix" // MQTT Topic to Publish to for state and config (Home Assistant) + #define MQTT_TOPIC_SET "/set" // MQTT Topic to subscribe to for changes(Home Assistant) + #define MQTT_DEVICE_NAME "Led Matrix" + #elif DEVICE_TYPE == 2 + #define MQTT_TOPIC "homeassistant/light/7-segment-clock" // MQTT Topic to Publish to for state and config (Home Assistant) + #define MQTT_TOPIC_SET "/set" // MQTT Topic to subscribe to for changes(Home Assistant) + #define MQTT_DEVICE_NAME "7 Segment Clock" + #elif DEVICE_TYPE == 3 + #define MQTT_TOPIC "homeassistant/light/desklamp" // MQTT Topic to Publish to for state and config (Home Assistant) + #define MQTT_TOPIC_SET "/set" // MQTT Topic to subscribe to for changes(Home Assistant) + #define MQTT_DEVICE_NAME "Led Desk Lamp" + #elif DEVICE_TYPE == 4 + #define MQTT_TOPIC "homeassistant/light/nanoleafs" // MQTT Topic to Publish to for state and config (Home Assistant) + #define MQTT_TOPIC_SET "/set" // MQTT Topic to subscribe to for changes(Home Assistant) + #define MQTT_DEVICE_NAME "Nanoleafs" + #elif DEVICE_TYPE == 5 + #define MQTT_TOPIC "homeassistant/light/ledlogo" // MQTT Topic to Publish to for state and config (Home Assistant) + #define MQTT_TOPIC_SET "/set" // MQTT Topic to subscribe to for changes(Home Assistant) + #define MQTT_DEVICE_NAME "Animated Logo" + #endif + #define MQTT_UNIQUE_IDENTIFIER WiFi.macAddress() // A Unique Identifier for the device in Homeassistant (MAC Address used by default) + #define MQTT_MAX_PACKET_SIZE 512 + #define MQTT_MAX_TRANSFER_SIZE 512 + // For the user / password check the Secrets.h file and modify your settings in there. + // const char* mqttUser = "YourMqttUser"; + // const char* mqttPassword = "YourMqttUserPassword"; + + #include // Include the MQTT Library, must be installed via the library manager + #include + WiFiClient espClient; + PubSubClient mqttClient(espClient); #endif /*###################### MQTT Configuration END ######################*/ @@ -310,56 +310,56 @@ if you have connected the ring first it should look like this: const int twpOffs #include #if DEVICE_TYPE == 1 - #define PACKET_LENGTH LENGTH - #define NUM_LEDS (HEIGHT * LENGTH) - #define PACKET_LENGTH LENGTH + #define PACKET_LENGTH LENGTH + #define NUM_LEDS (HEIGHT * LENGTH) + #define PACKET_LENGTH LENGTH #elif DEVICE_TYPE == 2 - #define PACKET_LENGTH NUM_LEDS + #define PACKET_LENGTH NUM_LEDS - IPAddress timeServerIP; - WiFiUDP udpTime; + IPAddress timeServerIP; + WiFiUDP udpTime; - byte packetBuffer[NTP_PACKET_SIZE]; - int hours = 0; int mins = 0; int secs = 0; - unsigned int localPortTime = 2390; - unsigned long update_timestamp = 0; - unsigned long last_diff = 0; - unsigned long ntp_timestamp = 0; + byte packetBuffer[NTP_PACKET_SIZE]; + int hours = 0; int mins = 0; int secs = 0; + unsigned int localPortTime = 2390; + unsigned long update_timestamp = 0; + unsigned long last_diff = 0; + unsigned long ntp_timestamp = 0; #elif DEVICE_TYPE == 3 - #define NUM_LEDS (LINE_COUNT * LEDS_PER_LINE) - #define PACKET_LENGTH LEDS_PER_LINE + #define NUM_LEDS (LINE_COUNT * LEDS_PER_LINE) + #define PACKET_LENGTH LEDS_PER_LINE #elif DEVICE_TYPE == 4 - #define NUM_LEDS (PIXELS_PER_LEAF * LEAFCOUNT) - #define PACKET_LENGTH (LEAFCOUNT * 3) + #define NUM_LEDS (PIXELS_PER_LEAF * LEAFCOUNT) + #define PACKET_LENGTH (LEAFCOUNT * 3) #elif VISUALIZER_TYPE == 5 - #ifdef TWENTYONEPILOTS - #define NUM_LEDS (RING_LENGTH+DOT_LENGTH+DOUBLE_STRIP_LENGTH+ITALIC_STRIP_LENGTH) - #endif - #ifdef THINGIVERSE - #define NUM_LEDS (RING_LENGTH+HORIZONTAL_LENGTH+VERTICAL_LENGTH) - #endif + #ifdef TWENTYONEPILOTS + #define NUM_LEDS (RING_LENGTH+DOT_LENGTH+DOUBLE_STRIP_LENGTH+ITALIC_STRIP_LENGTH) + #endif + #ifdef THINGIVERSE + #define NUM_LEDS (RING_LENGTH+HORIZONTAL_LENGTH+VERTICAL_LENGTH) + #endif #else - #ifdef BAND_GROUPING - #define PACKET_LENGTH (int)((NUM_LEDS/BAND_GROUPING)) - #else - #define PACKET_LENGTH NUM_LEDS - #endif + #ifdef BAND_GROUPING + #define PACKET_LENGTH (int)((NUM_LEDS/BAND_GROUPING)) + #else + #define PACKET_LENGTH NUM_LEDS + #endif #endif // Misc Params #define AVG_ARRAY_SIZE 10 #define BAND_START 1 -#define BAND_END 3 // can be increased when working with bigger spectrums (40+) +#define BAND_END 3 // can be increased when working with bigger spectrums (40+) #define UDP_PORT 4210 - WiFiUDP Udp; - unsigned int localUdpPort = UDP_PORT; // local port to listen on - uint8_t incomingPacket[PACKET_LENGTH + 1]; + WiFiUDP Udp; + unsigned int localUdpPort = UDP_PORT; // local port to listen on + uint8_t incomingPacket[PACKET_LENGTH + 1]; #endif ESP8266WebServer webServer(80); @@ -451,16 +451,16 @@ CRGB solidColor = CRGB::Blue; // scale the brightness of all pixels down void dimAll(byte value) { - for (int i = 0; i < NUM_LEDS; i++) { - leds[i].nscale8(value); - } + for (int i = 0; i < NUM_LEDS; i++) { + leds[i].nscale8(value); + } } typedef void(*Pattern)(); typedef Pattern PatternList[]; typedef struct { - Pattern pattern; - String name; + Pattern pattern; + String name; } PatternAndName; typedef PatternAndName PatternAndNameList[]; @@ -471,126 +471,126 @@ typedef PatternAndName PatternAndNameList[]; PatternAndNameList patterns = { - // Time patterns - #if DEVICE_TYPE == 2 - { displayTimeStatic, "Time" }, - { displayTimeRainbow, "Time Rainbow" }, + // Time patterns + #if DEVICE_TYPE == 2 + { displayTimeStatic, "Time" }, + { displayTimeRainbow, "Time Rainbow" }, #endif #if DEVICE_TYPE == 3 - { pride_Waves, "Pride Waves" }, - { pride_Rings, "Pride Rings" }, - { colorWaves_hori, "Vertical Waves" }, - { colorWaves_vert, "Color Rings" }, - { rainbow_vert, "Vertical Rainbow" }, + { pride_Waves, "Pride Waves" }, + { pride_Rings, "Pride Rings" }, + { colorWaves_hori, "Vertical Waves" }, + { colorWaves_vert, "Color Rings" }, + { rainbow_vert, "Vertical Rainbow" }, #endif - // animation patterns - { pride, "Pride" }, - { colorWaves, "Color Waves" }, - { rainbow, "Horizontal Rainbow" }, - { rainbowSolid, "Solid Rainbow" }, - { confetti, "Confetti" }, - { sinelon, "Sinelon" }, - { bpm, "Beat" }, - { juggle, "Juggle" }, - { fire, "Fire" }, - { water, "Water" }, - { strobe, "Strobe"}, - { rainbow_strobe, "Rainbow Strobe"}, - { smooth_rainbow_strobe, "Smooth Rainbow Strobe"}, - - // DigitalJohnson patterns - { rainbowRoll, "Rainbow Roll" }, - { rainbowBeat, "Rainbow Beat" }, - { randomPaletteFades, "Palette Fades" }, - { rainbowChase, "Rainbow Chase" }, - { randomDots, "Rainbow Dots" }, - { randomFades, "Rainbow Fades" }, - { policeLights, "Police Lights" }, - { glitter, "Glitter" }, - { snowFlakes, "Snow Flakes" }, - { lightning, "Lightning"}, - - // twinkle patterns - { rainbowTwinkles, "Rainbow Twinkles" }, - { snowTwinkles, "Snow Twinkles" }, - { cloudTwinkles, "Cloud Twinkles" }, - { incandescentTwinkles, "Incandescent Twinkles" }, - - // TwinkleFOX patterns - { retroC9Twinkles, "Retro C9 Twinkles" }, - { redWhiteTwinkles, "Red & White Twinkles" }, - { blueWhiteTwinkles, "Blue & White Twinkles" }, - { redGreenWhiteTwinkles, "Red, Green & White Twinkles" }, - { fairyLightTwinkles, "Fairy Light Twinkles" }, - { snow2Twinkles, "Snow 2 Twinkles" }, - { hollyTwinkles, "Holly Twinkles" }, - { iceTwinkles, "Ice Twinkles" }, - { partyTwinkles, "Party Twinkles" }, - { forestTwinkles, "Forest Twinkles" }, - { lavaTwinkles, "Lava Twinkles" }, - { fireTwinkles, "Fire Twinkles" }, - { cloud2Twinkles, "Cloud 2 Twinkles" }, - { oceanTwinkles, "Ocean Twinkles" }, + // animation patterns + { pride, "Pride" }, + { colorWaves, "Color Waves" }, + { rainbow, "Horizontal Rainbow" }, + { rainbowSolid, "Solid Rainbow" }, + { confetti, "Confetti" }, + { sinelon, "Sinelon" }, + { bpm, "Beat" }, + { juggle, "Juggle" }, + { fire, "Fire" }, + { water, "Water" }, + { strobe, "Strobe"}, + { rainbow_strobe, "Rainbow Strobe"}, + { smooth_rainbow_strobe, "Smooth Rainbow Strobe"}, + + // DigitalJohnson patterns + { rainbowRoll, "Rainbow Roll" }, + { rainbowBeat, "Rainbow Beat" }, + { randomPaletteFades, "Palette Fades" }, + { rainbowChase, "Rainbow Chase" }, + { randomDots, "Rainbow Dots" }, + { randomFades, "Rainbow Fades" }, + { policeLights, "Police Lights" }, + { glitter, "Glitter" }, + { snowFlakes, "Snow Flakes" }, + { lightning, "Lightning"}, + + // twinkle patterns + { rainbowTwinkles, "Rainbow Twinkles" }, + { snowTwinkles, "Snow Twinkles" }, + { cloudTwinkles, "Cloud Twinkles" }, + { incandescentTwinkles, "Incandescent Twinkles" }, + + // TwinkleFOX patterns + { retroC9Twinkles, "Retro C9 Twinkles" }, + { redWhiteTwinkles, "Red & White Twinkles" }, + { blueWhiteTwinkles, "Blue & White Twinkles" }, + { redGreenWhiteTwinkles, "Red, Green & White Twinkles" }, + { fairyLightTwinkles, "Fairy Light Twinkles" }, + { snow2Twinkles, "Snow 2 Twinkles" }, + { hollyTwinkles, "Holly Twinkles" }, + { iceTwinkles, "Ice Twinkles" }, + { partyTwinkles, "Party Twinkles" }, + { forestTwinkles, "Forest Twinkles" }, + { lavaTwinkles, "Lava Twinkles" }, + { fireTwinkles, "Fire Twinkles" }, + { cloud2Twinkles, "Cloud 2 Twinkles" }, + { oceanTwinkles, "Ocean Twinkles" }, #ifndef REMOVE_VISUALIZATION - // Visualization Patterns -#if DEVICE_TYPE == 1 // Matrix - { RainbowVisualizer, "Rainbow Visualization"}, - { SingleColorVisualizer, "Single Color Visualization"}, - { RainbowVisualizerDoubleSided, "Rainbow Visualization Outside"}, - { SingleColorVisualizerDoubleSided, "Single Color Visualization Outside"}, - - #ifdef AddLogoVisualizers - #if LENGTH == 32 && HEIGHT == 8 // Logo Visualizers - { HbzVisualizerRainbow, "Hbz Visualizer Spectrum"}, - { HbzVisualizerWhite, "Hbz Visualizer"}, - #endif - #endif + // Visualization Patterns +#if DEVICE_TYPE == 1 // Matrix + { RainbowVisualizer, "Rainbow Visualization"}, + { SingleColorVisualizer, "Single Color Visualization"}, + { RainbowVisualizerDoubleSided, "Rainbow Visualization Outside"}, + { SingleColorVisualizerDoubleSided, "Single Color Visualization Outside"}, + + #ifdef AddLogoVisualizers + #if LENGTH == 32 && HEIGHT == 8 // Logo Visualizers + { HbzVisualizerRainbow, "Hbz Visualizer Spectrum"}, + { HbzVisualizerWhite, "Hbz Visualizer"}, + #endif + #endif #endif - #ifdef DEVICE_TYPE // Generic Visualization Patterns - { vuMeterSolid, "Solid Volume Visualizer"}, - { vuMeterStaticRainbow, "Static Rainbow Volume Visualizer"}, - { vuMeterRainbow, "Flowing Rainbow Volume Visualizer"}, - { vuMeterTriColor, "Tri-Color Volume Visualizer"}, - { RefreshingVisualizer, "Wave Visualizer"}, - { CentralVisualizer, "Center Visualizer"}, - { SolidColorDualTone, "Solid-Color Pair Bullet Visualizer"}, - { SolidColorComplementary, "Solid-Color Complementary Bullet Visualizer"}, - { BluePurpleBullets, "Blue/Purple Bullet Visualizer"}, - { BulletVisualizer, "Beat-Bullet Visualization"}, - //{ TrailingBulletsVisualizer, "Trailing Bullet Visualization"}, // obsolete - //{ BrightnessVisualizer, "Brightness Visualizer"}, // broken - { RainbowBandVisualizer, "Rainbow Band Visualizer"}, - { SingleColorBandVisualizer, "Single Color Band Visualizer"}, + #ifdef DEVICE_TYPE // Generic Visualization Patterns + { vuMeterSolid, "Solid Volume Visualizer"}, + { vuMeterStaticRainbow, "Static Rainbow Volume Visualizer"}, + { vuMeterRainbow, "Flowing Rainbow Volume Visualizer"}, + { vuMeterTriColor, "Tri-Color Volume Visualizer"}, + { RefreshingVisualizer, "Wave Visualizer"}, + { CentralVisualizer, "Center Visualizer"}, + { SolidColorDualTone, "Solid-Color Pair Bullet Visualizer"}, + { SolidColorComplementary, "Solid-Color Complementary Bullet Visualizer"}, + { BluePurpleBullets, "Blue/Purple Bullet Visualizer"}, + { BulletVisualizer, "Beat-Bullet Visualization"}, + //{ TrailingBulletsVisualizer, "Trailing Bullet Visualization"}, // obsolete + //{ BrightnessVisualizer, "Brightness Visualizer"}, // broken + { RainbowBandVisualizer, "Rainbow Band Visualizer"}, + { SingleColorBandVisualizer, "Single Color Band Visualizer"}, #endif #endif #if DEVICE_TYPE == 4 - { NanoleafWaves, "Nanoleaf Wave Visualizer" }, - { NanoleafBand, "Nanoleaf Rainbow Band Visualizer" }, - { NanoleafSingleBand, "Nanoleaf Solid Color Band Visualizer" }, + { NanoleafWaves, "Nanoleaf Wave Visualizer" }, + { NanoleafBand, "Nanoleaf Rainbow Band Visualizer" }, + { NanoleafSingleBand, "Nanoleaf Solid Color Band Visualizer" }, #endif #ifdef ENABLE_SERIAL_AMBILIGHT - { ambilight, "⋆Serial Ambilight"}, + { ambilight, "⋆Serial Ambilight"}, #endif // ENABLE_SERIAL_AMBILIGHT #ifdef SOUND_SENSOR_SUPPORT - { soundReactive, "Sound Reactive" }, + { soundReactive, "Sound Reactive" }, #endif - { showSolidColor, "Solid Color" } + { showSolidColor, "Solid Color" } }; const uint8_t patternCount = ARRAY_SIZE(patterns); typedef struct { - CRGBPalette16 palette; - String name; + CRGBPalette16 palette; + String name; } PaletteAndName; typedef PaletteAndName PaletteAndNameList[]; @@ -624,699 +624,699 @@ const String paletteNames[paletteCount] = { void setSolidColor(uint8_t r, uint8_t g, uint8_t b, bool updatePattern = true) { - solidColor = CRGB(r, g, b); + solidColor = CRGB(r, g, b); - EEPROM.write(2, r); - EEPROM.write(3, g); - EEPROM.write(4, b); - EEPROM.commit(); + EEPROM.write(2, r); + EEPROM.write(3, g); + EEPROM.write(4, b); + EEPROM.commit(); - if (updatePattern && currentPatternIndex != patternCount - 2)setPattern(patternCount - 1); + if (updatePattern && currentPatternIndex != patternCount - 2)setPattern(patternCount - 1); - broadcastString("color", String(solidColor.r) + "," + String(solidColor.g) + "," + String(solidColor.b)); + broadcastString("color", String(solidColor.r) + "," + String(solidColor.g) + "," + String(solidColor.b)); } void setSolidColor(CRGB color, bool updatePattern = true) { - setSolidColor(color.r, color.g, color.b, updatePattern); + setSolidColor(color.r, color.g, color.b, updatePattern); } String getRebootString() { - return "

Rebooting... returning in 4 seconds

"; + return "

Rebooting... returning in 4 seconds

"; } void handleReboot() { - webServer.send(200, "text/html", getRebootString()); - delay(500); - ESP.restart(); + webServer.send(200, "text/html", getRebootString()); + delay(500); + ESP.restart(); } #ifdef ENABLE_ALEXA_SUPPORT void handleReboot2() { - webServer2.send(200, "text/html", getRebootString()); - delay(500); - ESP.restart(); + webServer2.send(200, "text/html", getRebootString()); + delay(500); + ESP.restart(); } #endif // ENABLE_ALEXA_SUPPORT void addRebootPage(int webServerNr = 0) { - if (webServerNr < 2) - { - webServer.on("/reboot", handleReboot); - } - #ifdef ENABLE_ALEXA_SUPPORT - else if (webServerNr == 2) - { - webServer2.on("/reboot", handleReboot2); - } - #endif // ENABLE_ALEXA_SUPPORT + if (webServerNr < 2) + { + webServer.on("/reboot", handleReboot); + } + #ifdef ENABLE_ALEXA_SUPPORT + else if (webServerNr == 2) + { + webServer2.on("/reboot", handleReboot2); + } + #endif // ENABLE_ALEXA_SUPPORT } void setup() { - WiFi.setSleepMode(WIFI_NONE_SLEEP); - Serial.begin(115200); + WiFi.setSleepMode(WIFI_NONE_SLEEP); + Serial.begin(115200); - delay(100); - Serial.setDebugOutput(true); + delay(100); + Serial.setDebugOutput(true); #if LED_TYPE == WS2812 || LED_TYPE == WS2812B || LED_TYPE == WS2811 || LED_TYPE == WS2813 || LED_TYPE == NEOPIXEL - FastLED.addLeds(leds, NUM_LEDS); // WS2812 (Neopixel) + FastLED.addLeds(leds, NUM_LEDS); // WS2812 (Neopixel) #elif defined CLK_PIN - FastLED.addLeds(leds, NUM_LEDS); // for APA102 (Dotstar) + FastLED.addLeds(leds, NUM_LEDS); // for APA102 (Dotstar) #else - FastLED.addLeds(leds, NUM_LEDS); // misc. 3-pin + FastLED.addLeds(leds, NUM_LEDS); // misc. 3-pin #endif - - FastLED.setDither(false); - FastLED.setCorrection(CORRECTION); - FastLED.setBrightness(brightness); - FastLED.setMaxPowerInVoltsAndMilliamps(VOLTS, MILLI_AMPS); - fill_solid(leds, NUM_LEDS, CRGB::Black); - FastLED.show(); - - EEPROM.begin(4095); - loadSettings(); - - FastLED.setBrightness(brightness); - - // irReceiver.enableIRIn(); // Start the receiver - - Serial.println(); - Serial.print(F("Heap: ")); Serial.println(system_get_free_heap_size()); - Serial.print(F("Boot Vers: ")); Serial.println(system_get_boot_version()); - Serial.print(F("CPU: ")); Serial.println(system_get_cpu_freq()); - Serial.print(F("SDK: ")); Serial.println(system_get_sdk_version()); - Serial.print(F("Chip ID: ")); Serial.println(system_get_chip_id()); - Serial.print(F("Flash ID: ")); Serial.println(spi_flash_get_id()); - Serial.print(F("Flash Size: ")); Serial.println(ESP.getFlashChipRealSize()); - Serial.print(F("Vcc: ")); Serial.println(ESP.getVcc()); - Serial.println(); + + FastLED.setDither(false); + FastLED.setCorrection(CORRECTION); + FastLED.setBrightness(brightness); + FastLED.setMaxPowerInVoltsAndMilliamps(VOLTS, MILLI_AMPS); + fill_solid(leds, NUM_LEDS, CRGB::Black); + FastLED.show(); + + EEPROM.begin(4095); + loadSettings(); + + FastLED.setBrightness(brightness); + + // irReceiver.enableIRIn(); // Start the receiver + + Serial.println(); + Serial.print(F("Heap: ")); Serial.println(system_get_free_heap_size()); + Serial.print(F("Boot Vers: ")); Serial.println(system_get_boot_version()); + Serial.print(F("CPU: ")); Serial.println(system_get_cpu_freq()); + Serial.print(F("SDK: ")); Serial.println(system_get_sdk_version()); + Serial.print(F("Chip ID: ")); Serial.println(system_get_chip_id()); + Serial.print(F("Flash ID: ")); Serial.println(spi_flash_get_id()); + Serial.print(F("Flash Size: ")); Serial.println(ESP.getFlashChipRealSize()); + Serial.print(F("Vcc: ")); Serial.println(ESP.getVcc()); + Serial.println(); #ifdef SOUND_REACTIVE #if SENSOR_TYPE == 0 - pinMode(SOUND_SENSOR_PIN, INPUT); + pinMode(SOUND_SENSOR_PIN, INPUT); #endif #endif // SOUND_REACTIVE - SPIFFS.begin(); - { - Serial.println("SPIFFS contents:"); + SPIFFS.begin(); + { + Serial.println("SPIFFS contents:"); - Dir dir = SPIFFS.openDir("/"); - while (dir.next()) { - String fileName = dir.fileName(); - size_t fileSize = dir.fileSize(); - Serial.printf("FS File: %s, size: %s\n", fileName.c_str(), String(fileSize).c_str()); - } - Serial.printf("\n"); - } + Dir dir = SPIFFS.openDir("/"); + while (dir.next()) { + String fileName = dir.fileName(); + size_t fileSize = dir.fileSize(); + Serial.printf("FS File: %s, size: %s\n", fileName.c_str(), String(fileSize).c_str()); + } + Serial.printf("\n"); + } #ifdef ACCESS_POINT_MODE - WiFi.mode(WIFI_AP); - // Do a little work to get a unique-ish name. Append the - // last two bytes of the MAC (HEX'd) to "Thing-": - uint8_t mac[WL_MAC_ADDR_LENGTH]; - WiFi.softAPmacAddress(mac); - String macID = String(mac[WL_MAC_ADDR_LENGTH - 2], HEX) + - String(mac[WL_MAC_ADDR_LENGTH - 1], HEX); - macID.toUpperCase(); - String AP_NameString = "ESP8266 Thing " + macID; - char AP_NameChar[AP_NameString.length() + 1]; - memset(AP_NameChar, 0, AP_NameString.length() + 1); - for (int i = 0; i < AP_NameString.length(); i++) - AP_NameChar[i] = AP_NameString.charAt(i); - WiFi.softAP(AP_NameChar, WiFiAPPSK); - Serial.printf("Connect to Wi-Fi access point: %s\n", AP_NameChar); - Serial.println("and open http://192.168.4.1 in your browser"); + WiFi.mode(WIFI_AP); + // Do a little work to get a unique-ish name. Append the + // last two bytes of the MAC (HEX'd) to "Thing-": + uint8_t mac[WL_MAC_ADDR_LENGTH]; + WiFi.softAPmacAddress(mac); + String macID = String(mac[WL_MAC_ADDR_LENGTH - 2], HEX) + + String(mac[WL_MAC_ADDR_LENGTH - 1], HEX); + macID.toUpperCase(); + String AP_NameString = "ESP8266 Thing " + macID; + char AP_NameChar[AP_NameString.length() + 1]; + memset(AP_NameChar, 0, AP_NameString.length() + 1); + for (int i = 0; i < AP_NameString.length(); i++) + AP_NameChar[i] = AP_NameString.charAt(i); + WiFi.softAP(AP_NameChar, WiFiAPPSK); + Serial.printf("Connect to Wi-Fi access point: %s\n", AP_NameChar); + Serial.println("and open http://192.168.4.1 in your browser"); #else - WiFi.mode(WIFI_STA); - Serial.printf("Connecting to %s\n", ssid); - if (String(WiFi.SSID()) != String(ssid)) { - WiFi.hostname(HOSTNAME); - WiFi.begin(ssid, password); - } + WiFi.mode(WIFI_STA); + Serial.printf("Connecting to %s\n", ssid); + if (String(WiFi.SSID()) != String(ssid)) { + WiFi.hostname(HOSTNAME); + WiFi.begin(ssid, password); + } #endif - initUdp(UDP_PORT); + initUdp(UDP_PORT); #ifdef ENABLE_OTA_SUPPORT - webServer.on("/ota", HTTP_GET, []() { - IPAddress ip = WiFi.localIP(); - String h = "

OTA Update Mode

"; - h += "

Procedure:

"; - h += "The UI won't be available until reset.
"; - h += "Open your Arduino IDE and select the new PORT in Tools menu and upload the code!"; - h += "
Exit OTA mode: Reboot"; - h += ""; - - webServer.send(200, "text/html", h); - delay(100); - //webServer.stop(); - //delay(500); - //webServer.close(); - //delay(500); - //addRebootPage(); - //delay(100); - //webServer.stop(); - //delay(500); - //webServer.close(); - //delay(500); - ArduinoOTA.setHostname(HOSTNAME); + webServer.on("/ota", HTTP_GET, []() { + IPAddress ip = WiFi.localIP(); + String h = "

OTA Update Mode

"; + h += "

Procedure:

"; + h += "The UI won't be available until reset.
"; + h += "Open your Arduino IDE and select the new PORT in Tools menu and upload the code!"; + h += "
Exit OTA mode: Reboot"; + h += ""; + + webServer.send(200, "text/html", h); + delay(100); + //webServer.stop(); + //delay(500); + //webServer.close(); + //delay(500); + //addRebootPage(); + //delay(100); + //webServer.stop(); + //delay(500); + //webServer.close(); + //delay(500); + ArduinoOTA.setHostname(HOSTNAME); #ifdef OTA_PASSWORD - ArduinoOTA.setPassword(OTA_PASSWORD); + ArduinoOTA.setPassword(OTA_PASSWORD); #endif - ArduinoOTA.onStart([]() { - String type; - SPIFFS.end(); - if (ArduinoOTA.getCommand() == U_FLASH) { - type = "sketch"; - } - else { // U_FS - type = "filesystem"; - } - - // NOTE: if updating FS this would be the place to unmount FS using FS.end() - Serial.println("Start updating " + type); - }); - ArduinoOTA.onEnd([]() { - Serial.println("\nEnd"); - delay(500); - ESP.restart(); - }); - ArduinoOTA.onProgress([](unsigned int progress, unsigned int total) { - Serial.printf("Progress: %u%%\r", (progress / (total / 100))); - }); - ArduinoOTA.onError([](ota_error_t error) { - Serial.printf("Error[%u]: ", error); - if (error == OTA_AUTH_ERROR) { - Serial.println("Auth Failed"); - } - else if (error == OTA_BEGIN_ERROR) { - Serial.println("Begin Failed"); - } - else if (error == OTA_CONNECT_ERROR) { - Serial.println("Connect Failed"); - } - else if (error == OTA_RECEIVE_ERROR) { - Serial.println("Receive Failed"); - } - else if (error == OTA_END_ERROR) { - Serial.println("End Failed"); - } - }); - ArduinoOTA.begin(); - delay(100); - while (1) - { - ArduinoOTA.handle(); - delay(1); - webServer.handleClient(); - delay(1); - } - }); + ArduinoOTA.onStart([]() { + String type; + SPIFFS.end(); + if (ArduinoOTA.getCommand() == U_FLASH) { + type = "sketch"; + } + else { // U_FS + type = "filesystem"; + } + + // NOTE: if updating FS this would be the place to unmount FS using FS.end() + Serial.println("Start updating " + type); + }); + ArduinoOTA.onEnd([]() { + Serial.println("\nEnd"); + delay(500); + ESP.restart(); + }); + ArduinoOTA.onProgress([](unsigned int progress, unsigned int total) { + Serial.printf("Progress: %u%%\r", (progress / (total / 100))); + }); + ArduinoOTA.onError([](ota_error_t error) { + Serial.printf("Error[%u]: ", error); + if (error == OTA_AUTH_ERROR) { + Serial.println("Auth Failed"); + } + else if (error == OTA_BEGIN_ERROR) { + Serial.println("Begin Failed"); + } + else if (error == OTA_CONNECT_ERROR) { + Serial.println("Connect Failed"); + } + else if (error == OTA_RECEIVE_ERROR) { + Serial.println("Receive Failed"); + } + else if (error == OTA_END_ERROR) { + Serial.println("End Failed"); + } + }); + ArduinoOTA.begin(); + delay(100); + while (1) + { + ArduinoOTA.handle(); + delay(1); + webServer.handleClient(); + delay(1); + } + }); #endif #ifdef ENABLE_ALEXA_SUPPORT #ifdef ALEXA_DEVICE_NAME - alexa_main = new EspalexaDevice(ALEXA_DEVICE_NAME, mainAlexaEvent, EspalexaDeviceType::color); + alexa_main = new EspalexaDevice(ALEXA_DEVICE_NAME, mainAlexaEvent, EspalexaDeviceType::color); #else - alexa_main = new EspalexaDevice(HOSTNAME, mainAlexaEvent, EspalexaDeviceType::color); + alexa_main = new EspalexaDevice(HOSTNAME, mainAlexaEvent, EspalexaDeviceType::color); #endif - espalexa.addDevice(alexa_main); + espalexa.addDevice(alexa_main); #ifdef AddAutoplayDevice - espalexa.addDevice(AddAutoplayDevice, AlexaAutoplayEvent, EspalexaDeviceType::onoff); //non-dimmable device + espalexa.addDevice(AddAutoplayDevice, AlexaAutoplayEvent, EspalexaDeviceType::onoff); //non-dimmable device #endif #ifdef AddStrobeDevice - espalexa.addDevice(AddStrobeDevice, AlexaStrobeEvent, EspalexaDeviceType::color); //non-dimmable device + espalexa.addDevice(AddStrobeDevice, AlexaStrobeEvent, EspalexaDeviceType::color); //non-dimmable device #endif #ifdef AddSpecificPatternDeviceA - espalexa.addDevice(AddSpecificPatternDeviceA, AlexaSpecificEventA, EspalexaDeviceType::onoff); //non-dimmable device + espalexa.addDevice(AddSpecificPatternDeviceA, AlexaSpecificEventA, EspalexaDeviceType::onoff); //non-dimmable device #endif #ifdef AddSpecificPatternDeviceB - espalexa.addDevice(AddSpecificPatternDeviceB, AlexaSpecificEventB, EspalexaDeviceType::onoff); //non-dimmable device + espalexa.addDevice(AddSpecificPatternDeviceB, AlexaSpecificEventB, EspalexaDeviceType::onoff); //non-dimmable device #endif #ifdef AddSpecificPatternDeviceC - espalexa.addDevice(AddSpecificPatternDeviceC, AlexaSpecificEventC, EspalexaDeviceType::onoff); //non-dimmable device + espalexa.addDevice(AddSpecificPatternDeviceC, AlexaSpecificEventC, EspalexaDeviceType::onoff); //non-dimmable device #endif #ifdef AddAudioDevice - espalexa.addDevice(AddAudioDevice, AlexaAudioEvent, EspalexaDeviceType::onoff); //non-dimmable device + espalexa.addDevice(AddAudioDevice, AlexaAudioEvent, EspalexaDeviceType::onoff); //non-dimmable device #endif - webServer.onNotFound([]() { - if (!espalexa.handleAlexaApiCall(webServer.uri(), webServer.arg(0))) //if you don't know the URI, ask espalexa whether it is an Alexa control request - { - //whatever you want to do with 404s - webServer.send(404, "text/plain", "Not found"); - } - }); - - addRebootPage(); - - webServer.on("/alexa", HTTP_GET, []() { - IPAddress ip = WiFi.localIP(); - String h = "

Alexa pairing mode

"; - h += "

Procedure:

"; - h += "The webserver will reboot and the UI won't be available.
"; - h += "Now. Say to Alexa: 'Alexa, discover devices'.

"; - h += "Alexa should tell you that it found a new device, if it did reset the esp8266 to return to the normal mode."; - h += "
Exit pairing mode: Reboot"; - h += ""; - - webServer.send(200, "text/html", h); - webServer2.on("/alexa", [&]() {webServer2.send(200, "text/html", h); }); - delay(100); - webServer.stop(); - delay(500); - webServer.close(); - delay(500); - webServer2.onNotFound([]() { - if (!espalexa.handleAlexaApiCall(webServer2.uri(), webServer2.arg(0))) //if you don't know the URI, ask espalexa whether it is an Alexa control request - { - //whatever you want to do with 404s - webServer2.send(404, "text/plain", "Not found"); - } - }); - addRebootPage(2); - delay(100); - webServer.stop(); - delay(500); - webServer.close(); - delay(500); - espalexa.begin(&webServer2); - delay(100); - while (1) - { - espalexa.loop(); - delay(1); - } - }); + webServer.onNotFound([]() { + if (!espalexa.handleAlexaApiCall(webServer.uri(), webServer.arg(0))) //if you don't know the URI, ask espalexa whether it is an Alexa control request + { + //whatever you want to do with 404s + webServer.send(404, "text/plain", "Not found"); + } + }); + + addRebootPage(); + + webServer.on("/alexa", HTTP_GET, []() { + IPAddress ip = WiFi.localIP(); + String h = "

Alexa pairing mode

"; + h += "

Procedure:

"; + h += "The webserver will reboot and the UI won't be available.
"; + h += "Now. Say to Alexa: 'Alexa, discover devices'.

"; + h += "Alexa should tell you that it found a new device, if it did reset the esp8266 to return to the normal mode."; + h += "
Exit pairing mode: Reboot"; + h += ""; + + webServer.send(200, "text/html", h); + webServer2.on("/alexa", [&]() {webServer2.send(200, "text/html", h); }); + delay(100); + webServer.stop(); + delay(500); + webServer.close(); + delay(500); + webServer2.onNotFound([]() { + if (!espalexa.handleAlexaApiCall(webServer2.uri(), webServer2.arg(0))) //if you don't know the URI, ask espalexa whether it is an Alexa control request + { + //whatever you want to do with 404s + webServer2.send(404, "text/plain", "Not found"); + } + }); + addRebootPage(2); + delay(100); + webServer.stop(); + delay(500); + webServer.close(); + delay(500); + espalexa.begin(&webServer2); + delay(100); + while (1) + { + espalexa.loop(); + delay(1); + } + }); #endif - webServer.on("/all", HTTP_GET, []() { - String json = getFieldsJson(fields, fieldCount); - json += ",{\"name\":\"lines\",\"label\":\"Amount of Lines for the Visualizer\",\"type\":\"String\",\"value\":"; - json += PACKET_LENGTH; - json += "}"; - json += ",{\"name\":\"hostname\",\"label\":\"Name of the device\",\"type\":\"String\",\"value\":\""; - json += HOSTNAME; - json += "\"}"; - json += "]"; - webServer.send(200, "text/json", json); - }); - - webServer.on("/fieldValue", HTTP_GET, []() { - String name = webServer.arg("name"); - String value = getFieldValue(name, fields, fieldCount); - webServer.send(200, "text/json", value); - }); - - webServer.on("/fieldValue", HTTP_POST, []() { - String name = webServer.arg("name"); - String value = webServer.arg("value"); - String newValue = setFieldValue(name, value, fields, fieldCount); - webServer.send(200, "text/json", newValue); - }); - - webServer.on("/power", HTTP_POST, []() { - String value = webServer.arg("value"); - setPower(value.toInt()); - sendInt(power); - }); - - webServer.on("/cooling", HTTP_POST, []() { - String value = webServer.arg("value"); - cooling = value.toInt(); - broadcastInt("cooling", cooling); - sendInt(cooling); - }); - - webServer.on("/sparking", HTTP_POST, []() { - String value = webServer.arg("value"); - sparking = value.toInt(); - broadcastInt("sparking", sparking); - sendInt(sparking); - }); - - webServer.on("/speed", HTTP_POST, []() { - String value = webServer.arg("value"); - setSpeed(value.toInt()); - sendInt(speed); - }); - - webServer.on("/twinkleSpeed", HTTP_POST, []() { - String value = webServer.arg("value"); - twinkleSpeed = value.toInt(); - if (twinkleSpeed < 0) twinkleSpeed = 0; - else if (twinkleSpeed > 8) twinkleSpeed = 8; - broadcastInt("twinkleSpeed", twinkleSpeed); - sendInt(twinkleSpeed); - }); - - webServer.on("/twinkleDensity", HTTP_POST, []() { - String value = webServer.arg("value"); - twinkleDensity = value.toInt(); - if (twinkleDensity < 0) twinkleDensity = 0; - else if (twinkleDensity > 8) twinkleDensity = 8; - broadcastInt("twinkleDensity", twinkleDensity); - sendInt(twinkleDensity); - }); - - webServer.on("/solidColor", HTTP_POST, []() { - String r = webServer.arg("r"); - String g = webServer.arg("g"); - String b = webServer.arg("b"); - setSolidColor(r.toInt(), g.toInt(), b.toInt(), false); + webServer.on("/all", HTTP_GET, []() { + String json = getFieldsJson(fields, fieldCount); + json += ",{\"name\":\"lines\",\"label\":\"Amount of Lines for the Visualizer\",\"type\":\"String\",\"value\":"; + json += PACKET_LENGTH; + json += "}"; + json += ",{\"name\":\"hostname\",\"label\":\"Name of the device\",\"type\":\"String\",\"value\":\""; + json += HOSTNAME; + json += "\"}"; + json += "]"; + webServer.send(200, "text/json", json); + }); + + webServer.on("/fieldValue", HTTP_GET, []() { + String name = webServer.arg("name"); + String value = getFieldValue(name, fields, fieldCount); + webServer.send(200, "text/json", value); + }); + + webServer.on("/fieldValue", HTTP_POST, []() { + String name = webServer.arg("name"); + String value = webServer.arg("value"); + String newValue = setFieldValue(name, value, fields, fieldCount); + webServer.send(200, "text/json", newValue); + }); + + webServer.on("/power", HTTP_POST, []() { + String value = webServer.arg("value"); + setPower(value.toInt()); + sendInt(power); + }); + + webServer.on("/cooling", HTTP_POST, []() { + String value = webServer.arg("value"); + cooling = value.toInt(); + broadcastInt("cooling", cooling); + sendInt(cooling); + }); + + webServer.on("/sparking", HTTP_POST, []() { + String value = webServer.arg("value"); + sparking = value.toInt(); + broadcastInt("sparking", sparking); + sendInt(sparking); + }); + + webServer.on("/speed", HTTP_POST, []() { + String value = webServer.arg("value"); + setSpeed(value.toInt()); + sendInt(speed); + }); + + webServer.on("/twinkleSpeed", HTTP_POST, []() { + String value = webServer.arg("value"); + twinkleSpeed = value.toInt(); + if (twinkleSpeed < 0) twinkleSpeed = 0; + else if (twinkleSpeed > 8) twinkleSpeed = 8; + broadcastInt("twinkleSpeed", twinkleSpeed); + sendInt(twinkleSpeed); + }); + + webServer.on("/twinkleDensity", HTTP_POST, []() { + String value = webServer.arg("value"); + twinkleDensity = value.toInt(); + if (twinkleDensity < 0) twinkleDensity = 0; + else if (twinkleDensity > 8) twinkleDensity = 8; + broadcastInt("twinkleDensity", twinkleDensity); + sendInt(twinkleDensity); + }); + + webServer.on("/solidColor", HTTP_POST, []() { + String r = webServer.arg("r"); + String g = webServer.arg("g"); + String b = webServer.arg("b"); + setSolidColor(r.toInt(), g.toInt(), b.toInt(), false); #ifdef ENABLE_ALEXA_SUPPORT - alexa_main->setColor(r.toInt(), g.toInt(), b.toInt()); + alexa_main->setColor(r.toInt(), g.toInt(), b.toInt()); #endif - sendString(String(solidColor.r) + "," + String(solidColor.g) + "," + String(solidColor.b)); - }); - - webServer.on("/pattern", HTTP_POST, []() { - String value = webServer.arg("value"); - setPattern(value.toInt()); - sendInt(currentPatternIndex); - }); - - webServer.on("/patternName", HTTP_POST, []() { - String value = webServer.arg("value"); - setPatternName(value); - sendInt(currentPatternIndex); - }); - - webServer.on("/palette", HTTP_POST, []() { - String value = webServer.arg("value"); - setPalette(value.toInt()); - sendInt(currentPaletteIndex); - }); - - webServer.on("/paletteName", HTTP_POST, []() { - String value = webServer.arg("value"); - setPaletteName(value); - sendInt(currentPaletteIndex); - }); - - webServer.on("/brightness", HTTP_POST, []() { - String value = webServer.arg("value"); - setBrightness(value.toInt()); + sendString(String(solidColor.r) + "," + String(solidColor.g) + "," + String(solidColor.b)); + }); + + webServer.on("/pattern", HTTP_POST, []() { + String value = webServer.arg("value"); + setPattern(value.toInt()); + sendInt(currentPatternIndex); + }); + + webServer.on("/patternName", HTTP_POST, []() { + String value = webServer.arg("value"); + setPatternName(value); + sendInt(currentPatternIndex); + }); + + webServer.on("/palette", HTTP_POST, []() { + String value = webServer.arg("value"); + setPalette(value.toInt()); + sendInt(currentPaletteIndex); + }); + + webServer.on("/paletteName", HTTP_POST, []() { + String value = webServer.arg("value"); + setPaletteName(value); + sendInt(currentPaletteIndex); + }); + + webServer.on("/brightness", HTTP_POST, []() { + String value = webServer.arg("value"); + setBrightness(value.toInt()); #ifdef ENABLE_ALEXA_SUPPORT - alexa_main->setValue(brightness); + alexa_main->setValue(brightness); #endif - sendInt(brightness); - }); - - webServer.on("/autoplay", HTTP_POST, []() { - String value = webServer.arg("value"); - setAutoplay(value.toInt()); - sendInt(autoplay); - }); - - webServer.on("/autoplayDuration", HTTP_POST, []() { - String value = webServer.arg("value"); - setAutoplayDuration(value.toInt()); - sendInt(autoplayDuration); - }); - - - //list directory - webServer.on("/list", HTTP_GET, handleFileList); - /* - //load editor - webServer.on("/edit", HTTP_GET, []() { - if (!handleFileRead("/edit.htm")) webServer.send(404, "text/plain", "FileNotFound"); - }); - //create file - webServer.on("/edit", HTTP_PUT, handleFileCreate); - //delete file - webServer.on("/edit", HTTP_DELETE, handleFileDelete); - //first callback is called after the request has ended with all parsed arguments - //second callback handles file uploads at that location - webServer.on("/edit", HTTP_POST, []() { - webServer.send(200, "text/plain", ""); - }, handleFileUpload); - */ - webServer.serveStatic("/", SPIFFS, "/", "max-age=86400"); + sendInt(brightness); + }); + + webServer.on("/autoplay", HTTP_POST, []() { + String value = webServer.arg("value"); + setAutoplay(value.toInt()); + sendInt(autoplay); + }); + + webServer.on("/autoplayDuration", HTTP_POST, []() { + String value = webServer.arg("value"); + setAutoplayDuration(value.toInt()); + sendInt(autoplayDuration); + }); + + + //list directory + webServer.on("/list", HTTP_GET, handleFileList); + /* + //load editor + webServer.on("/edit", HTTP_GET, []() { + if (!handleFileRead("/edit.htm")) webServer.send(404, "text/plain", "FileNotFound"); + }); + //create file + webServer.on("/edit", HTTP_PUT, handleFileCreate); + //delete file + webServer.on("/edit", HTTP_DELETE, handleFileDelete); + //first callback is called after the request has ended with all parsed arguments + //second callback handles file uploads at that location + webServer.on("/edit", HTTP_POST, []() { + webServer.send(200, "text/plain", ""); + }, handleFileUpload); + */ + webServer.serveStatic("/", SPIFFS, "/", "max-age=86400"); #ifdef ENABLE_ALEXA_SUPPORT - espalexa.begin(&webServer); + espalexa.begin(&webServer); #endif #ifndef ENABLE_ALEXA_SUPPORT - webServer.begin(); + webServer.begin(); #endif - Serial.println("HTTP web server started"); + Serial.println("HTTP web server started"); - // webSocketsServer.begin(); - // webSocketsServer.onEvent(webSocketEvent); - // Serial.println("Web socket server started"); + // webSocketsServer.begin(); + // webSocketsServer.onEvent(webSocketEvent); + // Serial.println("Web socket server started"); - autoPlayTimeout = millis() + (autoplayDuration * 1000); + autoPlayTimeout = millis() + (autoplayDuration * 1000); } void sendInt(uint8_t value) { - sendString(String(value)); + sendString(String(value)); } void sendString(String value) { - webServer.send(200, "text/plain", value); + webServer.send(200, "text/plain", value); } void broadcastInt(String name, uint8_t value) { - String json = "{\"name\":\"" + name + "\",\"value\":" + String(value) + "}"; - // webSocketsServer.broadcastTXT(json); - #ifdef ENABLE_MQTT_SUPPORT - sendStatus(); - #endif + String json = "{\"name\":\"" + name + "\",\"value\":" + String(value) + "}"; + // webSocketsServer.broadcastTXT(json); + #ifdef ENABLE_MQTT_SUPPORT + sendStatus(); + #endif } void broadcastString(String name, String value) { - String json = "{\"name\":\"" + name + "\",\"value\":\"" + String(value) + "\"}"; - // webSocketsServer.broadcastTXT(json); - #ifdef ENABLE_MQTT_SUPPORT - sendStatus(); - #endif + String json = "{\"name\":\"" + name + "\",\"value\":\"" + String(value) + "\"}"; + // webSocketsServer.broadcastTXT(json); + #ifdef ENABLE_MQTT_SUPPORT + sendStatus(); + #endif } void loop() { - // Add entropy to random number generator; we use a lot of it. - random16_add_entropy(random(65535)); + // Add entropy to random number generator; we use a lot of it. + random16_add_entropy(random(65535)); - // dnsServer.processNextRequest(); - // webSocketsServer.loop(); + // dnsServer.processNextRequest(); + // webSocketsServer.loop(); #ifdef ENABLE_ALEXA_SUPPORT - espalexa.loop(); + espalexa.loop(); #else - webServer.handleClient(); + webServer.handleClient(); #endif #ifdef ENABLE_MULTICAST_DNS - MDNS.update(); + MDNS.update(); #endif // ENABLE_MULTICAST_DNS #ifdef ENABLE_MQTT_SUPPORT - mqttClient.loop(); + mqttClient.loop(); #endif - // handleIrInput(); - - static bool hasConnected = false; - EVERY_N_SECONDS(1) { - if (WiFi.status() != WL_CONNECTED) { - // Serial.printf("Connecting to %s\n", ssid); - hasConnected = false; - } - else if (!hasConnected) { - hasConnected = true; - Serial.print("Connected! Open http://"); - Serial.print(WiFi.localIP()); - Serial.println(" in your browser"); + // handleIrInput(); + + static bool hasConnected = false; + EVERY_N_SECONDS(1) { + if (WiFi.status() != WL_CONNECTED) { + // Serial.printf("Connecting to %s\n", ssid); + hasConnected = false; + } + else if (!hasConnected) { + hasConnected = true; + Serial.print("Connected! Open http://"); + Serial.print(WiFi.localIP()); + Serial.println(" in your browser"); #ifdef ENABLE_MULTICAST_DNS - if (!MDNS.begin(HOSTNAME)) { - Serial.println("\nError setting up MDNS responder! \n"); - } - else { - Serial.println("\nmDNS responder started \n"); - MDNS.addService("http", "tcp", 80); - } + if (!MDNS.begin(HOSTNAME)) { + Serial.println("\nError setting up MDNS responder! \n"); + } + else { + Serial.println("\nmDNS responder started \n"); + MDNS.addService("http", "tcp", 80); + } #endif - } - } + } + } #ifdef ENABLE_MQTT_SUPPORT - static bool mqttConnected = false; - EVERY_N_SECONDS(10) { - if (!mqttClient.connected()) { - mqttClient.setServer(mqttServer, mqttPort); - mqttClient.setCallback(mqttCallback); - mqttConnected = false; - } - if (!mqttConnected) { - mqttConnected = true; - Serial.println("Connecting to MQTT..."); - if (mqttClient.connect(HOSTNAME, mqttUser, mqttPassword)) { - mqttClient.setKeepAlive(10); - Serial.println("connected \n"); - - Serial.println("Subscribing to MQTT Topics \n"); - mqttClient.subscribe(MQTT_TOPIC MQTT_TOPIC_SET); - - DynamicJsonDocument JSONencoder(2048); - JSONencoder["~"] = MQTT_TOPIC, - JSONencoder["name"] = MQTT_DEVICE_NAME, - JSONencoder["dev"]["ids"] = MQTT_UNIQUE_IDENTIFIER, - JSONencoder["dev"]["mf"] = "Surrbradl08", - JSONencoder["dev"]["mdl"] = "0.4", - JSONencoder["dev"]["name"] = MQTT_DEVICE_NAME, - JSONencoder["stat_t"] = "~", - JSONencoder["cmd_t"] = "~" MQTT_TOPIC_SET, - JSONencoder["brightness"] = true, - JSONencoder["rgb"] = true, - JSONencoder["effect"] = true, - JSONencoder["uniq_id"] = MQTT_UNIQUE_IDENTIFIER, - JSONencoder["schema"] = "json"; - - JsonArray effect_list = JSONencoder.createNestedArray("effect_list"); - for (uint8_t i = 0; i < patternCount; i++) { - effect_list.add(patterns[i].name); - } - size_t n = measureJson(JSONencoder); - if (mqttClient.beginPublish(MQTT_TOPIC "/config", n, true) == true) { - Serial.println("Configuration Publishing Begun"); - if (serializeJson(JSONencoder, mqttClient) == n){ - Serial.println("Configuration Sent"); - } - if (mqttClient.endPublish() == true) { - Serial.println("Configuration Publishing Finished"); - sendStatus(); - Serial.println("Sending Initial Status"); - } - } - else { - Serial.println("Error sending Configuration"); - } - } - else { - Serial.print("failed with state "); - Serial.print(mqttClient.state()); - } - } - } - - EVERY_N_SECONDS(90) { - sendStatus(); - } + static bool mqttConnected = false; + EVERY_N_SECONDS(10) { + if (!mqttClient.connected()) { + mqttClient.setServer(mqttServer, mqttPort); + mqttClient.setCallback(mqttCallback); + mqttConnected = false; + } + if (!mqttConnected) { + mqttConnected = true; + Serial.println("Connecting to MQTT..."); + if (mqttClient.connect(HOSTNAME, mqttUser, mqttPassword)) { + mqttClient.setKeepAlive(10); + Serial.println("connected \n"); + + Serial.println("Subscribing to MQTT Topics \n"); + mqttClient.subscribe(MQTT_TOPIC MQTT_TOPIC_SET); + + DynamicJsonDocument JSONencoder(2048); + JSONencoder["~"] = MQTT_TOPIC, + JSONencoder["name"] = MQTT_DEVICE_NAME, + JSONencoder["dev"]["ids"] = MQTT_UNIQUE_IDENTIFIER, + JSONencoder["dev"]["mf"] = "Surrbradl08", + JSONencoder["dev"]["mdl"] = "0.4", + JSONencoder["dev"]["name"] = MQTT_DEVICE_NAME, + JSONencoder["stat_t"] = "~", + JSONencoder["cmd_t"] = "~" MQTT_TOPIC_SET, + JSONencoder["brightness"] = true, + JSONencoder["rgb"] = true, + JSONencoder["effect"] = true, + JSONencoder["uniq_id"] = MQTT_UNIQUE_IDENTIFIER, + JSONencoder["schema"] = "json"; + + JsonArray effect_list = JSONencoder.createNestedArray("effect_list"); + for (uint8_t i = 0; i < patternCount; i++) { + effect_list.add(patterns[i].name); + } + size_t n = measureJson(JSONencoder); + if (mqttClient.beginPublish(MQTT_TOPIC "/config", n, true) == true) { + Serial.println("Configuration Publishing Begun"); + if (serializeJson(JSONencoder, mqttClient) == n){ + Serial.println("Configuration Sent"); + } + if (mqttClient.endPublish() == true) { + Serial.println("Configuration Publishing Finished"); + sendStatus(); + Serial.println("Sending Initial Status"); + } + } + else { + Serial.println("Error sending Configuration"); + } + } + else { + Serial.print("failed with state "); + Serial.print(mqttClient.state()); + } + } + } + + EVERY_N_SECONDS(90) { + sendStatus(); + } #endif - if (power == 0) { - fill_solid(leds, NUM_LEDS, CRGB::Black); - FastLED.show(); - // FastLED.delay(15); - return; - } + if (power == 0) { + fill_solid(leds, NUM_LEDS, CRGB::Black); + FastLED.show(); + // FastLED.delay(15); + return; + } - // EVERY_N_SECONDS(10) { - // Serial.print( F("Heap: ") ); Serial.println(system_get_free_heap_size()); - // } + // EVERY_N_SECONDS(10) { + // Serial.print( F("Heap: ") ); Serial.println(system_get_free_heap_size()); + // } - // change to a new cpt-city gradient palette - EVERY_N_SECONDS(secondsPerPalette) { - gCurrentPaletteNumber = addmod8(gCurrentPaletteNumber, 1, gGradientPaletteCount); - gTargetPalette = gGradientPalettes[gCurrentPaletteNumber]; - } + // change to a new cpt-city gradient palette + EVERY_N_SECONDS(secondsPerPalette) { + gCurrentPaletteNumber = addmod8(gCurrentPaletteNumber, 1, gGradientPaletteCount); + gTargetPalette = gGradientPalettes[gCurrentPaletteNumber]; + } - EVERY_N_MILLISECONDS(40) { - // slowly blend the current palette to the next - nblendPaletteTowardPalette(gCurrentPalette, gTargetPalette, 8); - gHue++; // slowly cycle the "base color" through the rainbow - } + EVERY_N_MILLISECONDS(40) { + // slowly blend the current palette to the next + nblendPaletteTowardPalette(gCurrentPalette, gTargetPalette, 8); + gHue++; // slowly cycle the "base color" through the rainbow + } - if (autoplay && (millis() > autoPlayTimeout)) { - adjustPattern(true); - autoPlayTimeout = millis() + (autoplayDuration * 1000); - } + if (autoplay && (millis() > autoPlayTimeout)) { + adjustPattern(true); + autoPlayTimeout = millis() + (autoplayDuration * 1000); + } - // Call the current pattern function once, updating the 'leds' array - patterns[currentPatternIndex].pattern(); + // Call the current pattern function once, updating the 'leds' array + patterns[currentPatternIndex].pattern(); - FastLED.show(); + FastLED.show(); - // insert a delay to keep the framerate modest - FastLED.delay(1000 / FRAMES_PER_SECOND); + // insert a delay to keep the framerate modest + FastLED.delay(1000 / FRAMES_PER_SECOND); } void loadSettings() { - brightness = EEPROM.read(0); + brightness = EEPROM.read(0); - currentPatternIndex = EEPROM.read(1); - if (currentPatternIndex < 0) - currentPatternIndex = 0; - else if (currentPatternIndex >= patternCount) - currentPatternIndex = patternCount - 1; + currentPatternIndex = EEPROM.read(1); + if (currentPatternIndex < 0) + currentPatternIndex = 0; + else if (currentPatternIndex >= patternCount) + currentPatternIndex = patternCount - 1; - byte r = EEPROM.read(2); - byte g = EEPROM.read(3); - byte b = EEPROM.read(4); + byte r = EEPROM.read(2); + byte g = EEPROM.read(3); + byte b = EEPROM.read(4); - if (r == 0 && g == 0 && b == 0) - { - } - else - { - solidColor = CRGB(r, g, b); - } + if (r == 0 && g == 0 && b == 0) + { + } + else + { + solidColor = CRGB(r, g, b); + } - power = EEPROM.read(5); + power = EEPROM.read(5); - autoplay = EEPROM.read(6); - autoplayDuration = EEPROM.read(7); + autoplay = EEPROM.read(6); + autoplayDuration = EEPROM.read(7); - currentPaletteIndex = EEPROM.read(8); - if (currentPaletteIndex < 0) - currentPaletteIndex = 0; - else if (currentPaletteIndex >= paletteCount) - currentPaletteIndex = paletteCount - 1; - speed = EEPROM.read(9); + currentPaletteIndex = EEPROM.read(8); + if (currentPaletteIndex < 0) + currentPaletteIndex = 0; + else if (currentPaletteIndex >= paletteCount) + currentPaletteIndex = paletteCount - 1; + speed = EEPROM.read(9); } void setPower(uint8_t value) { - power = value == 0 ? 0 : 1; + power = value == 0 ? 0 : 1; - EEPROM.write(5, power); - EEPROM.commit(); + EEPROM.write(5, power); + EEPROM.commit(); - broadcastInt("power", power); + broadcastInt("power", power); } void setAutoplay(uint8_t value) { - autoplay = value == 0 ? 0 : 1; + autoplay = value == 0 ? 0 : 1; - EEPROM.write(6, autoplay); - EEPROM.commit(); + EEPROM.write(6, autoplay); + EEPROM.commit(); - broadcastInt("autoplay", autoplay); + broadcastInt("autoplay", autoplay); } void setAutoplayDuration(uint8_t value) { - autoplayDuration = value; + autoplayDuration = value; - EEPROM.write(7, autoplayDuration); - EEPROM.commit(); + EEPROM.write(7, autoplayDuration); + EEPROM.commit(); - autoPlayTimeout = millis() + (autoplayDuration * 1000); + autoPlayTimeout = millis() + (autoplayDuration * 1000); - broadcastInt("autoplayDuration", autoplayDuration); + broadcastInt("autoplayDuration", autoplayDuration); } @@ -1325,326 +1325,326 @@ void setAutoplayDuration(uint8_t value) void adjustPattern(bool up) { #ifdef RANDOM_AUTOPLAY_PATTERN - if (autoplay == 1) - { - uint8_t lastpattern = currentPatternIndex; - while (currentPatternIndex == lastpattern) - { - uint8_t newpattern = random8(0, patternCount - 1); - if (newpattern != lastpattern)currentPatternIndex = newpattern; - } - } + if (autoplay == 1) + { + uint8_t lastpattern = currentPatternIndex; + while (currentPatternIndex == lastpattern) + { + uint8_t newpattern = random8(0, patternCount - 1); + if (newpattern != lastpattern)currentPatternIndex = newpattern; + } + } #else // RANDOM_AUTOPLAY_PATTERN - if (up) - currentPatternIndex++; - else - currentPatternIndex--; + if (up) + currentPatternIndex++; + else + currentPatternIndex--; #endif - if (autoplay == 0) - { - if (up) - currentPatternIndex++; - else - currentPatternIndex--; - } - // wrap around at the ends - if (currentPatternIndex < 0) - currentPatternIndex = patternCount - 1; - if (currentPatternIndex >= patternCount) - currentPatternIndex = 0; - - if (autoplay == 0) { - EEPROM.write(1, currentPatternIndex); - EEPROM.commit(); - } + if (autoplay == 0) + { + if (up) + currentPatternIndex++; + else + currentPatternIndex--; + } + // wrap around at the ends + if (currentPatternIndex < 0) + currentPatternIndex = patternCount - 1; + if (currentPatternIndex >= patternCount) + currentPatternIndex = 0; + + if (autoplay == 0) { + EEPROM.write(1, currentPatternIndex); + EEPROM.commit(); + } #ifdef AUTOPLAY_IGNORE_UDP_PATTERNS - if (autoplay == 1) - { - if (((String)patterns[currentPatternIndex].name).indexOf("Visual") > 0) adjustPattern(true); // new pattern if it is a udp pattern - else if (((String)patterns[currentPatternIndex].name).indexOf("Serial") > 0) adjustPattern(true); // new pattern if it is a serial pattern - } + if (autoplay == 1) + { + if (((String)patterns[currentPatternIndex].name).indexOf("Visual") > 0) adjustPattern(true); // new pattern if it is a udp pattern + else if (((String)patterns[currentPatternIndex].name).indexOf("Serial") > 0) adjustPattern(true); // new pattern if it is a serial pattern + } #endif - broadcastInt("pattern", currentPatternIndex); + broadcastInt("pattern", currentPatternIndex); } void setPattern(uint8_t value) { - if (value >= patternCount) - value = patternCount - 1; + if (value >= patternCount) + value = patternCount - 1; - currentPatternIndex = value; + currentPatternIndex = value; - if (autoplay != 1) { - EEPROM.write(1, currentPatternIndex); - EEPROM.commit(); - } + if (autoplay != 1) { + EEPROM.write(1, currentPatternIndex); + EEPROM.commit(); + } - broadcastInt("pattern", currentPatternIndex); + broadcastInt("pattern", currentPatternIndex); } void setPatternName(String name) { - for (uint8_t i = 0; i < patternCount; i++) { - if (patterns[i].name == name) { - setPattern(i); - break; - } - } + for (uint8_t i = 0; i < patternCount; i++) { + if (patterns[i].name == name) { + setPattern(i); + break; + } + } } void setPalette(uint8_t value) { - if (value >= paletteCount) - value = paletteCount - 1; + if (value >= paletteCount) + value = paletteCount - 1; - currentPaletteIndex = value; + currentPaletteIndex = value; - EEPROM.write(8, currentPaletteIndex); - EEPROM.commit(); + EEPROM.write(8, currentPaletteIndex); + EEPROM.commit(); - broadcastInt("palette", currentPaletteIndex); + broadcastInt("palette", currentPaletteIndex); } void setPaletteName(String name) { - for (uint8_t i = 0; i < paletteCount; i++) { - if (paletteNames[i] == name) { - setPalette(i); - break; - } - } + for (uint8_t i = 0; i < paletteCount; i++) { + if (paletteNames[i] == name) { + setPalette(i); + break; + } + } } void adjustBrightness(bool up) { - if (up && brightnessIndex < brightnessCount - 1) - brightnessIndex++; - else if (!up && brightnessIndex > 0) - brightnessIndex--; + if (up && brightnessIndex < brightnessCount - 1) + brightnessIndex++; + else if (!up && brightnessIndex > 0) + brightnessIndex--; - brightness = brightnessMap[brightnessIndex]; + brightness = brightnessMap[brightnessIndex]; - FastLED.setBrightness(brightness); + FastLED.setBrightness(brightness); - EEPROM.write(0, brightness); - EEPROM.commit(); + EEPROM.write(0, brightness); + EEPROM.commit(); - broadcastInt("brightness", brightness); + broadcastInt("brightness", brightness); } void setBrightness(uint8_t value) { - if (value > 255) - value = 255; - else if (value < 0) value = 0; + if (value > 255) + value = 255; + else if (value < 0) value = 0; - brightness = value; + brightness = value; - FastLED.setBrightness(brightness); + FastLED.setBrightness(brightness); - EEPROM.write(0, brightness); - EEPROM.commit(); + EEPROM.write(0, brightness); + EEPROM.commit(); - broadcastInt("brightness", brightness); + broadcastInt("brightness", brightness); } void setSpeed(uint8_t value) { - if (value > 255) - value = 255; - else if (value < 0) value = 0; + if (value > 255) + value = 255; + else if (value < 0) value = 0; - speed = value; + speed = value; - FastLED.setBrightness(brightness); + FastLED.setBrightness(brightness); - EEPROM.write(9, speed); - EEPROM.commit(); + EEPROM.write(9, speed); + EEPROM.commit(); - broadcastInt("speed", brightness); + broadcastInt("speed", brightness); } void strandTest() { - static uint8_t i = 0; + static uint8_t i = 0; - EVERY_N_SECONDS(1) - { - i++; - if (i >= NUM_LEDS) - i = 0; - } + EVERY_N_SECONDS(1) + { + i++; + if (i >= NUM_LEDS) + i = 0; + } - fill_solid(leds, NUM_LEDS, CRGB::Black); + fill_solid(leds, NUM_LEDS, CRGB::Black); - leds[i] = solidColor; + leds[i] = solidColor; } void showSolidColor() { - fill_solid(leds, NUM_LEDS, solidColor); + fill_solid(leds, NUM_LEDS, solidColor); } // Patterns from FastLED example DemoReel100: https://github.com/FastLED/FastLED/blob/master/examples/DemoReel100/DemoReel100.ino void rainbow_strobe() { - if (autoplay == 1)adjustPattern(true); - static bool p = false; - static long lm = 0; - if (millis() - lm > (128 - (speed / 2))) - { - if (p) fill_solid(leds, NUM_LEDS, CRGB(0, 0, 0)); - else fill_solid(leds, NUM_LEDS, CHSV(gHue, 255, 255)); - lm = millis(); - p = !p; - } + if (autoplay == 1)adjustPattern(true); + static bool p = false; + static long lm = 0; + if (millis() - lm > (128 - (speed / 2))) + { + if (p) fill_solid(leds, NUM_LEDS, CRGB(0, 0, 0)); + else fill_solid(leds, NUM_LEDS, CHSV(gHue, 255, 255)); + lm = millis(); + p = !p; + } } void smooth_rainbow_strobe() { - if (autoplay == 1)adjustPattern(true); - uint8_t beat = beatsin8(speed, 0, 255); - fill_solid(leds, NUM_LEDS, CHSV(gHue, 255, beat)); + if (autoplay == 1)adjustPattern(true); + uint8_t beat = beatsin8(speed, 0, 255); + fill_solid(leds, NUM_LEDS, CHSV(gHue, 255, beat)); } void strobe() { - if (autoplay == 1)adjustPattern(true); - static bool p = false; - static long lm = 0; - if (millis() - lm > (128 - (speed / 2))) - { - if (p) fill_solid(leds, NUM_LEDS, CRGB(0, 0, 0)); - else fill_solid(leds, NUM_LEDS, solidColor); - lm = millis(); - p = !p; - } + if (autoplay == 1)adjustPattern(true); + static bool p = false; + static long lm = 0; + if (millis() - lm > (128 - (speed / 2))) + { + if (p) fill_solid(leds, NUM_LEDS, CRGB(0, 0, 0)); + else fill_solid(leds, NUM_LEDS, solidColor); + lm = millis(); + p = !p; + } } void rainbow() { #if DEVICE_TYPE == 4 - for (int i = 0; i < LEAFCOUNT; i++) - { - uint8_t myHue = (gHue + i * (255 / LEAFCOUNT)); - gHue = gHue > 255 ? gHue - 255 : gHue; - fill_solid(leds + i * PIXELS_PER_LEAF, PIXELS_PER_LEAF, CHSV(myHue, 255, 255)); - } + for (int i = 0; i < LEAFCOUNT; i++) + { + uint8_t myHue = (gHue + i * (255 / LEAFCOUNT)); + gHue = gHue > 255 ? gHue - 255 : gHue; + fill_solid(leds + i * PIXELS_PER_LEAF, PIXELS_PER_LEAF, CHSV(myHue, 255, 255)); + } #else - // FastLED's built-in rainbow generator - fill_rainbow(leds, NUM_LEDS, gHue, 255 / NUM_LEDS); + // FastLED's built-in rainbow generator + fill_rainbow(leds, NUM_LEDS, gHue, 255 / NUM_LEDS); #endif } void rainbowWithGlitter() { - // built-in FastLED rainbow, plus some random sparkly glitter - rainbow(); - addGlitter(80); + // built-in FastLED rainbow, plus some random sparkly glitter + rainbow(); + addGlitter(80); } void rainbowSolid() { - fill_solid(leds, NUM_LEDS, CHSV(gHue, 255, 255)); + fill_solid(leds, NUM_LEDS, CHSV(gHue, 255, 255)); } void confetti() { - // random colored speckles that blink in and fade smoothly - fadeToBlackBy(leds, NUM_LEDS, 10); + // random colored speckles that blink in and fade smoothly + fadeToBlackBy(leds, NUM_LEDS, 10); #if DEVICE_TYPE == 4 - int pos = random16(LEAFCOUNT * 3); - int val = gHue + random8(64); - for (int i = 0; i < (PIXELS_PER_LEAF / 3); i++) - { + int pos = random16(LEAFCOUNT * 3); + int val = gHue + random8(64); + for (int i = 0; i < (PIXELS_PER_LEAF / 3); i++) + { - leds[i + pos * (PIXELS_PER_LEAF / 3)] += ColorFromPalette(palettes[currentPaletteIndex], val); - } + leds[i + pos * (PIXELS_PER_LEAF / 3)] += ColorFromPalette(palettes[currentPaletteIndex], val); + } #else - int pos = random16(NUM_LEDS); - // leds[pos] += CHSV( gHue + random8(64), 200, 255); - leds[pos] += ColorFromPalette(palettes[currentPaletteIndex], gHue + random8(64)); + int pos = random16(NUM_LEDS); + // leds[pos] += CHSV( gHue + random8(64), 200, 255); + leds[pos] += ColorFromPalette(palettes[currentPaletteIndex], gHue + random8(64)); #endif } void sinelon() { - // a colored dot sweeping back and forth, with fading trails - fadeToBlackBy(leds, NUM_LEDS, 20); - int pos = beatsin16(speed, 0, NUM_LEDS); - static int prevpos = 0; - CRGB color = ColorFromPalette(palettes[currentPaletteIndex], gHue, 255); - if (pos < prevpos) { - fill_solid(leds + pos, (prevpos - pos) + 1, color); - } - else { - fill_solid(leds + prevpos, (pos - prevpos) + 1, color); - } - prevpos = pos; + // a colored dot sweeping back and forth, with fading trails + fadeToBlackBy(leds, NUM_LEDS, 20); + int pos = beatsin16(speed, 0, NUM_LEDS); + static int prevpos = 0; + CRGB color = ColorFromPalette(palettes[currentPaletteIndex], gHue, 255); + if (pos < prevpos) { + fill_solid(leds + pos, (prevpos - pos) + 1, color); + } + else { + fill_solid(leds + prevpos, (pos - prevpos) + 1, color); + } + prevpos = pos; } void bpm() { - // colored stripes pulsing at a defined Beats-Per-Minute (BPM) - uint8_t beat = beatsin8(speed, 64, 255); - CRGBPalette16 palette = palettes[currentPaletteIndex]; + // colored stripes pulsing at a defined Beats-Per-Minute (BPM) + uint8_t beat = beatsin8(speed, 64, 255); + CRGBPalette16 palette = palettes[currentPaletteIndex]; #if DEVICE_TYPE == 4 - for (int i = 0; i < LEAFCOUNT; i++) { - for (int i2 = 0; i2 < PIXELS_PER_LEAF; i2++)leds[i * PIXELS_PER_LEAF + i2] = ColorFromPalette(palette, gHue + (i * 2), beat - gHue + (i * 10)); - } + for (int i = 0; i < LEAFCOUNT; i++) { + for (int i2 = 0; i2 < PIXELS_PER_LEAF; i2++)leds[i * PIXELS_PER_LEAF + i2] = ColorFromPalette(palette, gHue + (i * 2), beat - gHue + (i * 10)); + } #else - for (int i = 0; i < NUM_LEDS; i++) { - leds[i] = ColorFromPalette(palette, gHue + (i * 2), beat - gHue + (i * 10)); - } + for (int i = 0; i < NUM_LEDS; i++) { + leds[i] = ColorFromPalette(palette, gHue + (i * 2), beat - gHue + (i * 10)); + } #endif } void juggle() { - static uint8_t numdots = 4; // Number of dots in use. - static uint8_t faderate = 2; // How long should the trails be. Very low value = longer trails. - static uint8_t hueinc = 255 / numdots - 1; // Incremental change in hue between each dot. - static uint8_t thishue = 0; // Starting hue. - static uint8_t curhue = 0; // The current hue - static uint8_t thissat = 255; // Saturation of the colour. - static uint8_t thisbright = 255; // How bright should the LED/display be. - static uint8_t basebeat = 5; // Higher = faster movement. - - static uint8_t lastSecond = 99; // Static variable, means it's only defined once. This is our 'debounce' variable. - uint8_t secondHand = (millis() / 1000) % 30; // IMPORTANT!!! Change '30' to a different value to change duration of the loop. - - if (lastSecond != secondHand) { // Debounce to make sure we're not repeating an assignment. - lastSecond = secondHand; - switch (secondHand) { - case 0: numdots = 1; basebeat = 20; hueinc = 16; faderate = 2; thishue = 0; break; // You can change values here, one at a time , or altogether. - case 10: numdots = 4; basebeat = 10; hueinc = 16; faderate = 8; thishue = 128; break; - case 20: numdots = 8; basebeat = 3; hueinc = 0; faderate = 8; thishue = random8(); break; // Only gets called once, and not continuously for the next several seconds. Therefore, no rainbows. - case 30: break; - } - } - - // Several colored dots, weaving in and out of sync with each other - curhue = thishue; // Reset the hue values. - fadeToBlackBy(leds, NUM_LEDS, faderate); - for (int i = 0; i < numdots; i++) { - //beat16 is a FastLED 3.1 function - leds[beatsin16(basebeat + i + numdots, 0, NUM_LEDS)] += CHSV(gHue + curhue, thissat, thisbright); - curhue += hueinc; - } + static uint8_t numdots = 4; // Number of dots in use. + static uint8_t faderate = 2; // How long should the trails be. Very low value = longer trails. + static uint8_t hueinc = 255 / numdots - 1; // Incremental change in hue between each dot. + static uint8_t thishue = 0; // Starting hue. + static uint8_t curhue = 0; // The current hue + static uint8_t thissat = 255; // Saturation of the colour. + static uint8_t thisbright = 255; // How bright should the LED/display be. + static uint8_t basebeat = 5; // Higher = faster movement. + + static uint8_t lastSecond = 99; // Static variable, means it's only defined once. This is our 'debounce' variable. + uint8_t secondHand = (millis() / 1000) % 30; // IMPORTANT!!! Change '30' to a different value to change duration of the loop. + + if (lastSecond != secondHand) { // Debounce to make sure we're not repeating an assignment. + lastSecond = secondHand; + switch (secondHand) { + case 0: numdots = 1; basebeat = 20; hueinc = 16; faderate = 2; thishue = 0; break; // You can change values here, one at a time , or altogether. + case 10: numdots = 4; basebeat = 10; hueinc = 16; faderate = 8; thishue = 128; break; + case 20: numdots = 8; basebeat = 3; hueinc = 0; faderate = 8; thishue = random8(); break; // Only gets called once, and not continuously for the next several seconds. Therefore, no rainbows. + case 30: break; + } + } + + // Several colored dots, weaving in and out of sync with each other + curhue = thishue; // Reset the hue values. + fadeToBlackBy(leds, NUM_LEDS, faderate); + for (int i = 0; i < numdots; i++) { + //beat16 is a FastLED 3.1 function + leds[beatsin16(basebeat + i + numdots, 0, NUM_LEDS)] += CHSV(gHue + curhue, thissat, thisbright); + curhue += hueinc; + } } void fire() { - heatMap(HeatColors_p, true); + heatMap(HeatColors_p, true); } void water() { - heatMap(IceColors_p, false); + heatMap(IceColors_p, false); } // Pride2015 by Mark Kriegsman: https://gist.github.com/kriegsman/964de772d64c502760e5 @@ -1652,114 +1652,114 @@ void water() // widely-varying set of parameters. void pride() { - static uint16_t sPseudotime = 0; - static uint16_t sLastMillis = 0; - static uint16_t sHue16 = 0; + static uint16_t sPseudotime = 0; + static uint16_t sLastMillis = 0; + static uint16_t sHue16 = 0; - uint8_t sat8 = beatsin88(87, 220, 250); - uint8_t brightdepth = beatsin88(341, 96, 224); - uint16_t brightnessthetainc16 = beatsin88(203, (25 * 256), (40 * 256)); - uint8_t msmultiplier = beatsin88(147, 23, 60); + uint8_t sat8 = beatsin88(87, 220, 250); + uint8_t brightdepth = beatsin88(341, 96, 224); + uint16_t brightnessthetainc16 = beatsin88(203, (25 * 256), (40 * 256)); + uint8_t msmultiplier = beatsin88(147, 23, 60); - uint16_t hue16 = sHue16;//gHue * 256; - uint16_t hueinc16 = beatsin88(113, 1, 3000); + uint16_t hue16 = sHue16;//gHue * 256; + uint16_t hueinc16 = beatsin88(113, 1, 3000); - uint16_t ms = millis(); - uint16_t deltams = ms - sLastMillis; - sLastMillis = ms; - sPseudotime += deltams * msmultiplier; - sHue16 += deltams * beatsin88(400, 5, 9); - uint16_t brightnesstheta16 = sPseudotime; + uint16_t ms = millis(); + uint16_t deltams = ms - sLastMillis; + sLastMillis = ms; + sPseudotime += deltams * msmultiplier; + sHue16 += deltams * beatsin88(400, 5, 9); + uint16_t brightnesstheta16 = sPseudotime; #if DEVICE_TYPE == 4 - for (uint16_t i = 0; i < (LEAFCOUNT * 3); i++) { + for (uint16_t i = 0; i < (LEAFCOUNT * 3); i++) { #else - for (uint16_t i = 0; i < NUM_LEDS; i++) { + for (uint16_t i = 0; i < NUM_LEDS; i++) { #endif - hue16 += hueinc16; - uint8_t hue8 = hue16 / 256; + hue16 += hueinc16; + uint8_t hue8 = hue16 / 256; - brightnesstheta16 += brightnessthetainc16; - uint16_t b16 = sin16(brightnesstheta16) + 32768; + brightnesstheta16 += brightnessthetainc16; + uint16_t b16 = sin16(brightnesstheta16) + 32768; - uint16_t bri16 = (uint32_t)((uint32_t)b16 * (uint32_t)b16) / 65536; - uint8_t bri8 = (uint32_t)(((uint32_t)bri16) * brightdepth) / 65536; - bri8 += (255 - brightdepth); + uint16_t bri16 = (uint32_t)((uint32_t)b16 * (uint32_t)b16) / 65536; + uint8_t bri8 = (uint32_t)(((uint32_t)bri16) * brightdepth) / 65536; + bri8 += (255 - brightdepth); - CRGB newcolor = CHSV(hue8, sat8, bri8); + CRGB newcolor = CHSV(hue8, sat8, bri8); - uint16_t pixelnumber = i; + uint16_t pixelnumber = i; #if DEVICE_TYPE == 4 - pixelnumber = ((LEAFCOUNT * 3) - 1) - pixelnumber; - for (int i2 = 0; i2 < (PIXELS_PER_LEAF / 3); i2++) - { - nblend(leds[pixelnumber * (PIXELS_PER_LEAF / 3) + i2], newcolor, 64); - } + pixelnumber = ((LEAFCOUNT * 3) - 1) - pixelnumber; + for (int i2 = 0; i2 < (PIXELS_PER_LEAF / 3); i2++) + { + nblend(leds[pixelnumber * (PIXELS_PER_LEAF / 3) + i2], newcolor, 64); + } #else - pixelnumber = (NUM_LEDS - 1) - pixelnumber; - nblend(leds[pixelnumber], newcolor, 64); + pixelnumber = (NUM_LEDS - 1) - pixelnumber; + nblend(leds[pixelnumber], newcolor, 64); #endif - } + } } void radialPaletteShift() { - for (uint16_t i = 0; i < NUM_LEDS; i++) { - // leds[i] = ColorFromPalette( gCurrentPalette, gHue + sin8(i*16), brightness); - leds[i] = ColorFromPalette(gCurrentPalette, i + gHue, 255, LINEARBLEND); - } + for (uint16_t i = 0; i < NUM_LEDS; i++) { + // leds[i] = ColorFromPalette( gCurrentPalette, gHue + sin8(i*16), brightness); + leds[i] = ColorFromPalette(gCurrentPalette, i + gHue, 255, LINEARBLEND); + } } // based on FastLED example Fire2012WithPalette: https://github.com/FastLED/FastLED/blob/master/examples/Fire2012WithPalette/Fire2012WithPalette.ino void heatMap(CRGBPalette16 palette, bool up) { - fill_solid(leds, NUM_LEDS, CRGB::Black); + fill_solid(leds, NUM_LEDS, CRGB::Black); - // Add entropy to random number generator; we use a lot of it. - random16_add_entropy(random(256)); + // Add entropy to random number generator; we use a lot of it. + random16_add_entropy(random(256)); - // Array of temperature readings at each simulation cell - static byte heat[NUM_LEDS]; + // Array of temperature readings at each simulation cell + static byte heat[NUM_LEDS]; - byte colorindex; + byte colorindex; - // Step 1. Cool down every cell a little - for (uint16_t i = 0; i < NUM_LEDS; i++) { - heat[i] = qsub8(heat[i], random8(0, ((cooling * 10) / NUM_LEDS) + 2)); - } + // Step 1. Cool down every cell a little + for (uint16_t i = 0; i < NUM_LEDS; i++) { + heat[i] = qsub8(heat[i], random8(0, ((cooling * 10) / NUM_LEDS) + 2)); + } - // Step 2. Heat from each cell drifts 'up' and diffuses a little - for (uint16_t k = NUM_LEDS - 1; k >= 2; k--) { - heat[k] = (heat[k - 1] + heat[k - 2] + heat[k - 2]) / 3; - } + // Step 2. Heat from each cell drifts 'up' and diffuses a little + for (uint16_t k = NUM_LEDS - 1; k >= 2; k--) { + heat[k] = (heat[k - 1] + heat[k - 2] + heat[k - 2]) / 3; + } - // Step 3. Randomly ignite new 'sparks' of heat near the bottom - if (random8() < sparking) { - int y = random8(7); - heat[y] = qadd8(heat[y], random8(160, 255)); - } + // Step 3. Randomly ignite new 'sparks' of heat near the bottom + if (random8() < sparking) { + int y = random8(7); + heat[y] = qadd8(heat[y], random8(160, 255)); + } - // Step 4. Map from heat cells to LED colors - for (uint16_t j = 0; j < NUM_LEDS; j++) { - // Scale the heat value from 0-255 down to 0-240 - // for best results with color palettes. - colorindex = scale8(heat[j], 190); + // Step 4. Map from heat cells to LED colors + for (uint16_t j = 0; j < NUM_LEDS; j++) { + // Scale the heat value from 0-255 down to 0-240 + // for best results with color palettes. + colorindex = scale8(heat[j], 190); - CRGB color = ColorFromPalette(palette, colorindex); + CRGB color = ColorFromPalette(palette, colorindex); - if (up) { - leds[j] = color; - } - else { - leds[(NUM_LEDS - 1) - j] = color; - } - } + if (up) { + leds[j] = color; + } + else { + leds[(NUM_LEDS - 1) - j] = color; + } + } } void addGlitter(uint8_t chanceOfGlitter) { - if (random8() < chanceOfGlitter) { - leds[random16(NUM_LEDS)] += CRGB::White; - } + if (random8() < chanceOfGlitter) { + leds[random16(NUM_LEDS)] += CRGB::White; + } } /////////////////////////////////////////////////////////////////////// @@ -1771,22 +1771,22 @@ extern const TProgmemRGBGradientPalettePtr gGradientPalettes[]; extern const uint8_t gGradientPaletteCount; uint8_t beatsaw8(accum88 beats_per_minute, uint8_t lowest = 0, uint8_t highest = 255, - uint32_t timebase = 0, uint8_t phase_offset = 0) + uint32_t timebase = 0, uint8_t phase_offset = 0) { - uint8_t beat = beat8(beats_per_minute, timebase); - uint8_t beatsaw = beat + phase_offset; - uint8_t rangewidth = highest - lowest; - uint8_t scaledbeat = scale8(beatsaw, rangewidth); - uint8_t result = lowest + scaledbeat; - return result; + uint8_t beat = beat8(beats_per_minute, timebase); + uint8_t beatsaw = beat + phase_offset; + uint8_t rangewidth = highest - lowest; + uint8_t scaledbeat = scale8(beatsaw, rangewidth); + uint8_t result = lowest + scaledbeat; + return result; } void colorWaves() { #if DEVICE_TYPE == 4 - colorwaves(leds, LEAFCOUNT * 3, gCurrentPalette); + colorwaves(leds, LEAFCOUNT * 3, gCurrentPalette); #else - colorwaves(leds, NUM_LEDS, gCurrentPalette); + colorwaves(leds, NUM_LEDS, gCurrentPalette); #endif } @@ -1795,71 +1795,71 @@ void colorWaves() // widely-varying set of parameters, using a color palette. void colorwaves(CRGB* ledarray, uint16_t numleds, CRGBPalette16& palette) { - static uint16_t sPseudotime = 0; - static uint16_t sLastMillis = 0; - static uint16_t sHue16 = 0; - - // uint8_t sat8 = beatsin88( 87, 220, 250); - uint8_t brightdepth = beatsin88(341, 96, 224); - uint16_t brightnessthetainc16 = beatsin88(203, (25 * 256), (40 * 256)); - uint8_t msmultiplier = beatsin88(147, 23, 60); - - uint16_t hue16 = sHue16;//gHue * 256; - uint16_t hueinc16 = beatsin88(113, 300, 1500); - - uint16_t ms = millis(); - uint16_t deltams = ms - sLastMillis; - sLastMillis = ms; - sPseudotime += deltams * msmultiplier; - sHue16 += deltams * beatsin88(400, 5, 9); - uint16_t brightnesstheta16 = sPseudotime; - - for (uint16_t i = 0; i < numleds; i++) { - hue16 += hueinc16; - uint8_t hue8 = hue16 / 256; - uint16_t h16_128 = hue16 >> 7; - if (h16_128 & 0x100) { - hue8 = 255 - (h16_128 >> 1); - } - else { - hue8 = h16_128 >> 1; - } - - brightnesstheta16 += brightnessthetainc16; - uint16_t b16 = sin16(brightnesstheta16) + 32768; - - uint16_t bri16 = (uint32_t)((uint32_t)b16 * (uint32_t)b16) / 65536; - uint8_t bri8 = (uint32_t)(((uint32_t)bri16) * brightdepth) / 65536; - bri8 += (255 - brightdepth); - - uint8_t index = hue8; - //index = triwave8( index); - index = scale8(index, 240); - - CRGB newcolor = ColorFromPalette(palette, index, bri8); - - uint16_t pixelnumber = i; + static uint16_t sPseudotime = 0; + static uint16_t sLastMillis = 0; + static uint16_t sHue16 = 0; + + // uint8_t sat8 = beatsin88( 87, 220, 250); + uint8_t brightdepth = beatsin88(341, 96, 224); + uint16_t brightnessthetainc16 = beatsin88(203, (25 * 256), (40 * 256)); + uint8_t msmultiplier = beatsin88(147, 23, 60); + + uint16_t hue16 = sHue16;//gHue * 256; + uint16_t hueinc16 = beatsin88(113, 300, 1500); + + uint16_t ms = millis(); + uint16_t deltams = ms - sLastMillis; + sLastMillis = ms; + sPseudotime += deltams * msmultiplier; + sHue16 += deltams * beatsin88(400, 5, 9); + uint16_t brightnesstheta16 = sPseudotime; + + for (uint16_t i = 0; i < numleds; i++) { + hue16 += hueinc16; + uint8_t hue8 = hue16 / 256; + uint16_t h16_128 = hue16 >> 7; + if (h16_128 & 0x100) { + hue8 = 255 - (h16_128 >> 1); + } + else { + hue8 = h16_128 >> 1; + } + + brightnesstheta16 += brightnessthetainc16; + uint16_t b16 = sin16(brightnesstheta16) + 32768; + + uint16_t bri16 = (uint32_t)((uint32_t)b16 * (uint32_t)b16) / 65536; + uint8_t bri8 = (uint32_t)(((uint32_t)bri16) * brightdepth) / 65536; + bri8 += (255 - brightdepth); + + uint8_t index = hue8; + //index = triwave8( index); + index = scale8(index, 240); + + CRGB newcolor = ColorFromPalette(palette, index, bri8); + + uint16_t pixelnumber = i; #if DEVICE_TYPE == 4 - pixelnumber = ((LEAFCOUNT * 3) - 1) - pixelnumber; - for (int i2 = 0; i2 < (PIXELS_PER_LEAF / 3); i2++) - { - nblend(leds[pixelnumber * (PIXELS_PER_LEAF / 3) + i2], newcolor, 128); - } + pixelnumber = ((LEAFCOUNT * 3) - 1) - pixelnumber; + for (int i2 = 0; i2 < (PIXELS_PER_LEAF / 3); i2++) + { + nblend(leds[pixelnumber * (PIXELS_PER_LEAF / 3) + i2], newcolor, 128); + } #else - pixelnumber = (numleds - 1) - pixelnumber; + pixelnumber = (numleds - 1) - pixelnumber; - nblend(ledarray[pixelnumber], newcolor, 128); + nblend(ledarray[pixelnumber], newcolor, 128); #endif - } + } } // Alternate rendering function just scrolls the current palette // across the defined LED strip. void palettetest(CRGB* ledarray, uint16_t numleds, const CRGBPalette16& gCurrentPalette) { - static uint8_t startindex = 0; - startindex--; - fill_palette(ledarray, numleds, startindex, (256 / NUM_LEDS) + 1, gCurrentPalette, 255, LINEARBLEND); + static uint8_t startindex = 0; + startindex--; + fill_palette(ledarray, numleds, startindex, (256 / NUM_LEDS) + 1, gCurrentPalette, 255, LINEARBLEND); } @@ -1872,27 +1872,27 @@ static bool firstRun = true; // First run flag used by some patterns struct timer_struct { - unsigned long period; - unsigned long mark; - bool enabled = false; + unsigned long period; + unsigned long mark; + bool enabled = false; }; // Brightness level per pattern const uint8_t brightVal[ARRAY_SIZE(patterns)] = { - 192, 192, 225, 225, 225, 225, 225, 255, 255, 192, 225 + 192, 192, 225, 225, 225, 225, 225, 255, 255, 192, 225 }; // Delay for incrementing gHue variable per pattern const uint8_t hueStep[ARRAY_SIZE(patterns)] = { - 10, 15, 8, 1, 10, 1, 1, 1, 1, 1, 1 + 10, 15, 8, 1, 10, 1, 1, 1, 1, 1, 1 }; // Delay inserted into loop() per pattern unsigned long patternDelay[ARRAY_SIZE(patterns)] = { - 0, 0, 0, 55, 55, 5, 10, 15, 15, 15, 0 + 0, 0, 0, 55, 55, 5, 10, 15, 15, 15, 0 }; /////////////////////////// @@ -1902,168 +1902,168 @@ unsigned long patternDelay[ARRAY_SIZE(patterns)] = void rainbowRoll() { - // FastLED's built-in rainbow generator - fill_rainbow(leds, NUM_LEDS, gHue, 7); + // FastLED's built-in rainbow generator + fill_rainbow(leds, NUM_LEDS, gHue, 7); } void rainbowBeat() { - // colored stripes pulsing at a defined Beats-Per-Minute (BPM) - uint8_t beat = beatsin8(speed, 64, 255); // Beat advances and retreats in a sine wave - for (int i = 0; i < NUM_LEDS; i++) - { - leds[i] = ColorFromPalette(palettes[0], gHue + (i * 2), beat - gHue + (i * 10)); - } + // colored stripes pulsing at a defined Beats-Per-Minute (BPM) + uint8_t beat = beatsin8(speed, 64, 255); // Beat advances and retreats in a sine wave + for (int i = 0; i < NUM_LEDS; i++) + { + leds[i] = ColorFromPalette(palettes[0], gHue + (i * 2), beat - gHue + (i * 10)); + } } // LEDs turn on one at a time at full brightness and slowly fade to black // Uses colors from a palette of colors void randomPaletteFades() { - uint16_t i = random16(0, (NUM_LEDS - 1)); // Pick a random LED - { - uint8_t colorIndex = random8(0, 255); // Pick a random color (from palette) - if (CRGB(0, 0, 0) == CRGB(leds[i])) // Only set new color to LED that is off - { - leds[i] = ColorFromPalette(palettes[currentPaletteIndex], colorIndex, 255, currentBlending); - blur1d(leds, NUM_LEDS, 32); // Blur colors with neighboring LEDs - } - } - fadeToBlackBy(leds, NUM_LEDS, 8); // Slowly fade LEDs to black + uint16_t i = random16(0, (NUM_LEDS - 1)); // Pick a random LED + { + uint8_t colorIndex = random8(0, 255); // Pick a random color (from palette) + if (CRGB(0, 0, 0) == CRGB(leds[i])) // Only set new color to LED that is off + { + leds[i] = ColorFromPalette(palettes[currentPaletteIndex], colorIndex, 255, currentBlending); + blur1d(leds, NUM_LEDS, 32); // Blur colors with neighboring LEDs + } + } + fadeToBlackBy(leds, NUM_LEDS, 8); // Slowly fade LEDs to black } // Theater style chasing lights rotating in one direction while the // rainbow colors rotate in the opposite direction. void rainbowChase() { - static int q = 0; - fill_gradient(leds, (NUM_LEDS - 1), CHSV(gHue, 200, 255), 0, CHSV((gHue + 1), 200, 255), LONGEST_HUES); - for (int i = 0; (NUM_LEDS - 3) > i; i += 3) - { - leds[((i + q) + 1)] = CRGB(0, 0, 0); - leds[((i + q) + 2)] = CRGB(0, 0, 0); - } - if (2 > q) - { - q++; - } - else - { - q = 0; - } + static int q = 0; + fill_gradient(leds, (NUM_LEDS - 1), CHSV(gHue, 200, 255), 0, CHSV((gHue + 1), 200, 255), LONGEST_HUES); + for (int i = 0; (NUM_LEDS - 3) > i; i += 3) + { + leds[((i + q) + 1)] = CRGB(0, 0, 0); + leds[((i + q) + 2)] = CRGB(0, 0, 0); + } + if (2 > q) + { + q++; + } + else + { + q = 0; + } } void randomDots() // Similar to randomFades(), colors flash on/off quickly { - uint16_t pos; - do - { - pos = random16(0, (NUM_LEDS - 1)); - } while (CRGB(0, 0, 0) != CRGB(leds[pos])); - fadeToBlackBy(leds, NUM_LEDS, 64); - leds[pos] = CHSV((random8() % 256), 200, 255); + uint16_t pos; + do + { + pos = random16(0, (NUM_LEDS - 1)); + } while (CRGB(0, 0, 0) != CRGB(leds[pos])); + fadeToBlackBy(leds, NUM_LEDS, 64); + leds[pos] = CHSV((random8() % 256), 200, 255); } // Same as randomPaletteFades() but with completely random colors void randomFades() { - uint16_t pos; - pos = random16(0, (NUM_LEDS - 1)); - if (CRGB(0, 0, 0) == CRGB(leds[pos])) - { - leds[pos] = CHSV((random8() % 256), 200, 255); - } - fadeToBlackBy(leds, NUM_LEDS, 8); + uint16_t pos; + pos = random16(0, (NUM_LEDS - 1)); + if (CRGB(0, 0, 0) == CRGB(leds[pos])) + { + leds[pos] = CHSV((random8() % 256), 200, 255); + } + fadeToBlackBy(leds, NUM_LEDS, 8); } // Same as randomDots() but with red and blue flashes only void policeLights() { - fadeToBlackBy(leds, NUM_LEDS, 128); - uint16_t p = random16(0, (NUM_LEDS - 1)); - uint8_t n = (1 & random8()); - if (n) - { - leds[p] = CRGB(255, 0, 0); - } - else - { - leds[p] = CRGB(0, 0, 255); - } + fadeToBlackBy(leds, NUM_LEDS, 128); + uint16_t p = random16(0, (NUM_LEDS - 1)); + uint8_t n = (1 & random8()); + if (n) + { + leds[p] = CRGB(255, 0, 0); + } + else + { + leds[p] = CRGB(0, 0, 255); + } } // Same as randomDots() but faster white flashes only void glitter() { - fadeToBlackBy(leds, NUM_LEDS, 128); - if (random8() < 225) - { - leds[random16(0, (NUM_LEDS - 1))] = CRGB::White; - } + fadeToBlackBy(leds, NUM_LEDS, 128); + if (random8() < 225) + { + leds[random16(0, (NUM_LEDS - 1))] = CRGB::White; + } } // Twinkling random dim white LEDs mixed with glitter() above void snowFlakes() { - uint8_t shader; - for (int x = 0; NUM_LEDS > x; x++) - { - shader = random8(20, 30); - leds[x] = CRGB(shader, shader, shader); - } - leds[random16(0, (NUM_LEDS - 1))] = CRGB::White; - delay(40); + uint8_t shader; + for (int x = 0; NUM_LEDS > x; x++) + { + shader = random8(20, 30); + leds[x] = CRGB(shader, shader, shader); + } + leds[random16(0, (NUM_LEDS - 1))] = CRGB::White; + delay(40); } // Simulates lightning with randomly timed and random size bolts void lightning() { - static timer_struct boltTimer; - if (firstRun) - { - firstRun = false; - boltTimer.period = 0; - boltTimer.mark = millis(); - } - if (boltTimer.period < (millis() - boltTimer.mark)) - { - uint16_t boltLength = random16(5, 30); - uint8_t numStrobes = random8(1, 3); - uint32_t highPulseTime[numStrobes]; - uint32_t lowPulseTime[numStrobes]; - for (uint8_t i = 0; numStrobes > i; i++) - { - highPulseTime[i] = (uint32_t)(random16(60, 250)); - lowPulseTime[i] = (uint32_t)(random16(50, 300)); - } - uint16_t pos = random16(0, ((NUM_LEDS - 1) - boltLength)); - for (uint8_t i = 0; numStrobes > i; i++) - { - for (uint16_t x = pos; (pos + boltLength) > x; x++) - { - leds[x] = CRGB(255, 255, 255); - LEDS.show(); - delay(3); - } - delay(highPulseTime[i]); - if (numStrobes > 1) - { - for (uint16_t x = pos; (pos + boltLength) > x; x++) - { - leds[x] = CRGB(127, 127, 127); - LEDS.show(); - delay(3); - } - delay(lowPulseTime[i]); - } - } - for (uint16_t x = pos; (pos + boltLength) > x; x++) - { - leds[x] = CRGB(0, 0, 0); - } - boltTimer.period = (unsigned long)(random16(1500, 5000)); - boltTimer.mark = millis(); - } + static timer_struct boltTimer; + if (firstRun) + { + firstRun = false; + boltTimer.period = 0; + boltTimer.mark = millis(); + } + if (boltTimer.period < (millis() - boltTimer.mark)) + { + uint16_t boltLength = random16(5, 30); + uint8_t numStrobes = random8(1, 3); + uint32_t highPulseTime[numStrobes]; + uint32_t lowPulseTime[numStrobes]; + for (uint8_t i = 0; numStrobes > i; i++) + { + highPulseTime[i] = (uint32_t)(random16(60, 250)); + lowPulseTime[i] = (uint32_t)(random16(50, 300)); + } + uint16_t pos = random16(0, ((NUM_LEDS - 1) - boltLength)); + for (uint8_t i = 0; numStrobes > i; i++) + { + for (uint16_t x = pos; (pos + boltLength) > x; x++) + { + leds[x] = CRGB(255, 255, 255); + LEDS.show(); + delay(3); + } + delay(highPulseTime[i]); + if (numStrobes > 1) + { + for (uint16_t x = pos; (pos + boltLength) > x; x++) + { + leds[x] = CRGB(127, 127, 127); + LEDS.show(); + delay(3); + } + delay(lowPulseTime[i]); + } + } + for (uint16_t x = pos; (pos + boltLength) > x; x++) + { + leds[x] = CRGB(0, 0, 0); + } + boltTimer.period = (unsigned long)(random16(1500, 5000)); + boltTimer.mark = millis(); + } } //######################### Patterns by Resseguie/FastLED-Patterns END ######################### @@ -2074,199 +2074,199 @@ void lightning() void pride_Waves() { - static uint16_t sPseudotime = 0; - static uint16_t sLastMillis = 0; - static uint16_t sHue16 = 0; + static uint16_t sPseudotime = 0; + static uint16_t sLastMillis = 0; + static uint16_t sHue16 = 0; - uint8_t sat8 = beatsin88(87, 220, 250); - uint8_t brightdepth = beatsin88(341, 96, 224); - uint16_t brightnessthetainc16 = beatsin88(203, (25 * 256), (40 * 256)); - uint8_t msmultiplier = beatsin88(147, 23, 60); + uint8_t sat8 = beatsin88(87, 220, 250); + uint8_t brightdepth = beatsin88(341, 96, 224); + uint16_t brightnessthetainc16 = beatsin88(203, (25 * 256), (40 * 256)); + uint8_t msmultiplier = beatsin88(147, 23, 60); - uint16_t hue16 = sHue16;//gHue * 256; - uint16_t hueinc16 = beatsin88(113, 1, 3000); + uint16_t hue16 = sHue16;//gHue * 256; + uint16_t hueinc16 = beatsin88(113, 1, 3000); - uint16_t ms = millis(); - uint16_t deltams = ms - sLastMillis; - sLastMillis = ms; - sPseudotime += deltams * msmultiplier; - sHue16 += deltams * beatsin88(400, 5, 9); - uint16_t brightnesstheta16 = sPseudotime; + uint16_t ms = millis(); + uint16_t deltams = ms - sLastMillis; + sLastMillis = ms; + sPseudotime += deltams * msmultiplier; + sHue16 += deltams * beatsin88(400, 5, 9); + uint16_t brightnesstheta16 = sPseudotime; - for (uint16_t i = 0; i < LINE_COUNT; i++) { - hue16 += hueinc16; - uint8_t hue8 = hue16 / 256; + for (uint16_t i = 0; i < LINE_COUNT; i++) { + hue16 += hueinc16; + uint8_t hue8 = hue16 / 256; - brightnesstheta16 += brightnessthetainc16; - uint16_t b16 = sin16(brightnesstheta16) + 32768; + brightnesstheta16 += brightnessthetainc16; + uint16_t b16 = sin16(brightnesstheta16) + 32768; - uint16_t bri16 = (uint32_t)((uint32_t)b16 * (uint32_t)b16) / 65536; - uint8_t bri8 = (uint32_t)(((uint32_t)bri16) * brightdepth) / 65536; - bri8 += (255 - brightdepth); + uint16_t bri16 = (uint32_t)((uint32_t)b16 * (uint32_t)b16) / 65536; + uint8_t bri8 = (uint32_t)(((uint32_t)bri16) * brightdepth) / 65536; + bri8 += (255 - brightdepth); - CRGB newcolor = CHSV(hue8, sat8, bri8); + CRGB newcolor = CHSV(hue8, sat8, bri8); - uint16_t pixelnumber = i; - pixelnumber = (LINE_COUNT - 1) - pixelnumber; + uint16_t pixelnumber = i; + pixelnumber = (LINE_COUNT - 1) - pixelnumber; - for (int l = 0; l < LEDS_PER_LINE; l++) - { - nblend(leds[pixelnumber * LEDS_PER_LINE + l], newcolor, 64); - } - } + for (int l = 0; l < LEDS_PER_LINE; l++) + { + nblend(leds[pixelnumber * LEDS_PER_LINE + l], newcolor, 64); + } + } } void pride_Rings() { - static uint16_t sPseudotime = 0; - static uint16_t sLastMillis = 0; - static uint16_t sHue16 = 0; + static uint16_t sPseudotime = 0; + static uint16_t sLastMillis = 0; + static uint16_t sHue16 = 0; - uint8_t sat8 = beatsin88(87, 220, 250); - uint8_t brightdepth = beatsin88(341, 96, 224); - uint16_t brightnessthetainc16 = beatsin88(203, (25 * 256), (40 * 256)); - uint8_t msmultiplier = beatsin88(147, 23, 60); + uint8_t sat8 = beatsin88(87, 220, 250); + uint8_t brightdepth = beatsin88(341, 96, 224); + uint16_t brightnessthetainc16 = beatsin88(203, (25 * 256), (40 * 256)); + uint8_t msmultiplier = beatsin88(147, 23, 60); - uint16_t hue16 = sHue16;//gHue * 256; - uint16_t hueinc16 = beatsin88(113, 1, 3000); + uint16_t hue16 = sHue16;//gHue * 256; + uint16_t hueinc16 = beatsin88(113, 1, 3000); - uint16_t ms = millis(); - uint16_t deltams = ms - sLastMillis; - sLastMillis = ms; - sPseudotime += deltams * msmultiplier; - sHue16 += deltams * beatsin88(400, 5, 9); - uint16_t brightnesstheta16 = sPseudotime; + uint16_t ms = millis(); + uint16_t deltams = ms - sLastMillis; + sLastMillis = ms; + sPseudotime += deltams * msmultiplier; + sHue16 += deltams * beatsin88(400, 5, 9); + uint16_t brightnesstheta16 = sPseudotime; - for (uint16_t i = 0; i < LEDS_PER_LINE; i++) { - hue16 += hueinc16; - uint8_t hue8 = hue16 / 256; + for (uint16_t i = 0; i < LEDS_PER_LINE; i++) { + hue16 += hueinc16; + uint8_t hue8 = hue16 / 256; - brightnesstheta16 += brightnessthetainc16; - uint16_t b16 = sin16(brightnesstheta16) + 32768; + brightnesstheta16 += brightnessthetainc16; + uint16_t b16 = sin16(brightnesstheta16) + 32768; - uint16_t bri16 = (uint32_t)((uint32_t)b16 * (uint32_t)b16) / 65536; - uint8_t bri8 = (uint32_t)(((uint32_t)bri16) * brightdepth) / 65536; - bri8 += (255 - brightdepth); + uint16_t bri16 = (uint32_t)((uint32_t)b16 * (uint32_t)b16) / 65536; + uint8_t bri8 = (uint32_t)(((uint32_t)bri16) * brightdepth) / 65536; + bri8 += (255 - brightdepth); - CRGB newcolor = CHSV(hue8, sat8, bri8); + CRGB newcolor = CHSV(hue8, sat8, bri8); - uint16_t pixelnumber = i; - pixelnumber = (LEDS_PER_LINE - 1) - pixelnumber; + uint16_t pixelnumber = i; + pixelnumber = (LEDS_PER_LINE - 1) - pixelnumber; - for (int p = 0; p < LINE_COUNT; p++) - { - if (p % 2 == 0) nblend(leds[p * LEDS_PER_LINE + pixelnumber], newcolor, 64); - else nblend(leds[p * LEDS_PER_LINE + (LEDS_PER_LINE - pixelnumber - 1)], newcolor, 64); - } - } + for (int p = 0; p < LINE_COUNT; p++) + { + if (p % 2 == 0) nblend(leds[p * LEDS_PER_LINE + pixelnumber], newcolor, 64); + else nblend(leds[p * LEDS_PER_LINE + (LEDS_PER_LINE - pixelnumber - 1)], newcolor, 64); + } + } } void ColorSingleRing(int pos, CHSV c) { - for (int p = 0; p < LINE_COUNT; p++) - { - if (p % 2 == 0) leds[p * LEDS_PER_LINE + pos] = c; - else leds[p * LEDS_PER_LINE + (LEDS_PER_LINE - pos - 1)] = c; - } + for (int p = 0; p < LINE_COUNT; p++) + { + if (p % 2 == 0) leds[p * LEDS_PER_LINE + pos] = c; + else leds[p * LEDS_PER_LINE + (LEDS_PER_LINE - pos - 1)] = c; + } } void ColorSingleRing(int pos, CRGB c) { - for (int p = 0; p < LINE_COUNT; p++) - { - if (p % 2 == 0) leds[p * LEDS_PER_LINE + pos] = c; - else leds[p * LEDS_PER_LINE + (LEDS_PER_LINE - pos - 1)] = c; - } + for (int p = 0; p < LINE_COUNT; p++) + { + if (p % 2 == 0) leds[p * LEDS_PER_LINE + pos] = c; + else leds[p * LEDS_PER_LINE + (LEDS_PER_LINE - pos - 1)] = c; + } } void colorWaves_hori() { - colorwaves_Lamp(leds, LINE_COUNT, gCurrentPalette, 1); + colorwaves_Lamp(leds, LINE_COUNT, gCurrentPalette, 1); } void colorWaves_vert() { - colorwaves_Lamp(leds, LEDS_PER_LINE, gCurrentPalette, 0); + colorwaves_Lamp(leds, LEDS_PER_LINE, gCurrentPalette, 0); } void colorwaves_Lamp(CRGB* ledarray, uint16_t numleds, CRGBPalette16& palette, uint8_t horizonal) { - static uint16_t sPseudotime = 0; - static uint16_t sLastMillis = 0; - static uint16_t sHue16 = 0; - - // uint8_t sat8 = beatsin88( 87, 220, 250); - uint8_t brightdepth = beatsin88(341, 96, 224); - uint16_t brightnessthetainc16 = beatsin88(203, (25 * 256), (40 * 256)); - uint8_t msmultiplier = beatsin88(147, 23, 60); - - uint16_t hue16 = sHue16;//gHue * 256; - uint16_t hueinc16 = beatsin88(113, 300, 1500); - - uint16_t ms = millis(); - uint16_t deltams = ms - sLastMillis; - sLastMillis = ms; - sPseudotime += deltams * msmultiplier; - sHue16 += deltams * beatsin88(400, 5, 9); - uint16_t brightnesstheta16 = sPseudotime; - - for (uint16_t i = 0; i < numleds; i++) { - hue16 += hueinc16; - uint8_t hue8 = hue16 / 256; - uint16_t h16_128 = hue16 >> 7; - if (h16_128 & 0x100) { - hue8 = 255 - (h16_128 >> 1); - } - else { - hue8 = h16_128 >> 1; - } - - brightnesstheta16 += brightnessthetainc16; - uint16_t b16 = sin16(brightnesstheta16) + 32768; - - uint16_t bri16 = (uint32_t)((uint32_t)b16 * (uint32_t)b16) / 65536; - uint8_t bri8 = (uint32_t)(((uint32_t)bri16) * brightdepth) / 65536; - bri8 += (255 - brightdepth); - - uint8_t index = hue8; - //index = triwave8( index); - index = scale8(index, 240); - - CRGB newcolor = ColorFromPalette(palette, index, bri8); - - uint16_t pixelnumber = i; - pixelnumber = (numleds - 1) - pixelnumber; - - nblend(ledarray[pixelnumber], newcolor, 128); - if (horizonal != 0) - { - for (int l = 0; l < LEDS_PER_LINE; l++) - { - nblend(ledarray[pixelnumber * LEDS_PER_LINE + l], newcolor, 128); -} - } - else - { - for (int p = 0; p < LINE_COUNT; p++) - { - if (p % 2 == 0) nblend(leds[p * LEDS_PER_LINE + pixelnumber], newcolor, 128); - else nblend(leds[p * LEDS_PER_LINE + (LEDS_PER_LINE - pixelnumber - 1)], newcolor, 128); - } - } - - } + static uint16_t sPseudotime = 0; + static uint16_t sLastMillis = 0; + static uint16_t sHue16 = 0; + + // uint8_t sat8 = beatsin88( 87, 220, 250); + uint8_t brightdepth = beatsin88(341, 96, 224); + uint16_t brightnessthetainc16 = beatsin88(203, (25 * 256), (40 * 256)); + uint8_t msmultiplier = beatsin88(147, 23, 60); + + uint16_t hue16 = sHue16;//gHue * 256; + uint16_t hueinc16 = beatsin88(113, 300, 1500); + + uint16_t ms = millis(); + uint16_t deltams = ms - sLastMillis; + sLastMillis = ms; + sPseudotime += deltams * msmultiplier; + sHue16 += deltams * beatsin88(400, 5, 9); + uint16_t brightnesstheta16 = sPseudotime; + + for (uint16_t i = 0; i < numleds; i++) { + hue16 += hueinc16; + uint8_t hue8 = hue16 / 256; + uint16_t h16_128 = hue16 >> 7; + if (h16_128 & 0x100) { + hue8 = 255 - (h16_128 >> 1); + } + else { + hue8 = h16_128 >> 1; + } + + brightnesstheta16 += brightnessthetainc16; + uint16_t b16 = sin16(brightnesstheta16) + 32768; + + uint16_t bri16 = (uint32_t)((uint32_t)b16 * (uint32_t)b16) / 65536; + uint8_t bri8 = (uint32_t)(((uint32_t)bri16) * brightdepth) / 65536; + bri8 += (255 - brightdepth); + + uint8_t index = hue8; + //index = triwave8( index); + index = scale8(index, 240); + + CRGB newcolor = ColorFromPalette(palette, index, bri8); + + uint16_t pixelnumber = i; + pixelnumber = (numleds - 1) - pixelnumber; + + nblend(ledarray[pixelnumber], newcolor, 128); + if (horizonal != 0) + { + for (int l = 0; l < LEDS_PER_LINE; l++) + { + nblend(ledarray[pixelnumber * LEDS_PER_LINE + l], newcolor, 128); +} + } + else + { + for (int p = 0; p < LINE_COUNT; p++) + { + if (p % 2 == 0) nblend(leds[p * LEDS_PER_LINE + pixelnumber], newcolor, 128); + else nblend(leds[p * LEDS_PER_LINE + (LEDS_PER_LINE - pixelnumber - 1)], newcolor, 128); + } + } + + } } void rainbow_vert() { - for (int l = 0; l < LEDS_PER_LINE; l++) - { - for (int p = 0; p < LINE_COUNT; p++) - { - if (p % 2 == 0) leds[p * LEDS_PER_LINE + l] = CHSV((((255.00 / (LEDS_PER_LINE)) * l) + gHue), 255, 255); - else leds[p * LEDS_PER_LINE + (LEDS_PER_LINE - l - 1)] = CHSV((((255.00 / (LEDS_PER_LINE)) * l) + gHue), 255, 255); - } - } + for (int l = 0; l < LEDS_PER_LINE; l++) + { + for (int p = 0; p < LINE_COUNT; p++) + { + if (p % 2 == 0) leds[p * LEDS_PER_LINE + l] = CHSV((((255.00 / (LEDS_PER_LINE)) * l) + gHue), 255, 255); + else leds[p * LEDS_PER_LINE + (LEDS_PER_LINE - l - 1)] = CHSV((((255.00 / (LEDS_PER_LINE)) * l) + gHue), 255, 255); + } + } } @@ -2276,180 +2276,180 @@ void rainbow_vert() #if DEVICE_TYPE == 2 unsigned long sendNTPpacket(IPAddress& address) { - //Serial.println("sending NTP packet..."); - // set all bytes in the buffer to 0 - memset(packetBuffer, 0, NTP_PACKET_SIZE); - // Initialize values needed to form NTP request - // (see URL above for details on the packets) - packetBuffer[0] = 0b11100011; // LI, Version, Mode - packetBuffer[1] = 0; // Stratum, or type of clock - packetBuffer[2] = 6; // Polling Interval - packetBuffer[3] = 0xEC; // Peer Clock Precision - // 8 bytes of zero for Root Delay & Root Dispersion - packetBuffer[12] = 49; - packetBuffer[13] = 0x4E; - packetBuffer[14] = 49; - packetBuffer[15] = 52; - - // all NTP fields have been given values, now - // you can send a packet requesting a timestamp: - udpTime.beginPacket(address, 123); //NTP requests are to port 123 - udpTime.write(packetBuffer, NTP_PACKET_SIZE); - udpTime.endPacket(); + //Serial.println("sending NTP packet..."); + // set all bytes in the buffer to 0 + memset(packetBuffer, 0, NTP_PACKET_SIZE); + // Initialize values needed to form NTP request + // (see URL above for details on the packets) + packetBuffer[0] = 0b11100011; // LI, Version, Mode + packetBuffer[1] = 0; // Stratum, or type of clock + packetBuffer[2] = 6; // Polling Interval + packetBuffer[3] = 0xEC; // Peer Clock Precision + // 8 bytes of zero for Root Delay & Root Dispersion + packetBuffer[12] = 49; + packetBuffer[13] = 0x4E; + packetBuffer[14] = 49; + packetBuffer[15] = 52; + + // all NTP fields have been given values, now + // you can send a packet requesting a timestamp: + udpTime.beginPacket(address, 123); //NTP requests are to port 123 + udpTime.write(packetBuffer, NTP_PACKET_SIZE); + udpTime.endPacket(); } bool GetTime() { - WiFi.hostByName(ntpServerName, timeServerIP); - - sendNTPpacket(timeServerIP); - delay(1000); - ntp_timestamp = millis(); - - int cb = udpTime.parsePacket(); - if (!cb) { - return false; - } - else { - //Serial.print("packet received, length="); - //Serial.println(cb); - udpTime.read(packetBuffer, NTP_PACKET_SIZE); - ntp_timestamp = millis(); - - unsigned long highWord = word(packetBuffer[40], packetBuffer[41]); - unsigned long lowWord = word(packetBuffer[42], packetBuffer[43]); - unsigned long secsSince1900 = highWord << 16 | lowWord; - const unsigned long seventyYears = 2208988800UL; - unsigned long epoch = secsSince1900 - seventyYears; - - hours = (epoch % 86400L) / 3600; - hours += t_offset; - if (hours >= 24)hours -= 24; - if (hours < 0) hours += 24; - mins = (epoch % 3600) / 60; - secs = (epoch % 60); - - if (hours < 10)Serial.print("0"); - Serial.print(hours); - Serial.print(':'); - if (mins < 10)Serial.print("0"); - Serial.println(mins); - Serial.print(':'); - if (secs < 10)Serial.print("0"); - Serial.println(secs); - return true; - } + WiFi.hostByName(ntpServerName, timeServerIP); + + sendNTPpacket(timeServerIP); + delay(1000); + ntp_timestamp = millis(); + + int cb = udpTime.parsePacket(); + if (!cb) { + return false; + } + else { + //Serial.print("packet received, length="); + //Serial.println(cb); + udpTime.read(packetBuffer, NTP_PACKET_SIZE); + ntp_timestamp = millis(); + + unsigned long highWord = word(packetBuffer[40], packetBuffer[41]); + unsigned long lowWord = word(packetBuffer[42], packetBuffer[43]); + unsigned long secsSince1900 = highWord << 16 | lowWord; + const unsigned long seventyYears = 2208988800UL; + unsigned long epoch = secsSince1900 - seventyYears; + + hours = (epoch % 86400L) / 3600; + hours += t_offset; + if (hours >= 24)hours -= 24; + if (hours < 0) hours += 24; + mins = (epoch % 3600) / 60; + secs = (epoch % 60); + + if (hours < 10)Serial.print("0"); + Serial.print(hours); + Serial.print(':'); + if (mins < 10)Serial.print("0"); + Serial.println(mins); + Serial.print(':'); + if (secs < 10)Serial.print("0"); + Serial.println(secs); + return true; + } } bool shouldUpdateNTP() { - if ((millis() - ntp_timestamp) > (NTP_REFRESH_INTERVAL_SECONDS * 1000) || (millis() - update_timestamp) >= 2000)return true; - return false; + if ((millis() - ntp_timestamp) > (NTP_REFRESH_INTERVAL_SECONDS * 1000) || (millis() - update_timestamp) >= 2000)return true; + return false; } bool shouldUpdateTime() { - if ((millis() - update_timestamp) > (1000-last_diff))return true; - return false; + if ((millis() - update_timestamp) > (1000-last_diff))return true; + return false; } void DrawDots(int r, int g, int b) { - for (int i = 2*Digit2; i < Digit2; i++) leds[i] = CRGB(r, g, b); + for (int i = 2*Digit2; i < Digit2; i++) leds[i] = CRGB(r, g, b); } void displayTime(CRGB x = CRGB(0, 0, 0)) { - CRGB c = CRGB(0, 0, 0); - if (x.r == 0 && x.g == 0 && x.b == 0) - { - hsv2rgb_rainbow(CHSV(gHue, 255, 255), c); - DrawTime(c.r, c.g, c.b); - DrawDots(c.r, c.g, c.b); - } - else - { - DrawTime(x.r, x.g, x.b); - DrawDots(x.r, x.g, x.b); - } + CRGB c = CRGB(0, 0, 0); + if (x.r == 0 && x.g == 0 && x.b == 0) + { + hsv2rgb_rainbow(CHSV(gHue, 255, 255), c); + DrawTime(c.r, c.g, c.b); + DrawDots(c.r, c.g, c.b); + } + else + { + DrawTime(x.r, x.g, x.b); + DrawDots(x.r, x.g, x.b); + } } void displayTimeStatic() { - bool fresh_update = false; - if (shouldUpdateNTP) - { - fresh_update = GetTime(); - } - if (fresh_update || shouldUpdateTime()) - { - if (incrementTime() || fresh_update) - { - displayTime(solidColor); - } - } + bool fresh_update = false; + if (shouldUpdateNTP) + { + fresh_update = GetTime(); + } + if (fresh_update || shouldUpdateTime()) + { + if (incrementTime() || fresh_update) + { + displayTime(solidColor); + } + } } void displayTimeRainbow() { - bool fresh_update = false; - if (shouldUpdateNTP) - { - fresh_update = GetTime(); - } - if (fresh_update || shouldUpdateTime()) - { - if (incrementTime() || fresh_update) - { - displayTime(); - } - } + bool fresh_update = false; + if (shouldUpdateNTP) + { + fresh_update = GetTime(); + } + if (fresh_update || shouldUpdateTime()) + { + if (incrementTime() || fresh_update) + { + displayTime(); + } + } } bool incrementTime() { - bool retval = false; - secs++; - last_diff = millis() - update_timestamp - 1000; - update_timestamp = millis(); - if (secs >= 60) - { - secs = 0; - mins++; - retval = true; - } - if (mins >= 60) - { - mins = 0; - hours++; - retval = true; - } - if (hours >= 24) hours = 0; - return retval; + bool retval = false; + secs++; + last_diff = millis() - update_timestamp - 1000; + update_timestamp = millis(); + if (secs >= 60) + { + secs = 0; + mins++; + retval = true; + } + if (mins >= 60) + { + mins = 0; + hours++; + retval = true; + } + if (hours >= 24) hours = 0; + return retval; } void DrawTime(int r, int g, int b) { #define LEDS_PER_SEGMENT (Digit2 / 7) - for (int l = 0; l < LEDS_PER_SEGMENT; l++) - { - if (hours < 10) DrawDigit(Digit1 + l, LEDS_PER_SEGMENT, r, g, b, -1); // Turn off leading zero - else DrawDigit(Digit1 + l, LEDS_PER_SEGMENT, r, g, b, hours / 10); //Draw the first digit of the hour - DrawDigit(Digit2 + l, LEDS_PER_SEGMENT, r, g, b, hours - ((hours / 10) * 10)); //Draw the second digit of the hour + for (int l = 0; l < LEDS_PER_SEGMENT; l++) + { + if (hours < 10) DrawDigit(Digit1 + l, LEDS_PER_SEGMENT, r, g, b, -1); // Turn off leading zero + else DrawDigit(Digit1 + l, LEDS_PER_SEGMENT, r, g, b, hours / 10); //Draw the first digit of the hour + DrawDigit(Digit2 + l, LEDS_PER_SEGMENT, r, g, b, hours - ((hours / 10) * 10)); //Draw the second digit of the hour - DrawDigit(Digit3 + l, LEDS_PER_SEGMENT, r, g, b, mins / 10); //Draw the first digit of the minute - DrawDigit(Digit4 + l, LEDS_PER_SEGMENT, r, g, b, mins - ((mins / 10) * 10)); //Draw the second digit of the minute - } + DrawDigit(Digit3 + l, LEDS_PER_SEGMENT, r, g, b, mins / 10); //Draw the first digit of the minute + DrawDigit(Digit4 + l, LEDS_PER_SEGMENT, r, g, b, mins - ((mins / 10) * 10)); //Draw the second digit of the minute + } } void dDHelper(int seg, int segmentLedCount, CRGB rgb = CRGB(0, 0, 0)) { - for (int i = 0; i < segmentLedCount; i++) - { - leds[seg + i + seg * (segmentLedCount - 1)] = rgb; - } + for (int i = 0; i < segmentLedCount; i++) + { + leds[seg + i + seg * (segmentLedCount - 1)] = rgb; + } } /* @@ -2465,64 +2465,64 @@ void dDHelper(int seg, int segmentLedCount, CRGB rgb = CRGB(0, 0, 0)) */ void DrawDigit(int offset, int segmentLedCount, int r, int g, int b, int n) { - int s = segmentLedCount; - CRGB rgb = CRGB(r, g, b); - if (n == 2 || n == 3 || n == 4 || n == 5 || n == 6 || n == 8 || n == 9) //MIDDLE - { - dDHelper(0, s, rgb); - } - else - { - dDHelper(0, s); - } - if (n == 0 || n == 1 || n == 2 || n == 3 || n == 4 || n == 7 || n == 8 || n == 9) //TOP RIGHT - { - dDHelper(1, s, rgb); - } - else - { - dDHelper(1, s); - } - if (n == 0 || n == 2 || n == 3 || n == 5 || n == 6 || n == 7 || n == 8 || n == 9) //TOP - { - dDHelper(2, s, rgb); - } - else - { - dDHelper(2, s); - } - if (n == 0 || n == 4 || n == 5 || n == 6 || n == 8 || n == 9) //TOP LEFT - { - dDHelper(3, s, rgb); - } - else - { - dDHelper(3, s); - } - if (n == 0 || n == 2 || n == 6 || n == 8) //BOTTOM LEFT - { - dDHelper(4, s, rgb); - } - else - { - dDHelper(4, s); - } - if (n == 0 || n == 2 || n == 3 || n == 5 || n == 6 || n == 8 || n == 9) //BOTTOM - { - dDHelper(5, s, rgb); - } - else - { - dDHelper(5, s); - } - if (n == 0 || n == 1 || n == 3 || n == 4 || n == 5 || n == 6 || n == 7 || n == 8 || n == 9) //BOTTOM RIGHT - { - dDHelper(6, s, rgb); - } - else - { - dDHelper(6, s); - } + int s = segmentLedCount; + CRGB rgb = CRGB(r, g, b); + if (n == 2 || n == 3 || n == 4 || n == 5 || n == 6 || n == 8 || n == 9) //MIDDLE + { + dDHelper(0, s, rgb); + } + else + { + dDHelper(0, s); + } + if (n == 0 || n == 1 || n == 2 || n == 3 || n == 4 || n == 7 || n == 8 || n == 9) //TOP RIGHT + { + dDHelper(1, s, rgb); + } + else + { + dDHelper(1, s); + } + if (n == 0 || n == 2 || n == 3 || n == 5 || n == 6 || n == 7 || n == 8 || n == 9) //TOP + { + dDHelper(2, s, rgb); + } + else + { + dDHelper(2, s); + } + if (n == 0 || n == 4 || n == 5 || n == 6 || n == 8 || n == 9) //TOP LEFT + { + dDHelper(3, s, rgb); + } + else + { + dDHelper(3, s); + } + if (n == 0 || n == 2 || n == 6 || n == 8) //BOTTOM LEFT + { + dDHelper(4, s, rgb); + } + else + { + dDHelper(4, s); + } + if (n == 0 || n == 2 || n == 3 || n == 5 || n == 6 || n == 8 || n == 9) //BOTTOM + { + dDHelper(5, s, rgb); + } + else + { + dDHelper(5, s); + } + if (n == 0 || n == 1 || n == 3 || n == 4 || n == 5 || n == 6 || n == 7 || n == 8 || n == 9) //BOTTOM RIGHT + { + dDHelper(6, s, rgb); + } + else + { + dDHelper(6, s); + } } #endif @@ -2532,38 +2532,38 @@ void DrawDigit(int offset, int segmentLedCount, int r, int g, int b, int n) void initUdp(int port) { - Udp.begin(port); + Udp.begin(port); #if DEVICE_TYPE == 2 - udpTime.begin(localPortTime); + udpTime.begin(localPortTime); #endif } bool parseUdp() { - static int nopackage = 0; - int packetSize = Udp.parsePacket(); - if (Udp.available() == 0)nopackage++; - if (nopackage >= 10) - { - fadeToBlackBy(leds, NUM_LEDS, 10); - } - if (packetSize) - { - nopackage = 0; - // receive incoming UDP packets - //Serial.printf("Received %d bytes from %s, port %d\n", packetSize, Udp.remoteIP().toString().c_str(), Udp.remotePort()); - int len = Udp.readBytes(incomingPacket, PACKET_LENGTH); - if (len > 0) - { - incomingPacket[len] = '\0'; - } - //Serial.printf("UDP packet contents: %s\n", incomingPacket); - //Serial.printf("%d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d\n", incomingPacket[0], incomingPacket[1], incomingPacket[2], incomingPacket[3], incomingPacket[4], incomingPacket[5], incomingPacket[6], incomingPacket[7], incomingPacket[8], incomingPacket[9], incomingPacket[10], incomingPacket[11], incomingPacket[12], incomingPacket[13], incomingPacket[14], incomingPacket[15]); - //Serial.println(incomingPacket); - //PrintBar(); - return true; - } - else return false; + static int nopackage = 0; + int packetSize = Udp.parsePacket(); + if (Udp.available() == 0)nopackage++; + if (nopackage >= 10) + { + fadeToBlackBy(leds, NUM_LEDS, 10); + } + if (packetSize) + { + nopackage = 0; + // receive incoming UDP packets + //Serial.printf("Received %d bytes from %s, port %d\n", packetSize, Udp.remoteIP().toString().c_str(), Udp.remotePort()); + int len = Udp.readBytes(incomingPacket, PACKET_LENGTH); + if (len > 0) + { + incomingPacket[len] = '\0'; + } + //Serial.printf("UDP packet contents: %s\n", incomingPacket); + //Serial.printf("%d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d\n", incomingPacket[0], incomingPacket[1], incomingPacket[2], incomingPacket[3], incomingPacket[4], incomingPacket[5], incomingPacket[6], incomingPacket[7], incomingPacket[8], incomingPacket[9], incomingPacket[10], incomingPacket[11], incomingPacket[12], incomingPacket[13], incomingPacket[14], incomingPacket[15]); + //Serial.println(incomingPacket); + //PrintBar(); + return true; + } + else return false; } @@ -2571,679 +2571,679 @@ bool parseUdp() int getVolume(uint8_t vals[], int start, int end, double factor = 1.0) { - int result = 0; - int iter = 0; - //Serial.printf("%d, start: %d, end: %d\n", vals[iter], start, end); - for (iter = start; iter <= end && vals[iter] != '\0'; iter++) - { - //Serial.println(vals[iter]); - result += vals[iter]; - } - if (result == 0)return 0; - if(end > start)result = result / (end-start); - result = int(((double)result) * factor); - if (result > 255)result = 255; - return result; + int result = 0; + int iter = 0; + //Serial.printf("%d, start: %d, end: %d\n", vals[iter], start, end); + for (iter = start; iter <= end && vals[iter] != '\0'; iter++) + { + //Serial.println(vals[iter]); + result += vals[iter]; + } + if (result == 0)return 0; + if(end > start)result = result / (end-start); + result = int(((double)result) * factor); + if (result > 255)result = 255; + return result; } //############################## Patterns void BrightnessVisualizer() { - static uint8_t lastVals[AVG_ARRAY_SIZE] = { 1,1,1,1,1,1,1,1,1,1 }; - static int lastBrightness = 0; - static int i_pos = 0; - static bool lastFinished = true; - static CRGB lastCol; - int currentVolume = 0; - int avgVolume = 0; - double cd = 0; + static uint8_t lastVals[AVG_ARRAY_SIZE] = { 1,1,1,1,1,1,1,1,1,1 }; + static int lastBrightness = 0; + static int i_pos = 0; + static bool lastFinished = true; + static CRGB lastCol; + int currentVolume = 0; + int avgVolume = 0; + double cd = 0; - CHSV toSend; + CHSV toSend; - if (!parseUdp())return; - //if (incomingPacket[0] != 0) - currentVolume = getVolume(incomingPacket, BAND_START, BAND_END); - avgVolume = getVolume(lastVals, 0, AVG_ARRAY_SIZE - 1); - if (avgVolume != 0)cd = ((double)currentVolume) / ((double)avgVolume); - //Serial.printf("%d, %d, %lf\n", currentVolume, avgVolume, cd); - if (currentVolume < 30)cd = 0; + if (!parseUdp())return; + //if (incomingPacket[0] != 0) + currentVolume = getVolume(incomingPacket, BAND_START, BAND_END); + avgVolume = getVolume(lastVals, 0, AVG_ARRAY_SIZE - 1); + if (avgVolume != 0)cd = ((double)currentVolume) / ((double)avgVolume); + //Serial.printf("%d, %d, %lf\n", currentVolume, avgVolume, cd); + if (currentVolume < 30)cd = 0; - if (!lastFinished) { - lastFinished = FadeUp(lastCol, 0, NUM_LEDS, map(speed, 0, 255, 1, 15), 50, false); - return; - }; + if (!lastFinished) { + lastFinished = FadeUp(lastCol, 0, NUM_LEDS, map(speed, 0, 255, 1, 15), 50, false); + return; + }; - int decay = map(speed, 0, 255, 8, 200); - int b = map(cd * 100, 30, 130, 0, 255); - if (b < 0)b = 0; else if (b > 255)b = 255; - if (b == 0) fadeToBlackBy(leds, NUM_LEDS, decay); - //else fill_solid(leds, NUM_LEDS, CHSV(gHue, 255, b)); - else - { + int decay = map(speed, 0, 255, 8, 200); + int b = map(cd * 100, 30, 130, 0, 255); + if (b < 0)b = 0; else if (b > 255)b = 255; + if (b == 0) fadeToBlackBy(leds, NUM_LEDS, decay); + //else fill_solid(leds, NUM_LEDS, CHSV(gHue, 255, b)); + else + { - } - lastBrightness = b; + } + lastBrightness = b; - i_pos++; - if (i_pos >= AVG_ARRAY_SIZE)i_pos = 0; - lastVals[i_pos] = currentVolume; + i_pos++; + if (i_pos >= AVG_ARRAY_SIZE)i_pos = 0; + lastVals[i_pos] = currentVolume; } bool FadeUp(CRGB c, int start, int end, int update_rate, int starting_brightness, bool isNew) { - static uint8_t b = 0; // start out at 0 - if (isNew)b = starting_brightness; - bool retval = false; + static uint8_t b = 0; // start out at 0 + if (isNew)b = starting_brightness; + bool retval = false; - // slowly increase the brightness + // slowly increase the brightness //EVERY_N_MILLISECONDS(update_rate) //{ - if (b < 255) { - b += update_rate; - } - else retval = true; - //} - //return false; + if (b < 255) { + b += update_rate; + } + else retval = true; + //} + //return false; - CRGB color((int)(c.r * ((double)(b / 255.0))), (int)(c.g * ((double)(b / 255.0))), (int)(c.b * ((double)(b / 255.0)))); - fill_solid(leds + start, end - start, color); - return retval; + CRGB color((int)(c.r * ((double)(b / 255.0))), (int)(c.g * ((double)(b / 255.0))), (int)(c.b * ((double)(b / 255.0)))); + fill_solid(leds + start, end - start, color); + return retval; } void TrailingBulletsVisualizer() { - static uint8_t lastVals[AVG_ARRAY_SIZE] = { 1,1,1,1,1,1,1,1,1,1 }; - static int i_pos = 0; - int currentVolume = 0; - int avgVolume = 0; - double cd = 0; + static uint8_t lastVals[AVG_ARRAY_SIZE] = { 1,1,1,1,1,1,1,1,1,1 }; + static int i_pos = 0; + int currentVolume = 0; + int avgVolume = 0; + double cd = 0; - CHSV toSend; + CHSV toSend; - if (!parseUdp()) - { - ShiftLeds(1); - return; - } - currentVolume = getVolume(incomingPacket, BAND_START, BAND_END); - avgVolume = getVolume(lastVals, 0, AVG_ARRAY_SIZE - 1); - if (avgVolume != 0)cd = ((double)currentVolume) / ((double)avgVolume); - if (currentVolume < 25)cd = 0; - if (currentVolume > 230) cd += 0.15; + if (!parseUdp()) + { + ShiftLeds(1); + return; + } + currentVolume = getVolume(incomingPacket, BAND_START, BAND_END); + avgVolume = getVolume(lastVals, 0, AVG_ARRAY_SIZE - 1); + if (avgVolume != 0)cd = ((double)currentVolume) / ((double)avgVolume); + if (currentVolume < 25)cd = 0; + if (currentVolume > 230) cd += 0.15; - toSend = getVisualizerBulletValue(cd); + toSend = getVisualizerBulletValue(cd); - int update_rate = map(speed, 0, 255, 1, 15); - ShiftLeds(update_rate); - SendTrailingLeds(toSend, update_rate); - ShiftLeds(update_rate / 2); - SendTrailingLeds(CHSV(0, 0, 0), update_rate); - i_pos++; - if (i_pos >= AVG_ARRAY_SIZE)i_pos = 0; - lastVals[i_pos] = currentVolume; + int update_rate = map(speed, 0, 255, 1, 15); + ShiftLeds(update_rate); + SendTrailingLeds(toSend, update_rate); + ShiftLeds(update_rate / 2); + SendTrailingLeds(CHSV(0, 0, 0), update_rate); + i_pos++; + if (i_pos >= AVG_ARRAY_SIZE)i_pos = 0; + lastVals[i_pos] = currentVolume; } CHSV getVisualizerBulletValue(double cd) { - CHSV toSend; - if (cd < 1.05)toSend = CHSV(0, 0, 0); - if (cd < 1.10)toSend = CHSV(gHue, 255, 5); - else if (cd < 1.15)toSend = CHSV(gHue, 255, 150); - else if (cd < 1.20)toSend = CHSV(gHue + 20, 255, 200); - else if (cd < 1.25)toSend = CHSV(gHue + 40, 255, 255); - else if (cd < 1.30)toSend = CHSV(gHue + 60, 255, 255); - else if (cd < 1.45)toSend = CHSV(gHue + 100, 255, 255); - else toSend = CHSV(gHue, 255, 255); - return toSend; + CHSV toSend; + if (cd < 1.05)toSend = CHSV(0, 0, 0); + if (cd < 1.10)toSend = CHSV(gHue, 255, 5); + else if (cd < 1.15)toSend = CHSV(gHue, 255, 150); + else if (cd < 1.20)toSend = CHSV(gHue + 20, 255, 200); + else if (cd < 1.25)toSend = CHSV(gHue + 40, 255, 255); + else if (cd < 1.30)toSend = CHSV(gHue + 60, 255, 255); + else if (cd < 1.45)toSend = CHSV(gHue + 100, 255, 255); + else toSend = CHSV(gHue, 255, 255); + return toSend; } CHSV getVisualizerBulletValue(int hue, double cd) { - CHSV toSend; - if (cd < 1.05)toSend = CHSV(0, 0, 0); - if (cd < 1.10)toSend = CHSV(hue, 255, 5); - else if (cd < 1.15)toSend = CHSV(hue, 255, 150); - else if (cd < 1.20)toSend = CHSV(hue, 255, 200); - else if (cd < 1.25)toSend = CHSV(hue, 255, 255); - else if (cd < 1.30)toSend = CHSV(hue, 255, 255); - else if (cd < 1.45)toSend = CHSV(hue, 255, 255); - else toSend = CHSV(hue, 255, 255); - return toSend; + CHSV toSend; + if (cd < 1.05)toSend = CHSV(0, 0, 0); + if (cd < 1.10)toSend = CHSV(hue, 255, 5); + else if (cd < 1.15)toSend = CHSV(hue, 255, 150); + else if (cd < 1.20)toSend = CHSV(hue, 255, 200); + else if (cd < 1.25)toSend = CHSV(hue, 255, 255); + else if (cd < 1.30)toSend = CHSV(hue, 255, 255); + else if (cd < 1.45)toSend = CHSV(hue, 255, 255); + else toSend = CHSV(hue, 255, 255); + return toSend; } void vuMeter(CHSV c, int mode = 0) { - int vol = getVolume(incomingPacket, BAND_START, BAND_END, 1.75); - fill_solid(leds, NUM_LEDS, CRGB::Black); + int vol = getVolume(incomingPacket, BAND_START, BAND_END, 1.75); + fill_solid(leds, NUM_LEDS, CRGB::Black); #if DEVICE_TYPE == 3 - int toPaint = map(vol, 0, 255, 0, LEDS_PER_LINE); - if(mode == 0) for (int i = 0; i < toPaint; i++)ColorSingleRing(i,c); - else if(mode == 1) for (int i = 0; i < toPaint; i++)ColorSingleRing(i,CHSV(map(i, 0, LEDS_PER_LINE, 0,255),255,255)); - else for (int i = 0; i < toPaint; i++)ColorSingleRing(i,CHSV((uint8_t)(((uint8_t)map(i, 0, LEDS_PER_LINE, 0,255))+gHue),255,255)); + int toPaint = map(vol, 0, 255, 0, LEDS_PER_LINE); + if(mode == 0) for (int i = 0; i < toPaint; i++)ColorSingleRing(i,c); + else if(mode == 1) for (int i = 0; i < toPaint; i++)ColorSingleRing(i,CHSV(map(i, 0, LEDS_PER_LINE, 0,255),255,255)); + else for (int i = 0; i < toPaint; i++)ColorSingleRing(i,CHSV((uint8_t)(((uint8_t)map(i, 0, LEDS_PER_LINE, 0,255))+gHue),255,255)); #else - int toPaint = map(vol, 0, 255, 0, NUM_LEDS); - - if (mode == 0) for (int i = 0; i < toPaint; i++)for (int i = 0; i < toPaint; i++)leds[i] = c; - else if (mode == 1) for (int i = 0; i < toPaint; i++)for (int i = 0; i < toPaint; i++)leds[i] = CHSV(map(i, 0, NUM_LEDS, 0, 255), 255, 255); - else for (int i = 0; i < toPaint; i++)leds[i] = CHSV(((uint8_t)map(i, 0, NUM_LEDS, 0, 255)) + gHue, 255, 255); + int toPaint = map(vol, 0, 255, 0, NUM_LEDS); + + if (mode == 0) for (int i = 0; i < toPaint; i++)for (int i = 0; i < toPaint; i++)leds[i] = c; + else if (mode == 1) for (int i = 0; i < toPaint; i++)for (int i = 0; i < toPaint; i++)leds[i] = CHSV(map(i, 0, NUM_LEDS, 0, 255), 255, 255); + else for (int i = 0; i < toPaint; i++)leds[i] = CHSV(((uint8_t)map(i, 0, NUM_LEDS, 0, 255)) + gHue, 255, 255); #endif } void vuMeterTriColor() { - if (!parseUdp()) - { - fadeToBlackBy(leds, NUM_LEDS, 5); - return; - } - int vol = getVolume(incomingPacket, BAND_START, BAND_END, 1.75); - fill_solid(leds, NUM_LEDS, CRGB::Black); + if (!parseUdp()) + { + fadeToBlackBy(leds, NUM_LEDS, 5); + return; + } + int vol = getVolume(incomingPacket, BAND_START, BAND_END, 1.75); + fill_solid(leds, NUM_LEDS, CRGB::Black); #if DEVICE_TYPE == 3 - int toPaint = map(vol, 0, 255, 0, LEDS_PER_LINE); - if (vol < 153) for(int i = 0;i= 204) - { - for (int i = 0; i < (LEDS_PER_LINE * 0.6); i++)ColorSingleRing(i, CRGB::Green); - for (int i = LEDS_PER_LINE * 0.6; i < (LEDS_PER_LINE * 0.8); i++)ColorSingleRing(i, CRGB::Orange); - for (int i = LEDS_PER_LINE * 0.8; i < toPaint; i++)ColorSingleRing(i, CRGB::Red); - } + int toPaint = map(vol, 0, 255, 0, LEDS_PER_LINE); + if (vol < 153) for(int i = 0;i= 204) + { + for (int i = 0; i < (LEDS_PER_LINE * 0.6); i++)ColorSingleRing(i, CRGB::Green); + for (int i = LEDS_PER_LINE * 0.6; i < (LEDS_PER_LINE * 0.8); i++)ColorSingleRing(i, CRGB::Orange); + for (int i = LEDS_PER_LINE * 0.8; i < toPaint; i++)ColorSingleRing(i, CRGB::Red); + } #else - int toPaint = map(vol, 0, 255, 0, NUM_LEDS); - if (vol < 153) fill_solid(leds, toPaint, CRGB::Green); - else if (vol < 204) - { - fill_solid(leds, NUM_LEDS*0.6, CRGB::Green); - fill_solid(leds+(int(NUM_LEDS * 0.6)), toPaint - NUM_LEDS * 0.6, CRGB::Orange); - } - else if (vol >= 204) - { - fill_solid(leds, NUM_LEDS * 0.6, CRGB::Green); - fill_solid(leds + (int(NUM_LEDS * 0.6)), NUM_LEDS * 0.2, CRGB::Orange); - fill_solid(leds + (int(NUM_LEDS * 0.8)), toPaint - NUM_LEDS * 0.8, CRGB::Red); - } + int toPaint = map(vol, 0, 255, 0, NUM_LEDS); + if (vol < 153) fill_solid(leds, toPaint, CRGB::Green); + else if (vol < 204) + { + fill_solid(leds, NUM_LEDS*0.6, CRGB::Green); + fill_solid(leds+(int(NUM_LEDS * 0.6)), toPaint - NUM_LEDS * 0.6, CRGB::Orange); + } + else if (vol >= 204) + { + fill_solid(leds, NUM_LEDS * 0.6, CRGB::Green); + fill_solid(leds + (int(NUM_LEDS * 0.6)), NUM_LEDS * 0.2, CRGB::Orange); + fill_solid(leds + (int(NUM_LEDS * 0.8)), toPaint - NUM_LEDS * 0.8, CRGB::Red); + } #endif } void vuMeterSolid() { - if (!parseUdp()) - { - fadeToBlackBy(leds, NUM_LEDS, 5); - return; - } - vuMeter(rgb2hsv_approximate(solidColor)); + if (!parseUdp()) + { + fadeToBlackBy(leds, NUM_LEDS, 5); + return; + } + vuMeter(rgb2hsv_approximate(solidColor)); } void vuMeterStaticRainbow() { - if (!parseUdp()) - { - fadeToBlackBy(leds, NUM_LEDS, 5); - return; - } - vuMeter(rgb2hsv_approximate(solidColor), 1); + if (!parseUdp()) + { + fadeToBlackBy(leds, NUM_LEDS, 5); + return; + } + vuMeter(rgb2hsv_approximate(solidColor), 1); } void vuMeterRainbow() { - if (!parseUdp()) - { - fadeToBlackBy(leds, NUM_LEDS, 5); - return; - } - vuMeter(rgb2hsv_approximate(solidColor), 2); + if (!parseUdp()) + { + fadeToBlackBy(leds, NUM_LEDS, 5); + return; + } + vuMeter(rgb2hsv_approximate(solidColor), 2); } void vuMeterFading() { - if (!parseUdp()) - { - fadeToBlackBy(leds, NUM_LEDS, 5); - return; - } - vuMeter(CHSV(gHue, 255, 255)); + if (!parseUdp()) + { + fadeToBlackBy(leds, NUM_LEDS, 5); + return; + } + vuMeter(CHSV(gHue, 255, 255)); } void NanoleafWaves() { - static uint8_t lastVals[AVG_ARRAY_SIZE] = { 1,1,1,1,1,1,1,1,1,1 }; - static int i_pos = 0; - int currentVolume = 0; - int avgVolume = 0; - double cd = 0; - - CHSV toSend; - - if (!parseUdp()) - { - ShiftLeds(1); - return; - } - currentVolume = getVolume(incomingPacket, BAND_START, BAND_END); - avgVolume = getVolume(lastVals, 0, AVG_ARRAY_SIZE - 1); - if (avgVolume != 0)cd = ((double)currentVolume) / ((double)avgVolume); - if (currentVolume < 25)cd = 0; - if (currentVolume > 230) cd += 0.15; - - toSend = getVisualizerBulletValue(cd); - - int update_rate = map(speed, 0, 70, 100, 0); - if (update_rate >= 0) - { - ShiftLeds(3); - SendLeds(toSend, 3); - delay(update_rate); - } - else - { - int steps = map(update_rate, -264, 0, 8, 0); - steps /= 2; - steps *= 3; - ShiftLeds(steps); - SendLeds(toSend, steps); - } - - i_pos++; - if (i_pos >= AVG_ARRAY_SIZE)i_pos = 0; - lastVals[i_pos] = currentVolume; + static uint8_t lastVals[AVG_ARRAY_SIZE] = { 1,1,1,1,1,1,1,1,1,1 }; + static int i_pos = 0; + int currentVolume = 0; + int avgVolume = 0; + double cd = 0; + + CHSV toSend; + + if (!parseUdp()) + { + ShiftLeds(1); + return; + } + currentVolume = getVolume(incomingPacket, BAND_START, BAND_END); + avgVolume = getVolume(lastVals, 0, AVG_ARRAY_SIZE - 1); + if (avgVolume != 0)cd = ((double)currentVolume) / ((double)avgVolume); + if (currentVolume < 25)cd = 0; + if (currentVolume > 230) cd += 0.15; + + toSend = getVisualizerBulletValue(cd); + + int update_rate = map(speed, 0, 70, 100, 0); + if (update_rate >= 0) + { + ShiftLeds(3); + SendLeds(toSend, 3); + delay(update_rate); + } + else + { + int steps = map(update_rate, -264, 0, 8, 0); + steps /= 2; + steps *= 3; + ShiftLeds(steps); + SendLeds(toSend, steps); + } + + i_pos++; + if (i_pos >= AVG_ARRAY_SIZE)i_pos = 0; + lastVals[i_pos] = currentVolume; } void RefreshingVisualizer() { - static uint8_t lastVals[AVG_ARRAY_SIZE] = { 1,1,1,1,1,1,1,1,1,1 }; - static int i_pos = 0; - int currentVolume = 0; - int avgVolume = 0; - double cd = 0; - - CHSV toSend; - - if (!parseUdp()) - { - ShiftLeds(1); - return; - } - currentVolume = getVolume(incomingPacket, BAND_START, BAND_END); - avgVolume = getVolume(lastVals, 0, AVG_ARRAY_SIZE - 1); - if (avgVolume != 0)cd = ((double)currentVolume) / ((double)avgVolume); - if (currentVolume < 25)cd = 0; - if (currentVolume > 230) cd += 0.15; - - toSend = getVisualizerBulletValue(cd); - - int update_rate = map(speed, 0, 70, 100, 0); - if (update_rate >= 0) - { - ShiftLeds(1); - SendLeds(toSend, 1); - delay(update_rate); - } - else - { - int steps = map(update_rate, -264, 0, 8, 0); - ShiftLeds(steps); - SendLeds(toSend, steps); - } - - i_pos++; - if (i_pos >= AVG_ARRAY_SIZE)i_pos = 0; - lastVals[i_pos] = currentVolume; + static uint8_t lastVals[AVG_ARRAY_SIZE] = { 1,1,1,1,1,1,1,1,1,1 }; + static int i_pos = 0; + int currentVolume = 0; + int avgVolume = 0; + double cd = 0; + + CHSV toSend; + + if (!parseUdp()) + { + ShiftLeds(1); + return; + } + currentVolume = getVolume(incomingPacket, BAND_START, BAND_END); + avgVolume = getVolume(lastVals, 0, AVG_ARRAY_SIZE - 1); + if (avgVolume != 0)cd = ((double)currentVolume) / ((double)avgVolume); + if (currentVolume < 25)cd = 0; + if (currentVolume > 230) cd += 0.15; + + toSend = getVisualizerBulletValue(cd); + + int update_rate = map(speed, 0, 70, 100, 0); + if (update_rate >= 0) + { + ShiftLeds(1); + SendLeds(toSend, 1); + delay(update_rate); + } + else + { + int steps = map(update_rate, -264, 0, 8, 0); + ShiftLeds(steps); + SendLeds(toSend, steps); + } + + i_pos++; + if (i_pos >= AVG_ARRAY_SIZE)i_pos = 0; + lastVals[i_pos] = currentVolume; } void DualToneBullets(int hueA, int hueB, int grpsz) { - static uint8_t lastVals[AVG_ARRAY_SIZE] = { 1,1,1,1,1,1,1,1,1,1 }; - static int i_pos = 0; - int currentVolume = 0; - int avgVolume = 0; - double cd = 0; - static int hSwitch = 0; - static bool h = false; - - CHSV toSend; - - if (!parseUdp()) - { - ShiftLeds(1); - return; - } - currentVolume = getVolume(incomingPacket, BAND_START, BAND_END); - avgVolume = getVolume(lastVals, 0, AVG_ARRAY_SIZE - 1); - if (avgVolume != 0)cd = ((double)currentVolume) / ((double)avgVolume); - if (currentVolume < 25)cd = 0; - if (currentVolume > 230) cd += 0.15; - - toSend = getVisualizerBulletValue(h ? hueA : hueB, cd); - - int update_rate = map(speed, 0, 70, 100, 0); - if (update_rate >= 0) - { - ShiftLeds(1); - SendLeds(toSend, 1); - delay(update_rate); - } - else - { - int steps = map(update_rate, -264, 0, 8, 0); - ShiftLeds(steps); - SendLeds(toSend, steps); - } - - i_pos++; - hSwitch++; - if (hSwitch >= grpsz) { - hSwitch = 0; - h = !h; - } - if (i_pos >= AVG_ARRAY_SIZE)i_pos = 0; - lastVals[i_pos] = currentVolume; + static uint8_t lastVals[AVG_ARRAY_SIZE] = { 1,1,1,1,1,1,1,1,1,1 }; + static int i_pos = 0; + int currentVolume = 0; + int avgVolume = 0; + double cd = 0; + static int hSwitch = 0; + static bool h = false; + + CHSV toSend; + + if (!parseUdp()) + { + ShiftLeds(1); + return; + } + currentVolume = getVolume(incomingPacket, BAND_START, BAND_END); + avgVolume = getVolume(lastVals, 0, AVG_ARRAY_SIZE - 1); + if (avgVolume != 0)cd = ((double)currentVolume) / ((double)avgVolume); + if (currentVolume < 25)cd = 0; + if (currentVolume > 230) cd += 0.15; + + toSend = getVisualizerBulletValue(h ? hueA : hueB, cd); + + int update_rate = map(speed, 0, 70, 100, 0); + if (update_rate >= 0) + { + ShiftLeds(1); + SendLeds(toSend, 1); + delay(update_rate); + } + else + { + int steps = map(update_rate, -264, 0, 8, 0); + ShiftLeds(steps); + SendLeds(toSend, steps); + } + + i_pos++; + hSwitch++; + if (hSwitch >= grpsz) { + hSwitch = 0; + h = !h; + } + if (i_pos >= AVG_ARRAY_SIZE)i_pos = 0; + lastVals[i_pos] = currentVolume; } int getCounterHue(int h) { - if (h <= 127) return h + 127; - if (h > 127) return h - 127; + if (h <= 127) return h + 127; + if (h > 127) return h - 127; } int getPairHue(int h) { - if (h <= 84) return h + 84; - if (h > 84) return h - 84; + if (h <= 84) return h + 84; + if (h > 84) return h - 84; } #define BULLET_COLOR_SIZE ((int)(NUM_LEDS/7.9)) void SolidColorComplementary() { - int h1 = rgb2hsv_approximate(solidColor).hue; - int h2 = getCounterHue(h1); - DualToneBullets(h1, h2, BULLET_COLOR_SIZE); + int h1 = rgb2hsv_approximate(solidColor).hue; + int h2 = getCounterHue(h1); + DualToneBullets(h1, h2, BULLET_COLOR_SIZE); } void SolidColorDualTone() { - int h1 = rgb2hsv_approximate(solidColor).hue; - int h2 = getPairHue(h1); - DualToneBullets(h1, h2, BULLET_COLOR_SIZE); + int h1 = rgb2hsv_approximate(solidColor).hue; + int h2 = getPairHue(h1); + DualToneBullets(h1, h2, BULLET_COLOR_SIZE); } void BluePurpleBullets() { - DualToneBullets(240, 170, BULLET_COLOR_SIZE); + DualToneBullets(240, 170, BULLET_COLOR_SIZE); } int expo(double x, double start = 0) { - double res = 10.0 * (pow(1.02, x)) - 10.0 + start; - if (res > 255)res = 255; - if (res <= 0)res = 0; - return (int)res; + double res = 10.0 * (pow(1.02, x)) - 10.0 + start; + if (res > 255)res = 255; + if (res <= 0)res = 0; + return (int)res; } void Band(int grpSize, CRGB x, int mergePacket = 1) { - if (!parseUdp()) - { - fadeToBlackBy(leds, NUM_LEDS, 50); - return; - } - CHSV c = CHSV(0, 0, 0); - - - for (int i = 0; i <= (PACKET_LENGTH - 1) && incomingPacket[i] != '\0'; i+=mergePacket) - { - int avg = 0; - for (int t = i; t < (i + mergePacket); t++)avg += incomingPacket[t]; - avg /= (double)mergePacket; - //uint8_t mult = expo(getVolume(incomingPacket, i, i+(mergePacket-1)), 6.0); - uint8_t mult = expo(avg, 0.0); - - if (x.r == 0 && x.g == 0 && x.b == 0) - { - uint8_t h = gHue + 255.0 * (((double)i) / ((double)PACKET_LENGTH)); + if (!parseUdp()) + { + fadeToBlackBy(leds, NUM_LEDS, 50); + return; + } + CHSV c = CHSV(0, 0, 0); + + + for (int i = 0; i <= (PACKET_LENGTH - 1) && incomingPacket[i] != '\0'; i+=mergePacket) + { + int avg = 0; + for (int t = i; t < (i + mergePacket); t++)avg += incomingPacket[t]; + avg /= (double)mergePacket; + //uint8_t mult = expo(getVolume(incomingPacket, i, i+(mergePacket-1)), 6.0); + uint8_t mult = expo(avg, 0.0); + + if (x.r == 0 && x.g == 0 && x.b == 0) + { + uint8_t h = gHue + 255.0 * (((double)i) / ((double)PACKET_LENGTH)); #if DEVICE_TYPE==3 - ColorSingleRing(i, CHSV(h, 255, mult)); + ColorSingleRing(i, CHSV(h, 255, mult)); #else - //leds[i] = CHSV(h, 255, mult); - fill_solid(leds + i * (grpSize/mergePacket), grpSize, CHSV(h, 255, mult)); + //leds[i] = CHSV(h, 255, mult); + fill_solid(leds + i * (grpSize/mergePacket), grpSize, CHSV(h, 255, mult)); #endif - } - else - { - CRGB y = CRGB(x.r * (mult / 255.0), x.g * (mult / 255.0), x.b * (mult / 255.0)); + } + else + { + CRGB y = CRGB(x.r * (mult / 255.0), x.g * (mult / 255.0), x.b * (mult / 255.0)); #if DEVICE_TYPE==3 - ColorSingleRing(i, y); + ColorSingleRing(i, y); #else - fill_solid(leds + i * (grpSize / mergePacket), grpSize, y); + fill_solid(leds + i * (grpSize / mergePacket), grpSize, y); #endif - //leds[i] = x; - } - }/* - for (int i = 0; i < grpCnt; i++) - { + //leds[i] = x; + } + }/* + for (int i = 0; i < grpCnt; i++) + { - }*/ + }*/ } void SingleColorBandVisualizer() { - int grp = (NUM_LEDS) / (PACKET_LENGTH); - Band(grp, solidColor,1); + int grp = (NUM_LEDS) / (PACKET_LENGTH); + Band(grp, solidColor,1); } void RainbowBandVisualizer() { - int grp = (NUM_LEDS) / (PACKET_LENGTH); - Band(grp,CRGB(0, 0, 0), 1); + int grp = (NUM_LEDS) / (PACKET_LENGTH); + Band(grp,CRGB(0, 0, 0), 1); } void BulletVisualizer() { - static uint8_t lastVals[AVG_ARRAY_SIZE] = { 1,1,1,1,1,1,1,1,1,1 }; - static int i_pos = 0; - int currentVolume = 0; - int avgVolume = 0; - double cd = 0; + static uint8_t lastVals[AVG_ARRAY_SIZE] = { 1,1,1,1,1,1,1,1,1,1 }; + static int i_pos = 0; + int currentVolume = 0; + int avgVolume = 0; + double cd = 0; - CHSV toSend; + CHSV toSend; - if (!parseUdp()) - { - ShiftLeds(1); - return; - } - //if (incomingPacket[0] != 0) - currentVolume = getVolume(incomingPacket, BAND_START, BAND_END); - avgVolume = getVolume(lastVals, 0, AVG_ARRAY_SIZE - 1); - if (avgVolume != 0)cd = ((double)currentVolume) / ((double)avgVolume); - if (currentVolume < 25)cd = 0; - if (currentVolume > 230) cd += 0.15; + if (!parseUdp()) + { + ShiftLeds(1); + return; + } + //if (incomingPacket[0] != 0) + currentVolume = getVolume(incomingPacket, BAND_START, BAND_END); + avgVolume = getVolume(lastVals, 0, AVG_ARRAY_SIZE - 1); + if (avgVolume != 0)cd = ((double)currentVolume) / ((double)avgVolume); + if (currentVolume < 25)cd = 0; + if (currentVolume > 230) cd += 0.15; - toSend = getVisualizerBulletValue(cd); + toSend = getVisualizerBulletValue(cd); - int update_rate = map(speed, 0, 255, 1, 15); - ShiftLeds(update_rate); - SendLeds(toSend, update_rate); - i_pos++; - if (i_pos >= AVG_ARRAY_SIZE)i_pos = 0; - lastVals[i_pos] = currentVolume; + int update_rate = map(speed, 0, 255, 1, 15); + ShiftLeds(update_rate); + SendLeds(toSend, update_rate); + i_pos++; + if (i_pos >= AVG_ARRAY_SIZE)i_pos = 0; + lastVals[i_pos] = currentVolume; } #if DEVICE_TYPE == 4 void NanoleafBand() { - int grp = PIXELS_PER_LEAF; // All pixels in one leaf will be merged into one element - Band(grp, CRGB(0, 0, 0), 3); + int grp = PIXELS_PER_LEAF; // All pixels in one leaf will be merged into one element + Band(grp, CRGB(0, 0, 0), 3); } void NanoleafSingleBand() { - int grp = PIXELS_PER_LEAF; // All pixels in one leaf will be merged into one element - Band(grp, solidColor, 3); + int grp = PIXELS_PER_LEAF; // All pixels in one leaf will be merged into one element + Band(grp, solidColor, 3); } #endif void CentralVisualizer() { - static uint8_t lastVals[AVG_ARRAY_SIZE] = { 1,1,1,1,1,1,1,1,1,1 }; - static int i_pos = 0; - int currentVolume = 0; - int avgVolume = 0; - double cd = 0; - - CHSV toSend; - - if (!parseUdp()) - { - ShiftLedsCenter(1); - return; - } - currentVolume = getVolume(incomingPacket, BAND_START, BAND_END); - avgVolume = getVolume(lastVals, 0, AVG_ARRAY_SIZE - 1); - if (avgVolume != 0)cd = ((double)currentVolume) / ((double)avgVolume); - if (currentVolume < 25)cd = 0; - if (currentVolume > 230) cd += 0.15; - - - toSend = getVisualizerBulletValue(cd); - - int update_rate = map(speed, 0, 70, 100, 0); - if (update_rate >= 0) - { - ShiftLedsCenter(1); - SendLedsCenter(toSend); - delay(update_rate); - } - else - { - int steps = map(update_rate, -264, 0, 8, 0); - - for (int i = 0; i < steps; i++) - { - ShiftLedsCenter(1); - SendLedsCenter(toSend); - } - } - i_pos++; - if (i_pos >= AVG_ARRAY_SIZE)i_pos = 0; - lastVals[i_pos] = currentVolume; + static uint8_t lastVals[AVG_ARRAY_SIZE] = { 1,1,1,1,1,1,1,1,1,1 }; + static int i_pos = 0; + int currentVolume = 0; + int avgVolume = 0; + double cd = 0; + + CHSV toSend; + + if (!parseUdp()) + { + ShiftLedsCenter(1); + return; + } + currentVolume = getVolume(incomingPacket, BAND_START, BAND_END); + avgVolume = getVolume(lastVals, 0, AVG_ARRAY_SIZE - 1); + if (avgVolume != 0)cd = ((double)currentVolume) / ((double)avgVolume); + if (currentVolume < 25)cd = 0; + if (currentVolume > 230) cd += 0.15; + + + toSend = getVisualizerBulletValue(cd); + + int update_rate = map(speed, 0, 70, 100, 0); + if (update_rate >= 0) + { + ShiftLedsCenter(1); + SendLedsCenter(toSend); + delay(update_rate); + } + else + { + int steps = map(update_rate, -264, 0, 8, 0); + + for (int i = 0; i < steps; i++) + { + ShiftLedsCenter(1); + SendLedsCenter(toSend); + } + } + i_pos++; + if (i_pos >= AVG_ARRAY_SIZE)i_pos = 0; + lastVals[i_pos] = currentVolume; } void ShiftLedsCenter(int shiftAmount) { #if DEVICE_TYPE == 4 - shiftAmount *= (PIXELS_PER_LEAF / 3); + shiftAmount *= (PIXELS_PER_LEAF / 3); #endif - for (int cnt = 0; cnt < shiftAmount; cnt++) - { + for (int cnt = 0; cnt < shiftAmount; cnt++) + { #if DEVICE_TYPE == 3 - for (int i = 0; i < (LEDS_PER_LINE / 2); i++) - { - ColorSingleRing(i, leds[i + 1]); - ColorSingleRing(LEDS_PER_LINE - i, leds[LEDS_PER_LINE - i - 1]); - } + for (int i = 0; i < (LEDS_PER_LINE / 2); i++) + { + ColorSingleRing(i, leds[i + 1]); + ColorSingleRing(LEDS_PER_LINE - i, leds[LEDS_PER_LINE - i - 1]); + } //#elif DEVICE_TYPE == 4 -// for (int i = 0; i < (NUM_LEDS / 2); i++) -// { -// leds[i] = leds[i + 1]; -// leds[NUM_LEDS - i] = leds[NUM_LEDS - i - 1]; -// } +// for (int i = 0; i < (NUM_LEDS / 2); i++) +// { +// leds[i] = leds[i + 1]; +// leds[NUM_LEDS - i] = leds[NUM_LEDS - i - 1]; +// } #else - if ((NUM_LEDS % 2) == 0) - { - for (int i = 0; i < (NUM_LEDS / 2); i++) - { - leds[i] = leds[i + 1]; - leds[NUM_LEDS - i] = leds[NUM_LEDS - i - 1]; - } - }else for (int i = 0; i <= (NUM_LEDS / 2); i++) - { - leds[i] = leds[i + 1]; - leds[(NUM_LEDS-1) - i] = leds[(NUM_LEDS-1) - i - 1]; - } + if ((NUM_LEDS % 2) == 0) + { + for (int i = 0; i < (NUM_LEDS / 2); i++) + { + leds[i] = leds[i + 1]; + leds[NUM_LEDS - i] = leds[NUM_LEDS - i - 1]; + } + }else for (int i = 0; i <= (NUM_LEDS / 2); i++) + { + leds[i] = leds[i + 1]; + leds[(NUM_LEDS-1) - i] = leds[(NUM_LEDS-1) - i - 1]; + } #endif - } + } } void SendLedsCenter(CHSV c) { #if DEVICE_TYPE == 3 - if ((LEDS_PER_LINE % 2) == 0) ColorSingleRing((LEDS_PER_LINE / 2) - 1, c); - ColorSingleRing(LEDS_PER_LINE / 2.0, c); + if ((LEDS_PER_LINE % 2) == 0) ColorSingleRing((LEDS_PER_LINE / 2) - 1, c); + ColorSingleRing(LEDS_PER_LINE / 2.0, c); #elif DEVICE_TYPE == 4 - int p = (LEAFCOUNT * 3) / 2.0; - ColorSingleNanoleafCorner(p, c); - if (((LEAFCOUNT * 3) % 2) == 0) ColorSingleNanoleafCorner(p-1, c); + int p = (LEAFCOUNT * 3) / 2.0; + ColorSingleNanoleafCorner(p, c); + if (((LEAFCOUNT * 3) % 2) == 0) ColorSingleNanoleafCorner(p-1, c); #else - if ((NUM_LEDS % 2) == 0) - { - leds[(NUM_LEDS / 2)] = c; - leds[(NUM_LEDS / 2) - 1] = c; - } - else - { - leds[(int)(NUM_LEDS / 2.0)] = c; - } + if ((NUM_LEDS % 2) == 0) + { + leds[(NUM_LEDS / 2)] = c; + leds[(NUM_LEDS / 2) - 1] = c; + } + else + { + leds[(int)(NUM_LEDS / 2.0)] = c; + } #endif } void SendLeds(CHSV c, int shiftAmount) { - for (int i = 0; i < shiftAmount; i++) { + for (int i = 0; i < shiftAmount; i++) { #if DEVICE_TYPE == 3 - ColorSingleRing(i, c); + ColorSingleRing(i, c); #elif DEVICE_TYPE == 4 - ColorSingleNanoleafCorner(i, c); + ColorSingleNanoleafCorner(i, c); #else - leds[i] = c; + leds[i] = c; #endif - } + } } void SendTrailingLeds(CHSV c, int shiftAmount) { - double shiftMult = 1.0 / ((double)shiftAmount); - int i = shiftAmount; - leds[i] = c; - for (int t = shiftAmount - 1; t >= 0; t--) - { - CHSV c2 = rgb2hsv_approximate(leds[i]); - c2.v *= (shiftAmount - t) * shiftMult; - ShiftLeds(1); - SendLeds(c2,1); - } + double shiftMult = 1.0 / ((double)shiftAmount); + int i = shiftAmount; + leds[i] = c; + for (int t = shiftAmount - 1; t >= 0; t--) + { + CHSV c2 = rgb2hsv_approximate(leds[i]); + c2.v *= (shiftAmount - t) * shiftMult; + ShiftLeds(1); + SendLeds(c2,1); + } } #if DEVICE_TYPE == 4 void ColorSingleNanoleafCorner(int pos, CRGB x) { - int start = pos * (PIXELS_PER_LEAF / 3); - fill_solid(leds + start, (PIXELS_PER_LEAF / 3), x); + int start = pos * (PIXELS_PER_LEAF / 3); + fill_solid(leds + start, (PIXELS_PER_LEAF / 3), x); } #endif void ShiftLeds(int shiftAmount) { - int cnt = shiftAmount; + int cnt = shiftAmount; #if DEVICE_TYPE == 3 - for (int i = LEDS_PER_LINE - 1; i >= cnt; i--) - ColorSingleRing(i,leds[i-cnt]); + for (int i = LEDS_PER_LINE - 1; i >= cnt; i--) + ColorSingleRing(i,leds[i-cnt]); #elif DEVICE_TYPE == 4 - cnt *= (PIXELS_PER_LEAF / 3); - for (int i = NUM_LEDS - 1; i >= cnt; i--) { - leds[i] = leds[i - cnt]; - } + cnt *= (PIXELS_PER_LEAF / 3); + for (int i = NUM_LEDS - 1; i >= cnt; i--) { + leds[i] = leds[i - cnt]; + } #else - for (int i = NUM_LEDS - 1; i >= cnt; i--) { - leds[i] = leds[i - cnt]; - } + for (int i = NUM_LEDS - 1; i >= cnt; i--) { + leds[i] = leds[i - cnt]; + } #endif } @@ -3255,141 +3255,141 @@ void ShiftLeds(int shiftAmount) void RainbowVisualizer() { - if (!parseUdp())return; - fadeToBlackBy(leds, NUM_LEDS, 150); - for (int i = 0; i <= (LENGTH - 1) || incomingPacket[i] != '\0'; i++) - { - double value = incomingPacket[i]; - //setBar(i, map(value, 0, 255, 0, HEIGHT), CHSV(map(i, 0, LENGTH-1, 0, 255), 255, 255)); - setBar(i, value, CHSV(map(i, 0, LENGTH - 1, 0, 255), 255, 255), false); - } - FastLED.delay(1000 / FRAMES_PER_SECOND); + if (!parseUdp())return; + fadeToBlackBy(leds, NUM_LEDS, 150); + for (int i = 0; i <= (LENGTH - 1) || incomingPacket[i] != '\0'; i++) + { + double value = incomingPacket[i]; + //setBar(i, map(value, 0, 255, 0, HEIGHT), CHSV(map(i, 0, LENGTH-1, 0, 255), 255, 255)); + setBar(i, value, CHSV(map(i, 0, LENGTH - 1, 0, 255), 255, 255), false); + } + FastLED.delay(1000 / FRAMES_PER_SECOND); } void RainbowVisualizerDoubleSided() { - if (!parseUdp())return; - fadeToBlackBy(leds, NUM_LEDS, 150); - for (int i = 0; i <= (LENGTH - 1) || incomingPacket[i] != '\0'; i++) - { - double value = incomingPacket[i]; - //setBar(i, map(value, 0, 255, 0, HEIGHT), CHSV(map(i, 0, LENGTH-1, 0, 255), 255, 255)); - setBarDoubleSided(i, value, CHSV(map(i, 0, LENGTH - 1, 0, 255), 255, 255), false); - } - FastLED.delay(1000 / FRAMES_PER_SECOND); + if (!parseUdp())return; + fadeToBlackBy(leds, NUM_LEDS, 150); + for (int i = 0; i <= (LENGTH - 1) || incomingPacket[i] != '\0'; i++) + { + double value = incomingPacket[i]; + //setBar(i, map(value, 0, 255, 0, HEIGHT), CHSV(map(i, 0, LENGTH-1, 0, 255), 255, 255)); + setBarDoubleSided(i, value, CHSV(map(i, 0, LENGTH - 1, 0, 255), 255, 255), false); + } + FastLED.delay(1000 / FRAMES_PER_SECOND); } void SingleColorVisualizer() { - if (!parseUdp())return; - fadeToBlackBy(leds, NUM_LEDS, 150); - for (int i = 0; i <= (LENGTH - 1) || incomingPacket[i] != '\0'; i++) - { - double value = incomingPacket[i]; - //setBar(i, map(value, 0, 255, 0, HEIGHT), CHSV(map(i, 0, LENGTH-1, 0, 255), 255, 255)); - setBar(i, value, solidColor); - } - FastLED.delay(1000 / FRAMES_PER_SECOND); + if (!parseUdp())return; + fadeToBlackBy(leds, NUM_LEDS, 150); + for (int i = 0; i <= (LENGTH - 1) || incomingPacket[i] != '\0'; i++) + { + double value = incomingPacket[i]; + //setBar(i, map(value, 0, 255, 0, HEIGHT), CHSV(map(i, 0, LENGTH-1, 0, 255), 255, 255)); + setBar(i, value, solidColor); + } + FastLED.delay(1000 / FRAMES_PER_SECOND); } void SingleColorVisualizerDoubleSided() { - if (!parseUdp())return; - fadeToBlackBy(leds, NUM_LEDS, 150); - for (int i = 0; i <= (LENGTH - 1) || incomingPacket[i] != '\0'; i++) - { - double value = incomingPacket[i]; - //setBar(i, map(value, 0, 255, 0, HEIGHT), CHSV(map(i, 0, LENGTH-1, 0, 255), 255, 255)); - setBarDoubleSided(i, value, solidColor, false); - } - FastLED.delay(1000 / FRAMES_PER_SECOND); + if (!parseUdp())return; + fadeToBlackBy(leds, NUM_LEDS, 150); + for (int i = 0; i <= (LENGTH - 1) || incomingPacket[i] != '\0'; i++) + { + double value = incomingPacket[i]; + //setBar(i, map(value, 0, 255, 0, HEIGHT), CHSV(map(i, 0, LENGTH-1, 0, 255), 255, 255)); + setBarDoubleSided(i, value, solidColor, false); + } + FastLED.delay(1000 / FRAMES_PER_SECOND); } void HbzVisualizerWhite() { - if (!parseUdp()) - { - PrintHbzLogo(CRGB(255, 255, 255), 0); - FastLED.delay(1000 / FRAMES_PER_SECOND); - FastLED.delay(1000 / FRAMES_PER_SECOND); - return; - } - fadeToBlackBy(leds + NUM_LEDS / 2, NUM_LEDS / 2, 150); - double bright = (incomingPacket[1] + incomingPacket[2] + incomingPacket[3]) / 3; - double mult = map(bright, 0, 255, 80, 100); - //Serial.printf("%d, %lf\n", (int)bright, mult); - PrintHbzLogo(CRGB((int)(255.0 * mult * 0.01), (int)(255.0 * mult * 0.01), (int)(255.0 * mult * 0.01)), 0); - LogoSpectrum(false); + if (!parseUdp()) + { + PrintHbzLogo(CRGB(255, 255, 255), 0); + FastLED.delay(1000 / FRAMES_PER_SECOND); + FastLED.delay(1000 / FRAMES_PER_SECOND); + return; + } + fadeToBlackBy(leds + NUM_LEDS / 2, NUM_LEDS / 2, 150); + double bright = (incomingPacket[1] + incomingPacket[2] + incomingPacket[3]) / 3; + double mult = map(bright, 0, 255, 80, 100); + //Serial.printf("%d, %lf\n", (int)bright, mult); + PrintHbzLogo(CRGB((int)(255.0 * mult * 0.01), (int)(255.0 * mult * 0.01), (int)(255.0 * mult * 0.01)), 0); + LogoSpectrum(false); } void HbzVisualizerRainbow() { - if (!parseUdp()) - { - FastLED.delay(1000 / FRAMES_PER_SECOND); - FastLED.delay(1000 / FRAMES_PER_SECOND); - return; - } - fadeToBlackBy(leds + NUM_LEDS / 2, NUM_LEDS / 2, 150); - double bright = (incomingPacket[1] + incomingPacket[2] + incomingPacket[3]) / 3; - double mult = map(bright, 0, 255, 80, 100); - //Serial.printf("%d, %lf\n", (int)bright, mult); - PrintHbzLogo(CRGB((int)(255.0 * mult * 0.01), (int)(255.0 * mult * 0.01), (int)(255.0 * mult * 0.01)), 0); - LogoSpectrum(true); + if (!parseUdp()) + { + FastLED.delay(1000 / FRAMES_PER_SECOND); + FastLED.delay(1000 / FRAMES_PER_SECOND); + return; + } + fadeToBlackBy(leds + NUM_LEDS / 2, NUM_LEDS / 2, 150); + double bright = (incomingPacket[1] + incomingPacket[2] + incomingPacket[3]) / 3; + double mult = map(bright, 0, 255, 80, 100); + //Serial.printf("%d, %lf\n", (int)bright, mult); + PrintHbzLogo(CRGB((int)(255.0 * mult * 0.01), (int)(255.0 * mult * 0.01), (int)(255.0 * mult * 0.01)), 0); + LogoSpectrum(true); } void LogoSpectrum(bool isRainbow) { - for (int i = 0; i <= (LENGTH / 2 - 1) && incomingPacket[i * 2 + 1] != '\0'; i++) - { - double val1 = incomingPacket[i * 2]; - double val2 = incomingPacket[i * 2 + 1]; - double value = (val1 + val2) / 2; - //Serial.printf("i: %d, avg:%d, %d, %d\n",i,(int)value, (int)val1, (int)val2); - if (isRainbow)setBar(i + LENGTH / 2, value, CHSV(map(i, 0, LENGTH / 2 - 1, 0, 255), 255, 255), false); - else setBar(i + LENGTH / 2, value, solidColor, false); + for (int i = 0; i <= (LENGTH / 2 - 1) && incomingPacket[i * 2 + 1] != '\0'; i++) + { + double val1 = incomingPacket[i * 2]; + double val2 = incomingPacket[i * 2 + 1]; + double value = (val1 + val2) / 2; + //Serial.printf("i: %d, avg:%d, %d, %d\n",i,(int)value, (int)val1, (int)val2); + if (isRainbow)setBar(i + LENGTH / 2, value, CHSV(map(i, 0, LENGTH / 2 - 1, 0, 255), 255, 255), false); + else setBar(i + LENGTH / 2, value, solidColor, false); - //FastLED.show(); - //delay(500); - } - FastLED.delay(1000 / FRAMES_PER_SECOND); + //FastLED.show(); + //delay(500); + } + FastLED.delay(1000 / FRAMES_PER_SECOND); } void PrintHbzLogo(CRGB c, int starting_pos) { - static CRGB last = CRGB(0, 0, 0); - //Serial.printf("%d, %d, %d", c.r, c.g, c.b); - if (last.r > c.r) - { - fadeLightBy(leds + starting_pos, NUM_LEDS / 2, 40); - last = c; - return; - } - uint8_t logo[] = { - 0,0,0,0,0,0,0,0, - 0,1,1,1,1,1,1,0, - 0,0,0,0,0,0,0,0, - 0,0,0,1,1,0,0,0, - 0,1,1,1,1,1,1,0, - 0,0,0,0,0,0,1,0, - 0,1,0,1,1,1,1,0, - 0,1,0,0,0,0,1,0, - 0,1,1,0,1,0,1,0, - 0,1,1,0,1,1,0,0, - 0,0,0,0,0,0,0,0, - 0,1,0,0,1,0,0,0, - 0,0,0,1,0,1,1,0, - 0,1,0,1,1,0,0,0, - 0,0,0,1,0,0,1,0, - 0,0,0,0,0,0,0,0 - }; - for (int i = 0; i < sizeof(logo); i++) - { - if (logo[i] == 1)leds[i + starting_pos] = c; - else leds[i + starting_pos] = CRGB(0, 0, 0); - } - last = c; + static CRGB last = CRGB(0, 0, 0); + //Serial.printf("%d, %d, %d", c.r, c.g, c.b); + if (last.r > c.r) + { + fadeLightBy(leds + starting_pos, NUM_LEDS / 2, 40); + last = c; + return; + } + uint8_t logo[] = { + 0,0,0,0,0,0,0,0, + 0,1,1,1,1,1,1,0, + 0,0,0,0,0,0,0,0, + 0,0,0,1,1,0,0,0, + 0,1,1,1,1,1,1,0, + 0,0,0,0,0,0,1,0, + 0,1,0,1,1,1,1,0, + 0,1,0,0,0,0,1,0, + 0,1,1,0,1,0,1,0, + 0,1,1,0,1,1,0,0, + 0,0,0,0,0,0,0,0, + 0,1,0,0,1,0,0,0, + 0,0,0,1,0,1,1,0, + 0,1,0,1,1,0,0,0, + 0,0,0,1,0,0,1,0, + 0,0,0,0,0,0,0,0 + }; + for (int i = 0; i < sizeof(logo); i++) + { + if (logo[i] == 1)leds[i + starting_pos] = c; + else leds[i + starting_pos] = CRGB(0, 0, 0); + } + last = c; } void LineVisualizer() @@ -3400,71 +3400,71 @@ void LineVisualizer() void setBarDoubleSided(int row, double num, CRGB color, bool fill_ends) { - setBarDoubleSided(row, num, rgb2hsv_approximate(color), fill_ends); + setBarDoubleSided(row, num, rgb2hsv_approximate(color), fill_ends); } void setBar(int row, double num, CRGB color, bool fill_ends) { - setBar(row, num, rgb2hsv_approximate(color), fill_ends); + setBar(row, num, rgb2hsv_approximate(color), fill_ends); } void setBar(int row, int num, CRGB color) { - setBar(row, num, rgb2hsv_approximate(color)); + setBar(row, num, rgb2hsv_approximate(color)); } void setBarDoubleSided(int row, double num, CHSV col, bool fill_ends) { - double f = (num / 255.00) * (HEIGHT / 2); - for (int l = 0; l < f; l++) - { - if (row % 2 == 1) - { - leds[row * HEIGHT + l] = col; - leds[(row + 1) * HEIGHT - (l + 1)] = col; - } - else - { - leds[(row + 1) * HEIGHT - (l + 1)] = col; - leds[(row)*HEIGHT + l] = col; - } - } - if (fill_ends && f != HEIGHT) - { - if (row % 2 == 1)leds[row * HEIGHT + (int)f + 1] = CHSV(col.hue, col.sat, col.val * (int(f) - f)); - else leds[(row + 1) * HEIGHT - (int)f - 1] = CHSV(col.hue, col.sat, col.val * (int(f) - f)); - } + double f = (num / 255.00) * (HEIGHT / 2); + for (int l = 0; l < f; l++) + { + if (row % 2 == 1) + { + leds[row * HEIGHT + l] = col; + leds[(row + 1) * HEIGHT - (l + 1)] = col; + } + else + { + leds[(row + 1) * HEIGHT - (l + 1)] = col; + leds[(row)*HEIGHT + l] = col; + } + } + if (fill_ends && f != HEIGHT) + { + if (row % 2 == 1)leds[row * HEIGHT + (int)f + 1] = CHSV(col.hue, col.sat, col.val * (int(f) - f)); + else leds[(row + 1) * HEIGHT - (int)f - 1] = CHSV(col.hue, col.sat, col.val * (int(f) - f)); + } } void setBar(int row, double num, CHSV col, bool fill_ends) { - //fill_solid(leds + (row * HEIGHT), HEIGHT, CRGB::Black); - //fadeToBlackBy(leds + (row * HEIGHT), HEIGHT, 100); - double f = (num / 255.00) * HEIGHT; - for (int l = 0; l < f; l++) - { - if (row % 2 == 1)leds[row * HEIGHT + l] = col; - else leds[(row + 1) * HEIGHT - (l + 1)] = col; - } - if (fill_ends && f != HEIGHT) - { - if (row % 2 == 1)leds[row * HEIGHT + (int)f + 1] = CHSV(col.hue, col.sat, col.val * (int(f) - f)); - else leds[(row + 1) * HEIGHT - (int)f - 1] = CHSV(col.hue, col.sat, col.val * (int(f) - f)); - } + //fill_solid(leds + (row * HEIGHT), HEIGHT, CRGB::Black); + //fadeToBlackBy(leds + (row * HEIGHT), HEIGHT, 100); + double f = (num / 255.00) * HEIGHT; + for (int l = 0; l < f; l++) + { + if (row % 2 == 1)leds[row * HEIGHT + l] = col; + else leds[(row + 1) * HEIGHT - (l + 1)] = col; + } + if (fill_ends && f != HEIGHT) + { + if (row % 2 == 1)leds[row * HEIGHT + (int)f + 1] = CHSV(col.hue, col.sat, col.val * (int(f) - f)); + else leds[(row + 1) * HEIGHT - (int)f - 1] = CHSV(col.hue, col.sat, col.val * (int(f) - f)); + } } void setBar(int row, int num, CHSV col) { - //fill_solid(leds + (row * HEIGHT), HEIGHT, CRGB::Black); - //fadeToBlackBy(leds + (row * HEIGHT), HEIGHT, 100); - if (row % 2 == 1)fill_solid(leds + (row * HEIGHT), num, col); - else - { - for (int i = 0; i < num; i++) - { - leds[(row + 1) * HEIGHT - i] = col; - } - } + //fill_solid(leds + (row * HEIGHT), HEIGHT, CRGB::Black); + //fadeToBlackBy(leds + (row * HEIGHT), HEIGHT, 100); + if (row % 2 == 1)fill_solid(leds + (row * HEIGHT), num, col); + else + { + for (int i = 0; i < num; i++) + { + leds[(row + 1) * HEIGHT - i] = col; + } + } } #endif @@ -3480,111 +3480,111 @@ unsigned long endTime; // if timeout occured leds switch of, if configured bool checkIncommingData() { - boolean dataAvailable = true; - while (!Serial.available()) { - if (OFF_TIMEOUT > 0 && endTime < millis()) { - memset(leds, 0, NUM_LEDS * sizeof(struct CRGB)); - FastLED.show(); - dataAvailable = false; - endTime = millis() + OFF_TIMEOUT; - } - } - return dataAvailable; + boolean dataAvailable = true; + while (!Serial.available()) { + if (OFF_TIMEOUT > 0 && endTime < millis()) { + memset(leds, 0, NUM_LEDS * sizeof(struct CRGB)); + FastLED.show(); + dataAvailable = false; + endTime = millis() + OFF_TIMEOUT; + } + } + return dataAvailable; } // ambilight, implemented by @sunzi5 void ambilight() { - static bool is_initialized = false; - static boolean transmissionSuccess; - static unsigned long sum_r, sum_g, sum_b; - static int thisPatternId = 0; - uint8_t prefix[] = { 'A', 'd', 'a' }, hi, lo, chk, i; - - if (!is_initialized) - { - thisPatternId = currentPatternIndex; - Serial.print("Ada\n"); // Send "Magic Word" string to host - - int ledCount = NUM_LEDS; + static bool is_initialized = false; + static boolean transmissionSuccess; + static unsigned long sum_r, sum_g, sum_b; + static int thisPatternId = 0; + uint8_t prefix[] = { 'A', 'd', 'a' }, hi, lo, chk, i; + + if (!is_initialized) + { + thisPatternId = currentPatternIndex; + Serial.print("Ada\n"); // Send "Magic Word" string to host + + int ledCount = NUM_LEDS; #if INITIAL_LED_TEST_ENABLED == true - for (int v = 0; v < INITIAL_LED_TEST_BRIGHTNESS; v++) - { - fill_solid(leds, NUM_LEDS, CRGB(255, 0, 0)); - delay(INITIAL_LED_TEST_TIME_MS / 2 / INITIAL_LED_TEST_BRIGHTNESS); - } - for (int v = 0; v < INITIAL_LED_TEST_BRIGHTNESS; v++) - { - fill_solid(leds, NUM_LEDS, CRGB(0, 255, 0)); - delay(INITIAL_LED_TEST_TIME_MS / 2 / INITIAL_LED_TEST_BRIGHTNESS); - } - for (int v = 0; v < INITIAL_LED_TEST_BRIGHTNESS; v++) - { - fill_solid(leds, NUM_LEDS, CRGB(0, 0, 255)); - delay(INITIAL_LED_TEST_TIME_MS / 2 / INITIAL_LED_TEST_BRIGHTNESS); - } + for (int v = 0; v < INITIAL_LED_TEST_BRIGHTNESS; v++) + { + fill_solid(leds, NUM_LEDS, CRGB(255, 0, 0)); + delay(INITIAL_LED_TEST_TIME_MS / 2 / INITIAL_LED_TEST_BRIGHTNESS); + } + for (int v = 0; v < INITIAL_LED_TEST_BRIGHTNESS; v++) + { + fill_solid(leds, NUM_LEDS, CRGB(0, 255, 0)); + delay(INITIAL_LED_TEST_TIME_MS / 2 / INITIAL_LED_TEST_BRIGHTNESS); + } + for (int v = 0; v < INITIAL_LED_TEST_BRIGHTNESS; v++) + { + fill_solid(leds, NUM_LEDS, CRGB(0, 0, 255)); + delay(INITIAL_LED_TEST_TIME_MS / 2 / INITIAL_LED_TEST_BRIGHTNESS); + } #endif - fill_solid(leds, NUM_LEDS, CRGB(0, 0, 0)); + fill_solid(leds, NUM_LEDS, CRGB(0, 0, 0)); - is_initialized = true; - } - for (;;) - { + is_initialized = true; + } + for (;;) + { #ifdef ENABLE_ALEXA_SUPPORT - espalexa.loop(); + espalexa.loop(); #else - webServer.handleClient(); + webServer.handleClient(); #endif - if (currentPatternIndex != thisPatternId) break; - if (!Serial.available() > 0) continue; - for (int i = 0; i < sizeof prefix; ++i) { - if (!checkIncommingData() || prefix[i] != Serial.read()) { - i = 0; - } - } - if (!checkIncommingData()) continue; - hi = Serial.read(); - if (!checkIncommingData()) continue; - lo = Serial.read(); - if (!checkIncommingData()) continue; - chk = Serial.read(); - - if (chk != (hi ^ lo ^ 0x55)) continue; - - int num_leds = min(NUM_LEDS, (hi << 8) + lo + 1); - memset(leds, 0, num_leds * sizeof(struct CRGB)); - transmissionSuccess = true; - sum_r = 0; - sum_g = 0; - sum_b = 0; - - for (int idx = 0; idx < num_leds; idx++) { - byte r, g, b; - if (!checkIncommingData()) { - transmissionSuccess = false; - break; - } - r = Serial.read(); - if (!checkIncommingData()) { - transmissionSuccess = false; - break; - } - g = Serial.read(); - if (!checkIncommingData()) { - transmissionSuccess = false; - break; - } - b = Serial.read(); - leds[idx].r = r; - leds[idx].g = g; - leds[idx].b = b; - } - - // shows new values - if (transmissionSuccess) { - endTime = millis() + OFF_TIMEOUT; - FastLED.show(); - } + if (currentPatternIndex != thisPatternId) break; + if (!Serial.available() > 0) continue; + for (int i = 0; i < sizeof prefix; ++i) { + if (!checkIncommingData() || prefix[i] != Serial.read()) { + i = 0; + } + } + if (!checkIncommingData()) continue; + hi = Serial.read(); + if (!checkIncommingData()) continue; + lo = Serial.read(); + if (!checkIncommingData()) continue; + chk = Serial.read(); + + if (chk != (hi ^ lo ^ 0x55)) continue; + + int num_leds = min(NUM_LEDS, (hi << 8) + lo + 1); + memset(leds, 0, num_leds * sizeof(struct CRGB)); + transmissionSuccess = true; + sum_r = 0; + sum_g = 0; + sum_b = 0; + + for (int idx = 0; idx < num_leds; idx++) { + byte r, g, b; + if (!checkIncommingData()) { + transmissionSuccess = false; + break; + } + r = Serial.read(); + if (!checkIncommingData()) { + transmissionSuccess = false; + break; + } + g = Serial.read(); + if (!checkIncommingData()) { + transmissionSuccess = false; + break; + } + b = Serial.read(); + leds[idx].r = r; + leds[idx].g = g; + leds[idx].b = b; + } + + // shows new values + if (transmissionSuccess) { + endTime = millis() + OFF_TIMEOUT; + FastLED.show(); + } } } //############################## SERIAL AMBILIGHT END ############################# @@ -3593,97 +3593,97 @@ void ambilight() { #ifdef ENABLE_ALEXA_SUPPORT void mainAlexaEvent(EspalexaDevice* d) { - if (d == nullptr) return; - - Serial.print("Alexa update: rgb: "); Serial.print(d->getR() + d->getG() + d->getB()); Serial.print(", b: "); Serial.println(d->getValue()); - if (d->getValue() == 0)setPower(0); else { - setPower(1); - setBrightness(d->getValue()); - } - static int lr; - static int lg; - static int lb; - if ((lr != NULL && lr != d->getR() && lg != d->getG() && lb != d->getB()) || currentPatternIndex == patternCount - 1) - { - setSolidColor(d->getR(), d->getG(), d->getB()); - setPattern(patternCount - 1); - } - lr = d->getR(); - lg = d->getG(); - lb = d->getB(); + if (d == nullptr) return; + + Serial.print("Alexa update: rgb: "); Serial.print(d->getR() + d->getG() + d->getB()); Serial.print(", b: "); Serial.println(d->getValue()); + if (d->getValue() == 0)setPower(0); else { + setPower(1); + setBrightness(d->getValue()); + } + static int lr; + static int lg; + static int lb; + if ((lr != NULL && lr != d->getR() && lg != d->getG() && lb != d->getB()) || currentPatternIndex == patternCount - 1) + { + setSolidColor(d->getR(), d->getG(), d->getB()); + setPattern(patternCount - 1); + } + lr = d->getR(); + lg = d->getG(); + lb = d->getB(); } #ifdef AddStrobeDevice void AlexaStrobeEvent(EspalexaDevice* d) { - if (d == nullptr) return; - - Serial.print("Alexa Strobe update: rgb: "); Serial.print(d->getR() + d->getG() + d->getB()); Serial.print(", b: "); Serial.println(d->getValue()); - if (d->getValue() == 0)setPattern(patternCount - 1); else { - if (d->getValue() == 255) - { - setBrightness(255); - setPattern(13); - } - else speed = d->getValue(); - d->setValue(speed); - } - static int lr; - static int lg; - static int lb; - if ((lr != NULL && lr != d->getR() && lg != d->getG() && lb != d->getB()) || currentPatternIndex == patternCount - 1) - { - setSolidColor(d->getR(), d->getG(), d->getB()); - setPattern(12); - } - lr = d->getR(); - lg = d->getG(); - lb = d->getB(); + if (d == nullptr) return; + + Serial.print("Alexa Strobe update: rgb: "); Serial.print(d->getR() + d->getG() + d->getB()); Serial.print(", b: "); Serial.println(d->getValue()); + if (d->getValue() == 0)setPattern(patternCount - 1); else { + if (d->getValue() == 255) + { + setBrightness(255); + setPattern(13); + } + else speed = d->getValue(); + d->setValue(speed); + } + static int lr; + static int lg; + static int lb; + if ((lr != NULL && lr != d->getR() && lg != d->getG() && lb != d->getB()) || currentPatternIndex == patternCount - 1) + { + setSolidColor(d->getR(), d->getG(), d->getB()); + setPattern(12); + } + lr = d->getR(); + lg = d->getG(); + lb = d->getB(); } #endif #ifdef AddAutoplayDevice void AlexaAutoplayEvent(EspalexaDevice* d) { - if (d == nullptr) return; - Serial.print("Alexa Autoplay update: state: "); Serial.println(d->getPercent()); - if (d->getValue() > 0) - { - setAutoplay(1); - setAutoplayDuration(d->getPercent()); - } - else setAutoplay(0); + if (d == nullptr) return; + Serial.print("Alexa Autoplay update: state: "); Serial.println(d->getPercent()); + if (d->getValue() > 0) + { + setAutoplay(1); + setAutoplayDuration(d->getPercent()); + } + else setAutoplay(0); } #endif #ifdef AddSpecificPatternDeviceA void AlexaSpecificEventA(EspalexaDevice* d) { - if (d == nullptr) return; - Serial.print("Alexa Specific Pattern update: state: "); Serial.println(d->getValue()); - if (d->getValue() != 0)setPattern(SpecificPatternA); - else setPattern(patternCount - 1); + if (d == nullptr) return; + Serial.print("Alexa Specific Pattern update: state: "); Serial.println(d->getValue()); + if (d->getValue() != 0)setPattern(SpecificPatternA); + else setPattern(patternCount - 1); } #endif #ifdef AddSpecificPatternDeviceB void AlexaSpecificEventB(EspalexaDevice* d) { - if (d == nullptr) return; - Serial.print("Alexa Specific Pattern update: state: "); Serial.println(d->getValue()); - if (d->getValue() != 0)setPattern(SpecificPatternB); - else setPattern(patternCount - 1); + if (d == nullptr) return; + Serial.print("Alexa Specific Pattern update: state: "); Serial.println(d->getValue()); + if (d->getValue() != 0)setPattern(SpecificPatternB); + else setPattern(patternCount - 1); } #endif #ifdef AddSpecificPatternDeviceC void AlexaSpecificEventC(EspalexaDevice* d) { - if (d == nullptr) return; - Serial.print("Alexa Specific Pattern update: state: "); Serial.println(d->getValue()); - if (d->getValue() != 0)setPattern(SpecificPatternC); - else setPattern(patternCount - 1); + if (d == nullptr) return; + Serial.print("Alexa Specific Pattern update: state: "); Serial.println(d->getValue()); + if (d->getValue() != 0)setPattern(SpecificPatternC); + else setPattern(patternCount - 1); } #endif #ifdef AddAudioDevice void AlexaAudioEvent(EspalexaDevice* d) { - if (d == nullptr) return; + if (d == nullptr) return; - Serial.print("Alexa Audio update: rgb: "); Serial.print(d->getR() + d->getG() + d->getB()); Serial.print(", b: "); Serial.println(d->getValue()); - if (d->getValue() != 0)setPattern(AUDIOPATTERN); - else setPattern(patternCount - 1); + Serial.print("Alexa Audio update: rgb: "); Serial.print(d->getR() + d->getG() + d->getB()); Serial.print(", b: "); Serial.println(d->getValue()); + if (d->getValue() != 0)setPattern(AUDIOPATTERN); + else setPattern(patternCount - 1); } #endif @@ -3694,20 +3694,20 @@ void AlexaAudioEvent(EspalexaDevice* d) { void logo() { #ifdef TWENTYONEPILOTS - twp(); + twp(); #endif // TWENTYONEPILOTS #ifdef THINGIVERSE - thingiverse(); + thingiverse(); #endif } void logo_static() { #ifdef TWENTYONEPILOTS - twp_static(); + twp_static(); #endif // TWENTYONEPILOTS #ifdef THINGIVERSE - thingiverse_static(); + thingiverse_static(); #endif } @@ -3715,62 +3715,62 @@ void logo_static() #ifdef TWENTYONEPILOTS void twp_static() { - fill_solid(leds + twpOffsets[1], DOUBLE_STRIP_LENGTH, STATIC_LOGO_COLOR); - fill_solid(leds + twpOffsets[2], DOT_LENGTH, STATIC_LOGO_COLOR); - fill_solid(leds + twpOffsets[3], ITALIC_STRIP_LENGTH, STATIC_LOGO_COLOR); - fill_solid(leds + twpOffsets[0], RING_LENGTH, STATIC_RING_COLOR); + fill_solid(leds + twpOffsets[1], DOUBLE_STRIP_LENGTH, STATIC_LOGO_COLOR); + fill_solid(leds + twpOffsets[2], DOT_LENGTH, STATIC_LOGO_COLOR); + fill_solid(leds + twpOffsets[3], ITALIC_STRIP_LENGTH, STATIC_LOGO_COLOR); + fill_solid(leds + twpOffsets[0], RING_LENGTH, STATIC_RING_COLOR); } void twp() // twenty one pilots { - static uint8_t numdots = 4; // Number of dots in use. - static uint8_t faderate = 4; // How long should the trails be. Very low value = longer trails. - static uint8_t hueinc = 255 / numdots - 1; // Incremental change in hue between each dot. - static uint8_t thishue = 42; // Starting hue. - static uint8_t curhue = 42; // The current hue - static uint8_t thissat = 255; // Saturation of the colour. - static uint8_t thisbright = 255; // How bright should the LED/display be. - static uint8_t basebeat = 5; // Higher = faster movement. - - static uint8_t lastSecond = 99; // Static variable, means it's only defined once. This is our 'debounce' variable. - uint8_t secondHand = (millis() / 1000) % ANIMATION_RING_DURATION; // IMPORTANT!!! Change '30' to a different value to change duration of the loop. - - if (lastSecond != secondHand) { // Debounce to make sure we're not repeating an assignment. - lastSecond = secondHand; - switch (secondHand) { - case 0: numdots = 1; basebeat = 20; hueinc = 2; faderate = 4; thishue = random(38, 42); break; // You can change values here, one at a time , or altogether. - case 10: numdots = 4; basebeat = 10; hueinc = 2; faderate = 8; thishue = random(37, 43); break; - case 20: numdots = 8; basebeat = 3; hueinc = 0; faderate = 8; thishue = random(37, 43); break; // Only gets called once, and not continuously for the next several seconds. Therefore, no rainbows. - case 30: break; - } - } - - // Several colored dots, weaving in and out of sync with each other - curhue = thishue; // Reset the hue values. - fadeToBlackBy(leds, NUM_LEDS, faderate); - for (int i = 0; i < numdots; i++) { - //leds[beatsin16(basebeat + i + numdots, 0, NUM_LEDS)] += CHSV(curhue, thissat, thisbright); - leds[beatsin16(basebeat + i + numdots, twpOffsets[0], RING_LENGTH + twpOffsets[0])] += CHSV(curhue, thissat, thisbright); - //leds[beatsin16(basebeat + i + numdots, twpOffsets[1], DOUBLE_STRIP_LENGTH + twpOffsets[1])] += CHSV(curhue, thissat, thisbright); - //leds[beatsin16(basebeat + i + numdots, twpOffsets[2], DOT_LENGTH + twpOffsets[1]+ twpOffsets[2])] += CHSV(curhue, thissat, thisbright); - //leds[beatsin16(basebeat + i + numdots, twpOffsets[3], ITALIC_STRIP_LENGTH + twpOffsets[1]+ twpOffsets[2]+ twpOffsets[3])] += CHSV(curhue, thissat, thisbright); - curhue += hueinc; - } - - // sinelone for the lines - fadeToBlackBy(leds + twpOffsets[0], DOUBLE_STRIP_LENGTH + DOT_LENGTH + ITALIC_STRIP_LENGTH, 50); - int16_t myspeed = 30 + speed * 1.5; - if (myspeed > 255 || myspeed < 0)myspeed = 255; - int pos = beatsin16(myspeed, twpOffsets[1], twpOffsets[1] + DOUBLE_STRIP_LENGTH + DOT_LENGTH + ITALIC_STRIP_LENGTH - 1); - static int prevpos = 0; - CRGB color = STATIC_LOGO_COLOR; - if (pos < prevpos) { - fill_solid(leds + pos, (prevpos - pos) + 1, color); - } - else { - fill_solid(leds + prevpos, (pos - prevpos) + 1, color); - } - prevpos = pos; + static uint8_t numdots = 4; // Number of dots in use. + static uint8_t faderate = 4; // How long should the trails be. Very low value = longer trails. + static uint8_t hueinc = 255 / numdots - 1; // Incremental change in hue between each dot. + static uint8_t thishue = 42; // Starting hue. + static uint8_t curhue = 42; // The current hue + static uint8_t thissat = 255; // Saturation of the colour. + static uint8_t thisbright = 255; // How bright should the LED/display be. + static uint8_t basebeat = 5; // Higher = faster movement. + + static uint8_t lastSecond = 99; // Static variable, means it's only defined once. This is our 'debounce' variable. + uint8_t secondHand = (millis() / 1000) % ANIMATION_RING_DURATION; // IMPORTANT!!! Change '30' to a different value to change duration of the loop. + + if (lastSecond != secondHand) { // Debounce to make sure we're not repeating an assignment. + lastSecond = secondHand; + switch (secondHand) { + case 0: numdots = 1; basebeat = 20; hueinc = 2; faderate = 4; thishue = random(38, 42); break; // You can change values here, one at a time , or altogether. + case 10: numdots = 4; basebeat = 10; hueinc = 2; faderate = 8; thishue = random(37, 43); break; + case 20: numdots = 8; basebeat = 3; hueinc = 0; faderate = 8; thishue = random(37, 43); break; // Only gets called once, and not continuously for the next several seconds. Therefore, no rainbows. + case 30: break; + } + } + + // Several colored dots, weaving in and out of sync with each other + curhue = thishue; // Reset the hue values. + fadeToBlackBy(leds, NUM_LEDS, faderate); + for (int i = 0; i < numdots; i++) { + //leds[beatsin16(basebeat + i + numdots, 0, NUM_LEDS)] += CHSV(curhue, thissat, thisbright); + leds[beatsin16(basebeat + i + numdots, twpOffsets[0], RING_LENGTH + twpOffsets[0])] += CHSV(curhue, thissat, thisbright); + //leds[beatsin16(basebeat + i + numdots, twpOffsets[1], DOUBLE_STRIP_LENGTH + twpOffsets[1])] += CHSV(curhue, thissat, thisbright); + //leds[beatsin16(basebeat + i + numdots, twpOffsets[2], DOT_LENGTH + twpOffsets[1]+ twpOffsets[2])] += CHSV(curhue, thissat, thisbright); + //leds[beatsin16(basebeat + i + numdots, twpOffsets[3], ITALIC_STRIP_LENGTH + twpOffsets[1]+ twpOffsets[2]+ twpOffsets[3])] += CHSV(curhue, thissat, thisbright); + curhue += hueinc; + } + + // sinelone for the lines + fadeToBlackBy(leds + twpOffsets[0], DOUBLE_STRIP_LENGTH + DOT_LENGTH + ITALIC_STRIP_LENGTH, 50); + int16_t myspeed = 30 + speed * 1.5; + if (myspeed > 255 || myspeed < 0)myspeed = 255; + int pos = beatsin16(myspeed, twpOffsets[1], twpOffsets[1] + DOUBLE_STRIP_LENGTH + DOT_LENGTH + ITALIC_STRIP_LENGTH - 1); + static int prevpos = 0; + CRGB color = STATIC_LOGO_COLOR; + if (pos < prevpos) { + fill_solid(leds + pos, (prevpos - pos) + 1, color); + } + else { + fill_solid(leds + prevpos, (pos - prevpos) + 1, color); + } + prevpos = pos; } #endif // TWENTYONEPILOTS @@ -3778,176 +3778,176 @@ void twp() // twenty one pilots #ifdef THINGIVERSE void thingiverse_static() { - if (RINGFIRST) - { - fill_solid(leds, RING_LENGTH, STATIC_RING_COLOR); - fill_solid(leds + RING_LENGTH, HORIZONTAL_LENGTH, STATIC_LOGO_COLOR); - fill_solid(leds + RING_LENGTH + HORIZONTAL_LENGTH, VERTICAL_LENGTH, STATIC_LOGO_COLOR); - } - else - { - fill_solid(leds, HORIZONTAL_LENGTH, STATIC_LOGO_COLOR); - fill_solid(leds + HORIZONTAL_LENGTH, VERTICAL_LENGTH, STATIC_LOGO_COLOR); - fill_solid(leds + HORIZONTAL_LENGTH + VERTICAL_LENGTH, RING_LENGTH, STATIC_RING_COLOR); - } + if (RINGFIRST) + { + fill_solid(leds, RING_LENGTH, STATIC_RING_COLOR); + fill_solid(leds + RING_LENGTH, HORIZONTAL_LENGTH, STATIC_LOGO_COLOR); + fill_solid(leds + RING_LENGTH + HORIZONTAL_LENGTH, VERTICAL_LENGTH, STATIC_LOGO_COLOR); + } + else + { + fill_solid(leds, HORIZONTAL_LENGTH, STATIC_LOGO_COLOR); + fill_solid(leds + HORIZONTAL_LENGTH, VERTICAL_LENGTH, STATIC_LOGO_COLOR); + fill_solid(leds + HORIZONTAL_LENGTH + VERTICAL_LENGTH, RING_LENGTH, STATIC_RING_COLOR); + } } void thingiverse() // twenty one pilots { - static uint8_t numdots = 4; // Number of dots in use. - static uint8_t faderate = 4; // How long should the trails be. Very low value = longer trails. - static uint8_t hueinc = 255 / numdots - 1; // Incremental change in hue between each dot. - static uint8_t thishue = 82; // Starting hue. - static uint8_t curhue = 82; // The current hue - static uint8_t thissat = 255; // Saturation of the colour. - static uint8_t thisbright = 255; // How bright should the LED/display be. - static uint8_t basebeat = 5; // Higher = faster movement. - - static uint8_t lastSecond = 99; // Static variable, means it's only defined once. This is our 'debounce' variable. - uint8_t secondHand = (millis() / 1000) % ANIMATION_RING_DURATION; // IMPORTANT!!! Change '30' to a different value to change duration of the loop. - - if (lastSecond != secondHand) { // Debounce to make sure we're not repeating an assignment. - lastSecond = secondHand; - switch (secondHand) { - case 0: numdots = 1; basebeat = 20; hueinc = 2; faderate = 4; thishue = random(143, 147); break; // You can change values here, one at a time , or altogether. - case 10: numdots = 4; basebeat = 10; hueinc = 2; faderate = 8; thishue = random(142, 148); break; - case 20: numdots = 8; basebeat = 3; hueinc = 0; faderate = 8; thishue = random(143, 147); break; // Only gets called once, and not continuously for the next several seconds. Therefore, no rainbows. - case 30: break; - } - } - - // Several colored dots, weaving in and out of sync with each other - curhue = thishue; // Reset the hue values. - if (RINGFIRST) - { - fadeToBlackBy(leds, RING_LENGTH, faderate); - } - else fadeToBlackBy(leds + VERTICAL_LENGTH + HORIZONTAL_LENGTH, VERTICAL_LENGTH + HORIZONTAL_LENGTH + RING_LENGTH, faderate); - for (int i = 0; i < numdots; i++) { - if (RINGFIRST)leds[beatsin16(basebeat + i + numdots, 0, RING_LENGTH)] += CHSV(curhue, thissat, thisbright); - else leds[beatsin16(basebeat + i + numdots, VERTICAL_LENGTH + HORIZONTAL_LENGTH, RING_LENGTH + VERTICAL_LENGTH + HORIZONTAL_LENGTH)] += CHSV(curhue, thissat, thisbright); - curhue += hueinc; - } - - // sinelone for the lines - /* - fadeToBlackBy(leds + twpOffsets[0], DOUBLE_STRIP_LENGTH + DOT_LENGTH + ITALIC_STRIP_LENGTH, 50); - int16_t myspeed = 30 + speed * 1.5; - if (myspeed > 255 || myspeed < 0)myspeed = 255; - int pos = beatsin16(myspeed, twpOffsets[1], twpOffsets[1] + DOUBLE_STRIP_LENGTH + DOT_LENGTH + ITALIC_STRIP_LENGTH - 1); - static int prevpos = 0; - CRGB color = STATIC_LOGO_COLOR; - if (pos < prevpos) { - fill_solid(leds + pos, (prevpos - pos) + 1, color); - } - else { - fill_solid(leds + prevpos, (pos - prevpos) + 1, color); - } - prevpos = pos; - */ - //uint8_t b = beatsin8(10, 200, 255); - - uint8_t pos = 0; - uint8_t spd = 100; - uint8_t b = 255; - bool even = true; - if ((HORIZONTAL_LENGTH / 2.00) > (int)(HORIZONTAL_LENGTH / 2.00))even = false; - - if (!even) - { - //pos = beatsin8(spd, 0, VERTICAL_LENGTH + (HORIZONTAL_LENGTH - 1) / 2); - pos = beatsaw8(spd, 0, VERTICAL_LENGTH + (HORIZONTAL_LENGTH - 1) / 2); - b = beatsaw8(spd * 2, 255 / 2, 255); - } - else - { - //pos = beatsin8(spd, 0, VERTICAL_LENGTH + (HORIZONTAL_LENGTH - 2) / 2); - } - if (!even) - { - if (pos < VERTICAL_LENGTH) - { - if (HORIZONTAL_BEFORE_VERTICAL) - { - if (!RINGFIRST) leds[HORIZONTAL_LENGTH + VERTICAL_LENGTH - pos - 1] = CHSV(145, 255, b); - else { leds[HORIZONTAL_LENGTH + VERTICAL_LENGTH - pos - 1 + RING_LENGTH] = CHSV(145, 255, b); } - } - else - { - if (!RINGFIRST) leds[VERTICAL_LENGTH - pos - 1] = CHSV(145, 255, b); - else { leds[VERTICAL_LENGTH - pos - 1 + RING_LENGTH] = CHSV(145, 255, b); } - } - } - else if (pos == VERTICAL_LENGTH) - { - if (!RINGFIRST) - { - leds[(HORIZONTAL_LENGTH / 2)] = CHSV(145, 255, b); - } - else - { - leds[(HORIZONTAL_LENGTH / 2) + RING_LENGTH] = CHSV(145, 255, b); - } - } - else - { - if (HORIZONTAL_BEFORE_VERTICAL) - { - if (!RINGFIRST) - { - leds[HORIZONTAL_LENGTH - pos] = CHSV(145, 255, b); - leds[pos - 1] = CHSV(145, 255, b); - } - else - { - leds[HORIZONTAL_LENGTH - pos + RING_LENGTH] = CHSV(145, 255, b); - leds[pos - 1 + RING_LENGTH] = CHSV(145, 255, b); - } - } - else - { - if (!RINGFIRST) - { - leds[HORIZONTAL_LENGTH - pos + VERTICAL_LENGTH] = CHSV(145, 255, b); - leds[pos - 1 + VERTICAL_LENGTH] = CHSV(145, 255, b); - } - else - { - leds[HORIZONTAL_LENGTH - pos + RING_LENGTH + VERTICAL_LENGTH] = CHSV(145, 255, b); - leds[pos - 1 + RING_LENGTH + VERTICAL_LENGTH] = CHSV(145, 255, b); - } - } - } - } - if (!RINGFIRST) - { - //fadeToBlackBy(leds, HORIZONTAL_LENGTH + VERTICAL_LENGTH, 50); - fadeLightBy(leds, HORIZONTAL_LENGTH + VERTICAL_LENGTH, 5); - } - else - { - fadeLightBy(leds + RING_LENGTH, HORIZONTAL_LENGTH + VERTICAL_LENGTH, 5); - } - - /* - uint8_t b = 255; - uint8_t pos = 0; - if (RINGFIRST) - { - pos = beatsin8(30, RING_LENGTH, RING_LENGTH + VERTICAL_LENGTH + HORIZONTAL_LENGTH); - fadeToBlackBy(leds + RING_LENGTH, RING_LENGTH+VERTICAL_LENGTH + HORIZONTAL_LENGTH, 10); - - } - else - { - pos = beatsin8(30, 0, VERTICAL_LENGTH + HORIZONTAL_LENGTH); - fadeToBlackBy(leds, VERTICAL_LENGTH + HORIZONTAL_LENGTH, 10); - - } - //if (pos == 0 && RINGFIRST == false)fadeToBlackBy(leds, 1, 50); - //else if(pos == RING_LENGTH && RINGFIRST == true)fadeToBlackBy(leds+RING_LENGTH, 1, 50); - leds[pos] = CHSV(145, 255, b); - */ + static uint8_t numdots = 4; // Number of dots in use. + static uint8_t faderate = 4; // How long should the trails be. Very low value = longer trails. + static uint8_t hueinc = 255 / numdots - 1; // Incremental change in hue between each dot. + static uint8_t thishue = 82; // Starting hue. + static uint8_t curhue = 82; // The current hue + static uint8_t thissat = 255; // Saturation of the colour. + static uint8_t thisbright = 255; // How bright should the LED/display be. + static uint8_t basebeat = 5; // Higher = faster movement. + + static uint8_t lastSecond = 99; // Static variable, means it's only defined once. This is our 'debounce' variable. + uint8_t secondHand = (millis() / 1000) % ANIMATION_RING_DURATION; // IMPORTANT!!! Change '30' to a different value to change duration of the loop. + + if (lastSecond != secondHand) { // Debounce to make sure we're not repeating an assignment. + lastSecond = secondHand; + switch (secondHand) { + case 0: numdots = 1; basebeat = 20; hueinc = 2; faderate = 4; thishue = random(143, 147); break; // You can change values here, one at a time , or altogether. + case 10: numdots = 4; basebeat = 10; hueinc = 2; faderate = 8; thishue = random(142, 148); break; + case 20: numdots = 8; basebeat = 3; hueinc = 0; faderate = 8; thishue = random(143, 147); break; // Only gets called once, and not continuously for the next several seconds. Therefore, no rainbows. + case 30: break; + } + } + + // Several colored dots, weaving in and out of sync with each other + curhue = thishue; // Reset the hue values. + if (RINGFIRST) + { + fadeToBlackBy(leds, RING_LENGTH, faderate); + } + else fadeToBlackBy(leds + VERTICAL_LENGTH + HORIZONTAL_LENGTH, VERTICAL_LENGTH + HORIZONTAL_LENGTH + RING_LENGTH, faderate); + for (int i = 0; i < numdots; i++) { + if (RINGFIRST)leds[beatsin16(basebeat + i + numdots, 0, RING_LENGTH)] += CHSV(curhue, thissat, thisbright); + else leds[beatsin16(basebeat + i + numdots, VERTICAL_LENGTH + HORIZONTAL_LENGTH, RING_LENGTH + VERTICAL_LENGTH + HORIZONTAL_LENGTH)] += CHSV(curhue, thissat, thisbright); + curhue += hueinc; + } + + // sinelone for the lines + /* + fadeToBlackBy(leds + twpOffsets[0], DOUBLE_STRIP_LENGTH + DOT_LENGTH + ITALIC_STRIP_LENGTH, 50); + int16_t myspeed = 30 + speed * 1.5; + if (myspeed > 255 || myspeed < 0)myspeed = 255; + int pos = beatsin16(myspeed, twpOffsets[1], twpOffsets[1] + DOUBLE_STRIP_LENGTH + DOT_LENGTH + ITALIC_STRIP_LENGTH - 1); + static int prevpos = 0; + CRGB color = STATIC_LOGO_COLOR; + if (pos < prevpos) { + fill_solid(leds + pos, (prevpos - pos) + 1, color); + } + else { + fill_solid(leds + prevpos, (pos - prevpos) + 1, color); + } + prevpos = pos; + */ + //uint8_t b = beatsin8(10, 200, 255); + + uint8_t pos = 0; + uint8_t spd = 100; + uint8_t b = 255; + bool even = true; + if ((HORIZONTAL_LENGTH / 2.00) > (int)(HORIZONTAL_LENGTH / 2.00))even = false; + + if (!even) + { + //pos = beatsin8(spd, 0, VERTICAL_LENGTH + (HORIZONTAL_LENGTH - 1) / 2); + pos = beatsaw8(spd, 0, VERTICAL_LENGTH + (HORIZONTAL_LENGTH - 1) / 2); + b = beatsaw8(spd * 2, 255 / 2, 255); + } + else + { + //pos = beatsin8(spd, 0, VERTICAL_LENGTH + (HORIZONTAL_LENGTH - 2) / 2); + } + if (!even) + { + if (pos < VERTICAL_LENGTH) + { + if (HORIZONTAL_BEFORE_VERTICAL) + { + if (!RINGFIRST) leds[HORIZONTAL_LENGTH + VERTICAL_LENGTH - pos - 1] = CHSV(145, 255, b); + else { leds[HORIZONTAL_LENGTH + VERTICAL_LENGTH - pos - 1 + RING_LENGTH] = CHSV(145, 255, b); } + } + else + { + if (!RINGFIRST) leds[VERTICAL_LENGTH - pos - 1] = CHSV(145, 255, b); + else { leds[VERTICAL_LENGTH - pos - 1 + RING_LENGTH] = CHSV(145, 255, b); } + } + } + else if (pos == VERTICAL_LENGTH) + { + if (!RINGFIRST) + { + leds[(HORIZONTAL_LENGTH / 2)] = CHSV(145, 255, b); + } + else + { + leds[(HORIZONTAL_LENGTH / 2) + RING_LENGTH] = CHSV(145, 255, b); + } + } + else + { + if (HORIZONTAL_BEFORE_VERTICAL) + { + if (!RINGFIRST) + { + leds[HORIZONTAL_LENGTH - pos] = CHSV(145, 255, b); + leds[pos - 1] = CHSV(145, 255, b); + } + else + { + leds[HORIZONTAL_LENGTH - pos + RING_LENGTH] = CHSV(145, 255, b); + leds[pos - 1 + RING_LENGTH] = CHSV(145, 255, b); + } + } + else + { + if (!RINGFIRST) + { + leds[HORIZONTAL_LENGTH - pos + VERTICAL_LENGTH] = CHSV(145, 255, b); + leds[pos - 1 + VERTICAL_LENGTH] = CHSV(145, 255, b); + } + else + { + leds[HORIZONTAL_LENGTH - pos + RING_LENGTH + VERTICAL_LENGTH] = CHSV(145, 255, b); + leds[pos - 1 + RING_LENGTH + VERTICAL_LENGTH] = CHSV(145, 255, b); + } + } + } + } + if (!RINGFIRST) + { + //fadeToBlackBy(leds, HORIZONTAL_LENGTH + VERTICAL_LENGTH, 50); + fadeLightBy(leds, HORIZONTAL_LENGTH + VERTICAL_LENGTH, 5); + } + else + { + fadeLightBy(leds + RING_LENGTH, HORIZONTAL_LENGTH + VERTICAL_LENGTH, 5); + } + + /* + uint8_t b = 255; + uint8_t pos = 0; + if (RINGFIRST) + { + pos = beatsin8(30, RING_LENGTH, RING_LENGTH + VERTICAL_LENGTH + HORIZONTAL_LENGTH); + fadeToBlackBy(leds + RING_LENGTH, RING_LENGTH+VERTICAL_LENGTH + HORIZONTAL_LENGTH, 10); + + } + else + { + pos = beatsin8(30, 0, VERTICAL_LENGTH + HORIZONTAL_LENGTH); + fadeToBlackBy(leds, VERTICAL_LENGTH + HORIZONTAL_LENGTH, 10); + + } + //if (pos == 0 && RINGFIRST == false)fadeToBlackBy(leds, 1, 50); + //else if(pos == RING_LENGTH && RINGFIRST == true)fadeToBlackBy(leds+RING_LENGTH, 1, 50); + leds[pos] = CHSV(145, 255, b); + */ } #endif THINGIVERSE @@ -3957,85 +3957,85 @@ void thingiverse() // twenty one pilots #ifdef SOUND_SENSOR_SUPPORT void soundReactive() { - static int minlevel = 0; - static int decay = 60; - static double lastlevel = 2; - static double level = 0; + static int minlevel = 0; + static int decay = 60; + static double lastlevel = 2; + static double level = 0; #define arrsize 3 - static double measure8avg[arrsize] = { 0,0,0 }; - static int iter = 0; + static double measure8avg[arrsize] = { 0,0,0 }; + static int iter = 0; #if SENSOR_TYPE == 0 - if (digitalRead(SOUND_SENSOR_PIN) > 0)level++; - else level--; - if (level < minlevel)level = minlevel; - if (level > LEDS_PER_LINE)level = LEDS_PER_LINE; - fill_solid(leds, level, CHSV(gHue, 255, 255)); - fadeToBlackBy(leds + level, LEDS_PER_LINE - level, decay); + if (digitalRead(SOUND_SENSOR_PIN) > 0)level++; + else level--; + if (level < minlevel)level = minlevel; + if (level > LEDS_PER_LINE)level = LEDS_PER_LINE; + fill_solid(leds, level, CHSV(gHue, 255, 255)); + fadeToBlackBy(leds + level, LEDS_PER_LINE - level, decay); #endif #if SENSOR_TYPE > 0 #if SENSOR_TYPE == 2 - int measure = 0; - - for (int it = 0; it < 5; it++) - { - int m = analogRead(SOUND_SENSOR_PIN); - Serial.println(m); - if (m < 450 && m >350) m = 0; - else if (m < 350)m = (400 - m) * 2; - if (m > 400)m -= 400; - measure += m; - } - measure /= 5; + int measure = 0; + + for (int it = 0; it < 5; it++) + { + int m = analogRead(SOUND_SENSOR_PIN); + Serial.println(m); + if (m < 450 && m >350) m = 0; + else if (m < 350)m = (400 - m) * 2; + if (m > 400)m -= 400; + measure += m; + } + measure /= 5; #endif #if SENSOR_TYPE == 1 - int measure = 0; - - for (int it = 0; it < 5; it++) - { - int m = analogRead(SOUND_SENSOR_PIN); - m -= 800; - m *= -1; - //if (m < 100)m = 0; - if (m < 150) m = 0; - measure += m; - } - measure /= 5; - measure /= 2; // cut the volts in half + int measure = 0; + + for (int it = 0; it < 5; it++) + { + int m = analogRead(SOUND_SENSOR_PIN); + m -= 800; + m *= -1; + //if (m < 100)m = 0; + if (m < 150) m = 0; + measure += m; + } + measure /= 5; + measure /= 2; // cut the volts in half #endif //Serial.println(measure); - iter++; - if (iter > arrsize)iter = 0; - measure8avg[iter] = measure; - double avg = 0; - for (int x = 0; x < arrsize; x++) - { - avg += measure8avg[x]; - } - avg /= arrsize; - - avg = measure; - - int mlevel = map(avg, audioMinVol, audioMaxVol, 1, NUM_LEDS); - if (mlevel < 1)mlevel = 1; - //if (lastlevel > mlevel) level = lastlevel - 0.8; - //else if (lastlevel < mlevel) level = lastlevel+1; - level = mlevel; - - if (level < minlevel)level = minlevel; - if (level > NUM_LEDS)level = NUM_LEDS; + iter++; + if (iter > arrsize)iter = 0; + measure8avg[iter] = measure; + double avg = 0; + for (int x = 0; x < arrsize; x++) + { + avg += measure8avg[x]; + } + avg /= arrsize; + + avg = measure; + + int mlevel = map(avg, audioMinVol, audioMaxVol, 1, NUM_LEDS); + if (mlevel < 1)mlevel = 1; + //if (lastlevel > mlevel) level = lastlevel - 0.8; + //else if (lastlevel < mlevel) level = lastlevel+1; + level = mlevel; + + if (level < minlevel)level = minlevel; + if (level > NUM_LEDS)level = NUM_LEDS; #if DEVICE_TYPE == 3 - ColorSingleRing(map(level,1,NUM_LEDS,1,LEDS_PER_LINE), CHSV(gHue, 255, 255)); + ColorSingleRing(map(level,1,NUM_LEDS,1,LEDS_PER_LINE), CHSV(gHue, 255, 255)); #else - fill_solid(leds, level, CHSV(gHue, 255, 255)); + fill_solid(leds, level, CHSV(gHue, 255, 255)); #endif - fill_solid(leds, level, CHSV(gHue, 255, 255)); - fadeToBlackBy(leds + (int)level, NUM_LEDS - (int)level, decay); - lastlevel = level; + fill_solid(leds, level, CHSV(gHue, 255, 255)); + fadeToBlackBy(leds + (int)level, NUM_LEDS - (int)level, decay); + lastlevel = level; - //Serial.print(mlevel); Serial.print(" "); Serial.println(level); - //Serial.printf("%d, %d\n", mlevel, level); + //Serial.print(mlevel); Serial.print(" "); Serial.println(level); + //Serial.printf("%d, %d\n", mlevel, level); #endif } #endif @@ -4045,72 +4045,72 @@ void soundReactive() #ifdef ENABLE_MQTT_SUPPORT static bool mqttProcessing = false; void mqttCallback(char* topic, byte* payload, unsigned int length) { - mqttProcessing = true; - DynamicJsonDocument doc(1024); - deserializeJson(doc, payload); - - JsonObject obj = doc.as(); - for (JsonPair p : obj) { - const char* key = p.key().c_str(); - JsonVariant v = p.value(); - - if (strcmp(key, "state") == 0) { - String val = v.as(); - setPower((val == "ON") ? 1 : 0); - } - if (strcmp(key, "brightness") == 0) { - int val = v.as(); - setBrightness(val); - } - if (strcmp(key, "autoplay") == 0){ - String val = v.as(); - setAutoplay((val == "ON") ? 1 : 0); - } - if (strcmp(key, "speed") == 0){ - int val = v.as(); - speed = val; - } - if (strcmp(key, "effect") == 0) { - String val = v.as(); - setPatternName(val); - } - if (strcmp(key, "color") == 0) { - int cr, cb, cg; - JsonObject val = v.as(); - for (JsonPair o : val) { - const char* ckey = o.key().c_str(); - JsonVariant cv = o.value(); - if (strcmp(ckey, "r") == 0) { - cr = cv.as(); - } - if (strcmp(ckey, "g") == 0) { - cg = cv.as(); - } - if (strcmp(ckey, "b") == 0) { - cb = cv.as(); - } - } - setSolidColor(cr, cg, cb); - } - } - mqttProcessing = false; - sendStatus(); + mqttProcessing = true; + DynamicJsonDocument doc(1024); + deserializeJson(doc, payload); + + JsonObject obj = doc.as(); + for (JsonPair p : obj) { + const char* key = p.key().c_str(); + JsonVariant v = p.value(); + + if (strcmp(key, "state") == 0) { + String val = v.as(); + setPower((val == "ON") ? 1 : 0); + } + if (strcmp(key, "brightness") == 0) { + int val = v.as(); + setBrightness(val); + } + if (strcmp(key, "autoplay") == 0){ + String val = v.as(); + setAutoplay((val == "ON") ? 1 : 0); + } + if (strcmp(key, "speed") == 0){ + int val = v.as(); + speed = val; + } + if (strcmp(key, "effect") == 0) { + String val = v.as(); + setPatternName(val); + } + if (strcmp(key, "color") == 0) { + int cr, cb, cg; + JsonObject val = v.as(); + for (JsonPair o : val) { + const char* ckey = o.key().c_str(); + JsonVariant cv = o.value(); + if (strcmp(ckey, "r") == 0) { + cr = cv.as(); + } + if (strcmp(ckey, "g") == 0) { + cg = cv.as(); + } + if (strcmp(ckey, "b") == 0) { + cb = cv.as(); + } + } + setSolidColor(cr, cg, cb); + } + } + mqttProcessing = false; + sendStatus(); } void sendStatus() { - StaticJsonDocument<128> JSONencoder; - JSONencoder["state"] = (power == 1 ? "ON" : "OFF"), - JSONencoder["brightness"] = brightness, - JSONencoder["effect"] = patterns[currentPatternIndex].name, - JSONencoder["autoplay"] = autoplay, - JSONencoder["speed"] = speed; - - uint8_t JSONmessage[128]; - size_t n = serializeJson(JSONencoder, JSONmessage); - if (!mqttProcessing){ - mqttClient.publish(MQTT_TOPIC, JSONmessage, n, true); - } + StaticJsonDocument<128> JSONencoder; + JSONencoder["state"] = (power == 1 ? "ON" : "OFF"), + JSONencoder["brightness"] = brightness, + JSONencoder["effect"] = patterns[currentPatternIndex].name, + JSONencoder["autoplay"] = autoplay, + JSONencoder["speed"] = speed; + + uint8_t JSONmessage[128]; + size_t n = serializeJson(JSONencoder, JSONmessage); + if (!mqttProcessing){ + mqttClient.publish(MQTT_TOPIC, JSONmessage, n, true); + } } #endif // ENABLE_MQTT_SUPPORT //############################## MQTT HELPER FUNCTIONS END ##############################