Rebase onto v0.15.3

.gitignore

@@ -10,7 +10,6 @@
 .vscode
 
 esp01-update.sh
-platformio_override.ini
 replace_fs.py
 wled-update.sh
 

platformio.ini

@@ -433,6 +433,16 @@ board_build.partitions = ${esp32.default_partitions}
 ; board_build.f_flash = 80000000L
 ; board_build.flash_mode = dio
 
+[env:esp32_quinled_diguno]
+extends = env:esp32dev
+build_flags = ${env:esp32dev.build_flags} -D RLYPIN=12 -D BTNPIN=0 -D DATA_PINS=16 -D DMTYPE=1 -D I2S_SDPIN=19 -D I2S_WSPIN=4 -D I2S_CKPIN=18
+  -D USERMOD_AUDIOREACTIVE
+lib_deps = ${env:esp32dev.lib_deps}
+  https://github.com/blazoncek/arduinoFFT.git
+upload_speed = 690000
+board_build.f_flash = 80000000L
+board_build.flash_mode = qio
+
 [env:esp32dev_qio80]
 board = esp32dev
 platform = ${esp32.platform}

platformio_override.ini

@@ -0,0 +1,17 @@
+[platformio]
+default_envs = esp32dev
+extra_configs =
+  platformio_tubes.ini
+
+[env:golden]
+extends = env:esp32_quinled_dig2go_tubes
+build_flags = ${env:tubes.build_flags} -D GOLDEN
+
+[env:christmas]
+extends = env:esp32_quinled_dig2go_tubes
+build_flags = ${env:tubes.build_flags} -D CHRISTMAS
+
+[env:ruby]
+extends = env:esp32_quinled_dig2go_tubes
+build_flags = ${env:tubes.build_flags} -D RUBY
+

platformio_tubes.ini

@@ -0,0 +1,202 @@
+[tubes_no_mic]
+; these settings create a basic template for tubes build from
+; from which all other tube envs should build
+; the base build does not support
+; --  mic (audio reactive)
+; -- ir remotes
+; For devices with those inputs use the [tubes] settings
+; which adds those back in
+platform = espressif32@5.3.0
+platform_packages =
+;platform_packages = ;framework-arduinoespressif32 @ 3.20017.0
+build_unflags =
+  -D LOROL_LITTLEFS
+  -D CONFIG_ASYNC_TCP_USE_WDT
+build_flags =
+  -g
+  -O2
+  -D FASTLED_ALL_PINS_HARDWARE_SPI
+  -D ARDUINO_USB_CDC_ON_BOOT=0 ;; this flag is mandatory for "classic ESP32" when building with arduino-esp32 >=2.0.3
+  -D WLED_WATCHDOG_TIMEOUT=0
+  -D USERMOD_TUBES
+  -D CONFIG_ASYNC_TCP_RUNNING_CORE=-1
+  ; Disable a bunch of unnecessary integrations
+  -D WLED_DISABLE_BLYNK
+  -D WLED_DISABLE_MQTT
+  -D WLED_DISABLE_LOXONE
+  -D WLED_DISABLE_ALEXA
+  -D WLED_DISABLE_INFRARED
+  -D WLED_DISABLE_CRONIXIE
+  -D WLED_DISABLE_HUESYNC
+  -D WLED_DISABLE_WEBSOCKETS
+  -D WLED_DISABLE_ADALIGHT
+  -D WLED_DISABLE_ESPNOW
+  -D WLED_DISABLE_SERIAL
+  -D IRTYPE=0
+lib_ignore =
+  ESPAsyncTCP
+  ESPAsyncUDP
+  IRremoteESP8266
+lib_deps = 
+  fastled/FastLED @ ^3.7.3
+  makuna/NeoPixelBus @ ^2.8.0
+  https://github.com/Aircoookie/ESPAsyncWebServer.git#v2.2.1
+
+[tubes]
+extends = tubes_no_mic
+build_flags =
+  ${tubes_no_mic.build_flags}
+  ${esp32.AR_build_flags}
+lib_deps = ${tubes_no_mic.lib_deps}
+  IRremoteESP8266 @ ^2.8.6
+  https://github.com/kosme/arduinoFFT#v2.0.2
+
+
+[env:esp32_quinled_dig2go]
+; basis quinled dig2go without any tubes support
+extends = env:esp32_quinled_diguno
+build_unflags = ${env:esp32_quinled_diguno.build_unflags}
+  -D WLED_DISABLE_INFRARED
+  -D IRTYPE
+lib_ignore = ${env:esp32_quinled_diguno.lib_ignore}
+lib_deps = ${env:esp32_quinled_diguno.lib_deps}
+  IRremoteESP8266 @ 2.8.6
+
+
+[env:esp32_quinled_dig2go_tubes]
+extends = env:esp32_quinled_dig2go
+platform = ${tubes.platform}
+platform_packages = ${tubes.platform_packages}
+build_unflags = 
+  ${tubes.build_unflags}
+  ${env:esp32_quinled_dig2go}
+  -D WLED_RELEASE_NAME
+build_flags = -D WLED_RELEASE_NAME=DIG2GO_TUBES
+  ${tubes.build_flags}
+  ${env:esp32_quinled_dig2go.build_flags} 
+  -D FASTLED_ESP32_SPI_BUS=HSPI
+  -D NUM_STRIPS=1 -D DEFAULT_LED_COUNT=150
+  -D CHRISTMAS  # REMOVE
+lib_ignore = 
+  ESPAsyncTCP
+  ESPAsyncUDP
+  ${env:esp32_quinled_dig2go.lib_ignore}
+lib_deps = 
+  ${tubes.lib_deps}
+
+
+
+# ------------------------------------------------------------------------------
+# ESP32 S3 Matrix M1
+# ------------------------------------------------------------------------------
+[env:esp32-s3-matrix-m1]
+; builds using the default WLED settings
+extends = env:esp32s3dev_8MB_PSRAM_opi
+board_build.arduino.memory_type = qio_qspi ;; use with PSRAM: 2MB or  4MB
+board_upload.flash_size = 4MB
+board_build.partitions = tools/WLED_ESP32_4MB_1MB_FS.csv
+build_unflags = ${env:esp32s3dev_8MB_PSRAM_opi.build_unflags} 
+  -D ARDUINO_USB_CDC_ON_BOOT=1
+  -D ARDUINO_USB_MSC_ON_BOOT=0 
+  -D ARDUINO_DFU_ON_BOOT=0
+build_flags = ${common.build_flags} ${esp32s3.build_flags} -D WLED_RELEASE_NAME=ESP32-S3_MATRIX_M1
+  -D WLED_WATCHDOG_TIMEOUT=0
+  -D ARDUINO_USB_CDC_ON_BOOT=1
+  -D ARDUINO_USB_MODE=1
+  -D BOARD_HAS_PSRAM ; tells WLED that PSRAM shall be used
+  -D WLED_USE_PSRAM
+  -D ABL_MILLIAMPS_DEFAULT=250
+  -D NUM_STRIPS=1 -D PIXEL_COUNTS=64 -D DEFAULT_LED_COUNT=64
+  -D DEFAULT_LED_COLOR_ORDER=1 -D LEDPIN=14
+lib_deps = ${esp32s3.lib_deps}
+lib_ignore = ${env:esp32s3dev_8MB_PSRAM_opi.lib_ignore}
+  IRremoteESP8266
+
+[env:esp32-s3-matrix-m1_tubes]
+extends = env:esp32-s3-matrix-m1
+platform = espressif32@6.8.1
+platform_packages =
+;platform = ${tubes.platform}
+;platform_packages = ${tubes.platform_packages}
+board_build.partitions = tools/WLED_ESP32_4MB_noOTA.csv
+build_unflags = ${env:esp32-s3-matrix-m1.build_unflags}
+  ${tubes_no_mic.build_unflags}
+build_flags =
+  ${tubes_no_mic.build_flags}
+  ${env:esp32-s3-matrix-m1.build_flags} 
+  -D IRTYPE=0
+  -D FASTLED_ALL_PINS_HARDWARE_SPI
+lib_ignore = 
+  ${tubes_no_mic.lib_ignore}
+  ${env:esp32-s3-matrix-m1.lib_ignore} 
+lib_deps = 
+  ${tubes_no_mic.lib_deps}
+
+# ------------------------------------------------------------------------------
+# ESP32 C3 Athom
+# ------------------------------------------------------------------------------
+[env:esp32-c3-athom]
+extends = env:esp32c3dev
+lib_ignore = IRremoteESP8266
+  ${env:esp32c3dev.lib_ignore}
+build_flags = ${env:esp32c3dev.build_flags}
+  -D LEDPIN=10
+  -D BTNPIN=9
+  -D WLED_DISABLE_INFRARED
+  -D IRTYPE=0
+
+[env:esp32-c3-athom_tubes]
+extends = env:esp32-c3-athom
+platform = espressif32@6.8.1
+upload_speed = 115200
+platform_packages =
+;platform = ${tubes_no_mic.platform}
+;platform_packages = ${tubes_no_mic.platform_packages}
+build_unflags = ${env:esp32-c3-athom.build_unflags}
+  ${tubes_no_mic.build_unflags}
+build_flags = ${env:esp32-c3-athom.build_flags} -D WLED_RELEASE_NAME=ESP32-C3_ATHOM_TUBES
+  ${tubes_no_mic.build_flags}
+  -D FASTLED_ESP32_SPI_BUS=HSPI
+  -D NUM_STRIPS=1 -D DEFAULT_LED_COUNT=150
+  -D WLED_WIFI_POWER_SETTING=WIFI_POWER_8_5dBm
+  -D LOLIN_WIFI_FIX
+lib_ignore = ${env:esp32-c3-athom.lib_ignore}
+  ${tubes_no_mic.lib_ignore}
+lib_deps =
+  ${tubes_no_mic.lib_deps}
+
+
+# ------------------------------------------------------------------------------
+# ESP32 GLEDOPTO
+#
+# LEDs: GRB @ pin 16
+# Button: GPIO 0
+# SR:  i2S SD 26, WS 5, SCK 21, MCLK unused
+# ------------------------------------------------------------------------------
+[env:esp32-gledopto]
+extends = env:esp32dev
+lib_ignore = IRremoteESP8266
+  ${env:esp32c3dev.lib_ignore}   ; ok to keep this line if it exists, harmless
+build_flags =
+  -D LEDPIN=16
+  -D BTNPIN=0
+  -D WLED_DISABLE_INFRARED
+  -D IRTYPE=0
+
+[env:esp32-gledopto_tubes]
+extends = env:esp32-gledopto
+platform = platformio/espressif32 @ 6.7.0
+platform_packages =
+  framework-arduinoespressif32@3.20016.0   ; Arduino-ESP32 2.0.16
+build_unflags = ${env:esp32-gledopto.build_unflags}
+  ${tubes_no_mic.build_unflags}
+build_flags = ${env:esp32-gledopto.build_flags}
+  ${tubes_no_mic.build_flags}
+  -D FASTLED_ESP32_SPI_BUS=HSPI
+  -D NUM_STRIPS=1 -D DEFAULT_LED_COUNT=150
+  -D WLED_WIFI_POWER_SETTING=WIFI_POWER_8_5dBm
+  -D LOLIN_WIFI_FIX
+lib_ignore = ${env:esp32-gledopto.lib_ignore}
+  ${tubes_no_mic.lib_ignore}
+lib_deps = ${env:esp32-gledopto.lib_deps}
+  ${tubes_no_mic.lib_deps}

readme.md

@@ -1,19 +1,89 @@
-<p align="center">
-  <img src="/images/wled_logo_akemi.png">
-  <a href="https://github.com/Aircoookie/WLED/releases"><img src="https://img.shields.io/github/release/Aircoookie/WLED.svg?style=flat-square"></a>
-  <a href="https://raw.githubusercontent.com/Aircoookie/WLED/master/LICENSE"><img src="https://img.shields.io/github/license/Aircoookie/wled?color=blue&style=flat-square"></a>
-  <a href="https://wled.discourse.group"><img src="https://img.shields.io/discourse/topics?colorB=blue&label=forum&server=https%3A%2F%2Fwled.discourse.group%2F&style=flat-square"></a>
-  <a href="https://discord.gg/QAh7wJHrRM"><img src="https://img.shields.io/discord/473448917040758787.svg?colorB=blue&label=discord&style=flat-square"></a>
-  <a href="https://kno.wled.ge"><img src="https://img.shields.io/badge/quick_start-wiki-blue.svg?style=flat-square"></a>
-  <a href="https://github.com/Aircoookie/WLED-App"><img src="https://img.shields.io/badge/app-wled-blue.svg?style=flat-square"></a>
-  <a href="https://gitpod.io/#https://github.com/Aircoookie/WLED"><img src="https://img.shields.io/badge/Gitpod-ready--to--code-blue?style=flat-square&logo=gitpod"></a>
+# WLED-based LED Sticks
+These portable LED light poles make pretty lights for a dance party - and better yet:
 
-  </p>
+They're **portable**! Convenient tripod bases keep them standing at attention, and a 10Ah USB battery (like the one you charge your phone with) will power them for about 8 hours.
 
-# Welcome to my project WLED! ✨
+They're **versatile**! You can deploy them in a [wide open space at Burning Man](https://youtu.be/UtXL0ScNUoE), in a [private event space](https://youtu.be/B6OBde7zRN4), or right next to each other [in your living room](https://youtu.be/UmiRBCOAMBg).  (Click into these links for videos of them in action.)
+
+They're **coordinated**! If you put them next to each other, they sync using near-field radio. And they'll even daisy-chain, meaning the furthest ones can be really far apart as long as there are some in the middle to relay the signal.
+
+![IMG_1521](https://github.com/SteveEisner/tubes/blob/master/assembly/poles_in_use.jpg)
+
+They're **sturdy**! I built over 100 of them and have deployed them at parties in all kinds of weather, from hot & dusty windstorms to torrential rain. They've been tossed in a truck, carried around as totems, knocked or blown over, and almost all of 'em are still working.  Just don't let people use them like light sabers (lesson learned.)
+
+They're also **in progress** with lots of things that could be improved.  But for now:
+
+* they play patterns from an expanding set of "genetically-driven" combinations
+* they stay in sync or deliberately drift from each other in pleasing ways
+* they operate internally at a certain BPM - allowing them to sync to music
+
+## How do they work?
+
+Each light tube is running custom software on an ESP32 microcontroller. The software is running a generative light program, based on the popular software WLED, that has a simple "DNA" specifying its pattern, color, effects overlay, offset, and so on.
+
+The patterns run on a clock that's synced to a specific BPM and counts out the 4/4 rhythm of most dance music, so they morph and change on individual beats, measures, and phrases. After several beat phrases pass, a pole's DNA is mutated a little, which can cause it to change color, or adopt a new pattern, etc.
+
+On-board radio lets a light pole broadcast its DNA and clock timer; when others hear the signal, they can choose to follow along by updating their own pattern DNA to match it. The method of coordination is pretty simple right now: each pole has an 8-bit ID, and lower-ID poles obey higher-ID poles.
+
+If they're all close enough, they'll soon start doing the same thing as a group and keeping their clock timers in sync. In case they're not close enough, poles also re-broadcast all the signals they receive and obey. This lets them pass along a signal through the group until all of them have found it.
+
+Some randomness and chaos is intentional. Radio isn't 100% reliable, so they sometimes fall out of contact and then re-connect. And in some cases, the poles will deliberately offset their own clock a bit so that they are clearly doing the same thing but not exactly at the same time. Each tube is actually running several copies of the software and smoothly "cross-fading" between them, to avoid any jarring transitions.
+
+## Credits
+
+The form factor was inspired by [Mark Lottor's Hexatron](http://www.3waylabs.com/projects/hex/). The color schemes were inspired by [the work of Christopher Schardt](https://americanart.si.edu/exhibitions/burning-man/online/christopher-schardt) and many were found on [cpt-city](http://soliton.vm.bytemark.co.uk/pub/cpt-city/). My most recent versions use the excellent [WLED](https://github.com/Aircoookie/WLED) codebase and run as a usermod. My older code was written using [FastLED](http://fastled.io/) and I still use some original patterns that are evolved versions of FastLED examples. The mesh networking is based on [Chuck Sommerville's led-swarm](https://github.com/chucks13/LED-swarm), and still follows its [theory](https://github.com/chucks13/LED-swarm/blob/master/theory.txt) for radio connection. When I kicked off this project, I used [Paul Stoffregen's WS2812Serial](https://github.com/PaulStoffregen/WS2812Serial) for smooth animation, and of course [his Teensy CPU](https://www.pjrc.com/teensy/teensyLC.html) made the whole thing possible. Standing on the shoulders of these giants let me create these in about a month, in time to debut at Burning Man 2019 and appear at many parties since!
+
+## WLEDtubes branch changes
+
+This is a WLED-based update to my [2019 light tube project](https://github.com/SteveEisner/tubes), which ran on Teensy + FastLED + nRF24L01 radios.
+
+Most of the changes are in the usermod `usermods/Tubes`:
+* Tubes is installed as an overlay function, which allows it to run WLED "underneath" but completely control the output.
+* Its final output is a composition of multiple layers: it starts with WLED's output, then optionally overwrites with its own patterns, then runs a particle effects library on top of that.
+* It stores a curated playlist of composite effects. Some are WLED stock FX, others are custom-built. It moves randomly through that playlist.
+* At the time of writing, WLED could not correctly fade transitions between 2 FX. Tubes makes up for that by being able to fade between 1 WLED FX and 1 custom overlay pattern, or between 2 custom overlays. As it moves through the playlist, it ensures that it never plays two WLED FX in a row.
+* The particle library runs on top of everything (including WLED FX) and introduces a variety of patterns & blit effects.
+* If the user changes effects or palettes in the WLED web UI, Tubes will honor that & stop overlaying for a little while. It will eventually time out and revert to full overlay mode.
+* Everything runs on a custom clock that is synced to a specific BPM. The BPM can be changed (manually now, automatic eventually) so that the effects perfectly sync to nearby music. WLED FX don't sync yet but could be speed-adjusted.
+* An ESP-Now based mesh network is created, so all devices running this usermod stay in sync with each other, without Wi-Fi.
+
+Mesh networking is based on a unidirectional broadcast protocol:
+* Every device (node) is assigned a random 12-bit ID. This ID can change at any time, although in practice it only changes upon reboot.
+* A node begins with the assumption that it is the only node, and therefore it is the leader, which means it's the one controlling patterns, palettes, and effects.
+* As a node operates, it regularly broadcasts its status via ESP-Now, in case other device nodes are nearby. Nodes also continuously listen for ESP-Now broadcasts with node status.
+* Status messages are identified by the node's ID. If a node receives a broadcast from a lower ID, it ignores it.
+* When a node receives a broadcast from a higher ID, it assumes that other node must be the leader. It syncs its status to the leader's status & stops broadcasting its own status
+* When a node receives a broadcast from the same ID, it assumes there's been an ID assignment collision and randomizes its own ID. (This happens sometimes even in a 12-bit space.)
+* Nodes are assumed to be unstable; they can move or be turned off (or crash.) Status packets include both a current status and 30+ seconds of future states. All nodes can continue to run in sync even if they don't hear from the leader during this time.
+* If a node hasn't heard from the leader in a long time (20 sec or more), it assumes the leader has permanently left. It reverts to being its own leader again until it hears from a new leader with higher ID.
+* To help boost the leader's effective range, a following node will occasionally relay the leader's commands using the leader's ID. This helps sync devices that are out of range of the leader, but within range of a follower. The effective range of a single ESP32 device has been measured at hundreds feet; relays allow for an even larger mesh range.
+* There's a protocol for explicit control, with commands that can be sent to specific nodes or all nodes. This allows a single master remote to directly control the entire mesh.
+* This has been tested on 75+ devices in proximity, but theoretically can expand until it saturates ESPNow bandwidth (hundreds of devices? thousands? not sure)
+
+The Tubes usermod uses several sub-libraries and helper functions:
+* beats.h: an 8-bit bpm library that helps the Tubes run patterns at a specific bpm
+* node.h: the ESP-Now based mesh network
+* particle.h: a particle effects overlay library
+* firmware.sh: successful firmware+config mass-autoupdater
+* master.h: a remote that overrides & controls all ESP-Now nodes (run from a separate device)
+* timer.h: a tiny library to help with timed events
+
+There are several left-over modules that aren't used any more.
+* bluetooth.h: a failed initial attempt to sync over BLE (now unused)
+* updater.h + update_server.h: a failed attempt to write a peer-to-peer firmware auto-updater (unreliable)
+* sound.h: an initial attempt to create some sound-reactive effect overlays
+
+Also, there a few changes to core library files:
+* New brighter, more vivid color palettes (palettes.h + wled00/FX_fcn.cpp)
+* New button-press code to allow a single button to handle Wi-Fi protection (it's only turned on by explicit button press) and "Power-save" for battery operation (wled00/button.cpp)
+* Fleet provisioning for flashing dozens of WLED controllers (wled00/wled_serial.cpp disabled to allow it)
+
+# Original README: Welcome to WLED! ✨
 
 A fast and feature-rich implementation of an ESP8266/ESP32 webserver to control NeoPixel (WS2812B, WS2811, SK6812) LEDs or also SPI based chipsets like the WS2801 and APA102!
 
+Now with new magical sync powers!
+
 ## ⚙️ Features
 - WS2812FX library with more than 100 special effects  
 - FastLED noise effects and 50 palettes  

tools/WLED_ESP32_4MB_noOTA.csv

@@ -0,0 +1,6 @@
+# Name,   Type, SubType, Offset,  Size, Flags
+nvs,      data, nvs,     0x9000,  0x5000,
+otadata,  data, ota,     0xe000,  0x2000,
+app0,     app,  ota_0,   0x10000, 0x2F0000,
+spiffs,   data, spiffs,  0x300000,0xF0000,
+coredump, data, coredump,,64K