Merge branch 'mdev' into ES8388

2023-04-03 19:15:28 +01:00
parent 0a8347fb74 da3acc4627
commit 760ff836c3
199 changed files with 17247 additions and 9266 deletions
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -34,18 +34,21 @@ body:
    id: install_format
    attributes:
      label: Install Method
-      description: How did you install WLED?
+      description: How did you install MoonModules WLED?
      options:
+        - From MoonModules Release Page
+        - From srg74 firmware repository
+        - From https://wled-install.github.io/
        - Binary from WLED.me
-        - Self-Compiled
+        - Self-Compiled or other
    validations:
      required: true
  - type: input
    id: version
    attributes:
-      label: What version of WLED?
+      label: What version/release of MM WLED?
      description: You can find this in by going to Config -> Security & Updates -> Scroll to Bottom. Copy and paste the entire line after "Server message"
-      placeholder: "e.g. WLED 0.13.1 (build 2203150)"
+      placeholder: "e.g. WLEDMM_0.14.0.2.1_esp32_4MB_max (build 2212061)"
    validations:
      required: true
  - type: dropdown
@@ -56,6 +59,9 @@ body:
      options:
        - ESP8266
        - ESP32
+        - ESP32-S3
+        - ESP32-S2
+        - ESP32-C3
        - Other
    validations:
      required: true
@@ -80,4 +86,4 @@ body:
      description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/Aircoookie/WLED/blob/master/CODE_OF_CONDUCT.md)
      options:
        - label: I agree to follow this project's Code of Conduct
-          required: true
+          required: true
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -7,5 +7,5 @@ contact_links:
    url: https://wled.discourse.group/
    about: For issues and ideas that might need longer discussion.
  - name: kno.wled.ge base
-    url:  https://kno.wled.ge/basics/faq/
+    url:  https://mm.kno.wled.ge/basics/faq/
    about: Take a look at the frequently asked questions and documentation, perhaps your question is already answered!
--- a/.github/workflows/wled-ci.yml
+++ b/.github/workflows/wled-ci.yml
@@ -28,7 +28,7 @@ jobs:


  build:
-    name: Build Enviornments
+    name: Build Environments
    runs-on: ubuntu-latest
    needs: get_default_envs
    strategy:
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,69 @@
 ## WLED changelog

+#### Build 2301240
+
+-   Version bump to v0.14.0-b2 "Hoshi"
+-   PixelArt converter (convert any image to pixel art and display it on a matrix) (PR #3042)
+-   various effect updates and optimisations
+    -   added Overlay option to some effects (allows overlapping segments)
+    -   added gradient text on Scrolling Text
+    -   added #DDMM, #MMDD & #HHMM date and time options for Scrolling Text effect (PR #2990)
+    -   deprecated: Dynamic Smooth, Dissolve Rnd, Solid Glitter
+    -   optimised & enhanced loading of default values
+    -   new effect: Distortion Waves (2D)
+    -   2D support for Ripple effect
+    -   slower minimum speed for Railway effect
+-   DMX effect mode & segment controls (PR #2891)
+-   Optimisations for conditional compiles (further reduction of code size)
+-   better UX with effect sliders (PR #3012)
+-   enhanced support for ESP32 variants: C3, S2 & S3
+-   usermod enhancements (PIR, Temperature, Battery (PR #2975), Analog Clock (PR #2993))
+-   new usermod SHT (PR #2963)
+-   2D matrix set up with gaps or irregular panels (breaking change!) (PR #2892)
+-   palette blending/transitions
+-   random palette smooth changes
+-   hex color notations in custom palettes
+-   allow more virtual buses
+-   plethora of bugfixes
+
+### WLED release 0.14.0-b1
+
+#### Build 2212222
+
+-   Version bump to v0.14.0-b1 "Hoshi"
+-   2D matrix support (including mapping 1D effects to 2D and 2D peek)
+-   [internal] completely rewritten Segment & WS2812FX handling code
+-   [internal] ability to add custom effects via usermods
+-   [internal] set of 2D drawing functions
+-   transitions on every segment (including ESP8266)
+-   enhanced old and new 2D effects (metadata: default values)
+-   custom palettes (up to 10; upload palette0.json, palette1.json, ...)
+-   custom effect sliders and options, quick filters
+-   global I2C and SPI GPIO allocation (for usermods)
+-   usermod settings page enhancements (dropdown & info)
+-   asynchronous preset loading (and added "pd" JSON API call for direct preset apply)
+-   new usermod Boblight (PR #2917)
+-   new usermod PWM Outputs (PR #2912)
+-   new usermod Audioreactive
+-   new usermod Word Clock Matrix (PR #2743)
+-   new usermod Ping Pong Clock (PR #2746)
+-   new usermod ADS1115 (PR #2752)
+-   new usermod Analog Clock (PR #2736)
+-   various usermod enhancements and updates
+-   allow disabling pull-up resistors on buttons
+-   SD card support (PR #2877)
+-   enhanced HTTP API to support custom effect sliders & options (X1, X2, X3, M1, M2, M3)
+-   multiple UDP sync message retries (PR #2830)
+-   network debug printer (PR #2870)
+-   automatic UI PC mode on large displays
+-   removed support for upgrading from pre-0.10 (EEPROM)
+-   support for setting GPIO level when LEDs are off (RMT idle level, ESP32 only) (PR #2478)
+-   Pakistan time-zone (PKT)
+-   ArtPoll support
+-   TM1829 LED support
+-   experimental support for ESP32 S2, S3 and C3
+-   general improvements and bugfixes
+
 ### WLED release 0.13.3

 -   Version bump to v0.13.3 "Toki"
--- a/boards/esp32_twilord.json
+++ b/boards/esp32_twilord.json
@@ -25,7 +25,7 @@
    "arduino",
    "espidf"
 ],
-"name": "TwilightLord-ESP32 16MB",
+"name": "ESP32 16MB",
 "upload": {
    "flash_size": "16MB",
    "maximum_ram_size": 327680,
@@ -34,5 +34,5 @@
    "speed": 2000000
 },
 "url": "https://en.wikipedia.org/wiki/ESP32",
-"vendor": "TwilightLord"
+"vendor": "Multiple"
 }
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "wled",
-  "version": "0.14.0.6.0",
+  "version": "0.14.0-b1.18",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "wled",
-      "version": "0.14.0.6.0",
+      "version": "0.14.0-b1.18",
      "license": "ISC",
      "dependencies": {
        "clean-css": "^4.2.3",
@@ -3845,9 +3845,9 @@
      }
    },
    "http-cache-semantics": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
-      "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
+      "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ=="
    },
    "http-signature": {
      "version": "1.2.0",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "wled",
-  "version": "0.14.0.6.0",
+  "version": "0.14.0-b1.18",
  "description": "Tools for WLED project",
  "main": "tools/cdata.js",
  "directories": {
--- a/platformio.ini
+++ b/platformio.ini
--- a/readme.md
+++ b/readme.md
@@ -15,11 +15,11 @@
 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!

 ## ⚙️ Features
- WS2812FX library integrated for over 100 special effects  
+- WS2812FX library with more than 100 special effects  
 - FastLED noise effects and 50 palettes  
 - Modern UI with color, effect and segment controls  
- Segments to set different effects and colors to parts of the LEDs  
- Settings page - configuration over network  
+- Segments to set different effects and colors to user defined parts of the LED string  
+- Settings page - configuration via the network  
 - Access Point and station mode - automatic failsafe AP  
 - Up to 10 LED outputs per instance
 - Support for RGBW strips  
@@ -28,7 +28,7 @@ A fast and feature-rich implementation of an ESP8266/ESP32 webserver to control
 - Nightlight function (gradually dims down)  
 - Full OTA software updatability (HTTP + ArduinoOTA), password protectable  
 - Configurable analog clock (Cronixie, 7-segment and EleksTube IPS clock support via usermods) 
- Configurable Auto Brightness limit for safer operation  
+- Configurable Auto Brightness limit for safe operation  
 - Filesystem-based config for easier backup of presets and settings  

 ## 💡 Supported light control interfaces
@@ -49,33 +49,37 @@ A fast and feature-rich implementation of an ESP8266/ESP32 webserver to control

 ## 📲 Quick start guide and documentation

-See the [documentation on our official site](https://kno.wled.ge)!
+See the [documentation on our official site](https://mm.kno.wled.ge)!

-[On this page](https://kno.wled.ge/basics/tutorials/) you can find excellent tutorials made by the community and helpful tools to help you get your new lamp up and running!
+[On this page](https://mm.kno.wled.ge/basics/tutorials/) you can find excellent tutorials and tools to help you get your new project up and running!

 ## 🖼️ User interface
 <img src="/images/macbook-pro-space-gray-on-the-wooden-table.jpg" width="50%"><img src="/images/walking-with-iphone-x.jpg" width="50%">

 ## 💾 Compatible hardware

-See [here](https://kno.wled.ge/basics/compatible-hardware)!
+See [here](https://mm.kno.wled.ge/basics/compatible-hardware)!

 ## ✌️ Other

 Licensed under the MIT license  
-Credits [here](https://kno.wled.ge/about/contributors/)!
+Credits [here](https://mm.kno.wled.ge/about/contributors/)!

 Join the Discord server to discuss everything about WLED!

 <a href="https://discord.gg/KuqP7NE"><img src="https://discordapp.com/api/guilds/473448917040758787/widget.png?style=banner2" width="25%"></a>

 Check out the WLED [Discourse forum](https://wled.discourse.group)!  
-You can also send me mails to [dev.aircoookie@gmail.com](mailto:dev.aircoookie@gmail.com), but please only do so if you want to talk to me privately.  
-If WLED really brightens up your every day, you can [![](https://img.shields.io/badge/send%20me%20a%20small%20gift-paypal-blue.svg?style=flat-square)](https://paypal.me/aircoookie)
+
+You can also send me mails to [dev.aircoookie@gmail.com](mailto:dev.aircoookie@gmail.com), but please, only do so if you want to talk to me privately.  
+
+If WLED really brightens up your day, you can [![](https://img.shields.io/badge/send%20me%20a%20small%20gift-paypal-blue.svg?style=flat-square)](https://paypal.me/aircoookie)


 *Disclaimer:*   
-If you are sensitive to photosensitive epilepsy it is not recommended that you use this software.  
-In case you still want to try, don't use strobe, lighting or noise modes or high effect speed settings.
+
+If you are prone to photosensitive epilepsy, we recommended you do **not** use this software.  
+If you still want to try, don't use strobe, lighting or noise modes or high effect speed settings.
+
 As per the MIT license, I assume no liability for any damage to you or any other person or equipment.  

--- a/requirements.txt
+++ b/requirements.txt
@@ -14,7 +14,7 @@ async-timeout==4.0.2
    # via zeroconf
 bottle==0.12.23
    # via platformio
-certifi==2022.6.15
+certifi==2022.12.7
    # via requests
 charset-normalizer==2.1.1
    # via requests
@@ -23,9 +23,7 @@ click==8.1.3
    #   platformio
    #   uvicorn
 colorama==0.4.5
-    # via
-    #   click
-    #   platformio
+    # via platformio
 h11==0.13.0
    # via
    #   uvicorn
@@ -58,8 +56,6 @@ starlette==0.20.4
    # via platformio
 tabulate==0.8.10
    # via platformio
-typing-extensions==4.3.0
-    # via starlette
 urllib3==1.26.11
    # via requests
 uvicorn==0.18.2
--- a/tools/ESP32-Chip_info.hpp
+++ b/tools/ESP32-Chip_info.hpp
@@ -545,12 +545,16 @@ void showRealSpeed() {
  Serial.print("FLASH SIZE (magic byte): "); Serial.print(ESP.getFlashChipSize() / (1024.0 * 1024), 2); Serial.println(" MB");
  Serial.print("FLASH MODE (magic byte): "); Serial.print(ESP.getFlashChipMode()); Serial.println(" ;  0=QIO, 1=QOUT, 2=DIO, 3=DOUT or other\n");

+  Serial.flush();
  Serial.print("FLASH CHIP ID:   0x"); Serial.println(my_ESP_getFlashChipId(), HEX);
-  Serial.print("FLASH CHIP FREQ: "); Serial.print(my_ESP_getFlashChipSpeed() / 1000000.0, 1); Serial.println(" MHz");
+#if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3)
+  //Serial.print("FLASH CHIP FREQ: "); Serial.print(my_ESP_getFlashChipSpeed() / 1000000.0, 1); Serial.println(" MHz"); // this seems to crash on -S2
+#endif
  Serial.print("FLASH REAL SIZE: "); Serial.print(my_ESP_getFlashChipRealSize() / (1024.0 * 1024), 2); Serial.println(" MB");
  Serial.print("FLASH REAL MODE: "); Serial.println(my_ESP_getFlashChipMode());

  Serial.println(F("\n------------------------------------"));
+  Serial.flush();
  Serial.print(  "RAM HEAP SIZE:  "); Serial.print(ESP.getHeapSize() / 1024.0, 2); Serial.println(" KB");
  Serial.print(  " FREE RAM:      "); Serial.print(ESP.getFreeHeap() / 1024.0, 2); Serial.println(" KB");
  Serial.print(  " MAX RAM alloc: "); Serial.print(ESP.getMaxAllocHeap() / 1024.0, 2); Serial.println(" KB");
@@ -566,6 +570,7 @@ void showRealSpeed() {
    Serial.println();
    show_psram_info_part2();
  }
+  Serial.flush();
 #endif

  Serial.println();
--- a/tools/cdata.js
+++ b/tools/cdata.js
@@ -134,7 +134,7 @@ function writeHtmlGzipped(sourceFile, resultFile, page) {
 * Binary array for the Web UI.
 * gzip is used for smaller size and improved speeds.
 * 
- * Please see https://kno.wled.ge/advanced/custom-features/#changing-web-ui
+ * Please see https://mm.kno.wled.ge/advanced/custom-features/#changing-web-ui
 * to find out how to easily modify the web UI source!
 */
 
@@ -199,7 +199,7 @@ function writeChunks(srcDir, specs, resultFile) {
  let src = `/*
 * More web UI HTML source arrays.
 * This file is auto generated, please don't make any changes manually.
- * Instead, see https://kno.wled.ge/advanced/custom-features/#changing-web-ui
+ * Instead, see https://mm.kno.wled.ge/advanced/custom-features/#changing-web-ui
 * to find out how to easily modify the web UI source!
 */ 
 `;
@@ -220,6 +220,7 @@ function writeChunks(srcDir, specs, resultFile) {

 writeHtmlGzipped("wled00/data/index.htm", "wled00/html_ui.h", 'index');
 writeHtmlGzipped("wled00/data/simple.htm", "wled00/html_simple.h", 'simple');
+writeHtmlGzipped("wled00/data/pixart/pixart.htm", "wled00/html_pixart.h", 'pixart');
 /*
 writeChunks(
  "wled00/data",
@@ -399,6 +400,13 @@ const char PAGE_dmxmap[] PROGMEM = R"=====()=====";
      method: "gzip",
      filter: "html-minify",
    },
+    //WLEDMM
+    {
+      file: "peek.js",
+      name: "PAGE_peekJs",
+      method: "gzip",
+      filter: "js-minify",
+    },
    {
      file: "404.htm",
      name: "PAGE_404",
--- a/tools/partitions-4MB-tinyuf2_spiffs.csv
+++ b/tools/partitions-4MB-tinyuf2_spiffs.csv
@@ -0,0 +1,11 @@
+# ESP-IDF Partition Table
+# Name,   Type, SubType, Offset,  Size, Flags
+# bootloader.bin,,          0x1000, 32K
+# partition table,          0x8000, 4K
+
+nvs,      data, nvs,      0x9000,  20K,
+otadata,  data, ota,      0xe000,  8K,
+ota_0,    0,    ota_0,   0x10000,  1408K,
+ota_1,    0,    ota_1,  0x170000,  1408K,
+uf2,      app,  factory,0x2d0000,  256K,
+spiffs,   data, spiffs, 0x310000,  960K,
--- a/usermods/ADS1115_v2/readme.md
+++ b/usermods/ADS1115_v2/readme.md
@@ -2,7 +2,7 @@

 This usermod will read from an ADS1115 ADC. The voltages are displayed in the Info section of the web UI.

-Configuration is all completed via the Usermod menu. There are no settings to set in code!
+Configuration is performed via the Usermod menu. There are no parameters to set in code!

 ## Installation 

--- a/usermods/Analog_Clock/Analog_Clock.h
+++ b/usermods/Analog_Clock/Analog_Clock.h
@@ -56,7 +56,7 @@ private:

    // runtime
    bool     initDone         = false;
-    uint32_t lastOverlayDraw  = 0; 
+    uint32_t lastOverlayDraw  = 0;

    void validateAndUpdate() {
        mainSegment.validateAndUpdate();
@@ -110,9 +110,9 @@ private:

    static inline uint32_t qadd32(uint32_t c1, uint32_t c2) {
        return RGBW32(
-            qadd8(R(c1), R(c2)), 
-            qadd8(G(c1), G(c2)), 
-            qadd8(B(c1), B(c2)), 
+            qadd8(R(c1), R(c2)),
+            qadd8(G(c1), G(c2)),
+            qadd8(B(c1), B(c2)),
            qadd8(W(c1), W(c2))
        );
    }
@@ -166,7 +166,7 @@ public:
        double secondP = second(localTime) / 60.0;
        double minuteP = minute(localTime) / 60.0;
        double hourP = (hour(localTime) % 12) / 12.0 + minuteP / 12.0;
-        
+
        if (hourMarksEnabled)         {
            for (int Led = 0; Led <= 55; Led = Led + 5)
            {
@@ -174,7 +174,7 @@ public:
                setPixelColor(hourmarkled, hourMarkColor);
            }
        }
-        
+
        if (secondsEnabled) {
            int16_t secondLed = adjustToSegment(secondP, secondsSegment);

@@ -203,45 +203,45 @@ public:
    void addToConfig(JsonObject& root) override {
        validateAndUpdate();

-        JsonObject top = root.createNestedObject("Analog Clock");
-        top["Overlay Enabled"]               = enabled;
-        top["First LED (Main Ring)"]         = mainSegment.firstLed;
-        top["Last LED (Main Ring)"]          = mainSegment.lastLed;
-        top["Center/12h LED (Main Ring)"]    = mainSegment.centerLed;
-        top["Hour Marks Enabled"]            = hourMarksEnabled;
-        top["Hour Mark Color (RRGGBB)"]      = colorToHexString(hourMarkColor);
-        top["Hour Color (RRGGBB)"]           = colorToHexString(hourColor);
-        top["Minute Color (RRGGBB)"]         = colorToHexString(minuteColor);
-        top["Show Seconds"]                  = secondsEnabled;
-        top["First LED (Seconds Ring)"]      = secondsSegment.firstLed;
-        top["Last LED (Seconds Ring)"]       = secondsSegment.lastLed;
-        top["Center/12h LED (Seconds Ring)"] = secondsSegment.centerLed;
-        top["Second Color (RRGGBB)"]         = colorToHexString(secondColor);
-        top["Seconds Effect (0-1)"]          = secondsEffect;
-        top["Blend Colors"]                  = blendColors;
+        JsonObject top = root.createNestedObject(F("Analog Clock"));
+        top[F("Overlay Enabled")]               = enabled;
+        top[F("First LED (Main Ring)")]         = mainSegment.firstLed;
+        top[F("Last LED (Main Ring)")]          = mainSegment.lastLed;
+        top[F("Center/12h LED (Main Ring)")]    = mainSegment.centerLed;
+        top[F("Hour Marks Enabled")]            = hourMarksEnabled;
+        top[F("Hour Mark Color (RRGGBB)")]      = colorToHexString(hourMarkColor);
+        top[F("Hour Color (RRGGBB)")]           = colorToHexString(hourColor);
+        top[F("Minute Color (RRGGBB)")]         = colorToHexString(minuteColor);
+        top[F("Show Seconds")]                  = secondsEnabled;
+        top[F("First LED (Seconds Ring)")]      = secondsSegment.firstLed;
+        top[F("Last LED (Seconds Ring)")]       = secondsSegment.lastLed;
+        top[F("Center/12h LED (Seconds Ring)")] = secondsSegment.centerLed;
+        top[F("Second Color (RRGGBB)")]         = colorToHexString(secondColor);
+        top[F("Seconds Effect (0-1)")]          = secondsEffect;
+        top[F("Blend Colors")]                  = blendColors;
    }

    bool readFromConfig(JsonObject& root) override {
-        JsonObject top = root["Analog Clock"];
+        JsonObject top = root[F("Analog Clock")];

        bool configComplete = !top.isNull();

        String color;
-        configComplete &= getJsonValue(top["Overlay Enabled"], enabled, false);
-        configComplete &= getJsonValue(top["First LED (Main Ring)"], mainSegment.firstLed, 0);
-        configComplete &= getJsonValue(top["Last LED (Main Ring)"], mainSegment.lastLed, 59);
-        configComplete &= getJsonValue(top["Center/12h LED (Main Ring)"], mainSegment.centerLed, 0);
-        configComplete &= getJsonValue(top["Hour marks Enabled"], hourMarksEnabled, false);
-        configComplete &= getJsonValue(top["Hour mark Color (RRGGBB)"], color, "FF0000") && hexStringToColor(color, hourMarkColor, 0x0000FF);
-        configComplete &= getJsonValue(top["Hour Color (RRGGBB)"], color, "0000FF") && hexStringToColor(color, hourColor, 0x0000FF);
-        configComplete &= getJsonValue(top["Minute Color (RRGGBB)"], color, "00FF00") && hexStringToColor(color, minuteColor, 0x00FF00);
-        configComplete &= getJsonValue(top["Show Seconds"], secondsEnabled, true);
-        configComplete &= getJsonValue(top["First LED (Seconds Ring)"], secondsSegment.firstLed, 0);
-        configComplete &= getJsonValue(top["Last LED (Seconds Ring)"], secondsSegment.lastLed, 59);
-        configComplete &= getJsonValue(top["Center/12h LED (Seconds Ring)"], secondsSegment.centerLed, 0);
-        configComplete &= getJsonValue(top["Second Color (RRGGBB)"], color, "FF0000") && hexStringToColor(color, secondColor, 0xFF0000);
-        configComplete &= getJsonValue(top["Seconds Effect (0-1)"], secondsEffect, 0);
-        configComplete &= getJsonValue(top["Blend Colors"], blendColors, true);
+        configComplete &= getJsonValue(top[F("Overlay Enabled")], enabled, false);
+        configComplete &= getJsonValue(top[F("First LED (Main Ring)")], mainSegment.firstLed, 0);
+        configComplete &= getJsonValue(top[F("Last LED (Main Ring)")], mainSegment.lastLed, 59);
+        configComplete &= getJsonValue(top[F("Center/12h LED (Main Ring)")], mainSegment.centerLed, 0);
+        configComplete &= getJsonValue(top[F("Hour Marks Enabled")], hourMarksEnabled, false);
+        configComplete &= getJsonValue(top[F("Hour Mark Color (RRGGBB)")], color, F("161616")) && hexStringToColor(color, hourMarkColor, 0x161616);
+        configComplete &= getJsonValue(top[F("Hour Color (RRGGBB)")], color, F("0000FF")) && hexStringToColor(color, hourColor, 0x0000FF);
+        configComplete &= getJsonValue(top[F("Minute Color (RRGGBB)")], color, F("00FF00")) && hexStringToColor(color, minuteColor, 0x00FF00);
+        configComplete &= getJsonValue(top[F("Show Seconds")], secondsEnabled, true);
+        configComplete &= getJsonValue(top[F("First LED (Seconds Ring)")], secondsSegment.firstLed, 0);
+        configComplete &= getJsonValue(top[F("Last LED (Seconds Ring)")], secondsSegment.lastLed, 59);
+        configComplete &= getJsonValue(top[F("Center/12h LED (Seconds Ring)")], secondsSegment.centerLed, 0);
+        configComplete &= getJsonValue(top[F("Second Color (RRGGBB)")], color, F("FF0000")) && hexStringToColor(color, secondColor, 0xFF0000);
+        configComplete &= getJsonValue(top[F("Seconds Effect (0-1)")], secondsEffect, 0);
+        configComplete &= getJsonValue(top[F("Blend Colors")], blendColors, true);

        if (initDone) {
            validateAndUpdate();
@@ -253,4 +253,4 @@ public:
    uint16_t getId() override {
        return USERMOD_ID_ANALOG_CLOCK;
    }
-};
+};
--- a/usermods/Animated_Staircase/Animated_Staircase.h
+++ b/usermods/Animated_Staircase/Animated_Staircase.h
@@ -92,12 +92,14 @@ class Animated_Staircase : public Usermod {
    static const char _bottomEchoCm[];
    
    void publishMqtt(bool bottom, const char* state) {
+#ifndef WLED_DISABLE_MQTT
      //Check if MQTT Connected, otherwise it will crash the 8266
      if (WLED_MQTT_CONNECTED){
        char subuf[64];
        sprintf_P(subuf, PSTR("%s/motion/%d"), mqttDeviceTopic, (int)bottom);
        mqtt->publish(subuf, 0, false, state);
      }
+#endif
    }

    void updateSegments() {
@@ -345,6 +347,7 @@ class Animated_Staircase : public Usermod {

    uint16_t getId() { return USERMOD_ID_ANIMATED_STAIRCASE; }

+#ifndef WLED_DISABLE_MQTT
    /**
     * handling of MQTT message
     * topic only contains stripped topic (part after /wled/MAC)
@@ -382,6 +385,7 @@ class Animated_Staircase : public Usermod {
        mqtt->subscribe(subuf, 0);
      }
    }
+#endif

    void addToJsonState(JsonObject& root) {
      JsonObject staircase = root[FPSTR(_name)];
@@ -414,6 +418,8 @@ class Animated_Staircase : public Usermod {
    }

    void appendConfigData() {
+      oappend(SET_F("addHB('staircase');"));
+      
      //oappend(SET_F("dd=addDropdown('staircase','selectfield');"));
      //oappend(SET_F("addOption(dd,'1st value',0);"));
      //oappend(SET_F("addOption(dd,'2nd value',1);"));
--- a/usermods/Animated_Staircase/README.md
+++ b/usermods/Animated_Staircase/README.md
@@ -1,14 +1,14 @@
 # Usermod Animated Staircase
-This usermod makes your staircase look cool by switching it on with an animation. It uses
+This usermod makes your staircase look cool by illuminating it with an animation. It uses
 PIR or ultrasonic sensors at the top and bottom of your stairs to:

- Light up the steps in your walking direction, leading the way.
+- Light up the steps in the direction you're walking.
 - Switch off the steps after you, in the direction of the last detected movement.
 - Always switch on when one of the sensors detects movement, even if an effect
-  is still running. It can therewith handle multiple people on the stairs gracefully.
+  is still running. It can gracefully handle multiple people on the stairs.

 The Animated Staircase can be controlled by the WLED API. Change settings such as
-speed, on/off time and distance settings by sending an HTTP request, see below.
+speed, on/off time and distance by sending an HTTP request, see below.

 ## WLED integration
 To include this usermod in your WLED setup, you have to be able to [compile WLED from source](https://github.com/Aircoookie/WLED/wiki/Compiling-WLED).
@@ -20,17 +20,16 @@ Edit `usermods_list.cpp`:
 2. add `#include "../usermods/Animated_Staircase/Animated_Staircase.h"` to the top of the file
 3. add `usermods.add(new Animated_Staircase());` to the end of the `void registerUsermods()` function.

-You can configure usermod using Usermods settings page.
-Please enter GPIO pins for PIR sensors or ultrasonic sensor (trigger and echo).
+You can configure usermod using the Usermods settings page.
+Please enter GPIO pins for PIR or ultrasonic sensors (trigger and echo).
 If you use PIR sensor enter -1 for echo pin.
-Maximum distance for ultrasonic sensor can be configured as a time needed for echo (see below).
+Maximum distance for ultrasonic sensor can be configured as the time needed for an echo (see below).

 ## Hardware installation
-1. Stick the LED strip under each step of the stairs.
-2. Connect the ESP8266 pin D4 or ESP32 pin D2 to the first LED data pin at the bottom step
-   of your stairs.
+1. Attach the LED strip to each step of the stairs.
+2. Connect the ESP8266 pin D4 or ESP32 pin D2 to the first LED data pin at the bottom step.
 3. Connect the data-out pin at the end of each strip per step to the data-in pin on the 
-   other end of the next step, creating one large virtual LED strip.
+   next step, creating one large virtual LED strip.
 4. Mount sensors of choice at the bottom and top of the stairs and connect them to the ESP.
 5. To make sure all LEDs get enough power and have your staircase lighted evenly, power each
   step from one side, using at least AWG14 or 2.5mm^2 cable. Don't connect them serial as you
@@ -62,7 +61,7 @@ or remove them and put everything on one line.

 To read the current settings, open a browser to `http://xxx.xxx.xxx.xxx/json/state` (use your WLED 
 device IP address). The device will respond with a json object containing all WLED settings. 
-The staircase settings and sensor states are inside the WLED status element:
+The staircase settings and sensor states are inside the WLED "state" element:

 ```json
 {
@@ -70,14 +69,14 @@ The staircase settings and sensor states are inside the WLED status element:
        "staircase": {
            "enabled": true,
            "bottom-sensor": false,
-            "tops-ensor": false
+            "top-sensor": false
        },
 }
 ```

 ### Enable/disable the usermod
 By disabling the usermod you will be able to keep the LED's on, independent from the sensor
-activity. This enables to play with the lights without the usermod switching them on or off.
+activity. This enables you to play with the lights without the usermod switching them on or off.

 To disable the usermod:

@@ -92,17 +91,17 @@ To enable the usermod again, use `"enabled":true`.
 Alternatively you can use _Usermod_ Settings page where you can change other parameters as well.

 ### Changing animation parameters and detection range of the ultrasonic HC-SR04 sensor
-Using _Usermod_ Settings page you can define different usermod parameters, includng sensor pins, delay between segment activation and so on.
+Using _Usermod_ Settings page you can define different usermod parameters, includng sensor pins, delay between segment activation etc.

 When an ultrasonic sensor is enabled you can enter maximum detection distance in centimeters separately for top and bottom sensors.

-**Please note:** that using an HC-SR04 sensor, particularly when detecting echos at longer
-distances creates delays in the WLED software, and _might_ introduce timing hickups in your animations or
+**Please note:** using an HC-SR04 sensor, particularly when detecting echos at longer
+distances creates delays in the WLED software, _might_ introduce timing hiccups in your animation or
 a less responsive web interface. It is therefore advised to keep the detection distance as short as possible.

 ### Animation triggering through the API
-Instead of stairs activation by one of the sensors, you can also trigger the animation through
-the API. To simulate triggering the bottom sensor, use:
+In addition to activation by one of the stair sensors, you can also trigger the animation manually
+via the API. To simulate triggering the bottom sensor, use:

 ```bash
 curl -X POST -H "Content-Type: application/json" \
@@ -110,7 +109,7 @@ curl -X POST -H "Content-Type: application/json" \
     xxx.xxx.xxx.xxx/json/state
 ```

-Likewise, to trigger the top sensor, use:
+Likewise, to trigger the top sensor:

 ```bash
 curl -X POST -H "Content-Type: application/json" \
@@ -119,7 +118,7 @@ curl -X POST -H "Content-Type: application/json" \
 ```
 **MQTT**
 You can publish a message with either `up` or `down` on topic `/swipe` to trigger animation.
-You can also use `on` or `off` for enabling or disabling usermod.
+You can also use `on` or `off` for enabling or disabling the usermod.

 Have fun with this usermod.<br/>
 www.rolfje.com
@@ -128,4 +127,4 @@ Modifications @blazoncek

 ## Change log
 2021-04
-* Adaptation for runtime configuration.
+* Adaptation for runtime configuration.
--- a/usermods/BH1750_v2/readme.md
+++ b/usermods/BH1750_v2/readme.md
@@ -1,7 +1,7 @@
 # BH1750 usermod

-This usermod will read from an ambient light sensor like the BH1750 sensor.
-The luminance is displayed both in the Info section of the web UI as well as published to the `/luminance` MQTT topic if enabled.
+This usermod will read from an ambient light sensor like the BH1750.
+The luminance is displayed in both the Info section of the web UI, as well as published to the `/luminance` MQTT topic if enabled.

 ## Dependencies
 - Libraries
@@ -28,9 +28,9 @@ The following settings can be set at compile-time but are configurable on the us
 *   `USERMOD_BH1750_MAX_MEASUREMENT_INTERVAL` - the max number of milliseconds between measurements, defaults to 10000ms
 *   `USERMOD_BH1750_MIN_MEASUREMENT_INTERVAL` - the min number of milliseconds between measurements, defaults to 500ms
 *   `USERMOD_BH1750_OFFSET_VALUE` - the offset value to report on, defaults to 1
-*   `USERMOD_BH1750_FIRST_MEASUREMENT_AT` - the number of milliseconds after boot to take first measurement, defaults to 10 seconds
+*   `USERMOD_BH1750_FIRST_MEASUREMENT_AT` - the number of milliseconds after boot to take first measurement, defaults to 10000 ms

-In addition, on the Usermod screen allows you to:
+In addition, the Usermod screen allows you to:
 - enable/disable the usermod
 - Enable Home Assistant Discovery of usermod
 - Configure the SCL/SDA pins
@@ -44,6 +44,6 @@ Jul 2022
 - Added Home Assistant Discovery
 - Implemented PinManager to register pins
 - Made pins configurable in usermod menu
- Added API call to read illuminance from other modules
+- Added API call to read luminance from other modules
 - Enhanced info-screen outputs
- Updated `readme.md`
+- Updated `readme.md`
--- a/usermods/BH1750_v2/usermod_bh1750.h
+++ b/usermods/BH1750_v2/usermod_bh1750.h
@@ -1,10 +1,16 @@
-// force the compiler to show a warning to confirm that this file is included
-#warning **** Included USERMOD_BH1750 ****
+// force the compiler to show a warning to confirm that this file is included WLEDMM: commented this warning as we want serious warnings ;-)
+// #warning **** Included USERMOD_BH1750 ****
+
+#ifndef WLED_ENABLE_MQTT
+#error "This user mod requires MQTT to be enabled."
+#endif

 #pragma once

-#include "wled.h"
+#include <Arduino.h>   // WLEDMM: make sure that I2C drivers have the "right" Wire Object
 #include <Wire.h>
+
+#include "wled.h"
 #include <BH1750.h>

 // the max frequency to check photoresistor, 10 seconds
@@ -53,14 +59,19 @@ private:
  static const char _HomeAssistantDiscovery[];

  // set the default pins based on the architecture, these get overridden by Usermod menu settings
-  #ifdef ARDUINO_ARCH_ESP32 // ESP32 boards
-    #define HW_PIN_SCL 22
-    #define HW_PIN_SDA 21
-  #else // ESP8266 boards
-    #define HW_PIN_SCL 5
-    #define HW_PIN_SDA 4
-  #endif
-  int8_t ioPin[2] = {HW_PIN_SCL, HW_PIN_SDA};        // I2C pins: SCL, SDA...defaults to Arch hardware pins but overridden at setup()
+  // #ifdef ARDUINO_ARCH_ESP32 // ESP32 boards -- WLEDMM: don't override already defined HW pins
+  //   #ifndef HW_PIN_SDA
+  //     #define HW_PIN_SCL 22
+  //   #endif
+  //   #ifndef HW_PIN_SDA
+  //     #define HW_PIN_SDA 21
+  //   #endif
+  // #else // ESP8266 boards
+  //   #define HW_PIN_SCL 5
+  //   #define HW_PIN_SDA 4
+  // #endif
+  //int8_t ioPin[2] = {HW_PIN_SCL, HW_PIN_SDA};        // I2C pins: SCL, SDA...defaults to Arch hardware pins but overridden at setup()
+  int8_t ioPin[2] = {-1, -1};        // WLEDMM - I2C pins: wait until hw pins get allocated
  bool initDone = false;
  bool sensorFound = false;

@@ -119,13 +130,28 @@ private:
 public:
  void setup()
  {
-    bool HW_Pins_Used = (ioPin[0]==HW_PIN_SCL && ioPin[1]==HW_PIN_SDA); // note whether architecture-based hardware SCL/SDA pins used
+    bool HW_Pins_Used = (ioPin[0]==i2c_scl && ioPin[1]==i2c_sda); // note whether architecture-based hardware SCL/SDA pins used
    PinOwner po = PinOwner::UM_BH1750; // defaults to being pinowner for SCL/SDA pins
-    PinManagerPinType pins[2] = { { ioPin[0], true }, { ioPin[1], true } };  // allocate pins
    if (HW_Pins_Used) po = PinOwner::HW_I2C; // allow multiple allocations of HW I2C bus pins
+    if ((i2c_scl >= 0) && (i2c_sda >=0)) { // WLEDMM: make sure that global HW pins are used if defined 
+      ioPin[0] = i2c_scl;
+      ioPin[1] = i2c_sda;
+      po = PinOwner::HW_I2C;
+    }
+    PinManagerPinType pins[2] = { { ioPin[0], true }, { ioPin[1], true } };  // allocate pins // WLEDMM: after selecting final pins
    if (!pinManager.allocateMultiplePins(pins, 2, po)) return;
    
-    Wire.begin(ioPin[1], ioPin[0]);
+#if defined(ARDUINO_ARCH_ESP32)
+      if (pins[1].pin < 0 || pins[0].pin < 0)  { sensorFound=false; enabled=false; return; }  //WLEDMM bugfix - ensure that "final" GPIO are valid and no "-1" sneaks trough
+      //Wire.begin(pins[1].pin, pins[0].pin);  // WLEDMM this might silently fail, which is OK as it just means that I2C bus is already running.
+#else
+      //Wire.begin();  // WLEDMM - i2c pins on 8266 are fixed.
+#endif
+    if (!pinManager.joinWire()) {  // WLEDMM - this allocates global I2C pins, then starts Wire - if not started previously
+      sensorFound = false;
+      enabled = false;
+      return;
+    }

    sensorFound = lightMeter.begin();
    initDone = true;
@@ -136,6 +162,7 @@ public:
    if ((!enabled) || strip.isUpdating())
      return;

+    if (!sensorFound) return;  // WLEDMM bugfix
    unsigned long now = millis();

    // check to see if we are due for taking a measurement
@@ -156,6 +183,7 @@ public:
    {
      lastLux = lux;
      lastSend = millis();
+#ifndef WLED_DISABLE_MQTT
      if (WLED_MQTT_CONNECTED)
      {
        if (!mqttInitialized)
@@ -164,12 +192,13 @@ public:
            mqttInitialized = true;
          }
        mqtt->publish(mqttLuminanceTopic.c_str(), 0, true, String(lux).c_str());
-        DEBUG_PRINTLN(F("Brightness: ") + String(lux) + F("lx"));
+        DEBUG_PRINTLN(String("Brightness: ") + String(lux) + String("lx"));  // WLEDMM fix compilation warning
      }
      else
      {
        DEBUG_PRINTLN(F("Missing MQTT connection. Not publishing data"));
      }
+#endif
    }
  }

@@ -179,6 +208,8 @@ public:

  void addToJsonInfo(JsonObject &root)
  {
+    if ((!enabled) || (!sensorFound)) return;  // WLEDMM bugfix
+
    JsonObject user = root[F("u")];
    if (user.isNull())
      user = root.createNestedObject(F("u"));
@@ -200,6 +231,15 @@ public:
    }
  }

+  void appendConfigData() {
+    oappend(SET_F("addHB('BH1750');"));
+    // WLEDMM this usermod can ONLY use HW_I2C - so always use globals
+    //oappend(SET_F("addInfo('BH1750:pin[]',0,'','I2C SCL');"));
+    //oappend(SET_F("rOpt('BH1750:pin[]',0,'use global (")); oappendi(i2c_scl); oappend(")',-1);"); 
+    //oappend(SET_F("addInfo('BH1750:pin[]',1,'','I2C SDA');"));
+    //oappend(SET_F("rOpt('BH1750:pin[]',1,'use global (")); oappendi(i2c_sda); oappend(")',-1);"); 
+  }    
+
  // (called from set.cpp) stores persistent properties to cfg.json
  void addToConfig(JsonObject &root)
  {
@@ -210,9 +250,14 @@ public:
    top[FPSTR(_minReadInterval)] = minReadingInterval;
    top[FPSTR(_HomeAssistantDiscovery)] = HomeAssistantDiscovery;
    top[FPSTR(_offset)] = offset;
-    JsonArray io_pin = top.createNestedArray(F("pin"));
-    for (byte i=0; i<2; i++) io_pin.add(ioPin[i]);
-    top[F("help4Pins")] = F("SCL,SDA"); // help for Settings page
+
+    // WLEDMM this usermod can ONLY use HW_I2C - so always use globals
+    //JsonArray io_pin = top.createNestedArray(F("pin"));
+    //WLEDMM: avoid global pin hijacking
+    //io_pin.add((ioPin[0]==i2c_scl)?-1:ioPin[0]);
+    //io_pin.add((ioPin[1]==i2c_sda)?-1:ioPin[1]);
+
+    // top[F("help4Pins")] = F("SCL,SDA"); // help for Settings page

    DEBUG_PRINTLN(F("BH1750 config saved."));
  }
@@ -220,7 +265,8 @@ public:
  // called before setup() to populate properties from values stored in cfg.json
  bool readFromConfig(JsonObject &root)
  {
-    int8_t newPin[2]; for (byte i=0; i<2; i++) newPin[i] = ioPin[i]; // prepare to note changed pins
+    int8_t newPin[2] = {-1, -1}; // WLEDMM this usermod can ONLY use HW_I2C - so always use globals
+    //for (byte i=0; i<2; i++) newPin[i] = ioPin[i]; // prepare to note changed pins

    // we look for JSON object.
    JsonObject top = root[FPSTR(_name)];
@@ -238,7 +284,8 @@ public:
    configComplete &= getJsonValue(top[FPSTR(_minReadInterval)], minReadingInterval, 500); //ms
    configComplete &= getJsonValue(top[FPSTR(_HomeAssistantDiscovery)], HomeAssistantDiscovery, false);
    configComplete &= getJsonValue(top[FPSTR(_offset)], offset, 1);
-    for (byte i=0; i<2; i++) configComplete &= getJsonValue(top[F("pin")][i], newPin[i], ioPin[i]);
+    // WLEDMM this usermod can ONLY use HW_I2C - so always use globals
+    //for (byte i=0; i<2; i++) configComplete &= getJsonValue(top[F("pin")][i], newPin[i], ioPin[i]);

    DEBUG_PRINT(FPSTR(_name));
    if (!initDone) {
@@ -252,7 +299,8 @@ public:
      for (byte i=0; i<2; i++) if (ioPin[i] != newPin[i]) { pinsChanged = true; break; } // check if any pins changed
      if (pinsChanged) { //if pins changed, deallocate old pins and allocate new ones
        PinOwner po = PinOwner::UM_BH1750;
-        if (ioPin[0]==HW_PIN_SCL && ioPin[1]==HW_PIN_SDA) po = PinOwner::HW_I2C;  // allow multiple allocations of HW I2C bus pins
+        if (ioPin[0]==i2c_scl && ioPin[1]==i2c_sda) po = PinOwner::HW_I2C;  // allow multiple allocations of HW I2C bus pins
+        if (ioPin[0]==-1 && ioPin[1]==-1) po = PinOwner::HW_I2C;            // WLEDMM global HW I2C bus pins
        pinManager.deallocateMultiplePins((const uint8_t *)ioPin, 2, po);  // deallocate pins
        for (byte i=0; i<2; i++) ioPin[i] = newPin[i];
        setup();
--- a/usermods/BME280_v2/README.md
+++ b/usermods/BME280_v2/README.md
@@ -6,14 +6,14 @@ This Usermod is designed to read a `BME280` or `BMP280` sensor and output the fo
 - Heat Index (`BME280` only)
 - Dew Point (`BME280` only)

-Configuration is all completed via the Usermod menu.  There are no settings to set in code!  The following settings can be configured in the Usermod Menu:
+Configuration is performed via the Usermod menu.  There are no parameters to set in code!  The following settings can be configured in the Usermod Menu:
 - Temperature Decimals (number of decimal places to output)
 - Humidity Decimals
 - Pressure Decimals
- Temperature Interval (how many seconds between reads of temperature and humidity)
+- Temperature Interval (how many seconds between temperature and humidity measurements)
 - Pressure Interval
 - Publish Always (turn off to only publish changes, on to publish whether or not value changed)
- Use Celsius (turn off to use Farenheit)
+- Use Celsius (turn off to use Fahrenheit)
 - Home Assistant Discovery (turn on to sent MQTT Discovery entries for Home Assistant)
 - SCL/SDA GPIO Pins

@@ -23,7 +23,7 @@ Dependencies
  - `Wire`
  - These must be added under `lib_deps` in your `platform.ini` (or `platform_override.ini`).
 - Data is published over MQTT - make sure you've enabled the MQTT sync interface.
- This usermod also writes to serial (GPIO1 on ESP8266). Please make sure nothing else listening on the serial TX pin of your board will get confused by log messages!
+- This usermod also writes to serial (GPIO1 on ESP8266). Please make sure nothing else is listening to the serial TX pin or your board will get confused by log messages!

 In addition to outputting via MQTT, you can read the values from the Info Screen on the dashboard page of the device's web interface.

@@ -37,7 +37,7 @@ Methods also exist to read the read/calculated values from other WLED modules th
 - `getHeatIndexC()`
 - `getHeatIndexF()`

-# Complilation
+# Compiling

 To enable, compile with `USERMOD_BME280` defined  (e.g. in `platformio_override.ini`)
 ```ini
@@ -63,7 +63,7 @@ Pressure | `<deviceTopic>/pressure`
 Heat index | `<deviceTopic>/heat_index`
 Dew point | `<deviceTopic>/dew_point`

-If you are using Home Assistant, and `Home Assistant Discovery` is turned on, Home Assistant should automatically detect a new device, provided you have the MQTT integration installed.  The  device is seperate from the main WLED device and will contain sensors for Pressure, Humidity, Temperature, Dew Point and Heat Index.
+If you are using Home Assistant, and `Home Assistant Discovery` is turned on, Home Assistant should automatically detect a new device, provided you have the MQTT integration installed.  The device is separate from the main WLED device and will contain sensors for Pressure, Humidity, Temperature, Dew Point and Heat Index.

 # Revision History
 Jul 2022
@@ -82,9 +82,9 @@ Apr 2021

 Dec 2020
 - Ported to V2 Usermod format
- Customisable `measure intervals`
- Customisable number of `decimal places` in published sensor values
+- Customizable `measure intervals`
+- Customizable number of `decimal places` in published sensor values
 - Pressure measured in units of hPa instead of Pa
 - Calculation of heat index (apparent temperature) and dew point
 - `16x oversampling` of sensor during measurement
- Values only published if they are different from the previous value
+- Values only published if they are different from the previous value
--- a/usermods/BME280_v2/usermod_bme280.h
+++ b/usermods/BME280_v2/usermod_bme280.h
@@ -1,5 +1,9 @@
-// force the compiler to show a warning to confirm that this file is included
-#warning **** Included USERMOD_BME280 version 2.0 ****
+// force the compiler to show a warning to confirm that this file is included  WLEDMM: commented this warning as we want serious warnings ;-)
+// #warning **** Included USERMOD_BME280 version 2.0 ****
+
+#ifndef WLED_ENABLE_MQTT
+#error "This user mod requires MQTT to be enabled."
+#endif

 #pragma once

@@ -16,14 +20,15 @@ private:
  // NOTE: Do not implement any compile-time variables, anything the user needs to configure
  // should be configurable from the Usermod menu using the methods below
  // key settings set via usermod menu
-  unsigned long TemperatureDecimals = 0;  // Number of decimal places in published temperaure values
-  unsigned long  HumidityDecimals = 0;    // Number of decimal places in published humidity values
-  unsigned long  PressureDecimals = 0;    // Number of decimal places in published pressure values
-  unsigned long  TemperatureInterval = 5; // Interval to measure temperature (and humidity, dew point if available) in seconds
-  unsigned long  PressureInterval = 300;  // Interval to measure pressure in seconds
+  uint8_t  TemperatureDecimals = 0;  // Number of decimal places in published temperaure values
+  uint8_t  HumidityDecimals = 0;    // Number of decimal places in published humidity values
+  uint8_t  PressureDecimals = 0;    // Number of decimal places in published pressure values
+  uint16_t TemperatureInterval = 5; // Interval to measure temperature (and humidity, dew point if available) in seconds
+  uint16_t PressureInterval = 300;  // Interval to measure pressure in seconds
  bool PublishAlways = false;             // Publish values even when they have not changed
  bool UseCelsius = true;                 // Use Celsius for Reporting
  bool HomeAssistantDiscovery = false;    // Publish Home Assistant Device Information
+  bool enabled = true;

  // set the default pins based on the architecture, these get overridden by Usermod menu settings
  #ifdef ESP8266
@@ -70,20 +75,16 @@ private:

  // MQTT topic strings for publishing Home Assistant discovery topics
  bool mqttInitialized = false;
-  String mqttTemperatureTopic = "";
-  String mqttHumidityTopic = "";
-  String mqttPressureTopic = "";
-  String mqttHeatIndexTopic = "";
-  String mqttDewPointTopic = "";

-  // Store packet IDs of MQTT publications
-  uint16_t mqttTemperaturePub = 0;
-  uint16_t mqttPressurePub = 0;
+  // strings to reduce flash memory usage (used more than twice)
+  static const char _name[];
+  static const char _enabled[];

  // Read the BME280/BMP280 Sensor (which one runs depends on whether Celsius or Farenheit being set in Usermod Menu)
  void UpdateBME280Data(int SensorType)
  {
    float _temperature, _humidity, _pressure;
+    if (!enabled || (sensorType == 0)) return;  // WLEDMM bugfix

    if (UseCelsius) {
      BME280::TempUnit tempUnit(BME280::TempUnit_Celsius);
@@ -95,7 +96,7 @@ private:
      sensorTemperature = _temperature;
      sensorHumidity = _humidity;
      sensorPressure = _pressure;
-      tempScale = "°C";
+      tempScale = F("°C");
      if (sensorType == 1)
      {
        sensorHeatIndex = EnvironmentCalculations::HeatIndex(_temperature, _humidity, envTempUnit);
@@ -111,7 +112,7 @@ private:
      sensorTemperature = _temperature;
      sensorHumidity = _humidity;
      sensorPressure = _pressure;
-      tempScale = "°F";
+      tempScale = F("°F");
      if (sensorType == 1)
      {
        sensorHeatIndex = EnvironmentCalculations::HeatIndex(_temperature, _humidity, envTempUnit);
@@ -123,18 +124,23 @@ private:
  // Procedure to define all MQTT discovery Topics 
  void _mqttInitialize()
  {
-    mqttTemperatureTopic = String(mqttDeviceTopic) + F("/temperature");
-    mqttPressureTopic = String(mqttDeviceTopic) + F("/pressure");
-    mqttHumidityTopic = String(mqttDeviceTopic) + F("/humidity");
-    mqttHeatIndexTopic = String(mqttDeviceTopic) + F("/heat_index");
-    mqttDewPointTopic = String(mqttDeviceTopic) + F("/dew_point");
+    char mqttTemperatureTopic[128];
+    char mqttHumidityTopic[128];
+    char mqttPressureTopic[128];
+    char mqttHeatIndexTopic[128];
+    char mqttDewPointTopic[128];
+    snprintf_P(mqttTemperatureTopic, 127, PSTR("%s/temperature"), mqttDeviceTopic);
+    snprintf_P(mqttPressureTopic, 127, PSTR("%s/pressure"), mqttDeviceTopic);
+    snprintf_P(mqttHumidityTopic, 127, PSTR("%s/humidity"), mqttDeviceTopic);
+    snprintf_P(mqttHeatIndexTopic, 127, PSTR("%s/heat_index"), mqttDeviceTopic);
+    snprintf_P(mqttDewPointTopic, 127, PSTR("%s/dew_point"), mqttDeviceTopic);

    if (HomeAssistantDiscovery) {
-      _createMqttSensor(F("Temperature"), mqttTemperatureTopic, F("temperature"), tempScale);
-      _createMqttSensor(F("Pressure"), mqttPressureTopic, F("pressure"), F("hPa"));
-      _createMqttSensor(F("Humidity"), mqttHumidityTopic, F("humidity"), F("%"));
-      _createMqttSensor(F("HeatIndex"), mqttHeatIndexTopic, F("temperature"), tempScale);
-      _createMqttSensor(F("DewPoint"), mqttDewPointTopic, F("temperature"), tempScale);
+      _createMqttSensor(F("Temperature"), mqttTemperatureTopic, "temperature", tempScale);
+      _createMqttSensor(F("Pressure"), mqttPressureTopic, "pressure", F("hPa"));
+      _createMqttSensor(F("Humidity"), mqttHumidityTopic, "humidity", F("%"));
+      _createMqttSensor(F("HeatIndex"), mqttHeatIndexTopic, "temperature", tempScale);
+      _createMqttSensor(F("DewPoint"), mqttDewPointTopic, "temperature", tempScale);
    }
  }

@@ -169,21 +175,31 @@ private:
    mqtt->publish(t.c_str(), 0, true, temp.c_str());
  }

+    void publishMqtt(const char *topic, const char* state) {
+      //Check if MQTT Connected, otherwise it will crash the 8266
+      if (WLED_MQTT_CONNECTED){
+        char subuf[128];
+        snprintf_P(subuf, 127, PSTR("%s/%s"), mqttDeviceTopic, topic);
+        mqtt->publish(subuf, 0, false, state);
+      }
+    }
+
 public:
  void setup()
  {
    bool HW_Pins_Used = (ioPin[0]==i2c_scl && ioPin[1]==i2c_sda); // note whether architecture-based hardware SCL/SDA pins used
-    PinOwner po = PinOwner::UM_BME280; // defaults to being pinowner for SCL/SDA pins
+    //PinOwner po = PinOwner::UM_BME280; // defaults to being pinowner for SCL/SDA pins  // WLEDMM not needed
    PinManagerPinType pins[2] = { { ioPin[0], true }, { ioPin[1], true } };  // allocate pins
-    if (HW_Pins_Used) po = PinOwner::HW_I2C; // allow multiple allocations of HW I2C bus pins
-    if (!pinManager.allocateMultiplePins(pins, 2, po)) { sensorType=0; return; }
-    
-    Wire.begin(ioPin[1], ioPin[0]);
+    //if (HW_Pins_Used) po = PinOwner::HW_I2C; // allow multiple allocations of HW I2C bus pins  // WLEDMM not needed
+    // WLEDMM join I2C HW wire
+    if (!pinManager.joinWire()) { sensorType=0; enabled = false; return; }
+    //if (!pinManager.allocateMultiplePins(pins, 2, po)) { sensorType=0; return; }
+    //Wire.begin(ioPin[1], ioPin[0]);

    if (!bme.begin())
    {
      sensorType = 0;
-      DEBUG_PRINTLN(F("Could not find BME280I2C sensor!"));
+      DEBUG_PRINTLN(F("Could not find BME280 I2C sensor!"));
    }
    else
    {
@@ -207,14 +223,16 @@ public:

  void loop()
  {
+    if (!enabled || strip.isUpdating()) return;
+
    // BME280 sensor MQTT publishing
-    // Check if sensor present and MQTT Connected, otherwise it will crash the MCU
-    if (sensorType != 0 && WLED_MQTT_CONNECTED)
+    // Check if sensor present and Connected, otherwise it will crash the MCU
+    if (sensorType != 0)
    {
      // Timer to fetch new temperature, humidity and pressure data at intervals
      timer = millis();

-      if (timer - lastTemperatureMeasure >= TemperatureInterval * 1000 || mqttTemperaturePub == 0)
+      if (timer - lastTemperatureMeasure >= TemperatureInterval * 1000)
      {
        lastTemperatureMeasure = timer;

@@ -223,18 +241,11 @@ public:
        float temperature = roundf(sensorTemperature * powf(10, TemperatureDecimals)) / powf(10, TemperatureDecimals);
        float humidity, heatIndex, dewPoint;

-        if (WLED_MQTT_CONNECTED && !mqttInitialized)
-        {
-          _mqttInitialize();
-          mqttInitialized = true;
-        }
-
        // If temperature has changed since last measure, create string populated with device topic
        // from the UI and values read from sensor, then publish to broker
        if (temperature != lastTemperature || PublishAlways)
        {
-          String topic = String(mqttDeviceTopic) + "/temperature";
-          mqttTemperaturePub = mqtt->publish(topic.c_str(), 0, false, String(temperature, TemperatureDecimals).c_str());
+          publishMqtt("temperature", String(temperature, TemperatureDecimals).c_str());
        }

        lastTemperature = temperature; // Update last sensor temperature for next loop
@@ -247,20 +258,17 @@ public:

          if (humidity != lastHumidity || PublishAlways)
          {
-            String topic = String(mqttDeviceTopic) + F("/humidity");
-            mqtt->publish(topic.c_str(), 0, false, String(humidity, HumidityDecimals).c_str());
+            publishMqtt("humidity", String(humidity, HumidityDecimals).c_str());
          }

          if (heatIndex != lastHeatIndex || PublishAlways)
          {
-            String topic = String(mqttDeviceTopic) + F("/heat_index");
-            mqtt->publish(topic.c_str(), 0, false, String(heatIndex, TemperatureDecimals).c_str());
+            publishMqtt("heat_index", String(heatIndex, TemperatureDecimals).c_str());
          }

          if (dewPoint != lastDewPoint || PublishAlways)
          {
-            String topic = String(mqttDeviceTopic) + F("/dew_point");
-            mqtt->publish(topic.c_str(), 0, false, String(dewPoint, TemperatureDecimals).c_str());
+            publishMqtt("dew_point", String(dewPoint, TemperatureDecimals).c_str());
          }

          lastHumidity = humidity;
@@ -269,7 +277,7 @@ public:
        }
      }

-      if (timer - lastPressureMeasure >= PressureInterval * 1000 || mqttPressurePub == 0)
+      if (timer - lastPressureMeasure >= PressureInterval * 1000)
      {
        lastPressureMeasure = timer;

@@ -277,15 +285,23 @@ public:

        if (pressure != lastPressure || PublishAlways)
        {
-          String topic = String(mqttDeviceTopic) + F("/pressure");
-          mqttPressurePub = mqtt->publish(topic.c_str(), 0, true, String(pressure, PressureDecimals).c_str());
+          publishMqtt("pressure", String(pressure, PressureDecimals).c_str());
        }

        lastPressure = pressure;
      }
    }
  }
-    
+
+  void onMqttConnect(bool sessionPresent)
+  {
+    if (WLED_MQTT_CONNECTED && !mqttInitialized)
+    {
+      _mqttInitialize();
+      mqttInitialized = true;
+    }
+  }
+
    /*
     * API calls te enable data exchange between WLED modules
     */
@@ -294,9 +310,9 @@ public:
        return (float)roundf(sensorTemperature * powf(10, TemperatureDecimals)) / powf(10, TemperatureDecimals);
      } else {
        return (float)roundf(sensorTemperature * powf(10, TemperatureDecimals)) / powf(10, TemperatureDecimals) * 1.8f + 32;
-      }
-      
+      }      
    }
+
    inline float getTemperatureF() {
      if (UseCelsius) {
        return ((float)roundf(sensorTemperature * powf(10, TemperatureDecimals)) / powf(10, TemperatureDecimals) -32) * 0.56f;
@@ -304,12 +320,15 @@ public:
        return (float)roundf(sensorTemperature * powf(10, TemperatureDecimals)) / powf(10, TemperatureDecimals);
      }
    }
+
    inline float getHumidity() {
      return (float)roundf(sensorHumidity * powf(10, HumidityDecimals));
    }
+
    inline float getPressure() {
      return (float)roundf(sensorPressure * powf(10, PressureDecimals));
    }
+
    inline float getDewPointC() {
      if (UseCelsius) {
        return (float)roundf(sensorDewPoint * powf(10, TemperatureDecimals)) / powf(10, TemperatureDecimals);
@@ -317,6 +336,7 @@ public:
        return (float)roundf(sensorDewPoint * powf(10, TemperatureDecimals)) / powf(10, TemperatureDecimals) * 1.8f + 32;
      }
    }
+
    inline float getDewPointF() {
      if (UseCelsius) {
        return ((float)roundf(sensorDewPoint * powf(10, TemperatureDecimals)) / powf(10, TemperatureDecimals) -32) * 0.56f;
@@ -324,13 +344,16 @@ public:
        return (float)roundf(sensorDewPoint * powf(10, TemperatureDecimals)) / powf(10, TemperatureDecimals);
      }
    }
+
    inline float getHeatIndexC() {
      if (UseCelsius) {
        return (float)roundf(sensorHeatIndex * powf(10, TemperatureDecimals)) / powf(10, TemperatureDecimals);
      } else {
        return (float)roundf(sensorHeatIndex * powf(10, TemperatureDecimals)) / powf(10, TemperatureDecimals) * 1.8f + 32;
      }
-    }inline float getHeatIndexF() {
+    }
+
+    inline float getHeatIndexF() {
      if (UseCelsius) {
        return ((float)roundf(sensorHeatIndex * powf(10, TemperatureDecimals)) / powf(10, TemperatureDecimals) -32) * 0.56f;
      } else {
@@ -381,10 +404,23 @@ public:
      return;
  }

+  void appendConfigData() {
+    oappend(SET_F("addHB('BME280');"));
+
+    oappend(SET_F("addInfo('BME280/BMP280:pin[]',0,'','I2C/SPI CLK');"));
+    oappend(SET_F("dRO('BME280/BMP280:pin[]',0);")); // disable read only pins
+    oappend(SET_F("rOpt('BME280/BMP280:pin[]',0,'use global (")); oappendi(i2c_scl); oappend(")',-1);"); 
+
+    oappend(SET_F("addInfo('BME280/BMP280:pin[]',1,'','I2C/SPI DTA');"));
+    oappend(SET_F("rOpt('BME280/BMP280:pin[]',1,'use global (")); oappendi(i2c_sda); oappend(")',-1);"); 
+  }
+      
+
  // Save Usermod Config Settings
  void addToConfig(JsonObject& root)
  {
-    JsonObject top = root.createNestedObject(F("BME280/BMP280"));
+    JsonObject top = root.createNestedObject(FPSTR(_name));
+    top[FPSTR(_enabled)] = enabled;
    top[F("TemperatureDecimals")] = TemperatureDecimals;
    top[F("HumidityDecimals")] = HumidityDecimals;
    top[F("PressureDecimals")] = PressureDecimals;
@@ -394,8 +430,9 @@ public:
    top[F("UseCelsius")] = UseCelsius;
    top[F("HomeAssistantDiscovery")] = HomeAssistantDiscovery;
    JsonArray io_pin = top.createNestedArray(F("pin"));
-    for (byte i=0; i<2; i++) io_pin.add(ioPin[i]);
-    top[F("help4Pins")] = F("SCL,SDA"); // help for Settings page
+    //WLEDMM: avoid global pin hijacking
+    io_pin.add((ioPin[0]==i2c_scl)?-1:ioPin[0]);
+    io_pin.add((ioPin[1]==i2c_sda)?-1:ioPin[1]);
    DEBUG_PRINTLN(F("BME280 config saved."));
  }

@@ -405,17 +442,17 @@ public:
    // default settings values could be set here (or below using the 3-argument getJsonValue()) instead of in the class definition or constructor
    // setting them inside readFromConfig() is slightly more robust, handling the rare but plausible use case of single value being missing after boot (e.g. if the cfg.json was manually edited and a value was removed)

-
    int8_t newPin[2]; for (byte i=0; i<2; i++) newPin[i] = ioPin[i]; // prepare to note changed pins

-    JsonObject top = root[F("BME280/BMP280")];
+    JsonObject top = root[FPSTR(_name)];
    if (top.isNull()) {
-      DEBUG_PRINT(F("BME280/BMP280"));
+      DEBUG_PRINT(F(_name));
      DEBUG_PRINTLN(F(": No config found. (Using defaults.)"));
      return false;
    }
    bool configComplete = !top.isNull();

+    configComplete &= getJsonValue(top[FPSTR(_enabled)], enabled);
    // A 3-argument getJsonValue() assigns the 3rd argument as a default value if the Json value is missing
    configComplete &= getJsonValue(top[F("TemperatureDecimals")], TemperatureDecimals, 1);
    configComplete &= getJsonValue(top[F("HumidityDecimals")], HumidityDecimals, 0);
@@ -427,7 +464,7 @@ public:
    configComplete &= getJsonValue(top[F("HomeAssistantDiscovery")], HomeAssistantDiscovery, false);
    for (byte i=0; i<2; i++) configComplete &= getJsonValue(top[F("pin")][i], newPin[i], ioPin[i]);

-    DEBUG_PRINT(FPSTR(F("BME280/BMP280")));
+    DEBUG_PRINT(FPSTR(_name));
    if (!initDone) {
      // first run: reading from cfg.json
      for (byte i=0; i<2; i++) ioPin[i] = newPin[i];
@@ -454,4 +491,7 @@ public:
  uint16_t getId() {
    return USERMOD_ID_BME280;
  }
-};
+};
+
+const char UsermodBME280::_name[]                      PROGMEM = "BME280/BMP280";
+const char UsermodBME280::_enabled[]                   PROGMEM = "enabled";
--- a/usermods/battery_status_basic/assets/battery_connection_schematic_01.png
+++ b/usermods/battery_status_basic/assets/battery_connection_schematic_01.png
--- a/usermods/battery_status_basic/assets/battery_connection_schematic_02.png
+++ b/usermods/battery_status_basic/assets/battery_connection_schematic_02.png
--- a/usermods/Battery/assets/battery_info_screen.png
+++ b/usermods/Battery/assets/battery_info_screen.png
--- a/usermods/Battery/assets/battery_usermod_logo.png
+++ b/usermods/Battery/assets/battery_usermod_logo.png
--- a/usermods/Battery/battery_defaults.h
+++ b/usermods/Battery/battery_defaults.h
@@ -0,0 +1,72 @@
+// pin defaults
+// for the esp32 it is best to use the ADC1: GPIO32 - GPIO39
+// https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-reference/peripherals/adc.html
+#ifndef USERMOD_BATTERY_MEASUREMENT_PIN
+  #ifdef ARDUINO_ARCH_ESP32
+    #define USERMOD_BATTERY_MEASUREMENT_PIN -1 //WLEDMM instead of 35
+  #else //ESP8266 boards
+    #define USERMOD_BATTERY_MEASUREMENT_PIN A0
+  #endif
+#endif
+
+// the frequency to check the battery, 30 sec
+#ifndef USERMOD_BATTERY_MEASUREMENT_INTERVAL
+  #define USERMOD_BATTERY_MEASUREMENT_INTERVAL 30000
+#endif
+
+// default for 18650 battery
+// https://batterybro.com/blogs/18650-wholesale-battery-reviews/18852515-when-to-recycle-18650-batteries-and-how-to-start-a-collection-center-in-your-vape-shop
+// Discharge voltage: 2.5 volt + .1 for personal safety
+#ifndef USERMOD_BATTERY_MIN_VOLTAGE
+  #ifdef USERMOD_BATTERY_USE_LIPO
+    // LiPo "1S" Batteries should not be dischared below 3V !!
+    #define USERMOD_BATTERY_MIN_VOLTAGE 3.2f
+  #else
+    #define USERMOD_BATTERY_MIN_VOLTAGE 2.6f
+  #endif
+#endif
+
+#ifndef USERMOD_BATTERY_MAX_VOLTAGE
+  #define USERMOD_BATTERY_MAX_VOLTAGE 4.2f
+#endif
+
+// a common capacity for single 18650 battery cells is between 2500 and 3600 mAh
+#ifndef USERMOD_BATTERY_TOTAL_CAPACITY
+  #define USERMOD_BATTERY_TOTAL_CAPACITY 3100
+#endif
+
+// offset or calibration value to fine tune the calculated voltage
+#ifndef USERMOD_BATTERY_CALIBRATION
+  #define USERMOD_BATTERY_CALIBRATION 0
+#endif
+
+// calculate remaining time / the time that is left before the battery runs out of power
+// #ifndef USERMOD_BATTERY_CALCULATE_TIME_LEFT_ENABLED
+//   #define USERMOD_BATTERY_CALCULATE_TIME_LEFT_ENABLED false
+// #endif
+
+// auto-off feature
+#ifndef USERMOD_BATTERY_AUTO_OFF_ENABLED
+  #define USERMOD_BATTERY_AUTO_OFF_ENABLED true
+#endif
+
+#ifndef USERMOD_BATTERY_AUTO_OFF_THRESHOLD
+  #define USERMOD_BATTERY_AUTO_OFF_THRESHOLD 10
+#endif
+
+// low power indication feature
+#ifndef USERMOD_BATTERY_LOW_POWER_INDICATOR_ENABLED
+  #define USERMOD_BATTERY_LOW_POWER_INDICATOR_ENABLED true
+#endif
+
+#ifndef USERMOD_BATTERY_LOW_POWER_INDICATOR_PRESET
+  #define USERMOD_BATTERY_LOW_POWER_INDICATOR_PRESET 0
+#endif
+
+#ifndef USERMOD_BATTERY_LOW_POWER_INDICATOR_THRESHOLD
+  #define USERMOD_BATTERY_LOW_POWER_INDICATOR_THRESHOLD 20
+#endif
+
+#ifndef USERMOD_BATTERY_LOW_POWER_INDICATOR_DURATION
+  #define USERMOD_BATTERY_LOW_POWER_INDICATOR_DURATION 5
+#endif
--- a/usermods/Battery/readme.md
+++ b/usermods/Battery/readme.md
@@ -0,0 +1,112 @@
+<p align="center">
+  <img width="700" src="assets/battery_usermod_logo.png">
+</p>
+
+# Welcome to the battery usermod! 🔋
+
+Enables battery level monitoring of your project.
+
+For this to work, the positive side of the (18650) battery must be connected to pin `A0` of the d1 mini/esp8266 with a 100k Ohm resistor (see [Useful Links](#useful-links)).
+
+If you have an ESP32 board, connect the positive side of the battery to ADC1 (GPIO32 - GPIO39)
+
+<p align="center">
+  <img width="500" src="assets/battery_info_screen.png">
+</p>
+
+## ⚙️ Features
+
+- 💯 Displays current battery voltage 
+- 🚥 Displays battery level
+- 🚫 Auto-off with configurable Threshold
+- 🚨 Low power indicator with many configuration posibilities
+
+## 🎈 Installation
+
+define `USERMOD_BATTERY` in `wled00/my_config.h`
+
+### Example wiring
+
+<p align="center">
+  <img width="300" src="assets/battery_connection_schematic_01.png">
+</p>
+
+### Define Your Options
+
+| Name                                            | Unit        | Description                                                                           |
+| ----------------------------------------------- | ----------- |-------------------------------------------------------------------------------------- |
+| `USERMOD_BATTERY`                               |             | define this (in `my_config.h`) to have this usermod included wled00\usermods_list.cpp |
+| `USERMOD_BATTERY_USE_LIPO`                      |             | define this (in `my_config.h`) if you use LiPo rechargeables (1S)                     |
+| `USERMOD_BATTERY_MEASUREMENT_PIN`               |             | defaults to A0 on ESP8266 and GPIO35 on ESP32                                         |
+| `USERMOD_BATTERY_MEASUREMENT_INTERVAL`          | ms          | battery check interval. defaults to 30 seconds                                        |
+| `USERMOD_BATTERY_MIN_VOLTAGE`                   | v           | minimum battery voltage. default is 2.6 (18650 battery standard)                      |
+| `USERMOD_BATTERY_MAX_VOLTAGE`                   | v           | maximum battery voltage. default is 4.2 (18650 battery standard)                      |
+| `USERMOD_BATTERY_TOTAL_CAPACITY`                | mAh         | the capacity of all cells in parralel sumed up                                        |
+| `USERMOD_BATTERY_CALIBRATION`                   |             | offset / calibration number, fine tune the measured voltage by the microcontroller    |
+| Auto-Off                                        | ---         | ---                                                                                   |
+| `USERMOD_BATTERY_AUTO_OFF_ENABLED`              | true/false  | enables auto-off                                                                      |
+| `USERMOD_BATTERY_AUTO_OFF_THRESHOLD`            | % (0-100)   | when this threshold is reached master power turns off                                 |
+| Low-Power-Indicator                             | ---         | ---                                                                                   |
+| `USERMOD_BATTERY_LOW_POWER_INDICATOR_ENABLED`   | true/false  | enables low power indication                                                          |
+| `USERMOD_BATTERY_LOW_POWER_INDICATOR_PRESET`    | preset id   | when low power is detected then use this preset to indicate low power                 |
+| `USERMOD_BATTERY_LOW_POWER_INDICATOR_THRESHOLD` | % (0-100)   | when this threshold is reached low power gets indicated                               |
+| `USERMOD_BATTERY_LOW_POWER_INDICATOR_DURATION`  | seconds     | for this long the configured preset is played                                         |
+
+All parameters can be configured at runtime via the Usermods settings page.
+
+## ⚠️ Important
+
+- Make sure you know your battery specifications! All batteries are **NOT** the same!
+- Example:
+
+| Your battery specification table  |                 | Options you can define        | 
+| :-------------------------------- |:--------------- | :---------------------------- |
+| Capacity                          | 3500mAh 12,5 Wh |                               |
+| Minimum capacity                  | 3350mAh 11,9 Wh |                               |
+| Rated voltage                     | 3.6V - 3.7V     |                               |
+| **Charging end voltage**          | **4,2V ± 0,05** | `USERMOD_BATTERY_MAX_VOLTAGE` |
+| **Discharge voltage**             | **2,5V**        | `USERMOD_BATTERY_MIN_VOLTAGE` |
+| Max. discharge current (constant) | 10A (10000mA)   |                               |
+| max. charging current             | 1.7A (1700mA)   |                               |
+| ...                               | ...             | ...                           |
+| ..                                | ..              | ..                            |
+
+Specification from:  [Molicel INR18650-M35A, 3500mAh 10A Lithium-ion battery, 3.6V - 3.7V](https://www.akkuteile.de/lithium-ionen-akkus/18650/molicel/molicel-inr18650-m35a-3500mah-10a-lithium-ionen-akku-3-6v-3-7v_100833)
+
+## 🌐 Useful Links
+
+- https://lazyzero.de/elektronik/esp8266/wemos_d1_mini_a0/start
+- https://arduinodiy.wordpress.com/2016/12/25/monitoring-lipo-battery-voltage-with-wemos-d1-minibattery-shield-and-thingspeak/
+
+## 📝 Change Log
+
+2023-01-04
+
+- basic support for LiPo rechargeable batteries ( `-D USERMOD_BATTERY_USE_LIPO`)
+- improved support for esp32 (read calibrated voltage)
+- corrected config saving (measurement pin, and battery min/max were lost)
+- various bugfixes
+
+2022-12-25
+
+- added "auto-off" feature
+- added "low-power-indication" feature
+- added "calibration/offset" field to configuration page
+- added getter and setter, so that user usermods could interact with this one
+- update readme (added new options, made it markdownlint compliant)
+
+2021-09-02
+
+- added "Battery voltage" to info
+- added circuit diagram to readme
+- added MQTT support, sending battery voltage
+- minor fixes
+
+2021-08-15
+
+- changed `USERMOD_BATTERY_MIN_VOLTAGE` to 2.6 volt as default for 18650 batteries
+- Updated readme, added specification table
+
+2021-08-10
+
+- Created
--- a/usermods/Battery/usermod_v2_Battery.h
+++ b/usermods/Battery/usermod_v2_Battery.h
@@ -0,0 +1,775 @@
+#pragma once
+
+#include "wled.h"
+#include "battery_defaults.h"
+
+/*
+ * Usermod by Maximilian Mewes
+ * Mail: mewes.maximilian@gmx.de
+ * GitHub: itCarl
+ * Date: 25.12.2022
+ * If you have any questions, please feel free to contact me.
+ */
+class UsermodBattery : public Usermod 
+{
+  private:
+    // battery pin can be defined in my_config.h
+    int8_t batteryPin = USERMOD_BATTERY_MEASUREMENT_PIN;
+    // how often to read the battery voltage
+    unsigned long readingInterval = USERMOD_BATTERY_MEASUREMENT_INTERVAL;
+    unsigned long nextReadTime = 0;
+    unsigned long lastReadTime = 0;
+    // battery min. voltage
+    float minBatteryVoltage = USERMOD_BATTERY_MIN_VOLTAGE;
+    // battery max. voltage
+    float maxBatteryVoltage = USERMOD_BATTERY_MAX_VOLTAGE;
+    // all battery cells summed up
+    unsigned int totalBatteryCapacity = USERMOD_BATTERY_TOTAL_CAPACITY;
+    // raw analog reading 
+    float rawValue = 0.0f;
+    // calculated voltage            
+    float voltage = maxBatteryVoltage;
+    // mapped battery level based on voltage
+    int8_t batteryLevel = 100;
+    // offset or calibration value to fine tune the calculated voltage
+    float calibration = USERMOD_BATTERY_CALIBRATION;
+    
+    // time left estimation feature
+    // bool calculateTimeLeftEnabled = USERMOD_BATTERY_CALCULATE_TIME_LEFT_ENABLED;
+    // float estimatedTimeLeft = 0.0;
+
+    // auto shutdown/shutoff/master off feature
+    bool autoOffEnabled = USERMOD_BATTERY_AUTO_OFF_ENABLED;
+    int8_t autoOffThreshold = USERMOD_BATTERY_AUTO_OFF_THRESHOLD;
+
+    // low power indicator feature
+    bool lowPowerIndicatorEnabled = USERMOD_BATTERY_LOW_POWER_INDICATOR_ENABLED;
+    int8_t lowPowerIndicatorPreset = USERMOD_BATTERY_LOW_POWER_INDICATOR_PRESET;
+    int8_t lowPowerIndicatorThreshold = USERMOD_BATTERY_LOW_POWER_INDICATOR_THRESHOLD;
+    int8_t lowPowerIndicatorReactivationThreshold = lowPowerIndicatorThreshold+10;
+    int8_t lowPowerIndicatorDuration = USERMOD_BATTERY_LOW_POWER_INDICATOR_DURATION;
+    bool lowPowerIndicationDone = false;
+    unsigned long lowPowerActivationTime = 0; // used temporary during active time
+    int8_t lastPreset = 0;
+
+    bool initDone = false;
+    bool initializing = true;
+
+    // strings to reduce flash memory usage (used more than twice)
+    static const char _name[];
+    static const char _readInterval[];
+    static const char _enabled[];
+    static const char _threshold[];
+    static const char _preset[];
+    static const char _duration[];
+    static const char _init[];
+    
+
+    // custom map function
+    // https://forum.arduino.cc/t/floating-point-using-map-function/348113/2
+    double mapf(double x, double in_min, double in_max, double out_min, double out_max) 
+    {
+      return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min;
+    }
+
+    float dot2round(float x) 
+    {
+      float nx = (int)(x * 100 + .5);
+      return (float)(nx / 100);
+    }
+
+    /*
+     * Turn off all leds
+     */
+    void turnOff()
+    {
+      bri = 0;
+      stateUpdated(CALL_MODE_DIRECT_CHANGE);
+    }
+
+    /*
+     * Indicate low power by activating a configured preset for a given time and then switching back to the preset that was selected previously
+     */
+    void lowPowerIndicator()
+    {
+      if (!lowPowerIndicatorEnabled) return;
+      if (batteryPin < 0) return;  // no measurement
+      if (lowPowerIndicationDone && lowPowerIndicatorReactivationThreshold <= batteryLevel) lowPowerIndicationDone = false;
+      if (lowPowerIndicatorThreshold <= batteryLevel) return;
+      if (lowPowerIndicationDone) return;
+      if (lowPowerActivationTime <= 1) {
+        lowPowerActivationTime = millis();
+        lastPreset = currentPreset;
+        applyPreset(lowPowerIndicatorPreset);
+      }
+
+      if (lowPowerActivationTime+(lowPowerIndicatorDuration*1000) <= millis()) {
+        lowPowerIndicationDone = true;
+        lowPowerActivationTime = 0;
+        applyPreset(lastPreset);
+      }      
+    }
+
+  public:
+    //Functions called by WLED
+
+    /*
+     * setup() is called once at boot. WiFi is not yet connected at this point.
+     * You can use it to initialize variables, sensors or similar.
+     */
+    void setup() 
+    {
+      #ifdef ARDUINO_ARCH_ESP32
+        bool success = false;
+        DEBUG_PRINTLN(F("Allocating battery pin..."));
+        if (batteryPin >= 0 && digitalPinToAnalogChannel(batteryPin) >= 0) 
+          if (pinManager.allocatePin(batteryPin, false, PinOwner::UM_Battery)) {
+            DEBUG_PRINTLN(F("Battery pin allocation succeeded."));
+            success = true;
+          }
+
+        if (!success) {
+          DEBUG_PRINTLN(F("Battery pin allocation failed."));
+          batteryPin = -1;  // allocation failed
+        } else {
+          pinMode(batteryPin, INPUT);
+        }
+      #else //ESP8266 boards have only one analog input pin A0
+
+        pinMode(batteryPin, INPUT);
+      #endif
+
+      nextReadTime = millis() + readingInterval;
+      lastReadTime = millis();
+
+      initDone = true;
+    }
+
+
+    /*
+     * connected() is called every time the WiFi is (re)connected
+     * Use it to initialize network interfaces
+     */
+    void connected() 
+    {
+      //Serial.println("Connected to WiFi!");
+    }
+
+
+    /*
+     * loop() is called continuously. Here you can check for events, read sensors, etc.
+     * 
+     */
+    void loop() 
+    {
+      if(strip.isUpdating()) return;
+
+      lowPowerIndicator();
+
+      // check the battery level every USERMOD_BATTERY_MEASUREMENT_INTERVAL (ms)
+      if (millis() < nextReadTime) return;
+
+      nextReadTime = millis() + readingInterval;
+      lastReadTime = millis();
+
+      if (batteryPin < 0) return;  // nothing to read
+
+      initializing = false;
+
+#ifdef ARDUINO_ARCH_ESP32
+      // use calibrated millivolts analogread on esp32 (150 mV ~ 2450 mV)
+      rawValue = analogReadMilliVolts(batteryPin);
+      // calculate the voltage
+      voltage = (rawValue / 1000.0f) + calibration;
+      // usually a voltage divider (50%) is used on ESP32, so we need to multiply by 2
+      voltage *= 2.0f;
+#else
+      // read battery raw input
+      rawValue = analogRead(batteryPin);
+
+      // calculate the voltage     
+      voltage = ((rawValue / getAdcPrecision()) * maxBatteryVoltage) + calibration;
+#endif
+      // check if voltage is within specified voltage range, allow 10% over/under voltage
+      voltage = ((voltage < minBatteryVoltage * 0.85f) || (voltage > maxBatteryVoltage * 1.1f)) ? -1.0f : voltage;
+
+      // translate battery voltage into percentage
+      /*
+        the standard "map" function doesn't work
+        https://www.arduino.cc/reference/en/language/functions/math/map/  notes and warnings at the bottom
+      */
+      #ifdef USERMOD_BATTERY_USE_LIPO
+        batteryLevel = mapf(voltage, minBatteryVoltage, maxBatteryVoltage, 0, 100); // basic mapping
+        // LiPo batteries have a differnt dischargin curve, see 
+        //  https://blog.ampow.com/lipo-voltage-chart/
+        if (batteryLevel < 40.0f) 
+          batteryLevel = mapf(batteryLevel, 0, 40, 0, 12);       // last 45% -> drops very quickly
+        else {
+          if (batteryLevel < 90.0f)
+            batteryLevel = mapf(batteryLevel, 40, 90, 12, 95);   // 90% ... 40% -> almost linear drop
+          else // level >  90%
+            batteryLevel = mapf(batteryLevel, 90, 105, 95, 100); // highest 15% -> drop slowly
+        }
+      #else
+        batteryLevel = mapf(voltage, minBatteryVoltage, maxBatteryVoltage, 0, 100);
+      #endif
+      if (voltage > -1.0f) batteryLevel = constrain(batteryLevel, 0.0f, 110.0f);
+
+      // if (calculateTimeLeftEnabled) {
+      //   float currentBatteryCapacity = totalBatteryCapacity;
+      //   estimatedTimeLeft = (currentBatteryCapacity/strip.currentMilliamps)*60;
+      // }
+
+      // Auto off -- Master power off
+      if (autoOffEnabled && (autoOffThreshold >= batteryLevel))
+        turnOff();
+
+#ifndef WLED_DISABLE_MQTT
+      // SmartHome stuff
+      // still don't know much about MQTT and/or HA
+      if (WLED_MQTT_CONNECTED) {
+        char buf[64]; // buffer for snprintf()
+        snprintf_P(buf, 63, PSTR("%s/voltage"), mqttDeviceTopic);
+        mqtt->publish(buf, 0, false, String(voltage).c_str());
+      }
+#endif
+
+    }
+
+    /*
+     * addToJsonInfo() can be used to add custom entries to the /json/info part of the JSON API.
+     * Creating an "u" object allows you to add custom key/value pairs to the Info section of the WLED web UI.
+     * Below it is shown how this could be used for e.g. a light sensor
+     */
+    void addToJsonInfo(JsonObject& root)
+    {
+      JsonObject user = root["u"];
+      if (user.isNull()) user = root.createNestedObject("u");
+
+      if (batteryPin < 0) {
+        JsonArray infoVoltage = user.createNestedArray(F("Battery voltage"));
+        infoVoltage.add(F("n/a"));
+        infoVoltage.add(F(" invalid GPIO"));
+        return;  // no GPIO - nothing to report
+      }
+
+      // info modal display names
+      JsonArray infoPercentage = user.createNestedArray(F("Battery level"));
+      JsonArray infoVoltage = user.createNestedArray(F("Battery voltage"));
+      // if (calculateTimeLeftEnabled)
+      // {
+      //   JsonArray infoEstimatedTimeLeft = user.createNestedArray(F("Estimated time left"));
+      //   if (initializing) {
+      //     infoEstimatedTimeLeft.add(FPSTR(_init));
+      //   } else {
+      //     infoEstimatedTimeLeft.add(estimatedTimeLeft);
+      //     infoEstimatedTimeLeft.add(F(" min"));
+      //   }
+      // }
+      JsonArray infoNextUpdate = user.createNestedArray(F("Next update"));
+
+      infoNextUpdate.add((nextReadTime - millis()) / 1000);
+      infoNextUpdate.add(F(" sec"));
+      
+      if (initializing) {
+        infoPercentage.add(FPSTR(_init));
+        infoVoltage.add(FPSTR(_init));
+        return;
+      }
+
+      if (batteryLevel < 0) {
+        infoPercentage.add(F("invalid"));
+      } else {
+        infoPercentage.add(batteryLevel);
+      }
+      infoPercentage.add(F(" %"));
+
+      if (voltage < 0) {
+        infoVoltage.add(F("invalid"));
+      } else {
+        infoVoltage.add(dot2round(voltage));
+      }
+      infoVoltage.add(F(" V"));
+    }
+
+
+    /*
+     * addToJsonState() can be used to add custom entries to the /json/state part of the JSON API (state object).
+     * Values in the state object may be modified by connected clients
+     */
+    /*
+    void addToJsonState(JsonObject& root)
+    {
+
+    }
+    */
+
+
+    /*
+     * readFromJsonState() can be used to receive data clients send to the /json/state part of the JSON API (state object).
+     * Values in the state object may be modified by connected clients
+     */
+    /*
+    void readFromJsonState(JsonObject& root)
+    {
+    }
+    */
+
+
+    /*
+     * addToConfig() can be used to add custom persistent settings to the cfg.json file in the "um" (usermod) object.
+     * It will be called by WLED when settings are actually saved (for example, LED settings are saved)
+     * If you want to force saving the current state, use serializeConfig() in your loop().
+     * 
+     * CAUTION: serializeConfig() will initiate a filesystem write operation.
+     * It might cause the LEDs to stutter and will cause flash wear if called too often.
+     * Use it sparingly and always in the loop, never in network callbacks!
+     * 
+     * addToConfig() will make your settings editable through the Usermod Settings page automatically.
+     *
+     * Usermod Settings Overview:
+     * - Numeric values are treated as floats in the browser.
+     *   - If the numeric value entered into the browser contains a decimal point, it will be parsed as a C float
+     *     before being returned to the Usermod.  The float data type has only 6-7 decimal digits of precision, and
+     *     doubles are not supported, numbers will be rounded to the nearest float value when being parsed.
+     *     The range accepted by the input field is +/- 1.175494351e-38 to +/- 3.402823466e+38.
+     *   - If the numeric value entered into the browser doesn't contain a decimal point, it will be parsed as a
+     *     C int32_t (range: -2147483648 to 2147483647) before being returned to the usermod.
+     *     Overflows or underflows are truncated to the max/min value for an int32_t, and again truncated to the type
+     *     used in the Usermod when reading the value from ArduinoJson.
+     * - Pin values can be treated differently from an integer value by using the key name "pin"
+     *   - "pin" can contain a single or array of integer values
+     *   - On the Usermod Settings page there is simple checking for pin conflicts and warnings for special pins
+     *     - Red color indicates a conflict.  Yellow color indicates a pin with a warning (e.g. an input-only pin)
+     *   - Tip: use int8_t to store the pin value in the Usermod, so a -1 value (pin not set) can be used
+     *
+     * See usermod_v2_auto_save.h for an example that saves Flash space by reusing ArduinoJson key name strings
+     * 
+     * If you need a dedicated settings page with custom layout for your Usermod, that takes a lot more work.  
+     * You will have to add the setting to the HTML, xml.cpp and set.cpp manually.
+     * See the WLED Soundreactive fork (code and wiki) for reference.  https://github.com/atuline/WLED
+     * 
+     * I highly recommend checking out the basics of ArduinoJson serialization and deserialization in order to use custom settings!
+     */
+    void addToConfig(JsonObject& root)
+    {
+      JsonObject battery = root.createNestedObject(FPSTR(_name));           // usermodname
+      #ifdef ARDUINO_ARCH_ESP32
+        battery[F("pin")] = batteryPin;
+      #endif
+
+      // battery[F("time-left")] = calculateTimeLeftEnabled;
+      battery[F("min-voltage")] = minBatteryVoltage;
+      battery[F("max-voltage")] = maxBatteryVoltage;
+      battery[F("capacity")] = totalBatteryCapacity;
+      battery[F("calibration")] = calibration;
+      battery[FPSTR(_readInterval)] = readingInterval;
+      
+      JsonObject ao = battery.createNestedObject(F("auto-off"));               // auto off section
+      ao[FPSTR(_enabled)] = autoOffEnabled;
+      ao[FPSTR(_threshold)] = autoOffThreshold;
+
+      JsonObject lp = battery.createNestedObject(F("indicator"));    // low power section
+      lp[FPSTR(_enabled)] = lowPowerIndicatorEnabled;
+      lp[FPSTR(_preset)] = lowPowerIndicatorPreset; // dropdown trickery (String)lowPowerIndicatorPreset; 
+      lp[FPSTR(_threshold)] = lowPowerIndicatorThreshold;
+      lp[FPSTR(_duration)] = lowPowerIndicatorDuration;
+
+      DEBUG_PRINTLN(F("Battery config saved."));
+    }
+
+    void appendConfigData()
+    {
+      oappend(SET_F("addHB('Battery');"));
+
+      oappend(SET_F("addInfo('Battery:min-voltage', 1, 'v');"));
+      oappend(SET_F("addInfo('Battery:max-voltage', 1, 'v');"));
+      oappend(SET_F("addInfo('Battery:capacity', 1, 'mAh');"));
+      oappend(SET_F("addInfo('Battery:interval', 1, 'ms');"));
+      oappend(SET_F("addInfo('Battery:auto-off:threshold', 1, '%');"));
+      oappend(SET_F("addInfo('Battery:indicator:threshold', 1, '%');"));
+      oappend(SET_F("addInfo('Battery:indicator:duration', 1, 's');"));
+      
+      // cannot quite get this mf to work. its exeeding some buffer limit i think
+      // what i wanted is a list of all presets to select one from
+      // oappend(SET_F("bd=addDropdown('Battery:low-power-indicator', 'preset');"));
+      // the loop generates: oappend(SET_F("addOption(bd, 'preset name', preset id);"));
+      // for(int8_t i=1; i < 42; i++) {
+      //   oappend(SET_F("addOption(bd, 'Preset#"));
+      //   oappendi(i);
+      //   oappend(SET_F("',"));
+      //   oappendi(i);
+      //   oappend(SET_F(");"));
+      // }
+    }
+
+
+    /*
+     * readFromConfig() can be used to read back the custom settings you added with addToConfig().
+     * This is called by WLED when settings are loaded (currently this only happens immediately after boot, or after saving on the Usermod Settings page)
+     * 
+     * readFromConfig() is called BEFORE setup(). This means you can use your persistent values in setup() (e.g. pin assignments, buffer sizes),
+     * but also that if you want to write persistent values to a dynamic buffer, you'd need to allocate it here instead of in setup.
+     * If you don't know what that is, don't fret. It most likely doesn't affect your use case :)
+     * 
+     * Return true in case the config values returned from Usermod Settings were complete, or false if you'd like WLED to save your defaults to disk (so any missing values are editable in Usermod Settings)
+     * 
+     * getJsonValue() returns false if the value is missing, or copies the value into the variable provided and returns true if the value is present
+     * The configComplete variable is true only if the "exampleUsermod" object and all values are present.  If any values are missing, WLED will know to call addToConfig() to save them
+     * 
+     * This function is guaranteed to be called on boot, but could also be called every time settings are updated
+     */
+    bool readFromConfig(JsonObject& root)
+    {
+      #ifdef ARDUINO_ARCH_ESP32
+        int8_t newBatteryPin = batteryPin;
+      #endif
+      
+      JsonObject battery = root[FPSTR(_name)];
+      if (battery.isNull()) 
+      {
+        DEBUG_PRINT(FPSTR(_name));
+        DEBUG_PRINTLN(F(": No config found. (Using defaults.)"));
+        return false;
+      }
+
+      #ifdef ARDUINO_ARCH_ESP32
+        newBatteryPin     = battery[F("pin")] | newBatteryPin;
+      #endif
+      // calculateTimeLeftEnabled = battery[F("time-left")] | calculateTimeLeftEnabled;
+      setMinBatteryVoltage(battery[F("min-voltage")] | minBatteryVoltage);
+      setMaxBatteryVoltage(battery[F("max-voltage")] | maxBatteryVoltage);
+      setTotalBatteryCapacity(battery[F("capacity")] | totalBatteryCapacity);
+      setCalibration(battery[F("calibration")] | calibration);
+      setReadingInterval(battery[FPSTR(_readInterval)] | readingInterval);
+
+      JsonObject ao = battery[F("auto-off")];
+      setAutoOffEnabled(ao[FPSTR(_enabled)] | autoOffEnabled);
+      setAutoOffThreshold(ao[FPSTR(_threshold)] | autoOffThreshold);
+
+      JsonObject lp = battery[F("indicator")];
+      setLowPowerIndicatorEnabled(lp[FPSTR(_enabled)] | lowPowerIndicatorEnabled);
+      setLowPowerIndicatorPreset(lp[FPSTR(_preset)] | lowPowerIndicatorPreset); // dropdown trickery (int)lp["preset"]
+      setLowPowerIndicatorThreshold(lp[FPSTR(_threshold)] | lowPowerIndicatorThreshold);
+      lowPowerIndicatorReactivationThreshold = lowPowerIndicatorThreshold+10;
+      setLowPowerIndicatorDuration(lp[FPSTR(_duration)] | lowPowerIndicatorDuration);
+
+      DEBUG_PRINT(FPSTR(_name));
+
+      #ifdef ARDUINO_ARCH_ESP32
+        if (!initDone) 
+        {
+          // first run: reading from cfg.json
+          batteryPin = newBatteryPin;
+          DEBUG_PRINTLN(F(" config loaded."));
+        } 
+        else 
+        {
+          DEBUG_PRINTLN(F(" config (re)loaded."));
+
+          // changing parameters from settings page
+          if (newBatteryPin != batteryPin) 
+          {
+            // deallocate pin
+            pinManager.deallocatePin(batteryPin, PinOwner::UM_Battery);
+            batteryPin = newBatteryPin;
+            // initialise
+            setup();
+          }
+        }
+      #endif
+
+      return !battery[FPSTR(_readInterval)].isNull();
+    }
+
+    /*
+     * Generate a preset sample for low power indication 
+     */
+    void generateExamplePreset()
+    {
+      // StaticJsonDocument<300> j;
+      // JsonObject preset = j.createNestedObject();
+      // preset["mainseg"] = 0;
+      // JsonArray seg = preset.createNestedArray("seg");
+      // JsonObject seg0 = seg.createNestedObject();
+      // seg0["id"] = 0;
+      // seg0["start"] = 0;
+      // seg0["stop"] = 60;
+      // seg0["grp"] = 0;
+      // seg0["spc"] = 0;
+      // seg0["on"] = true;
+      // seg0["bri"] = 255;
+
+      // JsonArray col0 = seg0.createNestedArray("col");
+      // JsonArray col00 = col0.createNestedArray();
+      // col00.add(255);
+      // col00.add(0);
+      // col00.add(0);
+
+      // seg0["fx"] = 1;
+      // seg0["sx"] = 128;
+      // seg0["ix"] = 128;
+
+      // savePreset(199, "Low power Indicator", preset);
+    }
+   
+
+    /*
+     *
+     * Getter and Setter. Just in case some other usermod wants to interact with this in the future
+     *
+     */
+
+    /*
+     * getId() allows you to optionally give your V2 usermod an unique ID (please define it in const.h!).
+     * This could be used in the future for the system to determine whether your usermod is installed.
+     */
+    uint16_t getId()
+    {
+      return USERMOD_ID_BATTERY;
+    }
+
+
+    unsigned long getReadingInterval()
+    {
+      return readingInterval;
+    }
+
+    /*
+     * minimum repetition is 3000ms (3s) 
+     */
+    void setReadingInterval(unsigned long newReadingInterval)
+    {
+      readingInterval = max((unsigned long)3000, newReadingInterval);
+    }
+
+
+    /*
+     * Get lowest configured battery voltage
+     */
+    float getMinBatteryVoltage()
+    {
+      return minBatteryVoltage;
+    }
+
+    /*
+     * Set lowest battery voltage
+     * can't be below 0 volt
+     */
+    void setMinBatteryVoltage(float voltage)
+    {
+      minBatteryVoltage = max(0.0f, voltage);
+    }
+
+    /*
+     * Get highest configured battery voltage
+     */
+    float getMaxBatteryVoltage()
+    {
+      return maxBatteryVoltage;
+    }
+    
+    /*
+     * Set highest battery voltage
+     * can't be below minBatteryVoltage
+     */
+    void setMaxBatteryVoltage(float voltage)
+    {
+      #ifdef USERMOD_BATTERY_USE_LIPO
+        maxBatteryVoltage = max(getMinBatteryVoltage()+0.7f, voltage);
+      #else
+        maxBatteryVoltage = max(getMinBatteryVoltage()+1.0f, voltage);
+      #endif
+    }
+
+
+    /*
+     * Get the capacity of all cells in parralel sumed up
+     * unit: mAh
+     */
+    unsigned int getTotalBatteryCapacity()
+    {
+      return totalBatteryCapacity;
+    }
+
+    void setTotalBatteryCapacity(unsigned int capacity)
+    {
+      totalBatteryCapacity = capacity;
+    }
+
+    /*
+     * Get the choosen adc precision
+     * esp8266 = 10bit resolution = 1024.0f 
+     * esp32 = 12bit resolution = 4095.0f
+     */
+    float getAdcPrecision()
+    {
+      #ifdef ARDUINO_ARCH_ESP32
+        // esp32
+        return 4096.0f;
+      #else
+        // esp8266
+        return 1024.0f;
+      #endif
+    }
+
+    /*
+     * Get the calculated voltage
+     * formula: (adc pin value / adc precision * max voltage) + calibration
+     */
+    float getVoltage()
+    {
+      return voltage;
+    }
+
+    /*
+     * Get the mapped battery level (0 - 100) based on voltage
+     * important: voltage can drop when a load is applied, so its only an estimate
+     */
+    int8_t getBatteryLevel()
+    {
+      return batteryLevel;
+    }
+
+    /*
+     * Get the configured calibration value
+     * a offset value to fine-tune the calculated voltage.
+     */
+    float getCalibration()
+    {
+      return calibration;
+    }
+
+    /*
+     * Set the voltage calibration offset value
+     * a offset value to fine-tune the calculated voltage.
+     */
+    void setCalibration(float offset)
+    {
+      calibration = offset;
+    }
+
+
+    /*
+     * Get auto-off feature enabled status
+     * is auto-off enabled, true/false
+     */
+    bool getAutoOffEnabled()
+    {
+      return autoOffEnabled;
+    }
+
+    /*
+     * Set auto-off feature status 
+     */
+    void setAutoOffEnabled(bool enabled)
+    {
+      autoOffEnabled = enabled;
+    }
+    
+    /*
+     * Get auto-off threshold in percent (0-100)
+     */
+    int8_t getAutoOffThreshold()
+    {
+      return autoOffThreshold;
+    }
+
+    /*
+     * Set auto-off threshold in percent (0-100) 
+     */
+    void setAutoOffThreshold(int8_t threshold)
+    {
+      autoOffThreshold = min((int8_t)100, max((int8_t)0, threshold));
+      // when low power indicator is enabled the auto-off threshold cannot be above indicator threshold
+      autoOffThreshold  = lowPowerIndicatorEnabled /*&& autoOffEnabled*/ ? min(lowPowerIndicatorThreshold-1, (int)autoOffThreshold) : autoOffThreshold;
+    }
+
+
+    /*
+     * Get low-power-indicator feature enabled status
+     * is the low-power-indicator enabled, true/false
+     */
+    bool getLowPowerIndicatorEnabled()
+    {
+      return lowPowerIndicatorEnabled;
+    }
+
+    /*
+     * Set low-power-indicator feature status 
+     */
+    void setLowPowerIndicatorEnabled(bool enabled)
+    {
+      lowPowerIndicatorEnabled = enabled;
+    }
+
+    /*
+     * Get low-power-indicator preset to activate when low power is detected
+     */
+    int8_t getLowPowerIndicatorPreset()
+    {
+      return lowPowerIndicatorPreset;
+    }
+
+    /* 
+     * Set low-power-indicator preset to activate when low power is detected
+     */
+    void setLowPowerIndicatorPreset(int8_t presetId)
+    {
+      // String tmp = ""; For what ever reason this doesn't work :(
+      // lowPowerIndicatorPreset = getPresetName(presetId, tmp) ? presetId : lowPowerIndicatorPreset;
+      lowPowerIndicatorPreset = presetId;
+    }
+
+    /*
+     * Get low-power-indicator threshold in percent (0-100)
+     */
+    int8_t getLowPowerIndicatorThreshold()
+    {
+      return lowPowerIndicatorThreshold;
+    }
+
+    /*
+     * Set low-power-indicator threshold in percent (0-100)
+     */
+    void setLowPowerIndicatorThreshold(int8_t threshold)
+    {
+      lowPowerIndicatorThreshold = threshold;
+      // when auto-off is enabled the indicator threshold cannot be below auto-off threshold
+      lowPowerIndicatorThreshold  = autoOffEnabled /*&& lowPowerIndicatorEnabled*/ ? max(autoOffThreshold+1, (int)lowPowerIndicatorThreshold) : max(5, (int)lowPowerIndicatorThreshold);
+    }
+
+    /*
+     * Get low-power-indicator duration in seconds
+     */
+    int8_t getLowPowerIndicatorDuration()
+    {
+      return lowPowerIndicatorDuration;
+    }
+
+    /*
+     * Set low-power-indicator duration in seconds
+     */
+    void setLowPowerIndicatorDuration(int8_t duration)
+    {
+      lowPowerIndicatorDuration = duration;
+    }
+
+
+    /*
+     * Get low-power-indicator status when the indication is done thsi returns true
+     */
+    bool getLowPowerIndicatorDone()
+    {
+      return lowPowerIndicationDone;
+    }
+};
+
+// strings to reduce flash memory usage (used more than twice)
+const char UsermodBattery::_name[]          PROGMEM = "Battery";
+const char UsermodBattery::_readInterval[]  PROGMEM = "interval";
+const char UsermodBattery::_enabled[]       PROGMEM = "enabled";
+const char UsermodBattery::_threshold[]     PROGMEM = "threshold";
+const char UsermodBattery::_preset[]        PROGMEM = "preset";
+const char UsermodBattery::_duration[]      PROGMEM = "duration";
+const char UsermodBattery::_init[]          PROGMEM = "init";
--- a/usermods/Cronixie/usermod_cronixie.h
+++ b/usermods/Cronixie/usermod_cronixie.h
@@ -271,6 +271,7 @@ class UsermodCronixie : public Usermod {
    {
      if (root["nx"].is<const char*>()) {
        strncpy(cronixieDisplay, root["nx"], 6);
+        setCronixie();
      }
    }

--- a/usermods/DHT/readme.md
+++ b/usermods/DHT/readme.md
@@ -1,11 +1,11 @@
 # DHT Temperature/Humidity sensor usermod

 This usermod will read from an attached DHT22 or DHT11 humidity and temperature sensor.
-The sensor readings are displayed in the Info section of the web UI (and optionally send to a MQTT broker).
+The sensor readings are displayed in the Info section of the web UI (and optionally sent to an MQTT broker).

-If sensor is not detected after a while (10 update intervals), this usermod will be disabled.
+If sensor is not detected after 10 update intervals, the usermod will be disabled.

-If enabled measured temperature and humidity will be published to the following MQTT topics
+If enabled, measured temperature and humidity will be published to the following MQTT topics
 * `{devceTopic}/dht/temperature`
 * `{devceTopic}/dht/humidity`

@@ -15,13 +15,13 @@ Copy the example `platformio_override.ini` to the root directory.  This file sho

 ### Define Your Options

-* `USERMOD_DHT`                      - define this to have this user mod included wled00\usermods_list.cpp
+* `USERMOD_DHT`                      - define this to include this user mod wled00\usermods_list.cpp
 * `USERMOD_DHT_DHTTYPE`              - DHT model: 11, 21, 22 for DHT11, DHT21, or DHT22, defaults to 22/DHT22
 * `USERMOD_DHT_PIN`                  - pin to which DTH is connected, defaults to Q2 pin on QuinLed Dig-Uno's board
-* `USERMOD_DHT_CELSIUS`              - define this to report temperatures in degrees celsious, otherwise fahrenheit will be reported
-* `USERMOD_DHT_MEASUREMENT_INTERVAL` - the number of milliseconds between measurements, defaults to 60 seconds
-* `USERMOD_DHT_FIRST_MEASUREMENT_AT` - the number of milliseconds after boot to take first measurement, defaults to 90 seconds
-* `USERMOD_DHT_MQTT`                 - publish measurements to the MQTT broker
+* `USERMOD_DHT_CELSIUS`              - define this to report temperatures in degrees Celsius, otherwise Fahrenheit will be reported
+* `USERMOD_DHT_MEASUREMENT_INTERVAL` - the number of milliseconds between measurements, defaults to 60000 ms
+* `USERMOD_DHT_FIRST_MEASUREMENT_AT` - the number of milliseconds after boot to take first measurement, defaults to 90000 ms
+* `USERMOD_DHT_MQTT`                 - publish measurements to an MQTT broker
 * `USERMOD_DHT_STATS`                - For debug, report delay stats

 ## Project link
@@ -35,11 +35,11 @@ If you are using `platformio_override.ini`, you should be able to refresh the ta

 ## Change Log
 2022-10-15
-* Add possibility to publish sensor readings to an MQTT broker
+* Add ability to publish sensor readings to an MQTT broker
 * fix compilation error for sample [env:d1_mini_usermod_dht_C] task
 2020-02-04
 * Change default QuinLed pin to Q2
-* Instead of trying to keep updates at constant cadence, space readings out by measurement interval; hope this helps to avoid occasional bursts of readings with errors
+* Instead of trying to keep updates at constant cadence, space out readings by measurement interval. Hopefully, this helps eliminate occasional bursts of readings with errors
 * Add some more (optional) stats
 2020-02-03
 * Due to poor readouts on ESP32 with previous DHT library, rewrote to use https://github.com/alwynallan/DHT_nonblocking
--- a/usermods/DHT/usermod_dht.h
+++ b/usermods/DHT/usermod_dht.h
@@ -1,6 +1,10 @@
 #pragma once

 #include "wled.h"
+#ifndef WLED_ENABLE_MQTT
+#error "This user mod requires MQTT to be enabled."
+#endif
+

 #include <dht_nonblocking.h>

--- a/usermods/EXAMPLE_v2/usermod_v2_example.h
+++ b/usermods/EXAMPLE_v2/usermod_v2_example.h
@@ -22,8 +22,12 @@

 //class name. Use something descriptive and leave the ": public Usermod" part :)
 class MyExampleUsermod : public Usermod {
+
  private:
-    //Private class members. You can declare variables and functions only accessible to your usermod here
+
+    // Private class members. You can declare variables and functions only accessible to your usermod here
+    bool enabled = false;
+    bool initDone = false;
    unsigned long lastTime = 0;

    // set your config variables to their boot default value (this can also be done in readFromConfig() or a constructor if you prefer)
@@ -37,15 +41,56 @@ class MyExampleUsermod : public Usermod {
    long testLong;
    int8_t testPins[2];

+    // string that are used multiple time (this will save some flash memory)
+    static const char _name[];
+    static const char _enabled[];
+
+
+    // any private methods should go here (non-inline methosd should be defined out of class)
+    void publishMqtt(const char* state, bool retain = false); // example for publishing MQTT message
+
+
  public:
-    //Functions called by WLED
+
+    // non WLED related methods, may be used for data exchange between usermods (non-inline methods should be defined out of class)
+
+    /**
+     * Enable/Disable the usermod
+     */
+    inline void enable(bool enable) { enabled = enable; }
+
+    /**
+     * Get usermod enabled/disabled state
+     */
+    inline bool isEnabled() { return enabled; }
+
+    // in such case add the following to another usermod:
+    //  in private vars:
+    //   #ifdef USERMOD_EXAMPLE
+    //   MyExampleUsermod* UM;
+    //   #endif
+    //  in setup()
+    //   #ifdef USERMOD_EXAMPLE
+    //   UM = (MyExampleUsermod*) usermods.lookup(USERMOD_ID_EXAMPLE);
+    //   #endif
+    //  somewhere in loop() or other member method
+    //   #ifdef USERMOD_EXAMPLE
+    //   if (UM != nullptr) isExampleEnabled = UM->isEnabled();
+    //   if (!isExampleEnabled) UM->enable(true);
+    //   #endif
+
+
+    // methods called by WLED (can be inlined as they are called only once but if you call them explicitly define them out of class)

    /*
     * setup() is called once at boot. WiFi is not yet connected at this point.
+     * readFromConfig() is called prior to setup()
     * You can use it to initialize variables, sensors or similar.
     */
    void setup() {
+      // do your set-up here
      //Serial.println("Hello from my usermod!");
+      initDone = true;
    }


@@ -69,6 +114,11 @@ class MyExampleUsermod : public Usermod {
     *    Instead, use a timer check as shown here.
     */
    void loop() {
+      // if usermod is disabled or called during strip updating just exit
+      // NOTE: on very long strips strip.isUpdating() may always return true so update accordingly
+      if (!enabled || strip.isUpdating()) return;
+
+      // do your magic here
      if (millis() - lastTime > 1000) {
        //Serial.println("I'm alive!");
        lastTime = millis();
@@ -81,19 +131,25 @@ class MyExampleUsermod : public Usermod {
     * Creating an "u" object allows you to add custom key/value pairs to the Info section of the WLED web UI.
     * Below it is shown how this could be used for e.g. a light sensor
     */
-    /*
    void addToJsonInfo(JsonObject& root)
    {
-      int reading = 20;
-      //this code adds "u":{"Light":[20," lux"]} to the info object
+      // if "u" object does not exist yet wee need to create it
      JsonObject user = root["u"];
      if (user.isNull()) user = root.createNestedObject("u");

-      JsonArray lightArr = user.createNestedArray("Light"); //name
-      lightArr.add(reading); //value
-      lightArr.add(" lux"); //unit
+      //this code adds "u":{"ExampleUsermod":[20," lux"]} to the info object
+      //int reading = 20;
+      //JsonArray lightArr = user.createNestedArray(FPSTR(_name))); //name
+      //lightArr.add(reading); //value
+      //lightArr.add(F(" lux")); //unit
+
+      // if you are implementing a sensor usermod, you may publish sensor data
+      //JsonObject sensor = root[F("sensor")];
+      //if (sensor.isNull()) sensor = root.createNestedObject(F("sensor"));
+      //temp = sensor.createNestedArray(F("light"));
+      //temp.add(reading);
+      //temp.add(F("lux"));
    }
-    */


    /*
@@ -102,7 +158,12 @@ class MyExampleUsermod : public Usermod {
     */
    void addToJsonState(JsonObject& root)
    {
-      //root["user0"] = userVar0;
+      if (!initDone || !enabled) return;  // prevent crash on boot applyPreset()
+
+      JsonObject usermod = root[FPSTR(_name)];
+      if (usermod.isNull()) usermod = root.createNestedObject(FPSTR(_name));
+
+      //usermod["user0"] = userVar0;
    }


@@ -112,7 +173,14 @@ class MyExampleUsermod : public Usermod {
     */
    void readFromJsonState(JsonObject& root)
    {
-      userVar0 = root["user0"] | userVar0; //if "user0" key exists in JSON, update, else keep old value
+      if (!initDone) return;  // prevent crash on boot applyPreset()
+
+      JsonObject usermod = root[FPSTR(_name)];
+      if (!usermod.isNull()) {
+        // expect JSON usermod data in usermod name object: {"ExampleUsermod:{"user0":10}"}
+        userVar0 = usermod["user0"] | userVar0; //if "user0" key exists in JSON, update, else keep old value
+      }
+      // you can as well check WLED state JSON keys
      //if (root["bri"] == 255) Serial.println(F("Don't burn down your garage!"));
    }

@@ -154,8 +222,10 @@ class MyExampleUsermod : public Usermod {
     */
    void addToConfig(JsonObject& root)
    {
-      JsonObject top = root.createNestedObject("exampleUsermod");
-      top["great"] = userVar0; //save these vars persistently whenever settings are saved
+      JsonObject top = root.createNestedObject(FPSTR(_name));
+      top[FPSTR(_enabled)] = enabled;
+      //save these vars persistently whenever settings are saved
+      top["great"] = userVar0;
      top["testBool"] = testBool;
      top["testInt"] = testInt;
      top["testLong"] = testLong;
@@ -188,7 +258,7 @@ class MyExampleUsermod : public Usermod {
      // default settings values could be set here (or below using the 3-argument getJsonValue()) instead of in the class definition or constructor
      // setting them inside readFromConfig() is slightly more robust, handling the rare but plausible use case of single value being missing after boot (e.g. if the cfg.json was manually edited and a value was removed)

-      JsonObject top = root["exampleUsermod"];
+      JsonObject top = root[FPSTR(_name)];

      bool configComplete = !top.isNull();

@@ -201,6 +271,8 @@ class MyExampleUsermod : public Usermod {
      // A 3-argument getJsonValue() assigns the 3rd argument as a default value if the Json value is missing
      configComplete &= getJsonValue(top["testInt"], testInt, 42);  
      configComplete &= getJsonValue(top["testLong"], testLong, -42424242);
+
+      // "pin" fields have special handling in settings page (or some_pin as well)
      configComplete &= getJsonValue(top["pin"][0], testPins[0], -1);
      configComplete &= getJsonValue(top["pin"][1], testPins[1], -1);

@@ -208,6 +280,21 @@ class MyExampleUsermod : public Usermod {
    }


+    /*
+     * appendConfigData() is called when user enters usermod settings page
+     * it may add additional metadata for certain entry fields (adding drop down is possible)
+     * be careful not to add too much as oappend() buffer is limited to 3k
+     */
+    void appendConfigData()
+    {
+      oappend(SET_F("addInfo('")); oappend(String(FPSTR(_name)).c_str()); oappend(SET_F(":great")); oappend(SET_F("',1,'<i>(this is a great config value)</i>');"));
+      oappend(SET_F("addInfo('")); oappend(String(FPSTR(_name)).c_str()); oappend(SET_F(":testString")); oappend(SET_F("',1,'enter any string you want');"));
+      oappend(SET_F("dd=addDropdown('")); oappend(String(FPSTR(_name)).c_str()); oappend(SET_F("','testInt');"));
+      oappend(SET_F("addOption(dd,'Nothing',0);"));
+      oappend(SET_F("addOption(dd,'Everything',42);"));
+    }
+
+
    /*
     * handleOverlayDraw() is called just before every show() (LED strip update frame) after effects have set the colors.
     * Use this to blank out some LEDs or set them to a different color regardless of the set effect mode.
@@ -218,7 +305,72 @@ class MyExampleUsermod : public Usermod {
      //strip.setPixelColor(0, RGBW32(0,0,0,0)) // set the first pixel to black
    }

-   
+
+    /**
+     * handleButton() can be used to override default button behaviour. Returning true
+     * will prevent button working in a default way.
+     * Replicating button.cpp
+     */
+    bool handleButton(uint8_t b) {
+      yield();
+      // ignore certain button types as they may have other consequences
+      if (!enabled
+       || buttonType[b] == BTN_TYPE_NONE
+       || buttonType[b] == BTN_TYPE_RESERVED
+       || buttonType[b] == BTN_TYPE_PIR_SENSOR
+       || buttonType[b] == BTN_TYPE_ANALOG
+       || buttonType[b] == BTN_TYPE_ANALOG_INVERTED) {
+        return false;
+      }
+
+      bool handled = false;
+      // do your button handling here
+      return handled;
+    }
+  
+
+#ifndef WLED_DISABLE_MQTT
+    /**
+     * handling of MQTT message
+     * topic only contains stripped topic (part after /wled/MAC)
+     */
+    bool onMqttMessage(char* topic, char* payload) {
+      // check if we received a command
+      //if (strlen(topic) == 8 && strncmp_P(topic, PSTR("/command"), 8) == 0) {
+      //  String action = payload;
+      //  if (action == "on") {
+      //    enabled = true;
+      //    return true;
+      //  } else if (action == "off") {
+      //    enabled = false;
+      //    return true;
+      //  } else if (action == "toggle") {
+      //    enabled = !enabled;
+      //    return true;
+      //  }
+      //}
+      return false;
+    }
+
+    /**
+     * onMqttConnect() is called when MQTT connection is established
+     */
+    void onMqttConnect(bool sessionPresent) {
+      // do any MQTT related initialisation here
+      //publishMqtt("I am alive!");
+    }
+#endif
+
+
+    /**
+     * onStateChanged() is used to detect WLED state change
+     * @mode parameter is CALL_MODE_... parameter used for notifications
+     */
+    void onStateChange(uint8_t mode) {
+      // do something if WLED state changed (color, brightness, effect, preset, etc)
+    }
+
+
    /*
     * getId() allows you to optionally give your V2 usermod an unique ID (please define it in const.h!).
     * This could be used in the future for the system to determine whether your usermod is installed.
@@ -230,4 +382,25 @@ class MyExampleUsermod : public Usermod {

   //More methods can be added in the future, this example will then be extended.
   //Your usermod will remain compatible as it does not need to implement all methods from the Usermod base class!
-};
+};
+
+
+// add more strings here to reduce flash memory usage
+const char MyExampleUsermod::_name[]    PROGMEM = "ExampleUsermod";
+const char MyExampleUsermod::_enabled[] PROGMEM = "enabled";
+
+
+// implementation of non-inline member methods
+
+void MyExampleUsermod::publishMqtt(const char* state, bool retain)
+{
+#ifndef WLED_DISABLE_MQTT
+  //Check if MQTT Connected, otherwise it will crash the 8266
+  if (WLED_MQTT_CONNECTED) {
+    char subuf[64];
+    strcpy(subuf, mqttDeviceTopic);
+    strcat_P(subuf, PSTR("/example"));
+    mqtt->publish(subuf, 0, retain, state);
+  }
+#endif
+}
--- a/usermods/EleksTube_IPS/readme.md
+++ b/usermods/EleksTube_IPS/readme.md
@@ -15,7 +15,7 @@ Not supported:
 - On-device setup with buttons (WiFi setup only)

 Your images must be 1-135 pixels wide and 1-240 pixels high.
-For BMP, 1, 4, 8, and 24 bits per pixel formats are supported.
+BMP 1, 4, 8, and 24 bits per pixel formats are supported.

 ## Installation 

@@ -26,11 +26,11 @@ Use LED pin 12, relay pin 27 and button pin 34.

 ## Use of RGB565 images

-Binary 16-bit per pixel RGB565 format `.bin` and `.clk` images are now supported. This has the benefit of only using 2/3rds of the file size a 24 BPP `.bmp` has.
-The drawback is that this format cannot be handled by common image programs and that an extra conversion step is needed.
+Binary 16-bit per pixel RGB565 format `.bin` and `.clk` images are now supported. This has the benefit of using only 2/3rds of the file space a 24 BPP `.bmp` occupies.
+The drawback is this format cannot be handled by common image programs and an extra conversion step is needed.
 You can use https://lvgl.io/tools/imageconverter to convert your .bmp to a .bin file (settings `True color` and `Binary RGB565`).  
 Thank you to @RedNax67 for adding .bin and .clk support.  
-For most clockface designs, using 4 or 8 BPP BMP formats will save even more file size:
+For most clockface designs, using 4 or 8 BPP BMP format will reduce file size even more:

 | Bits per pixel | File size in kB (for 135x240 img) | % of 24 BPP BMP | Max unique colors
 | --- | --- | --- | --- |
@@ -42,4 +42,4 @@ For most clockface designs, using 4 or 8 BPP BMP formats will save even more fil

 Comparison 1 vs. 4 vs. 8 vs. 24 BPP. With this clockface on the actual clock, 4 bit looks good, and 8 bit is almost indistinguishable from 24 bit.

-![comparison](https://user-images.githubusercontent.com/21045690/156899667-5b55ed9f-6e03-4066-b2aa-1260e9570369.png)
+![comparison](https://user-images.githubusercontent.com/21045690/156899667-5b55ed9f-6e03-4066-b2aa-1260e9570369.png)
--- a/usermods/Enclosure_with_OLED_temp_ESP07/readme.md
+++ b/usermods/Enclosure_with_OLED_temp_ESP07/readme.md
@@ -10,7 +10,7 @@ For BME280 sensor use usermod_bme280.cpp. Copy to wled00 and rename to usermod.c
 ## Features
 -   SSD1306 128x32 and 128x64 I2C OLED display
 -   On screen IP address, SSID and controller status (e.g. ON or OFF, recent effect)
-   Auto display shutoff for saving display lifetime
+-   Auto display shutoff for extending display lifetime
 -   Dallas temperature sensor
 -   Reporting temperature to MQTT broker

@@ -39,15 +39,15 @@ default_envs = esp07
 ...
 lib_deps_external =
  ...
-  #For use SSD1306 OLED display uncomment following
+  #To use the SSD1306 OLED display, uncomment following
  U8g2@~2.27.3
-  #For Dallas sensor uncomment following 2 lines
+  #For Dallas sensor, uncomment the following 2 lines
  DallasTemperature@~3.8.0
  OneWire@~2.3.5
 ...
 ```

-For BME280 sensor uncomment `U8g2@~2.27.3`,`BME280@~3.0.0 under` `[common]` section in `platformio.ini`:
+For BME280 sensor, uncomment `U8g2@~2.27.3`,`BME280@~3.0.0 under` `[common]` section in `platformio.ini`:
 ```ini
 # platformio.ini
 ...
@@ -60,7 +60,7 @@ default_envs = esp07
 ...
 lib_deps_external =
  ...
-  #For use SSD1306 OLED display uncomment following
+  #To use the SSD1306 OLED display, uncomment following
  U8g2@~2.27.3
  #For BME280 sensor uncomment following
  BME280@~3.0.0
--- a/usermods/Enclosure_with_OLED_temp_ESP07/usermod.cpp
+++ b/usermods/Enclosure_with_OLED_temp_ESP07/usermod.cpp
@@ -1,3 +1,7 @@
+#ifndef WLED_ENABLE_MQTT
+#error "This user mod requires MQTT to be enabled."
+#endif
+
 #include "wled.h"
 #include <Arduino.h>
 #include <U8x8lib.h> // from https://github.com/olikraus/u8g2/
--- a/usermods/Enclosure_with_OLED_temp_ESP07/usermod_bme280.cpp
+++ b/usermods/Enclosure_with_OLED_temp_ESP07/usermod_bme280.cpp
@@ -1,3 +1,7 @@
+#ifndef WLED_ENABLE_MQTT
+#error "This user mod requires MQTT to be enabled."
+#endif
+
 #include "wled.h"
 #include <Arduino.h>
 #include <U8x8lib.h> // from https://github.com/olikraus/u8g2/
--- a/usermods/Fix_unreachable_netservices_v2/readme.md
+++ b/usermods/Fix_unreachable_netservices_v2/readme.md
@@ -2,15 +2,16 @@

 **Attention: This usermod compiles only for ESP8266**

-This usermod-v2 modification performs a ping request to the local IP address every 60 seconds. By this procedure the net services of WLED remains accessible in some problematic WLAN environments.
+This usermod-v2 modification performs a ping request to a local IP address every 60 seconds. This ensures WLED net services remain accessible in some problematic WLAN environments.

 The modification works with static or DHCP IP address configuration.

 _Story:_

-Unfortunately, with all ESP projects where a web server or other network services are running, I have the problem that after some time the web server is no longer accessible.  Now I found out that the connection is at least reestablished when a ping request is executed by the device.
+Unfortunately, with many ESP projects where a web server or other network services are running, after some time, the connecton to the web server is lost.
+The connection can be reestablished with a ping request from the device.

-With this modification, in the worst case, the network functions are not available for 60 seconds until the next ping request.
+With this modification, in the worst case, the network functions are not available until the next ping request. (60 seconds)

 ## Webinterface

--- a/usermods/JSON_IR_remote/readme.md
+++ b/usermods/JSON_IR_remote/readme.md
@@ -2,8 +2,8 @@

 ## Purpose 

-The JSON IR remote allows users to customize IR remote behavior without writing custom code and compiling. 
-It also enables using any remote that is compatible with your IR receiver. Using the JSON IR remote, you can
+The JSON IR remote enables users to customize IR remote behavior without writing custom code and compiling. 
+It also allows using any remote compatible with your IR receiver. Using the JSON IR remote, you can
 map buttons from any remote to any HTTP request API or JSON API command.  

 ## Usage
--- a/usermods/PIR_sensor_switch/readme.md
+++ b/usermods/PIR_sensor_switch/readme.md
@@ -7,34 +7,35 @@ _Story:_
 I use the PIR Sensor to automatically turn on the WLED analog clock in my home office room when I am there.
 The LED strip is switched [using a relay](https://github.com/Aircoookie/WLED/wiki/Control-a-relay-with-WLED) to keep the power consumption low when it is switched off.

-## Webinterface
+## Web interface

 The info page in the web interface shows the remaining time of the off timer. Usermod can also be temporarily disbled/enabled from the info page by clicking PIR button.

 ## Sensor connection

-My setup uses an HC-SR501 or HC-SR602 sensor, a HC-SR505 should also work.
+My setup uses an HC-SR501 or HC-SR602 sensor, an HC-SR505 should also work.

-The usermod uses GPIO13 (D1 mini pin D7) by default for the sensor signal but can be changed in the Usermod settings page.
+The usermod uses GPIO13 (D1 mini pin D7) by default for the sensor signal, but can be changed in the Usermod settings page.
 [This example page](http://www.esp8266learning.com/wemos-mini-pir-sensor-example.php) describes how to connect the sensor.

-Use the potentiometers on the sensor to set the time-delay to the minimum and the sensitivity to about half, or slightly above.
+Use the potentiometers on the sensor to set the time delay to the minimum and the sensitivity to about half, or slightly above.
 You can also use usermod's off timer instead of sensor's. In such case rotate the potentiometer to its shortest time possible (or use SR602 which lacks such potentiometer).

 ## Usermod installation

-**NOTE:** Usermod has been included in master branch of WLED so it can be compiled in directly just by defining `-D USERMOD_PIRSWITCH` and optionaly `-D PIR_SENSOR_PIN=16` to override default pin. You can also change the default off tim by adding `-D PIR_SENSOR_OFF_SEC=30`.
+**NOTE:** Usermod has been included in master branch of WLED so it can be compiled in directly just by defining `-D USERMOD_PIRSWITCH` and optionaly `-D PIR_SENSOR_PIN=16` to override default pin. You can also change the default off time by adding `-D PIR_SENSOR_OFF_SEC=30`.

-## API to enable/disable the PIR sensor from outside. For example from another usermod.
+## API to enable/disable the PIR sensor from outside. For example from another usermod:

 To query or change the PIR sensor state the methods `bool PIRsensorEnabled()` and `void EnablePIRsensor(bool enable)` are available.

 When the PIR sensor state changes an MQTT message is broadcasted with topic `wled/deviceMAC/motion` and message `on` or `off`.
-Usermod can also be configured to just send MQTT message and not change WLED state using settings page as well as responding to motion only during nighttime (assuming NTP and lattitude/longitude are set to determine sunrise/sunset times).
+Usermod can also be configured to send just the MQTT message but not change WLED state using settings page as well as responding to motion only at night
+(assuming NTP and lattitude/longitude are set to determine sunrise/sunset times).

 ### There are two options to get access to the usermod instance:

-1. Include `usermod_PIR_sensor_switch.h` **before** you include the other usermod in `usermods_list.cpp'
+1. Include `usermod_PIR_sensor_switch.h` **before** you include other usermods in `usermods_list.cpp'

 or

@@ -63,7 +64,7 @@ class MyUsermod : public Usermod {

 ### Configuration options

-Usermod can be configured in Usermods settings page.
+Usermod can be configured via the Usermods settings page.

 * `PIRenabled` - enable/disable usermod
 * `pin` - dynamically change GPIO pin where PIR sensor is attached to ESP
@@ -71,8 +72,8 @@ Usermod can be configured in Usermods settings page.
 * `on-preset` - preset triggered when PIR activates (if this is 0 it will just turn WLED on)
 * `off-preset` - preset triggered when PIR deactivates (if this is 0 it will just turn WLED off)
 * `nighttime-only` - enable triggering only between sunset and sunrise (you will need to set up _NTP_, _Lat_ & _Lon_ in Time & Macro settings)
-* `mqtt-only` - only send MQTT messages, do not interact with WLED
-* `off-only` - only trigger presets or turn WLED on/off in WLED is not already on (displaying effect)
+* `mqtt-only` - send only MQTT messages, do not interact with WLED
+* `off-only` - only trigger presets or turn WLED on/off if WLED is not already on (displaying effect)
 * `notifications` - enable or disable sending notifications to other WLED instances using Sync button


@@ -89,4 +90,4 @@ Have fun - @gegu & @blazoncek
 2022-11
 * Added compile time option for off timer.
 * Added Home Assistant autodiscovery MQTT broadcast.
-* Updated info on compiling.
+* Updated info on compiling.
--- a/usermods/PIR_sensor_switch/usermod_PIR_sensor_switch.h
+++ b/usermods/PIR_sensor_switch/usermod_PIR_sensor_switch.h
@@ -4,11 +4,7 @@

 #ifndef PIR_SENSOR_PIN
  // compatible with QuinLED-Dig-Uno
-  #ifdef ARDUINO_ARCH_ESP32
-    #define PIR_SENSOR_PIN 23 // Q4
-  #else //ESP8266 boards
-    #define PIR_SENSOR_PIN 13 // Q4 (D7 on D1 mini)
-  #endif
+  #define PIR_SENSOR_PIN -1 //WLEDMM not default 23 // Q4 for esp32 or otherwise 13 // Q4 (D7 on D1 mini)
 #endif

 #ifndef PIR_SENSOR_OFF_SEC
@@ -114,6 +110,7 @@ private:
    if (m_offOnly && bri && (switchOn || (!PIRtriggered && !switchOn))) return; //if lights on and off only, do nothing
    if (PIRtriggered && switchOn) return; //if already on and triggered before, do nothing
    PIRtriggered = switchOn;
+    DEBUG_PRINT(F("PIR: strip=")); DEBUG_PRINTLN(switchOn?"on":"off");
    if (switchOn) {
      if (m_onPreset) {
        if (currentPlaylist>0 && !offMode) {
@@ -136,7 +133,7 @@ private:
      }
    } else {
      if (m_offPreset) {
-        if (currentPreset==m_onPreset || currentPlaylist==m_onPreset) applyPreset(m_offPreset, NotifyUpdateMode);
+        applyPreset(m_offPreset, NotifyUpdateMode);
        return;
      } else if (prevPlaylist) {
        if (currentPreset==m_onPreset || currentPlaylist==m_onPreset) applyPreset(prevPlaylist, NotifyUpdateMode);
@@ -159,6 +156,7 @@ private:

  void publishMqtt(const char* state)
  {
+  #ifndef WLED_DISABLE_MQTT
    //Check if MQTT Connected, otherwise it will crash the 8266
    if (WLED_MQTT_CONNECTED) {
      char subuf[64];
@@ -166,11 +164,13 @@ private:
      strcat_P(subuf, PSTR("/motion"));
      mqtt->publish(subuf, 0, false, state);
    }
+  #endif
  }

  // Create an MQTT Binary Sensor for Home Assistant Discovery purposes, this includes a pointer to the topic that is published to in the Loop.
  void publishHomeAssistantAutodiscovery()
  {
+  #ifndef WLED_DISABLE_MQTT
    if (WLED_MQTT_CONNECTED) {
      StaticJsonDocument<600> doc;
      char uid[24], json_str[1024], buf[128];
@@ -200,6 +200,7 @@ private:

      mqtt->publish(buf, 0, true, json_str, payload_size); // do we really need to retain?
    }
+  #endif
  }

  /**
@@ -235,7 +236,7 @@ private:
    if (offTimerStart > 0 && millis() - offTimerStart > m_switchOffDelay) {
      offTimerStart = 0;
      if (enabled == true) {
-        if (!m_mqttOnly && (!m_nightTimeOnly || (m_nightTimeOnly && !isDayTime()))) switchStrip(false);
+        if (!m_mqttOnly && (!m_nightTimeOnly || (m_nightTimeOnly && !isDayTime()) || PIRtriggered)) switchStrip(false);
        else if (NotifyUpdateMode != CALL_MODE_NO_NOTIFY) updateInterfaces(CALL_MODE_WS_SEND);
        publishMqtt("off");
      }
@@ -366,6 +367,19 @@ public:
    sensor[F("motion")] = sensorPinState || offTimerStart>0 ? true : false;
  }

+  /**
+   * onStateChanged() is used to detect WLED state change
+   */
+  void onStateChange(uint8_t mode) {
+    DEBUG_PRINT(F("PIR: offTimerStart=")); DEBUG_PRINTLN(offTimerStart);
+    if (PIRtriggered && offTimerStart) {
+      // checking PIRtriggered and offTimerStart will prevent cancellation upon On trigger
+      DEBUG_PRINTLN(F("PIR: Canceled."));
+      offTimerStart = 0;
+      PIRtriggered = false;
+    }
+  }
+
  /**
   * addToJsonState() can be used to add custom entries to the /json/state part of the JSON API (state object).
   * Values in the state object may be modified by connected clients
@@ -414,6 +428,8 @@ public:

  void appendConfigData()
  {
+    oappend(SET_F("addHB('PIRsensorSwitch');"));
+
    oappend(SET_F("addInfo('PIRsensorSwitch:HA-discovery',1,'HA=Home Assistant');"));     // 0 is field type, 1 is actual field
    oappend(SET_F("addInfo('PIRsensorSwitch:notifications',1,'Periodic WS updates');"));  // 0 is field type, 1 is actual field
  }
--- a/usermods/PWM_fan/readme.md
+++ b/usermods/PWM_fan/readme.md
@@ -2,12 +2,12 @@

 v2 Usermod to to control PWM fan with RPM feedback and temperature control

-This usermod requires Dallas Temperature usermod to obtain temperature information. If this is not available the fan will always run at 100% speed.
-If the fan does not have _tacho_ (RPM) output you can set the _tacho-pin_ to -1 to not use that feature.
+This usermod requires the Dallas Temperature usermod to obtain temperature information. If it's not available, the fan will run at 100% speed.
+If the fan does not have _tachometer_ (RPM) output you can set the _tachometer-pin_ to -1 to disable that feature.

-You can also set the thershold temperature at which fan runs at lowest speed. If the actual temperature measured will be 3°C greater than threshold temperature the fan will run at 100%.
+You can also set the thershold temperature at which fan runs at lowest speed. If the measured temperature is 3°C greater than the threshold temperature, the fan will run at 100%.

-If the _tacho_ is supported the current speed (in RPM) will be repored in WLED Info page.
+If the _tachometer_ is supported, the current speed (in RPM) will be displayed on the WLED Info page.

 ## Installation

@@ -20,7 +20,7 @@ All of the parameters are configured during run-time using Usermods settings pag
 This includes:

 * PWM output pin (can be configured at compile time `-D PWM_PIN=xx`)
-* tacho input pin (can be configured at compile time `-D TACHO_PIN=xx`)
+* tachometer input pin (can be configured at compile time `-D TACHO_PIN=xx`)
 * sampling frequency in seconds
 * threshold temperature in degees C

@@ -32,14 +32,14 @@ No special requirements.

 ## Control PWM fan speed using JSON API

-You can use e.g. `{"PWM-fan":{"speed":30,"lock":true}}` to set fan speed to 30 percent of maximum speed (replace 30 with arbitrary value between 0 and 100) and lock the speed.
-If you include `speed` property you can set fan speed in percent (%) of maximum speed.
-If you include `lock` property you can lock (_true_) or unlock (_false_) fan speed.
-If the fan speed is unlocked it will revert to temperature controlled speed on next update cycle. Once fan speed is locked it will remain so until it is unlocked by next API call.
+e.g. you can use `{"PWM-fan":{"speed":30,"lock":true}}` to lock fan speed to 30 percent of maximum. (replace 30 with an arbitrary value between 0 and 100)
+If you include `speed` property you can set fan speed as a percentage (%) of maximum speed.
+If you include `lock` property you can lock (_true_) or unlock (_false_) the fan speed.
+If the fan speed is unlocked, it will revert to temperature controlled speed on the next update cycle. Once fan speed is locked it will remain so until it is unlocked by the next API call.

 ## Change Log

 2021-10
 * First public release
 2022-05
-* Added JSON API call to allow changing of speed
+* Added JSON API call to allow changing of speed
--- a/usermods/PWM_fan/usermod_PWM_fan.h
+++ b/usermods/PWM_fan/usermod_PWM_fan.h
@@ -1,7 +1,7 @@
 #pragma once

-#ifndef USERMOD_DALLASTEMPERATURE
-#error The "PWM fan" usermod requires "Dallas Temeprature" usermod to function properly.
+#if !defined(USERMOD_DALLASTEMPERATURE) && !defined(USERMOD_SHT)
+#error The "PWM fan" usermod requires "Dallas Temeprature" or "SHT" usermod to function properly.
 #endif

 #include "wled.h"
@@ -42,6 +42,8 @@ class PWMFanUsermod : public Usermod {

    #ifdef USERMOD_DALLASTEMPERATURE
    UsermodTemperature* tempUM;
+    #elif defined(USERMOD_SHT)
+    ShtUsermod* tempUM;
    #endif

    // configurable parameters
@@ -145,7 +147,7 @@ class PWMFanUsermod : public Usermod {
    }

    float getActualTemperature(void) {
-      #ifdef USERMOD_DALLASTEMPERATURE
+      #if defined(USERMOD_DALLASTEMPERATURE) || defined(USERMOD_SHT)
      if (tempUM != nullptr)
        return tempUM->getTemperatureC();
      #endif
@@ -189,6 +191,8 @@ class PWMFanUsermod : public Usermod {
      #ifdef USERMOD_DALLASTEMPERATURE   
      // This Usermod requires Temperature usermod
      tempUM = (UsermodTemperature*) usermods.lookup(USERMOD_ID_TEMPERATURE);
+      #elif defined(USERMOD_SHT)
+      tempUM = (ShtUsermod*) usermods.lookup(USERMOD_ID_SHT);
      #endif
      initTacho();
      initPWMfan();
@@ -286,6 +290,10 @@ class PWMFanUsermod : public Usermod {
      }
    }

+    void appendConfigData() {
+      oappend(SET_F("addHB('PWM-fan');"));
+    }
+
    /*
     * addToConfig() can be used to add custom persistent settings to the cfg.json file in the "um" (usermod) object.
     * It will be called by WLED when settings are actually saved (for example, LED settings are saved)
--- a/usermods/RTC/readme.md
+++ b/usermods/RTC/readme.md
@@ -1,6 +1,6 @@
 # DS1307/DS3231 Real time clock

-Gets the time from I2C RTC module on boot. This allows clocks to operate e.g. if temporarily no WiFi is available.
+Gets the time from I2C RTC module on boot. This allows clock operation if WiFi is not available.
 The stored time is updated each time NTP is synced. 

 ## Installation 
--- a/usermods/RTC/usermod_rtc.h
+++ b/usermods/RTC/usermod_rtc.h
@@ -1,5 +1,8 @@
 #pragma once

+#include <Arduino.h>   // WLEDMM: make sure that I2C drivers have the "right" Wire Object
+#include <Wire.h>
+
 #include "src/dependencies/time/DS1307RTC.h"
 #include "wled.h"

@@ -13,7 +16,21 @@ class RTCUsermod : public Usermod {

    void setup() {
      PinManagerPinType pins[2] = { { i2c_scl, true }, { i2c_sda, true } };
-      if (!pinManager.allocateMultiplePins(pins, 2, PinOwner::HW_I2C)) { disabled = true; return; }
+      if (pins[1].pin < 0 || pins[0].pin < 0)  { disabled=true; return; }  //WLEDMM bugfix - ensure that "final" GPIO are valid and no "-1" sneaks trough
+
+      // WLEDMM join hardware I2C
+      if (!pinManager.joinWire()) {  // WLEDMM - this allocates global I2C pins, then starts Wire - if not started previously
+        disabled = true;
+        return;
+      }
+
+      //if (!pinManager.allocateMultiplePins(pins, 2, PinOwner::HW_I2C)) { disabled = true; return; }
+#if defined(ARDUINO_ARCH_ESP32)
+      //Wire.begin(pins[1].pin, pins[0].pin);  // WLEDMM this might silently fail, which is OK as it just means that I2C bus is already running.
+#else
+      //Wire.begin();  // WLEDMM - i2c pins on 8266 are fixed.
+#endif
+
      RTC.begin();
      time_t rtcTime = RTC.get();
      if (rtcTime) {
@@ -28,7 +45,7 @@ class RTCUsermod : public Usermod {
      if (strip.isUpdating()) return;
      if (!disabled && toki.isTick()) {
        time_t t = toki.second();
-        if (t != RTC.get()) RTC.set(t); //set RTC to NTP/UI-provided value
+        if (abs(t - RTC.get())> 2) RTC.set(t); //set RTC to NTP/UI-provided value - WLEDMM allow up to 3 sec deviation
      }
    }

--- a/usermods/RelayBlinds/readme.md
+++ b/usermods/RelayBlinds/readme.md
@@ -1,8 +1,8 @@
 # RelayBlinds usermod

-This simple usermod toggles two relay pins momentarily (default for 500ms) when `userVar0` is set.  
-This can be used to e.g. "push" the buttons of a window blinds motor controller.
+This simple usermod toggles two relay pins momentarily (defaults to 500ms) when `userVar0` is set.  
+e.g. can be used to "push" the buttons of a window blinds motor controller.

 v1 usermod. Please replace usermod.cpp in the `wled00` directory with the one in this file.
 You may upload `index.htm` to `[WLED-IP]/edit` to replace the default lighting UI with a simple Up/Down button one.  
-Also, a simple `presets.json` file is available, this makes the relay actions controllable via two presets to facilitate control e.g. via the default UI or Alexa.
+A simple `presets.json` file is available. This makes the relay actions controllable via two presets to facilitate control e.g. the default UI or Alexa.
--- a/usermods/SN_Photoresistor/readme.md
+++ b/usermods/SN_Photoresistor/readme.md
@@ -1,7 +1,7 @@
 # SN_Photoresistor usermod

-This usermod will read from an attached photoresistor sensor like the KY-018 sensor.
-The luminance is displayed both in the Info section of the web UI as well as published to the `/luminance` MQTT topic if enabled.
+This usermod will read from an attached photoresistor sensor like the KY-018.
+The luminance is displayed in both the Info section of the web UI as well as published to the `/luminance` MQTT topic, if enabled.

 ## Installation

@@ -9,15 +9,15 @@ Copy the example `platformio_override.ini` to the root directory.  This file sho

 ### Define Your Options

-* `USERMOD_SN_PHOTORESISTOR`                      - define this to have this user mod included wled00\usermods_list.cpp
-* `USERMOD_SN_PHOTORESISTOR_MEASUREMENT_INTERVAL` - the number of milliseconds between measurements, defaults to 60 seconds
-* `USERMOD_SN_PHOTORESISTOR_FIRST_MEASUREMENT_AT` - the number of milliseconds after boot to take first measurement, defaults to 20 seconds
-* `USERMOD_SN_PHOTORESISTOR_REFERENCE_VOLTAGE`    - the voltage supplied to the sensor, defaults to 5v
-* `USERMOD_SN_PHOTORESISTOR_ADC_PRECISION`        - the ADC precision is the number of distinguishable ADC inputs, defaults to 1024.0 (10 bits)
-* `USERMOD_SN_PHOTORESISTOR_RESISTOR_VALUE`       - the resistor size, defaults to 10000.0 (10K hms)
-* `USERMOD_SN_PHOTORESISTOR_OFFSET_VALUE`         - the offset value to report on, defaults to 25
+* `USERMOD_SN_PHOTORESISTOR`                      - Enables this user mod. wled00\usermods_list.cpp
+* `USERMOD_SN_PHOTORESISTOR_MEASUREMENT_INTERVAL` - Number of milliseconds between measurements. Defaults to 60000 ms
+* `USERMOD_SN_PHOTORESISTOR_FIRST_MEASUREMENT_AT` - Number of milliseconds after boot to take first measurement. Defaults to 20000 ms
+* `USERMOD_SN_PHOTORESISTOR_REFERENCE_VOLTAGE`    - Voltage supplied to the sensor. Defaults to 5v
+* `USERMOD_SN_PHOTORESISTOR_ADC_PRECISION`        - ADC precision. Defaults to 10 bits
+* `USERMOD_SN_PHOTORESISTOR_RESISTOR_VALUE`       - Resistor size, defaults to 10000.0 (10K Ohms)
+* `USERMOD_SN_PHOTORESISTOR_OFFSET_VALUE`         - Offset value to report on. Defaults to 25

-All parameters can be configured at runtime using Usermods settings page.
+All parameters can be configured at runtime via the Usermods settings page.

 ## Project link

--- a/usermods/SN_Photoresistor/usermod_sn_photoresistor.h
+++ b/usermods/SN_Photoresistor/usermod_sn_photoresistor.h
@@ -109,6 +109,7 @@ public:
    {
      lastLDRValue = currentLDRValue;

+#ifndef WLED_DISABLE_MQTT
      if (WLED_MQTT_CONNECTED)
      {
        char subuf[45];
@@ -121,6 +122,7 @@ public:
        DEBUG_PRINTLN("Missing MQTT connection. Not publishing data");
      }
    }
+#endif
  }

  uint16_t getLastLDRValue()
--- a/usermods/ST7789_display/README.md
+++ b/usermods/ST7789_display/README.md
@@ -1,15 +1,15 @@
-# ST7789 TFT IPS Color display 240x240pxwith ESP32 boards
+# Using the ST7789 TFT IPS 240x240 pixel color display with ESP32 boards

-This usermod allow to use 240x240 display to display following:
+This usermod enables display of the following:

-* current date and time;
+* Current date and time;
 * Network SSID;
 * IP address;
 * WiFi signal strength;
 * Brightness;
-* Chosen effect;
-* Chosen palette;
-* effect speed and intensity;
+* Selected effect;
+* Selected palette;
+* Effect speed and intensity;
 * Estimated current in mA;

 ## Hardware
@@ -41,9 +41,9 @@ lib_deps =
 ...
 ```

-Also, while in the `platformio.ini` file, you must change the environment setup to build for just the esp32dev platform as follows:
+In the `platformio.ini` file, you must change the environment setup to build for just the esp32dev platform as follows:

-Add lines to section:
+Add the following lines to section:

 ```ini
 default_envs = esp32dev
@@ -64,14 +64,14 @@ build_flags = ${common.build_flags_esp32}
    ;-DCONFIG_SPIRAM_SUPPORT=1
 ```

-Save the `platformio.ini` file.  Once this is saved, the required library files should be automatically downloaded for modifications in a later step.
+Save the `platformio.ini` file.  Once saved, the required library files should be automatically downloaded for modifications in a later step.

 ### TFT_eSPI Library Adjustments

-If you are not using PlatformIO you need to modify a file in the `TFT_eSPI` library. If you followed the directions to modify and save the `platformio.ini` file above, the `Setup24_ST7789.h` file can be found in the `/.pio/libdeps/esp32dev/TFT_eSPI/User_Setups/` folder.
+If you are not using PlatformIO, you need to modify a file in the `TFT_eSPI` library. If you followed the directions to modify and save the `platformio.ini` file above, the `Setup24_ST7789.h` file can be found in the `/.pio/libdeps/esp32dev/TFT_eSPI/User_Setups/` folder.

-Edit `Setup_ST7789.h` file and uncomment nad changep GPIO pin numbers in lines containing `TFT_MOSI`, `TFT_SCLK`, `TFT_RST`, `TFT_DC`.
+Edit `Setup_ST7789.h` file and uncomment and change GPIO pin numbers in lines containing `TFT_MOSI`, `TFT_SCLK`, `TFT_RST`, `TFT_DC`.

-Modify the `User_Setup_Select.h` by uncommentig the line containing `#include <User_Setups/Setup24_ST7789.h>` and commenting out line containing `#include <User_Setup.h>`.
+Modify the `User_Setup_Select.h` by uncommenting the line containing `#include <User_Setups/Setup24_ST7789.h>` and commenting out the line containing `#include <User_Setup.h>`.

-If your display includes backlight enable pin, #define TFT_BL with backlight enable GPIO number.
+If your display uses the backlight enable pin, add this definition: #define TFT_BL with backlight enable GPIO number.
--- a/usermods/Si7021_MQTT_HA/readme.md
+++ b/usermods/Si7021_MQTT_HA/readme.md
@@ -2,14 +2,14 @@

 This usermod implements support for [Si7021 I²C temperature and humidity sensors](https://www.silabs.com/documents/public/data-sheets/Si7021-A20.pdf).

-The sensor data will *not* be shown on the WLED UI (so far) but published via MQTT to WLED's "build in" MQTT device topic. 
+As of this writing, the sensor data will *not* be shown on the WLED UI, but it _is_ published via MQTT to WLED's "built-in" MQTT device topic. 

 ```
 temperature: $mqttDeviceTopic/si7021_temperature
 humidity: $mqttDeviceTopic/si7021_humidity
 ```

-Additionally the following sensors can be published:
+The following sensors can also be published:

 ```
 heat_index: $mqttDeviceTopic/si7021_heat_index
@@ -17,7 +17,7 @@ dew_point: $mqttDeviceTopic/si7021_dew_point
 absolute_humidity: $mqttDeviceTopic/si7021_absolute_humidity
 ```

-Sensor data will be updated/send every 60 seconds.
+Sensor data will be updated/sent every 60 seconds.

 This usermod also supports Home Assistant Auto Discovery.

@@ -66,4 +66,4 @@ Add to `lib_deps` in platformio.ini:

 - Aircoookie for making WLED
 - Other usermod creators for example code (`sensors_to_mqtt` and `multi_relay` especially)
- You, for reading this
+- You, for reading this
--- a/usermods/Si7021_MQTT_HA/usermod_si7021_mqtt_ha.h
+++ b/usermods/Si7021_MQTT_HA/usermod_si7021_mqtt_ha.h
@@ -1,3 +1,7 @@
+#ifndef WLED_ENABLE_MQTT
+#error "This user mod requires MQTT to be enabled."
+#endif
+
 #pragma once

 // this is remixed from usermod_v2_SensorsToMqtt.h (sensors_to_mqtt usermod)
--- a/usermods/TTGO-T-Display/README.md
+++ b/usermods/TTGO-T-Display/README.md
@@ -1,19 +1,19 @@
 # TTGO T-Display ESP32 with 240x135 TFT via SPI with TFT_eSPI
-This usermod allows use of the TTGO T-Display ESP32 module with integrated 240x135 display
+This usermod enables use of the TTGO 240x135 T-Display ESP32 module
 for controlling WLED and showing the following information: 
 * Current SSID
-* IP address if obtained
-  * If connected to a network, current brightness % is shown 
-  * in AP mode AP IP and password are shown
+* IP address, if obtained
+  * If connected to a network, current brightness percentage is shown 
+  * In AP mode, AP, IP and password are shown
 * Current effect
 * Current palette
-* Estimated current in mA is shown (NOTE: for this to be a reasonable value, the correct LED type must be specified in the LED Prefs section)
+* Estimated current in mA (NOTE: for this to be a reasonable value, the correct LED type must be specified in the LED Prefs section)

-Button pin is mapped to the onboard button next to the side actuated reset button of the TTGO T-Display board.
+Button pin is mapped to the onboard button adjacent to the reset button of the TTGO T-Display board.

-I have designed a 3D printed case around this board and an ["ElectroCookie"](https://amzn.to/2WCNeeA) project board, a [level shifter](https://amzn.to/3hbKu18), a [buck regulator](https://amzn.to/3mLMy0W), and a DC [power jack](https://amzn.to/3phj9NZ).  I use 12V WS2815 LED strips for my projects, and power them with 12V power supplies, so the regulator drops the voltage to the 5V level I need to power the ESP module and the level shifter.  If there is any interest in this case, which elevates the board and display on some custom extended headers to make place the screen at the top of the enclosure (with accessible buttons), let me know, and I could post the STL files.  It is a bit tricky to get the height correct, so I also designed a one-time use 3D printed solder fixture to set the board in the right location and at the correct height for the housing.  (It is one-time use because it has to be cut off after soldering to be able to remove it).  I didn't think the effort to make it in multiple pieces was worthwhile.
+I have designed a 3D printed case around this board and an ["ElectroCookie"](https://amzn.to/2WCNeeA) project board, a [level shifter](https://amzn.to/3hbKu18), a [buck regulator](https://amzn.to/3mLMy0W), and a DC [power jack](https://amzn.to/3phj9NZ).  I use 12V WS2815 LED strips for my projects, and power them with 12V power supplies. The regulator supplies 5V for the ESP module and the level shifter.  If there is any interest in this case which elevates the board and display on custom extended standoffs to place the screen at the top of the enclosure (with accessible buttons), let me know, and I will post the STL files.  It is a bit tricky to get the height correct, so I also designed a one-time use 3D printed solder fixture to set the board in the right location and at the correct height for the housing.  (It is one-time use because it has to be cut off after soldering to be able to remove it).  I didn't think the effort to make it in multiple pieces was worthwhile.

-Usermod based on a rework of the ssd1306_i2c_oled_u8g2 usermod from the WLED repo.
+Based on a rework of the ssd1306_i2c_oled_u8g2 usermod from the WLED repo.

 ## Hardware
 ![Hardware](assets/ttgo_hardware1.png)
@@ -30,8 +30,8 @@ Usermod based on a rework of the ssd1306_i2c_oled_u8g2 usermod from the WLED rep
 Functionality checked with:
 * TTGO T-Display
 * PlatformIO
-* Group of 4 individual Neopixels from Adafruit, and a several full strings of 12v WS2815 LEDs.
-* The hardware design shown above should be limited to shorter strings.  For larger strings, I use a different setup with a dedicated 12v power supply and power them directly off the supply (in addition to dropping the 12v supply down to 5v with a buck regulator for the ESP module and level shifter).
+* Group of 4 individual Neopixels from Adafruit and several full strings of 12v WS2815 LEDs.
+* The hardware design shown above should be limited to shorter strings.  For larger strings, I use a different setup with a dedicated 12v power supply and power them directly from said supply (in addition to dropping the 12v to 5v with a buck regulator for the ESP module and level shifter).

 ## Setup Needed:
 * As with all usermods, copy the usermod.cpp file from the TTGO-T-Display usermod folder to the wled00 folder (replacing the default usermod.cpp file).
@@ -51,24 +51,24 @@ lib_deps =
 ...
 ```

-Also, while in the `platformio.ini` file, you must change the environment setup to build for just the esp32dev platform as follows:
+In the `platformio.ini` file, you must change the environment setup to build for just the esp32dev platform as follows:

 Comment out the line described below:
 ```ini
-# Travis CI binaries (comment this out when building for single board)
-; default_envs = travis_esp8266, esp01, esp01_1m_ota, travis_esp32
+# Release binaries
+; default_envs = nodemcuv2, esp8266_2m, esp01_1m_full, esp32dev, esp32_eth, esp32s2_saola, esp32c3
 ```
-and UNCOMMENT the following line in the 'Single binaries' section:
+and uncomment the following line in the 'Single binaries' section:
 ```ini
 default_envs = esp32dev
 ```
-Save the `platformio.ini` file.  Once this is saved, the required library files should be automatically downloaded for modifications in a later step.
+Save the `platformio.ini` file.  Once saved, the required library files should be automatically downloaded for modifications in a later step.

 ### Platformio_overrides.ini (added)
 Copy the `platformio_overrides.ini` file which is contained in the `usermods/TTGO-T-Display/` folder into the root of your project folder. This file contains an override that remaps the button pin of WLED to use the on-board button to the right of the USB-C connector (when viewed with the port oriented downward - see hardware photo).

 ### TFT_eSPI Library Adjustments (board selection)
-We need to modify a file in the `TFT_eSPI` library to select the correct board.  If you followed the directions to modify and save the `platformio.ini` file above, the `User_Setup_Select.h` file can be found in the `/.pio/libdeps/esp32dev/TFT_eSPI_ID1559` folder.
+You need to modify a file in the `TFT_eSPI` library to select the correct board.  If you followed the directions to modify and save the `platformio.ini` file above, the `User_Setup_Select.h` file can be found in the `/.pio/libdeps/esp32dev/TFT_eSPI_ID1559` folder.

 Modify the  `User_Setup_Select.h` file as follows:
 * Comment out the following line (which is the 'default' setup file):
@@ -80,12 +80,12 @@ Modify the  `User_Setup_Select.h` file as follows:
 #include <User_Setups/Setup25_TTGO_T_Display.h>    // Setup file for ESP32 and TTGO T-Display ST7789V SPI bus TFT
 ```

-Run the build and it should complete correctly.  If you see a failure like this:
+Build the file.  If you see a failure like this:
 ```ini
 xtensa-esp32-elf-g++: error: wled00\wled00.ino.cpp: No such file or directory
 xtensa-esp32-elf-g++: fatal error: no input files
 ```
-Just try building again - I find that sometimes this happens on the first build attempt and subsequent attempts will build correctly.
+try building again. Sometimes this happens on the first build attempt and subsequent attempts build correctly.

 ## Arduino IDE
- UNTESTED
+- UNTESTED
--- a/usermods/Temperature/readme.md
+++ b/usermods/Temperature/readme.md
@@ -1,9 +1,9 @@
 # Temperature usermod

-Based on the excellent `QuinLED_Dig_Uno_Temp_MQTT` by srg74 and 400killer!  
-This usermod will read from an attached DS18B20 temperature sensor (as available on the QuinLED Dig-Uno)  
-The temperature is displayed both in the Info section of the web UI as well as published to the `/temperature` MQTT topic if enabled.  
-This usermod may be expanded with support for different sensor types in the future.
+Based on the excellent `QuinLED_Dig_Uno_Temp_MQTT` usermod by srg74 and 400killer!  
+Reads an attached DS18B20 temperature sensor (as available on the QuinLED Dig-Uno)  
+Temperature is displayed in both the Info section of the web UI as well as published to the `/temperature` MQTT topic, if enabled.  
+May be expanded with support for different sensor types in the future.

 If temperature sensor is not detected during boot, this usermod will be disabled.

@@ -13,10 +13,10 @@ Copy the example `platformio_override.ini` to the root directory.  This file sho

 ### Define Your Options

-* `USERMOD_DALLASTEMPERATURE`                      - define this to have this user mod included wled00\usermods_list.cpp
-* `USERMOD_DALLASTEMPERATURE_FIRST_MEASUREMENT_AT` - the number of milliseconds after boot to take first measurement, defaults to 20 seconds
+* `USERMOD_DALLASTEMPERATURE`                      - enables this user mod wled00/usermods_list.cpp
+* `USERMOD_DALLASTEMPERATURE_FIRST_MEASUREMENT_AT` - number of milliseconds after boot to take first measurement, defaults to 20000 ms

-All parameters can be configured at runtime using Usermods settings page, including pin, selection to display temerature in degrees Celsius or Farenheit mand measurement interval.
+All parameters can be configured at runtime via the Usermods settings page, including pin, temperature in degrees Celsius or Farenheit and measurement interval.

 ## Project link

@@ -50,9 +50,9 @@ lib_deps =
 ## Change Log

 2020-09-12 
-* Changed to use async, non-blocking implementation
-* Do not report low temperatures that indicate an error to mqtt
+* Changed to use async non-blocking implementation
+* Do not report erroneous low temperatures to MQTT
 * Disable plugin if temperature sensor not detected
 * Report the number of seconds until the first read in the info screen instead of sensor error
 2021-04
-* Adaptation for runtime configuration.
+* Adaptation for runtime configuration.
--- a/usermods/Temperature/usermod_temperature.h
+++ b/usermods/Temperature/usermod_temperature.h
@@ -29,6 +29,7 @@ class UsermodTemperature : public Usermod {
    bool degC = true;
    // using parasite power on the sensor
    bool parasite = false;
+    int8_t parasitePin = -1;
    // how often do we read from sensor?
    unsigned long readingInterval = USERMOD_DALLASTEMPERATURE_MEASUREMENT_INTERVAL;
    // set last reading as "40 sec before boot", so first reading is taken after 20 sec
@@ -53,6 +54,7 @@ class UsermodTemperature : public Usermod {
    static const char _enabled[];
    static const char _readInterval[];
    static const char _parasite[];
+    static const char _parasitePin[];

    //Dallas sensor quick (& dirty) reading. Credit to - Author: Peter Scargill, August 17th, 2013
    float readDallas() {
@@ -94,12 +96,14 @@ class UsermodTemperature : public Usermod {
      DEBUG_PRINTLN(F("Requesting temperature."));
      oneWire->reset();
      oneWire->skip();                        // skip ROM
-      oneWire->write(0x44,parasite);          // request new temperature reading (TODO: parasite would need special handling)
+      oneWire->write(0x44,parasite);          // request new temperature reading
+      if (parasite && parasitePin >=0 ) digitalWrite(parasitePin, HIGH); // has to happen within 10us (open MOSFET)
      lastTemperaturesRequest = millis();
      waitingForConversion = true;
    }

    void readTemperature() {
+      if (parasite && parasitePin >=0 ) digitalWrite(parasitePin, LOW); // deactivate power (close MOSFET)
      temperature = readDallas();
      lastMeasurement = millis();
      waitingForConversion = false;
@@ -134,6 +138,7 @@ class UsermodTemperature : public Usermod {
      return false;
    }

+#ifndef WLED_DISABLE_MQTT
    void publishHomeAssistantAutodiscovery() {
      if (!WLED_MQTT_CONNECTED) return;

@@ -155,6 +160,7 @@ class UsermodTemperature : public Usermod {
      mqtt->publish(buf, 0, true, json_str, payload_size);
      HApublished = true;
    }
+#endif

  public:

@@ -164,7 +170,7 @@ class UsermodTemperature : public Usermod {
      temperature = -127.0f; // default to -127, DS18B20 only goes down to -50C
      if (enabled) {
        // config says we are enabled
-        DEBUG_PRINTLN(F("Allocating temperature pin..."));
+        USER_PRINTLN(F("Finding temperature pin..."));
        // pin retrieved from cfg.json (readFromConfig()) prior to running setup()
        if (temperaturePin >= 0 && pinManager.allocatePin(temperaturePin, true, PinOwner::UM_Temperature)) {
          oneWire = new OneWire(temperaturePin);
@@ -173,15 +179,22 @@ class UsermodTemperature : public Usermod {
              delay(25); // try to find sensor
            }
          }
+          if (parasite && pinManager.allocatePin(parasitePin, true, PinOwner::UM_Temperature)) {
+            pinMode(parasitePin, OUTPUT);
+            digitalWrite(parasitePin, LOW); // deactivate power (close MOSFET)
+          } else {
+            parasitePin = -1;
+          }
        } else {
          if (temperaturePin >= 0) {
-            DEBUG_PRINTLN(F("Temperature pin allocation failed."));
+            USER_PRINTLN(F("Temperature pin allocation failed."));
          }
          temperaturePin = -1;  // allocation failed
        }
      }
      lastMeasurement = millis() - readingInterval + 10000;
      initDone = true;
+      USER_PRINTLN(F("temperature usermod initialized."));
    }

    void loop() {
@@ -212,6 +225,7 @@ class UsermodTemperature : public Usermod {
        }
        errorCount = 0;

+#ifndef WLED_DISABLE_MQTT
        if (WLED_MQTT_CONNECTED) {
          char subuf[64];
          strcpy(subuf, mqttDeviceTopic);
@@ -227,6 +241,7 @@ class UsermodTemperature : public Usermod {
            // publish something else to indicate status?
          }
        }
+#endif
      }
    }

@@ -236,6 +251,7 @@ class UsermodTemperature : public Usermod {
     */
    //void connected() {}

+#ifndef WLED_DISABLE_MQTT
    /**
     * subscribe to MQTT topic if needed
     */
@@ -246,6 +262,7 @@ class UsermodTemperature : public Usermod {
        publishHomeAssistantAutodiscovery();
      }
    }
+#endif

    /*
     * API calls te enable data exchange between WLED modules
@@ -315,6 +332,7 @@ class UsermodTemperature : public Usermod {
      top["degC"] = degC;  // usermodparam
      top[FPSTR(_readInterval)] = readingInterval / 1000;
      top[FPSTR(_parasite)] = parasite;
+      top[FPSTR(_parasitePin)] = parasitePin;
      DEBUG_PRINTLN(F("Temperature config saved."));
    }

@@ -340,6 +358,7 @@ class UsermodTemperature : public Usermod {
      readingInterval   = top[FPSTR(_readInterval)] | readingInterval/1000;
      readingInterval   = min(120,max(10,(int)readingInterval)) * 1000;  // convert to ms
      parasite          = top[FPSTR(_parasite)] | parasite;
+      parasitePin       = top[FPSTR(_parasitePin)] | parasitePin;

      if (!initDone) {
        // first run: reading from cfg.json
@@ -354,12 +373,22 @@ class UsermodTemperature : public Usermod {
          delete oneWire;
          pinManager.deallocatePin(temperaturePin, PinOwner::UM_Temperature);
          temperaturePin = newTemperaturePin;
+          pinManager.deallocatePin(parasitePin, PinOwner::UM_Temperature);
          // initialise
          setup();
        }
      }
      // use "return !top["newestParameter"].isNull();" when updating Usermod with new features
-      return !top[FPSTR(_parasite)].isNull();
+      return !top[FPSTR(_parasitePin)].isNull();
+    }
+
+    void appendConfigData()
+    {
+      oappend(SET_F("addHB('Temperature');")); // WLEDMM
+      oappend(SET_F("addInfo('Temperature:parasite-pwr")); //WLEDMM use literals
+      oappend(SET_F("',1,'<i>(if no Vcc connected)</i>');"));  // 0 is field type, 1 is actual field
+      oappend(SET_F("addInfo('Temperature:parasite-pwr-pin")); //WLEDMM use literals
+      oappend(SET_F("',1,'<i>(for external MOSFET)</i>');"));  // 0 is field type, 1 is actual field
    }

    uint16_t getId()
@@ -373,3 +402,4 @@ const char UsermodTemperature::_name[]         PROGMEM = "Temperature";
 const char UsermodTemperature::_enabled[]      PROGMEM = "enabled";
 const char UsermodTemperature::_readInterval[] PROGMEM = "read-interval-s";
 const char UsermodTemperature::_parasite[]     PROGMEM = "parasite-pwr";
+const char UsermodTemperature::_parasitePin[]  PROGMEM = "parasite-pwr-pin";
--- a/usermods/VL53L0X_gestures/readme.md
+++ b/usermods/VL53L0X_gestures/readme.md
@@ -1,10 +1,10 @@
 # Description

-That usermod implements support of simple hand gestures with VL53L0X sensor: on/off and brightness correction.
-It can be useful for kitchen strips to avoid any touches.
- - on/off - just swipe a hand below your sensor ("shortPressAction" is called and can be customized through WLED macros)
- - brightness correction - keep your hand below sensor for 1 second to switch to "brightness" mode.
-                           Configure brightness by changing distance to the sensor (see parameters below for customization).
+Implements support of simple hand gestures via a VL53L0X sensor: on/off and brightness adjustment.
+Useful for controlling strips when you want to avoid touching anything.
+ - on/off - swipe your hand below the sensor ("shortPressAction" is called. Can be customized via WLED macros)
+ - brightness adjustment - hold your hand below the sensor for 1 second to switch to "brightness" mode.
+                           adjust the brightness by changing the distance between your hand and the sensor (see parameters below for customization).
   
 ## Installation

@@ -26,4 +26,4 @@ default_envs = nodemcuv2
 build_flags = ${env.build_flags} -D USERMOD_VL53L0X_GESTURES
 lib_deps = ${env.lib_deps}
           pololu/VL53L0X @ ^1.3.0
-```
+```
--- a/usermods/VL53L0X_gestures/usermod_vl53l0x_gestures.h
+++ b/usermods/VL53L0X_gestures/usermod_vl53l0x_gestures.h
@@ -50,14 +50,21 @@ class UsermodVL53L0XGestures : public Usermod {
  public:

    void setup() {
-      PinManagerPinType pins[2] = { { i2c_scl, true }, { i2c_sda, true } };
-      if (!pinManager.allocateMultiplePins(pins, 2, PinOwner::HW_I2C)) { enabled = false; return; }
-      Wire.begin();
+      // WLEDMM join hardware I2C
+      if (!pinManager.joinWire()) {  // WLEDMM - this allocates global I2C pins, then starts Wire - if not started previously
+        enabled = false;
+        return;
+      }
+
+      //PinManagerPinType pins[2] = { { i2c_scl, true }, { i2c_sda, true } };
+      //if (!pinManager.allocateMultiplePins(pins, 2, PinOwner::HW_I2C)) { enabled = false; return; }
+      //Wire.begin();

      sensor.setTimeout(150);
      if (!sensor.init())
      {
        DEBUG_PRINTLN(F("Failed to detect and initialize VL53L0X sensor!"));
+        enabled = false;      // WLEDMM bugfix
      } else {
        sensor.setMeasurementTimingBudget(20000); // set high speed mode
      }
--- a/usermods/Wemos_D1_mini+Wemos32_mini_shield/readme.md
+++ b/usermods/Wemos_D1_mini+Wemos32_mini_shield/readme.md
@@ -9,10 +9,10 @@
 ## Features
 -   SSD1306 128x32 or 128x64 I2C OLED display
 -   On screen IP address, SSID and controller status (e.g. ON or OFF, recent effect)
-   Auto display shutoff for saving display lifetime
+-   Auto display shutoff for extending display lifetime
 -   Dallas temperature sensor
 -   Reporting temperature to MQTT broker
-   Relay for energy saving
+-   Relay for saving energy

 ## Hardware
 ![Shield](https://github.com/srg74/WLED-wemos-shield/blob/master/resources/Images/Assembly_8.jpg)
--- a/usermods/Wemos_D1_mini+Wemos32_mini_shield/usermod.cpp
+++ b/usermods/Wemos_D1_mini+Wemos32_mini_shield/usermod.cpp
@@ -101,6 +101,7 @@ void userLoop() {
  if (temptimer - lastMeasure > 60000) 
  {
    lastMeasure = temptimer;    
+#ifndef WLED_DISABLE_MQTT
 //Check if MQTT Connected, otherwise it will crash the 8266
    if (mqtt != nullptr)
    {
@@ -116,6 +117,7 @@ void userLoop() {
        t += "/temperature";
        mqtt->publish(t.c_str(), 0, true, String(board_temperature).c_str());
    }
+  #endif
  }

  // Check if we time interval for redrawing passes.
--- a/usermods/Wemos_D1_mini+Wemos32_mini_shield/usermod_bme280.cpp
+++ b/usermods/Wemos_D1_mini+Wemos32_mini_shield/usermod_bme280.cpp
@@ -103,6 +103,7 @@ void userLoop() {
  {
    lastMeasure = tempTimer;    

+#ifndef WLED_DISABLE_MQTT
 // Check if MQTT Connected, otherwise it will crash the 8266
    if (mqtt != nullptr)
    {
@@ -122,6 +123,7 @@ void userLoop() {
      h += "/humidity";
      mqtt->publish(h.c_str(), 0, true, String(board_humidity).c_str());
    }
+  #endif
  }

  // Check if we time interval for redrawing passes.
--- a/usermods/audioreactive/audio_reactive.h
+++ b/usermods/audioreactive/audio_reactive.h
@@ -54,6 +54,18 @@
 #endif
 #endif

+#if defined(MIC_LOGGER) || defined(FFT_SAMPLING_LOG)
+  #define PLOT_PRINT(x) DEBUGOUT.print(x)
+  #define PLOT_PRINTLN(x) DEBUGOUT.println(x)
+  #define PLOT_PRINTF(x...) DEBUGOUT.printf(x)
+  #define PLOT_FLUSH() DEBUGOUT.flush()
+#else
+  #define PLOT_PRINT(x)
+  #define PLOT_PRINTLN(x)
+  #define PLOT_PRINTF(x...)
+  #define PLOT_FLUSH()
+#endif
+
 // use audio source class (ESP32 specific)
 #include "audio_source.h"
 constexpr i2s_port_t I2S_PORT = I2S_NUM_0;       // I2S port to use (do not change !)
@@ -131,12 +143,24 @@ static unsigned long timeOfPeak = 0; // time of last sample peak detection.
 static void detectSamplePeak(void);  // peak detection function (needs scaled FFT reasults in vReal[])
 static void autoResetPeak(void);     // peak auto-reset function

+// shared vars for debugging
+#ifdef MIC_LOGGER
+static volatile float    micReal_min = 0.0f;             // MicIn data min from last batch of samples
+static volatile float    micReal_avg = 0.0f;             // MicIn data average (from last batch of samples)
+static volatile float    micReal_max = 0.0f;             // MicIn data max from last batch of samples
+#if 0
+static volatile float    micReal_min2 = 0.0f;             // MicIn data min after filtering
+static volatile float    micReal_max2 = 0.0f;             // MicIn data max after filtering
+#endif
+#endif

 ////////////////////
 // Begin FFT Code //
 ////////////////////

 // some prototypes, to ensure consistent interfaces
+static float mapf(float x, float in_min, float in_max, float out_min, float out_max); // map function for float
+static float fftAddAvg(int from, int to);   // average of several FFT result bins
 void FFTcode(void * parameter);      // audio processing task: read samples, run FFT, fill GEQ channels from FFT results
 static void runMicFilter(uint16_t numSamples, float *sampleBuffer);          // pre-filtering of raw samples (band-pass)
 static void postProcessFFTResults(bool noiseGateOpen, int numberOfChannels); // post-processing and post-amp of GEQ channels
@@ -201,17 +225,20 @@ static float FFT_MajorPeak = 1.0f;              // FFT: strongest (peak) frequen
 static float FFT_Magnitude = 0.0f;              // FFT: volume (magnitude) of peak frequency
 static uint8_t fftResult[NUM_GEQ_CHANNELS]= {0};// Our calculated freq. channel result table to be used by effects
 #if defined(WLED_DEBUG) || defined(SR_DEBUG) || defined(SR_STATS)
-static uint64_t fftTime = 0;
-static uint64_t sampleTime = 0;
+static float fftTaskCycle = 0;      // avg cycle time for FFT task
+static float fftTime = 0;           // avg time for single FFT
+static float sampleTime = 0;        // avg (blocked) time for reading I2S samples
 #endif

 // FFT Task variables (filtering and post-processing)
+static float   lastFftCalc[NUM_GEQ_CHANNELS] = {0.0f};                // backup of last FFT channels (before postprocessing)
 static float   fftCalc[NUM_GEQ_CHANNELS] = {0.0f};                    // Try and normalize fftBin values to a max of 4096, so that 4096/16 = 256.
 static float   fftAvg[NUM_GEQ_CHANNELS] = {0.0f};                     // Calculated frequency channel results, with smoothing (used if dynamics limiter is ON)
 #ifdef SR_DEBUG
 static float   fftResultMax[NUM_GEQ_CHANNELS] = {0.0f};               // A table used for testing to determine how our post-processing is working.
 #endif

+#if !defined(CONFIG_IDF_TARGET_ESP32C3)
 // audio source parameters and constant
 constexpr SRate_t SAMPLE_RATE = 22050;        // Base sample rate in Hz - 22Khz is a standard rate. Physical sample time -> 23ms
 //constexpr SRate_t SAMPLE_RATE = 16000;        // 16kHz - use if FFTtask takes more than 20ms. Physical sample time -> 32ms
@@ -221,6 +248,16 @@ constexpr SRate_t SAMPLE_RATE = 22050;        // Base sample rate in Hz - 22Khz
 //#define FFT_MIN_CYCLE 30                      // Use with 16Khz sampling
 //#define FFT_MIN_CYCLE 23                      // minimum time before FFT task is repeated. Use with 20Khz sampling
 //#define FFT_MIN_CYCLE 46                      // minimum time before FFT task is repeated. Use with 10Khz sampling
+#else
+// slightly lower the sampling rate for -C3, to improve stability
+//constexpr SRate_t SAMPLE_RATE = 20480;        // 20Khz; Physical sample time -> 25ms
+//#define FFT_MIN_CYCLE 23                      // minimum time before FFT task is repeated.
+constexpr SRate_t SAMPLE_RATE = 18000;          // 18Khz; Physical sample time -> 28ms
+#define FFT_MIN_CYCLE 25                        // minimum time before FFT task is repeated.
+// try 16Khz in case your device still lags and responds too slowly.
+//constexpr SRate_t SAMPLE_RATE = 16000;        // 16Khz -> Physical sample time -> 32ms
+//#define FFT_MIN_CYCLE 30                      // minimum time before FFT task is repeated.
+#endif

 // FFT Constants
 constexpr uint16_t samplesFFT = 512;            // Samples in an FFT batch - This value MUST ALWAYS be a power of 2
@@ -228,7 +265,7 @@ constexpr uint16_t samplesFFT_2 = 256;          // meaningfull part of FFT resul
 // the following are observed values, supported by a bit of "educated guessing"
 //#define FFT_DOWNSCALE 0.65f                             // 20kHz - downscaling factor for FFT results - "Flat-Top" window @20Khz, old freq channels 
 #define FFT_DOWNSCALE 0.46f                             // downscaling factor for FFT results - for "Flat-Top" window @22Khz, new freq channels
-#define LOG_256  5.54517744                             // log2(256)
+#define LOG_256  5.54517744f                            // log(256)

 // These are the input and output vectors.  Input vectors receive computed results from FFT.
 static float vReal[samplesFFT] = {0.0f};       // FFT sample inputs / freq output -  these are our raw result bins
@@ -240,13 +277,18 @@ static float windowWeighingFactors[samplesFFT] = {0.0f};
 // Create FFT object
 #ifdef UM_AUDIOREACTIVE_USE_NEW_FFT
 // lib_deps += https://github.com/kosme/arduinoFFT#develop @ 1.9.2
-#define FFT_SPEED_OVER_PRECISION     // enables use of reciprocals (1/x etc), and an a few other speedups
-#define FFT_SQRT_APPROXIMATION       // enables "quake3" style inverse sqrt
-#define sqrt(x) sqrtf(x)             // little hack that reduces FFT time by 50% on ESP32 (as alternative to FFT_SQRT_APPROXIMATION)
+#if  !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3)
+// these options actually cause slow-down on -S2 (-S2 doesn't have floating point hardware)
+//#define FFT_SPEED_OVER_PRECISION     // enables use of reciprocals (1/x etc), and an a few other speedups - WLEDMM not faster on ESP32
+//#define FFT_SQRT_APPROXIMATION       // enables "quake3" style inverse sqrt                               - WLEDMM slower on ESP32
+#endif
+#define sqrt(x) sqrtf(x)             // little hack that reduces FFT time by 10-50% on ESP32 (as alternative to FFT_SQRT_APPROXIMATION)
 #else
+  // around 50% slower on -S2
 // lib_deps += https://github.com/blazoncek/arduinoFFT.git
 #endif
 #include <arduinoFFT.h>
+
 #ifdef UM_AUDIOREACTIVE_USE_NEW_FFT
 static ArduinoFFT<float> FFT = ArduinoFFT<float>( vReal, vImag, samplesFFT, SAMPLE_RATE, windowWeighingFactors);
 #else
@@ -279,15 +321,22 @@ static float fftAddAvg(int from, int to) {
 }
 #endif

+#if defined(CONFIG_IDF_TARGET_ESP32C3)
+constexpr bool skipSecondFFT = true;
+#else
+constexpr bool skipSecondFFT = false;
+#endif
 //
 // FFT main task
 //
 void FFTcode(void * parameter)
 {
-  DEBUGSR_PRINT("FFT started on core: "); DEBUGSR_PRINTLN(xPortGetCoreID());
+  // DEBUGSR_PRINT("FFT started on core: "); DEBUGSR_PRINTLN(xPortGetCoreID()); // causes trouble on -S2

  // see https://www.freertos.org/vtaskdelayuntil.html
  const TickType_t xFrequency = FFT_MIN_CYCLE * portTICK_PERIOD_MS;  
+  const TickType_t xFrequencyDouble = FFT_MIN_CYCLE * portTICK_PERIOD_MS * 2;  
+  static bool isFirstRun = false;

  TickType_t xLastWakeTime = xTaskGetTickCount();
  for(;;) {
@@ -296,6 +345,7 @@ void FFTcode(void * parameter)

    // Don't run FFT computing code if we're in Receive mode or in realtime mode
    if (disableSoundProcessing || (audioSyncEnabled & 0x02)) {
+      isFirstRun = false;
      vTaskDelayUntil( &xLastWakeTime, xFrequency);        // release CPU, and let I2S fill its buffers
      continue;
    }
@@ -303,6 +353,15 @@ void FFTcode(void * parameter)
 #if defined(WLED_DEBUG) || defined(SR_DEBUG)|| defined(SR_STATS)
    uint64_t start = esp_timer_get_time();
    bool haveDoneFFT = false; // indicates if second measurement (FFT time) is valid
+
+    static uint64_t lastCycleStart = 0;
+    static uint64_t lastLastTime = 0;
+    if ((lastCycleStart > 0) && (lastCycleStart < start)) { // filter out overflows
+      uint64_t taskTimeInMillis = ((start - lastCycleStart) +5ULL) / 10ULL; // "+5" to ensure proper rounding
+      fftTaskCycle = (((taskTimeInMillis + lastLastTime)/2) *4 + fftTaskCycle*6)/10.0; // smart smooth
+      lastLastTime = taskTimeInMillis;
+    }
+    lastCycleStart = start;
 #endif

    // get a fresh batch of samples from I2S
@@ -311,12 +370,28 @@ void FFTcode(void * parameter)
 #if defined(WLED_DEBUG) || defined(SR_DEBUG)|| defined(SR_STATS)
    if (start < esp_timer_get_time()) { // filter out overflows
      uint64_t sampleTimeInMillis = (esp_timer_get_time() - start +5ULL) / 10ULL; // "+5" to ensure proper rounding
-      sampleTime = (sampleTimeInMillis*3 + sampleTime*7)/10; // smooth
+      sampleTime = (sampleTimeInMillis*3 + sampleTime*7)/10.0; // smooth
    }
    start = esp_timer_get_time(); // start measuring FFT time
 #endif

    xLastWakeTime = xTaskGetTickCount();       // update "last unblocked time" for vTaskDelay
+    isFirstRun = !isFirstRun; //  toggle throtte
+
+#ifdef MIC_LOGGER
+    float datMin = 0.0f;
+    float datMax = 0.0f;
+    double datAvg = 0.0f;
+    for (int i=0; i < samplesFFT; i++) {
+      if (i==0) {
+        datMin = datMax = vReal[i];
+      } else {
+        if (datMin >  vReal[i]) datMin =  vReal[i];
+        if (datMax <  vReal[i]) datMax =  vReal[i];
+      }
+      datAvg +=  vReal[i];
+    }
+#endif

    // band pass filter - can reduce noise floor by a factor of 50
    // downside: frequencies below 100Hz will be ignored
@@ -334,42 +409,62 @@ void FFTcode(void * parameter)
    // release highest sample to volume reactive effects early - not strictly necessary here - could also be done at the end of the function
    // early release allows the filters (getSample() and agcAvg()) to work with fresh values - we will have matching gain and noise gate values when we want to process the FFT results.
    micDataReal = maxSample;
-
+#ifdef MIC_LOGGER
+    micReal_min = datMin;
+    micReal_max = datMax;
+    micReal_avg = datAvg / samplesFFT;
+#if 0
+    // compute mix/max again after filering - usefull for filter debugging
+    for (int i=0; i < samplesFFT; i++) {
+      if (i==0) {
+        datMin = datMax = vReal[i];
+      } else {
+        if (datMin >  vReal[i]) datMin =  vReal[i];
+        if (datMax <  vReal[i]) datMax =  vReal[i];
+      }
+    }
+    micReal_min2 = datMin;
+    micReal_max2 = datMax;
+#endif
+#endif
    // run FFT (takes 3-5ms on ESP32)
    //if (fabsf(sampleAvg) > 0.25f) { // noise gate open
    if (fabsf(volumeSmth) > 0.25f) { // noise gate open
+      if ((skipSecondFFT == false) || (isFirstRun == true)) {
+        // run FFT (takes 2-3ms on ESP32, ~12ms on ESP32-S2, ~30ms on -C3)
+        #ifdef UM_AUDIOREACTIVE_USE_NEW_FFT
+        FFT.dcRemoval();                                            // remove DC offset
+        #if !defined(FFT_PREFER_EXACT_PEAKS)
+          FFT.windowing( FFTWindow::Flat_top, FFTDirection::Forward);        // Weigh data using "Flat Top" function - better amplitude accuracy
+        #else
+          FFT.windowing(FFTWindow::Blackman_Harris, FFTDirection::Forward);  // Weigh data using "Blackman- Harris" window - sharp peaks due to excellent sideband rejection
+        #endif
+        FFT.compute( FFTDirection::Forward );                       // Compute FFT
+        FFT.complexToMagnitude();                                   // Compute magnitudes
+        #else
+        FFT.DCRemoval(); // let FFT lib remove DC component, so we don't need to care about this in getSamples()

-      // run FFT (takes 3-5ms on ESP32, ~12ms on ESP32-S2)
-#ifdef UM_AUDIOREACTIVE_USE_NEW_FFT
-      FFT.dcRemoval();                                            // remove DC offset
-      #if !defined(FFT_PREFER_EXACT_PEAKS)
-        FFT.windowing( FFTWindow::Flat_top, FFTDirection::Forward);        // Weigh data using "Flat Top" function - better amplitude accuracy
-      #else
-        FFT.windowing(FFTWindow::Blackman_Harris, FFTDirection::Forward);  // Weigh data using "Blackman- Harris" window - sharp peaks due to excellent sideband rejection
-      #endif
-      FFT.compute( FFTDirection::Forward );                       // Compute FFT
-      FFT.complexToMagnitude();                                   // Compute magnitudes
-#else
-      FFT.DCRemoval(); // let FFT lib remove DC component, so we don't need to care about this in getSamples()
+        //FFT.Windowing( FFT_WIN_TYP_HAMMING, FFT_FORWARD );        // Weigh data - standard Hamming window
+        //FFT.Windowing( FFT_WIN_TYP_BLACKMAN, FFT_FORWARD );       // Blackman window - better side freq rejection
+        #if !defined(FFT_PREFER_EXACT_PEAKS)
+          FFT.Windowing( FFT_WIN_TYP_FLT_TOP, FFT_FORWARD );        // Flat Top Window - better amplitude accuracy
+        #else
+          FFT.Windowing( FFT_WIN_TYP_BLACKMAN_HARRIS, FFT_FORWARD );// Blackman-Harris - excellent sideband rejection
+        #endif
+        FFT.Compute( FFT_FORWARD );                             // Compute FFT
+        FFT.ComplexToMagnitude();                               // Compute magnitudes
+        #endif

-      //FFT.Windowing( FFT_WIN_TYP_HAMMING, FFT_FORWARD );        // Weigh data - standard Hamming window
-      //FFT.Windowing( FFT_WIN_TYP_BLACKMAN, FFT_FORWARD );       // Blackman window - better side freq rejection
-      #if !defined(FFT_PREFER_EXACT_PEAKS)
-        FFT.Windowing( FFT_WIN_TYP_FLT_TOP, FFT_FORWARD );        // Flat Top Window - better amplitude accuracy
-      #else
-        FFT.Windowing( FFT_WIN_TYP_BLACKMAN_HARRIS, FFT_FORWARD );// Blackman-Harris - excellent sideband rejection
-      #endif
-      FFT.Compute( FFT_FORWARD );                             // Compute FFT
-      FFT.ComplexToMagnitude();                               // Compute magnitudes
-#endif
-
-#ifdef UM_AUDIOREACTIVE_USE_NEW_FFT
-      FFT.majorPeak(FFT_MajorPeak, FFT_Magnitude);                // let the effects know which freq was most dominant
-#else
-      FFT.MajorPeak(&FFT_MajorPeak, &FFT_Magnitude);              // let the effects know which freq was most dominant
-#endif
-      FFT_MajorPeak = constrain(FFT_MajorPeak, 1.0f, 11025.0f);   // restrict value to range expected by effects
+        #ifdef UM_AUDIOREACTIVE_USE_NEW_FFT
+          FFT.majorPeak(FFT_MajorPeak, FFT_Magnitude);                // let the effects know which freq was most dominant
+        #else
+        FFT.MajorPeak(&FFT_MajorPeak, &FFT_Magnitude);              // let the effects know which freq was most dominant
+        #endif
+        FFT_MajorPeak = constrain(FFT_MajorPeak, 1.0f, 11025.0f);   // restrict value to range expected by effects

+      } else { // skip second run --> clear fft results, keep peaks
+        memset(vReal, 0, sizeof(vReal)); 
+      }
 #if defined(WLED_DEBUG) || defined(SR_DEBUG) || defined(SR_STATS)
      haveDoneFFT = true;
 #endif
@@ -380,14 +475,16 @@ void FFTcode(void * parameter)
      FFT_Magnitude = 0.001;
    }

-    for (int i = 0; i < samplesFFT; i++) {
-      float t = fabsf(vReal[i]);                      // just to be sure - values in fft bins should be positive any way
-      vReal[i] = t / 16.0f;                           // Reduce magnitude. Want end result to be scaled linear and ~4096 max.
-    } // for()
+    if ((skipSecondFFT == false) || (isFirstRun == true)) {

-    // mapping of FFT result bins to frequency channels
-    //if (fabsf(sampleAvg) > 0.25f) { // noise gate open
-    if (fabsf(volumeSmth) > 0.25f) { // noise gate open
+      for (int i = 0; i < samplesFFT; i++) {
+        float t = fabsf(vReal[i]);                      // just to be sure - values in fft bins should be positive any way
+        vReal[i] = t / 16.0f;                           // Reduce magnitude. Want end result to be scaled linear and ~4096 max.
+      } // for()
+
+      // mapping of FFT result bins to frequency channels
+      //if (fabsf(sampleAvg) > 0.25f) { // noise gate open
+      if (fabsf(volumeSmth) > 0.25f) { // noise gate open
 #if 0
    /* This FFT post processing is a DIY endeavour. What we really need is someone with sound engineering expertise to do a great job here AND most importantly, that the animations look GREAT as a result.
    *
@@ -445,24 +542,34 @@ void FFTcode(void * parameter)
      fftCalc[13] = fftAddAvg(86,104);              // 18 3704 - 4479 high mid
      fftCalc[14] = fftAddAvg(104,165) * 0.88f;     // 61 4479 - 7106 high mid + high  -- with slight damping
 #endif
-    } else {  // noise gate closed - just decay old values
-      for (int i=0; i < NUM_GEQ_CHANNELS; i++) {
-        fftCalc[i] *= 0.85f;  // decay to zero
-        if (fftCalc[i] < 4.0f) fftCalc[i] = 0.0f;
+      } else {  // noise gate closed - just decay old values
+        isFirstRun = false;
+        for (int i=0; i < NUM_GEQ_CHANNELS; i++) {
+          fftCalc[i] *= 0.85f;  // decay to zero
+          if (fftCalc[i] < 4.0f) fftCalc[i] = 0.0f;
+        }
      }
+
+      memcpy(lastFftCalc, fftCalc, sizeof(lastFftCalc)); // make a backup of last "good" channels
+
+    } else { // if second run skipped
+      memcpy(fftCalc, lastFftCalc, sizeof(fftCalc)); // restore last "good" channels
    }

    // post-processing of frequency channels (pink noise adjustment, AGC, smooting, scaling)
    if (pinkIndex > MAX_PINK) pinkIndex = MAX_PINK;
    //postProcessFFTResults((fabsf(sampleAvg) > 0.25f)? true : false , NUM_GEQ_CHANNELS);
-    postProcessFFTResults((fabsf(volumeSmth)>0.25f)? true : false , NUM_GEQ_CHANNELS);
+    postProcessFFTResults((fabsf(volumeSmth)>0.25f)? true : false , NUM_GEQ_CHANNELS);    // this function modifies fftCalc, fftAvg and fftResult

 #if defined(WLED_DEBUG) || defined(SR_DEBUG)|| defined(SR_STATS)
+    static uint64_t lastLastFFT = 0;
    if (haveDoneFFT && (start < esp_timer_get_time())) { // filter out overflows
      uint64_t fftTimeInMillis = ((esp_timer_get_time() - start) +5ULL) / 10ULL; // "+5" to ensure proper rounding
-      fftTime  = (fftTimeInMillis*3 + fftTime*7)/10; // smooth
+      fftTime  = (((fftTimeInMillis + lastLastFFT)/2) *3 + fftTime*7)/10.0; // smart smooth
+      lastLastFFT = fftTimeInMillis;
    }
 #endif
+
    // run peak detection
    autoResetPeak();
    detectSamplePeak();
@@ -470,8 +577,13 @@ void FFTcode(void * parameter)
    #if !defined(I2S_GRAB_ADC1_COMPLETELY)    
    if ((audioSource == nullptr) || (audioSource->getType() != AudioSource::Type_I2SAdc))  // the "delay trick" does not help for analog ADC
    #endif
-      vTaskDelayUntil( &xLastWakeTime, xFrequency);        // release CPU, and let I2S fill its buffers
-
+    {
+      if ((skipSecondFFT == false) || (fabsf(volumeSmth) < 0.25f)) {
+        vTaskDelayUntil( &xLastWakeTime, xFrequency);        // release CPU, and let I2S fill its buffers
+      } else if (isFirstRun == true) {
+        vTaskDelayUntil( &xLastWakeTime, xFrequencyDouble);  // release CPU after performing FFT in "skip second run" mode
+      }
+    }
  } // for(;;)ever
 } // FFTcode() task end

@@ -488,10 +600,10 @@ static void runMicFilter(uint16_t numSamples, float *sampleBuffer)          // p
  constexpr float alpha = 0.0225f; // 80hz
  //constexpr float alpha = 0.01693f;// 60hz
  // high frequency cutoff  parameter
-  //constexpr float beta1 = 0.75;    // 11Khz
-  //constexpr float beta1 = 0.82;    // 15Khz
-  //constexpr float beta1 = 0.8285;  // 18Khz
-  constexpr float beta1 = 0.85;   // 20Khz
+  //constexpr float beta1 = 0.75f;   // 11Khz
+  //constexpr float beta1 = 0.82f;   // 15Khz
+  //constexpr float beta1 = 0.8285f; // 18Khz
+  constexpr float beta1 = 0.85f;  // 20Khz

  constexpr float beta2 = (1.0f - beta1) / 2.0;
  static float last_vals[2] = { 0.0f }; // FIR high freq cutoff filter
@@ -598,13 +710,14 @@ static void postProcessFFTResults(bool noiseGateOpen, int numberOfChannels) // p
 // peak detection is called from FFT task when vReal[] contains valid FFT results
 static void detectSamplePeak(void) {
  bool havePeak = false;
-
+#if 0
  // Poor man's beat detection by seeing if sample > Average + some value.
  // This goes through ALL of the 255 bins - but ignores stupid settings
  // Then we got a peak, else we don't. The peak has to time out on its own in order to support UDP sound sync.
  if ((sampleAvg > 1) && (maxVol > 0) && (binNum > 1) && (vReal[binNum] > maxVol) && ((millis() - timeOfPeak) > 100)) {
    havePeak = true;
  }
+#endif

 #if 0
  // alternate detection, based on FFT_MajorPeak and FFT_Magnitude. Not much better...
@@ -620,7 +733,6 @@ static void detectSamplePeak(void) {
    timeOfPeak    = millis();
    udpSamplePeak = true;
  }
-
 }

 static void autoResetPeak(void) {
@@ -708,7 +820,11 @@ class AudioReactive : public Usermod {
    };

    // set your config variables to their boot default value (this can also be done in readFromConfig() or a constructor if you prefer)
+  #ifdef SR_ENABLE_DEFAULT
+    bool     enabled = true;        // WLEDMM
+  #else
    bool     enabled = false;
+  #endif
    bool     initDone = false;

    // variables  for UDP sound sync
@@ -724,7 +840,7 @@ class AudioReactive : public Usermod {
    // variables used by getSample() and agcAvg()
    int16_t  micIn = 0;           // Current sample starts with negative values and large values, which is why it's 16 bit signed
    double   sampleMax = 0.0;     // Max sample over a few seconds. Needed for AGC controler.
-    double   micLev = 0.0f;       // Used to convert returned value to have '0' as minimum. A leveller
+    double   micLev = 0.0;        // Used to convert returned value to have '0' as minimum. A leveller
    float    expAdjF = 0.0f;      // Used for exponential filter.
    float    sampleReal = 0.0f;	  // "sampleRaw" as float, to provide bits that are lost otherwise (before amplification by sampleGain or inputLevel). Needed for AGC.
    int16_t  sampleRaw = 0;       // Current sample. Must only be updated ONCE!!! (amplified mic value by sampleGain and inputLevel)
@@ -760,29 +876,36 @@ class AudioReactive : public Usermod {
      if (disableSoundProcessing && (!udpSyncConnected || ((audioSyncEnabled & 0x02) == 0))) return;   // no audio availeable
    #ifdef MIC_LOGGER
      // Debugging functions for audio input and sound processing. Comment out the values you want to see
-      Serial.print("micReal:");     Serial.print(micDataReal); Serial.print("\t");
-      Serial.print("volumeSmth:");  Serial.print(volumeSmth);  Serial.print("\t");
-      //Serial.print("volumeRaw:");   Serial.print(volumeRaw);   Serial.print("\t");
-      Serial.print("DC_Level:");    Serial.print(micLev);      Serial.print("\t");
-      //Serial.print("sampleAgc:");   Serial.print(sampleAgc);   Serial.print("\t");
-      //Serial.print("sampleAvg:");   Serial.print(sampleAvg);   Serial.print("\t");
-      //Serial.print("sampleReal:");  Serial.print(sampleReal);  Serial.print("\t");
-      //Serial.print("micIn:");       Serial.print(micIn);       Serial.print("\t");
-      //Serial.print("sample:");      Serial.print(sample);      Serial.print("\t");
-      //Serial.print("sampleMax:");   Serial.print(sampleMax);   Serial.print("\t");
-      //Serial.print("samplePeak:");  Serial.print((samplePeak!=0) ? 128:0);   Serial.print("\t");
-      //Serial.print("multAgc:");     Serial.print(multAgc, 4);  Serial.print("\t");
-      Serial.println();
+      PLOT_PRINT("micMin:");     PLOT_PRINT(0.5f * micReal_min);    PLOT_PRINT("\t");  // scaled down to 50%, for better readability
+      PLOT_PRINT("micMax:");     PLOT_PRINT(0.5f * micReal_max);    PLOT_PRINT("\t");  // scaled down to 50%
+      //PLOT_PRINT("micAvg:");     PLOT_PRINT(0.5f * micReal_avg);  PLOT_PRINT("\t");  // scaled down to 50%
+      //PLOT_PRINT("micDC:");      PLOT_PRINT(0.5f * (micReal_min + micReal_max)/2.0f);PLOT_PRINT("\t");  // scaled down to 50%
+      PLOT_PRINT("micReal:");     PLOT_PRINT(micDataReal + 256.0f); PLOT_PRINT("\t");  // +256 to move above other lines
+      PLOT_PRINT("volumeSmth:");  PLOT_PRINT(volumeSmth + 256.0f);  PLOT_PRINT("\t");  // +256 to move above other lines
+      //PLOT_PRINT("volumeRaw:");   PLOT_PRINT(volumeRaw + 256.0f); PLOT_PRINT("\t");  // +256 to move above other lines
+      PLOT_PRINT("DC_Level:");    PLOT_PRINT(micLev + 256.0f);      PLOT_PRINT("\t");  // +256 to move above other lines
+      // //PLOT_PRINT("filtmicMin:");     PLOT_PRINT(0.5f * micReal_min2);  PLOT_PRINT("\t"); // scaled down to 50%
+      // //PLOT_PRINT("filtmicMax:");     PLOT_PRINT(0.5f * micReal_max2);  PLOT_PRINT("\t"); // scaled down to 50%
+      //PLOT_PRINT("sampleAgc:");   PLOT_PRINT(sampleAgc);   PLOT_PRINT("\t");
+      //PLOT_PRINT("sampleAvg:");   PLOT_PRINT(sampleAvg);   PLOT_PRINT("\t");
+      //PLOT_PRINT("sampleReal:");  PLOT_PRINT(sampleReal);  PLOT_PRINT("\t");
+      //PLOT_PRINT("micIn:");       PLOT_PRINT(micIn);       PLOT_PRINT("\t");
+      //PLOT_PRINT("sample:");      PLOT_PRINT(sample);      PLOT_PRINT("\t");
+      //PLOT_PRINT("sampleMax:");   PLOT_PRINT(sampleMax);   PLOT_PRINT("\t");
+      //PLOT_PRINT("samplePeak:");  PLOT_PRINT((samplePeak!=0) ? 128:0);   PLOT_PRINT("\t");
+      //PLOT_PRINT("multAgc:");     PLOT_PRINT(multAgc, 4);  PLOT_PRINT("\t");
+      PLOT_PRINTLN();
+      PLOT_FLUSH();
    #endif

    #ifdef FFT_SAMPLING_LOG
      #if 0
        for(int i=0; i<NUM_GEQ_CHANNELS; i++) {
-          Serial.print(fftResult[i]);
-          Serial.print("\t");
+          PLOT_PRINT(fftResult[i]);
+          PLOT_PRINT("\t");
        }
-        Serial.println();
-      #endif
+        PLOT_PRINTLN();
+    #endif

      // OPTIONS are in the following format: Description \n Option
      //
@@ -808,20 +931,21 @@ class AudioReactive : public Usermod {
        if(fftResult[i] < minVal) minVal = fftResult[i];
      }
      for(int i = 0; i < NUM_GEQ_CHANNELS; i++) {
-        Serial.print(i); Serial.print(":");
-        Serial.printf("%04ld ", map(fftResult[i], 0, (scaleValuesFromCurrentMaxVal ? maxVal : defaultScalingFromHighValue), (mapValuesToPlotterSpace*i*scalingToHighValue)+0, (mapValuesToPlotterSpace*i*scalingToHighValue)+scalingToHighValue-1));
+        PLOT_PRINT(i); PLOT_PRINT(":");
+        PLOT_PRINTF("%04ld ", map(fftResult[i], 0, (scaleValuesFromCurrentMaxVal ? maxVal : defaultScalingFromHighValue), (mapValuesToPlotterSpace*i*scalingToHighValue)+0, (mapValuesToPlotterSpace*i*scalingToHighValue)+scalingToHighValue-1));
      }
      if(printMaxVal) {
-        Serial.printf("maxVal:%04d ", maxVal + (mapValuesToPlotterSpace ? 16*256 : 0));
+        PLOT_PRINTF("maxVal:%04d ", maxVal + (mapValuesToPlotterSpace ? 16*256 : 0));
      }
      if(printMinVal) {
-        Serial.printf("%04d:minVal ", minVal);  // printed with value first, then label, so negative values can be seen in Serial Monitor but don't throw off y axis in Serial Plotter
+        PLOT_PRINTF("%04d:minVal ", minVal);  // printed with value first, then label, so negative values can be seen in Serial Monitor but don't throw off y axis in Serial Plotter
      }
      if(mapValuesToPlotterSpace)
-        Serial.printf("max:%04d ", (printMaxVal ? 17 : 16)*256); // print line above the maximum value we expect to see on the plotter to avoid autoscaling y axis
-      else
-        Serial.printf("max:%04d ", 256);
-      Serial.println();
+        PLOT_PRINTF("max:%04d ", (printMaxVal ? 17 : 16)*256); // print line above the maximum value we expect to see on the plotter to avoid autoscaling y axis
+      else {
+        PLOT_PRINTF("max:%04d ", 256);
+      }
+      PLOT_PRINTLN();
    #endif // FFT_SAMPLING_LOG
    } // logAudio()

@@ -955,12 +1079,7 @@ class AudioReactive : public Usermod {
        #endif
      #endif

-      //micLev = ((micLev * 8191.0f) + micDataReal) / 8192.0f;                // takes a few seconds to "catch up" with the Mic Input
-      //if (useBandPassFilter) 
-      //  micLev += (micDataReal-micLev) / 8192.0f;                             // we expect some more fluctuations with mics that need pre-filtering
-      //else 
      micLev += (micDataReal-micLev) / 12288.0f;
-
      if(micIn < micLev) micLev = ((micLev * 31.0f) + micDataReal) / 32.0f; // align MicLev to lowest input signal

      micIn -= micLev;                                  // Let's center it to 0 now
@@ -1053,8 +1172,16 @@ class AudioReactive : public Usermod {
      static unsigned long last_connection_attempt = 0;

      if ((audioSyncPort <= 0) || ((audioSyncEnabled & 0x03) == 0)) return;  // Sound Sync not enabled
+      if (!(apActive || WLED_CONNECTED || interfacesInited))  {
+        if (udpSyncConnected) {
+          udpSyncConnected = false;
+          fftUdp.stop();
+          receivedFormat = 0;
+          DEBUGSR_PRINTLN(F("AR connectUDPSoundSync(): connection lost, UDP closed."));
+        }
+        return;                           // neither AP nor other connections availeable
+      }
      if (udpSyncConnected) return;                                          // already connected
-      if (!(apActive || interfacesInited)) return;                           // neither AP nor other connections availeable
      if (millis() - last_connection_attempt < 15000) return;                // only try once in 15 seconds

      // if we arrive here, we need a UDP connection but don't have one
@@ -1283,7 +1410,7 @@ class AudioReactive : public Usermod {
        case 0:
        default:
          DEBUGSR_PRINTLN(F("AR: Analog Microphone (left channel only)."));
-          //useBandPassFilter = true;
+          useBandPassFilter = true;
          audioSource = new I2SAdcSource(SAMPLE_RATE, BLOCK_SIZE);
          delay(100);
          if (audioSource) audioSource->initialize(audioPin);
@@ -1301,11 +1428,17 @@ class AudioReactive : public Usermod {
      #ifdef WLED_DEBUG
        DEBUG_PRINTLN(F("AR: Failed to initialize sound input driver. Please check input PIN settings."));
      #else
-        ERRORSR_PRINTLN(F("AR: Failed to initialize sound input driver. Please check input PIN settings."));
+        USER_PRINTLN(F("AR: Failed to initialize sound input driver. Please check input PIN settings."));
      #endif
        disableSoundProcessing = true;
+      } else {
+        USER_PRINTLN(F("AR: sound input driver initialized successfully."));        
      }

+      // try to start UDP
+      last_UDPTime = 0;
+      receivedFormat = 0;
+      delay(100);
      if (enabled) connectUDPSoundSync();
      initDone = true;
    }
@@ -1320,6 +1453,8 @@ class AudioReactive : public Usermod {
      if (udpSyncConnected) {   // clean-up: if open, close old UDP sync connection
        udpSyncConnected = false;
        fftUdp.stop();
+        receivedFormat = 0;
+        DEBUGSR_PRINTLN(F("AR connected(): old UDP connection closed."));
      }
      
      if (audioSyncPort > 0 && (audioSyncEnabled & 0x03)) {
@@ -1328,6 +1463,13 @@ class AudioReactive : public Usermod {
      #else
        udpSyncConnected = fftUdp.beginMulticast(WiFi.localIP(), IPAddress(239, 0, 0, 1), audioSyncPort);
      #endif
+        receivedFormat = 0;
+        if (udpSyncConnected) last_UDPTime = millis();
+        if (apActive && !(WLED_CONNECTED)) {
+          DEBUGSR_PRINTLN(udpSyncConnected ? F("AR connected(): UDP: connected using AP.") : F("AR connected(): UDP is disconnected (AP)."));
+        } else {
+          DEBUGSR_PRINTLN(udpSyncConnected ? F("AR connected(): UDP: connected to WIFI.") :  F("AR connected(): UDP is disconnected (Wifi)."));
+        }
      }
    }

@@ -1393,10 +1535,10 @@ class AudioReactive : public Usermod {
        int userloopDelay = int(t_now - lastUMRun);
        if (lastUMRun == 0) userloopDelay=0; // startup - don't have valid data from last run.

-        #ifdef WLED_DEBUG
+        #if defined(WLED_DEBUG) || defined(SR_DEBUG) || defined(SR_STATS)
          // complain when audio userloop has been delayed for long time. Currently we need userloop running between 500 and 1500 times per second. 
-          if ((userloopDelay > 23) && !disableSoundProcessing && (audioSyncEnabled == 0)) {
-            DEBUG_PRINTF("[AR userLoop] hickup detected -> was inactive for last %d millis!\n", userloopDelay);
+          if ((userloopDelay > /*23*/ 30) && !disableSoundProcessing && (audioSyncEnabled == 0)) {
+            USER_PRINTF("[AR userLoop] hickup detected -> was inactive for last %d millis!\n", userloopDelay);
          }
        #endif

@@ -1439,6 +1581,22 @@ class AudioReactive : public Usermod {
          if (have_new_sample) syncVolumeSmth = volumeSmth;   // remember received sample
          else volumeSmth = syncVolumeSmth;                   // restore originally received sample for next run of dynamics limiter
          limitSampleDynamics();                              // run dynamics limiter on received volumeSmth, to hide jumps and hickups
+      } else {
+          receivedFormat = 0;
+      }
+
+      if (   (audioSyncEnabled & 0x02) // receive mode
+          && udpSyncConnected          // connected
+          && (receivedFormat > 0)      // we actually received something in the past
+          && ((millis() - last_UDPTime) > 25000)) {   // close connection after 25sec idle
+        udpSyncConnected = false;
+        receivedFormat = 0;
+        fftUdp.stop();
+        volumeSmth =0.0f;
+        volumeRaw =0;
+        my_magnitude = 0.1; FFT_Magnitude = 0.01; FFT_MajorPeak = 2;
+        multAgc = 1;
+        DEBUGSR_PRINTLN(F("AR  loop(): UDP closed due to inactivity."));
      }

      #if defined(MIC_LOGGER) || defined(MIC_SAMPLING_LOG) || defined(FFT_SAMPLING_LOG)
@@ -1500,10 +1658,13 @@ class AudioReactive : public Usermod {
      autoResetPeak();

      if (init && FFT_Task) {
+        delay(25);                // WLEDMM: givesome time for I2S driver to finish sampling
        vTaskSuspend(FFT_Task);   // update is about to begin, disable task to prevent crash
        if (udpSyncConnected) {   // close UDP sync connection (if open)
          udpSyncConnected = false;
          fftUdp.stop();
+          DEBUGSR_PRINTLN(F("AR onUpdateBegin(true): UDP connection closed."));
+          receivedFormat = 0;
        }
      } else {
        // update has failed or create task requested
@@ -1675,12 +1836,16 @@ class AudioReactive : public Usermod {
        }

        #if defined(WLED_DEBUG) || defined(SR_DEBUG) || defined(SR_STATS)
+        infoArr = user.createNestedArray(F("I2S cycle time"));
+        infoArr.add(roundf(fftTaskCycle)/100.0f);
+        infoArr.add(" ms");
+
        infoArr = user.createNestedArray(F("Sampling time"));
-        infoArr.add(float(sampleTime)/100.0f);
+        infoArr.add(roundf(sampleTime)/100.0f);
        infoArr.add(" ms");

        infoArr = user.createNestedArray(F("FFT time"));
-        infoArr.add(float(fftTime)/100.0f);
+        infoArr.add(roundf(fftTime)/100.0f);
        if ((fftTime/100) >= FFT_MIN_CYCLE) // FFT time over budget -> I2S buffer will overflow 
          infoArr.add("<b style=\"color:red;\">! ms</b>");
        else if ((fftTime/80 + sampleTime/80) >= FFT_MIN_CYCLE) // FFT time >75% of budget -> risk of instability
@@ -1688,8 +1853,9 @@ class AudioReactive : public Usermod {
        else
          infoArr.add(" ms");

-        DEBUGSR_PRINTF("AR Sampling time: %5.2f ms\n", float(sampleTime)/100.0f);
-        DEBUGSR_PRINTF("AR FFT time     : %5.2f ms\n", float(fftTime)/100.0f);
+        DEBUGSR_PRINTF("AR I2S cycle time: %5.2f ms\n", roundf(fftTaskCycle)/100.0f);
+        DEBUGSR_PRINTF("AR Sampling time : %5.2f ms\n", roundf(sampleTime)/100.0f);
+        DEBUGSR_PRINTF("AR FFT time      : %5.2f ms\n", roundf(fftTime)/100.0f);
        #endif
      }
    }
@@ -1774,7 +1940,7 @@ class AudioReactive : public Usermod {
    #if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S3)
      JsonObject amic = top.createNestedObject(FPSTR(_analogmic));
      amic["pin"] = audioPin;
-#endif
+    #endif

      JsonObject dmic = top.createNestedObject(FPSTR(_digitalmic));
      dmic[F("type")] = dmType;
@@ -1798,7 +1964,7 @@ class AudioReactive : public Usermod {

      JsonObject freqScale = top.createNestedObject("frequency");
      freqScale[F("scale")] = FFTScalingMode;
-      freqScale[F("profile")] = pinkIndex;
+      freqScale[F("profile")] = pinkIndex; //WLEDMM

      JsonObject sync = top.createNestedObject("sync");
      sync[F("port")] = audioSyncPort;
@@ -1858,7 +2024,7 @@ class AudioReactive : public Usermod {
      configComplete &= getJsonValue(top["dynamics"][F("fall")],  decayTime);

      configComplete &= getJsonValue(top["frequency"][F("scale")], FFTScalingMode);
-      configComplete &= getJsonValue(top["frequency"][F("profile")], pinkIndex);
+      configComplete &= getJsonValue(top["frequency"][F("profile")], pinkIndex);  //WLEDMM

      configComplete &= getJsonValue(top["sync"][F("port")], audioSyncPort);
      configComplete &= getJsonValue(top["sync"][F("mode")], audioSyncEnabled);
@@ -1869,18 +2035,58 @@ class AudioReactive : public Usermod {

    void appendConfigData()
    {
+      oappend(SET_F("addInfo('AudioReactive:help',0,'<button onclick=\"location.href=&quot;https://mm.kno.wled.ge/soundreactive/Sound-Settings&quot;\" type=\"button\">?</button>');"));
+      
+      //WLEDMM: add defaults
+      #ifdef AUDIOPIN
+        oappend(SET_F("xOpt('AudioReactive:analogmic:pin',1,' ⎌',")); oappendi(AUDIOPIN); oappend(");"); 
+      #endif
+      oappend(SET_F("aOpt('AudioReactive:analogmic:pin',1);")); //only analog options
+
      oappend(SET_F("dd=addDropdown('AudioReactive','digitalmic:type');"));
-    #if  !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S3)
-      oappend(SET_F("addOption(dd,'Generic Analog',0);"));
-    #endif
-      oappend(SET_F("addOption(dd,'Generic I2S',1);"));
-      oappend(SET_F("addOption(dd,'ES7243',2);"));
-      oappend(SET_F("addOption(dd,'SPH0654',3);"));
-      oappend(SET_F("addOption(dd,'Generic I2S with Mclk',4);"));
-    #if  !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3)
-      oappend(SET_F("addOption(dd,'Generic I2S PDM',5);"));
-    #endif
+      #if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S3)
+        #if SR_DMTYPE==0
+          oappend(SET_F("addOption(dd,'Generic Analog (⎌)',0);"));
+        #else
+          oappend(SET_F("addOption(dd,'Generic Analog',0);"));
+        #endif
+      #endif
+      #if SR_DMTYPE==1
+        oappend(SET_F("addOption(dd,'Generic I2S (⎌)',1);"));
+      #else
+        oappend(SET_F("addOption(dd,'Generic I2S',1);"));
+      #endif
+      #if SR_DMTYPE==2
+        oappend(SET_F("addOption(dd,'ES7243 (⎌)',2);"));
+      #else
+        oappend(SET_F("addOption(dd,'ES7243',2);"));
+      #endif
+      #if SR_DMTYPE==3
+        oappend(SET_F("addOption(dd,'SPH0654 (⎌)',3);"));
+      #else
+        oappend(SET_F("addOption(dd,'SPH0654',3);"));
+      #endif
+      #if SR_DMTYPE==4
+        oappend(SET_F("addOption(dd,'Generic I2S with Mclk (⎌)',4);"));
+      #else
+        oappend(SET_F("addOption(dd,'Generic I2S with Mclk',4);"));
+      #endif
+      #if  !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3)
+        #if SR_DMTYPE==5
+          oappend(SET_F("addOption(dd,'Generic I2S PDM (⎌)',5);"));
+        #else
+          oappend(SET_F("addOption(dd,'Generic I2S PDM',5);"));
+        #endif
+      #endif
      oappend(SET_F("addOption(dd,'ES8388',6);"));
+
+      #ifdef SR_SQUELCH
+        oappend(SET_F("addInfo('AudioReactive:config:squelch',1,'<i>&#9100; ")); oappendi(SR_SQUELCH); oappend("</i>');");  // 0 is field type, 1 is actual field
+      #endif
+      #ifdef SR_GAIN
+        oappend(SET_F("addInfo('AudioReactive:config:gain',1,'<i>&#9100; ")); oappendi(SR_GAIN); oappend("</i>');");  // 0 is field type, 1 is actual field
+      #endif
+
      oappend(SET_F("dd=addDropdown('AudioReactive','config:AGC');"));
      oappend(SET_F("addOption(dd,'Off',0);"));
      oappend(SET_F("addOption(dd,'Normal',1);"));
@@ -1900,34 +2106,109 @@ class AudioReactive : public Usermod {
      oappend(SET_F("addOption(dd,'Square Root (Energy)',3);"));
      oappend(SET_F("addOption(dd,'Logarithmic (Loudness)',1);"));

+      //WLEDMM add defaults
      oappend(SET_F("dd=addDropdown('AudioReactive','frequency:profile');"));
-      oappend(SET_F("addOption(dd,'Generic Microphone',0);"));
-      oappend(SET_F("addOption(dd,'Generic Line-In',1);"));
-      oappend(SET_F("addOption(dd,'ICS-43434',5);"));
-      oappend(SET_F("addOption(dd,'ICS-43434 - big speakers',6);"));
-      oappend(SET_F("addOption(dd,'SPM1423',7);"));
-      oappend(SET_F("addOption(dd,'IMNP441',2);"));
-      oappend(SET_F("addOption(dd,'IMNP441 - big speakers',3);"));
-      oappend(SET_F("addOption(dd,'IMNP441 - small speakers',4);"));
-      oappend(SET_F("addOption(dd,'flat - no adjustments',10);"));
-      oappend(SET_F("addOption(dd,'userdefined #1',8);"));
-      oappend(SET_F("addOption(dd,'userdefined #2',9);"));
+      #if SR_FREQ_PROF==0
+        oappend(SET_F("addOption(dd,'Generic Microphone (⎌)',0);"));
+      #else
+        oappend(SET_F("addOption(dd,'Generic Microphone',0);"));
+      #endif
+      #if SR_FREQ_PROF==1
+        oappend(SET_F("addOption(dd,'Generic Line-In (⎌)',1);"));
+      #else
+        oappend(SET_F("addOption(dd,'Generic Line-In',1);"));
+      #endif
+      #if SR_FREQ_PROF==5
+        oappend(SET_F("addOption(dd,'ICS-43434 (⎌)',5);"));
+      #else
+        oappend(SET_F("addOption(dd,'ICS-43434',5);"));
+      #endif
+      #if SR_FREQ_PROF==6
+        oappend(SET_F("addOption(dd,'ICS-43434 - big speakers (⎌)',6);"));
+      #else
+        oappend(SET_F("addOption(dd,'ICS-43434 - big speakers',6);"));
+      #endif
+      #if SR_FREQ_PROF==7
+        oappend(SET_F("addOption(dd,'SPM1423 (⎌)',7);"));
+      #else
+        oappend(SET_F("addOption(dd,'SPM1423',7);"));
+      #endif
+      #if SR_FREQ_PROF==2
+        oappend(SET_F("addOption(dd,'IMNP441 (⎌)',2);"));
+      #else
+        oappend(SET_F("addOption(dd,'IMNP441',2);"));
+      #endif
+      #if SR_FREQ_PROF==3
+        oappend(SET_F("addOption(dd,'IMNP441 - big speakers (⎌)',3);"));
+      #else
+        oappend(SET_F("addOption(dd,'IMNP441 - big speakers',3);"));
+      #endif
+      #if SR_FREQ_PROF==4
+        oappend(SET_F("addOption(dd,'IMNP441 - small speakers (⎌)',4);"));
+      #else
+        oappend(SET_F("addOption(dd,'IMNP441 - small speakers',4);"));
+      #endif
+      #if SR_FREQ_PROF==10
+        oappend(SET_F("addOption(dd,'flat - no adjustments (⎌)',10);"));
+      #else
+        oappend(SET_F("addOption(dd,'flat - no adjustments',10);"));
+      #endif
+      #if SR_FREQ_PROF==8
+        oappend(SET_F("addOption(dd,'userdefined #1 (⎌)',8);"));
+      #else
+        oappend(SET_F("addOption(dd,'userdefined #1',8);"));
+      #endif
+      #if SR_FREQ_PROF==9
+        oappend(SET_F("addOption(dd,'userdefined #2 (⎌)',9);"));
+      #else
+        oappend(SET_F("addOption(dd,'userdefined #2',9);"));
+      #endif

      oappend(SET_F("dd=addDropdown('AudioReactive','sync:mode');"));
      oappend(SET_F("addOption(dd,'Off',0);"));
      oappend(SET_F("addOption(dd,'Send',1);"));
      oappend(SET_F("addOption(dd,'Receive',2);"));
      oappend(SET_F("addInfo('AudioReactive:digitalmic:type',1,'<i>requires reboot!</i>');"));  // 0 is field type, 1 is actual field
-      oappend(SET_F("addInfo('AudioReactive:digitalmic:pin[]',0,'I2S Serial Data', '<i><span class=\"h\">sd/data/dout</span></i>');"));
-      oappend(SET_F("addInfo('AudioReactive:digitalmic:pin[]',1,'I2S L/R Clock','<i><span class=\"h\">ws/clk/lrck</span></i>');"));
-      oappend(SET_F("addInfo('AudioReactive:digitalmic:pin[]',2,'I2S Serial Clock','<i>sck/bclk</i>');"));
-      #if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S3)
-        oappend(SET_F("addInfo('AudioReactive:digitalmic:pin[]',3,'I2S Master CLK','<i>only use -1, 0, 1 or 3</i>');"));
-      #else
-        oappend(SET_F("addInfo('AudioReactive:digitalmic:pin[]',3,'I2S Master CLK','');"));
+
+      oappend(SET_F("addInfo('AudioReactive:digitalmic:pin[]',0,'<i>sd/data/dout</i>','I2S SD');"));
+      #ifdef I2S_SDPIN
+        oappend(SET_F("xOpt('AudioReactive:digitalmic:pin[]',0,' ⎌',")); oappendi(I2S_SDPIN); oappend(");"); 
      #endif
-      oappend(SET_F("addInfo('AudioReactive:digitalmic:pin[]',4,'I2C SDA',' ');"));
-      oappend(SET_F("addInfo('AudioReactive:digitalmic:pin[]',5,'I2C SCL',' ');"));
+
+      oappend(SET_F("addInfo('AudioReactive:digitalmic:pin[]',1,'<i>ws/clk/lrck</i>','I2S WS');"));
+      oappend(SET_F("dRO('AudioReactive:digitalmic:pin[]',1);")); // disable read only pins
+      #ifdef I2S_WSPIN
+        oappend(SET_F("xOpt('AudioReactive:digitalmic:pin[]',1,' ⎌',")); oappendi(I2S_WSPIN); oappend(");"); 
+      #endif
+
+      oappend(SET_F("addInfo('AudioReactive:digitalmic:pin[]',2,'<i>sck/bclk</i>','I2S SCK');"));
+      oappend(SET_F("dRO('AudioReactive:digitalmic:pin[]',2);")); // disable read only pins
+      #ifdef I2S_CKPIN
+        oappend(SET_F("xOpt('AudioReactive:digitalmic:pin[]',2,' ⎌',")); oappendi(I2S_CKPIN); oappend(");"); 
+      #endif
+
+      oappend(SET_F("addInfo('AudioReactive:digitalmic:pin[]',3,'<i>master clock</i>','I2S MCLK');"));
+      oappend(SET_F("dRO('AudioReactive:digitalmic:pin[]',3);")); // disable read only pins
+      #if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S3)
+        oappend(SET_F("dOpt('AudioReactive:digitalmic:pin[]',3,2,2);")); //only use -1, 0, 1 or 3
+        oappend(SET_F("dOpt('AudioReactive:digitalmic:pin[]',3,4,39);")); //only use -1, 0, 1 or 3
+      #endif
+      #ifdef MCLK_PIN
+        oappend(SET_F("xOpt('AudioReactive:digitalmic:pin[]',3,' ⎌',")); oappendi(MCLK_PIN); oappend(");"); 
+      #endif
+
+      oappend(SET_F("addInfo('AudioReactive:digitalmic:pin[]',4,'','I2C SDA');"));
+      oappend(SET_F("rOpt('AudioReactive:digitalmic:pin[]',4,'use global (")); oappendi(i2c_sda); oappend(")',-1);"); 
+      #ifdef ES7243_SDAPIN
+        oappend(SET_F("xOpt('AudioReactive:digitalmic:pin[]',4,' ⎌',")); oappendi(ES7243_SDAPIN); oappend(");"); 
+      #endif
+
+      oappend(SET_F("addInfo('AudioReactive:digitalmic:pin[]',5,'','I2C SCL');"));
+      oappend(SET_F("rOpt('AudioReactive:digitalmic:pin[]',5,'use global (")); oappendi(i2c_scl); oappend(")',-1);"); 
+      #ifdef ES7243_SCLPIN
+        oappend(SET_F("xOpt('AudioReactive:digitalmic:pin[]',5,' ⎌',")); oappendi(ES7243_SCLPIN); oappend(");"); 
+      #endif
+      oappend(SET_F("dRO('AudioReactive:digitalmic:pin[]',5);")); // disable read only pins
    }


--- a/usermods/audioreactive/audio_source.h
+++ b/usermods/audioreactive/audio_source.h
@@ -24,14 +24,14 @@

 // see https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/hw-reference/chip-series-comparison.html#related-documents
 // and https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/api-reference/peripherals/i2s.html#overview-of-all-modes
-#if defined(CONFIG_IDF_TARGET_ESP32C2) || defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32C5) || defined(CONFIG_IDF_TARGET_ESP32C6) || defined(CONFIG_IDF_TARGET_ESP32H2) || defined(ESP8266) || defined(ESP8265)
+#if defined(CONFIG_IDF_TARGET_ESP32C2) || defined(CONFIG_IDF_TARGET_ESP32C5) || defined(CONFIG_IDF_TARGET_ESP32C6) || defined(CONFIG_IDF_TARGET_ESP32H2) || defined(ESP8266) || defined(ESP8265)
  // there are two things in these MCUs that could lead to problems with audio processing:
  // * no floating point hardware (FPU) support - FFT uses float calculations. If done in software, a strong slow-down can be expected (between 8x and 20x)
  // * single core, so FFT task might slow down other things like LED updates
  #if !defined(SOC_I2S_NUM) || (SOC_I2S_NUM < 1)
-  #error This audio reactive usermod does not support ESP32-C2, ESP32-C3 or ESP32-S2.
+  #error This audio reactive usermod does not support ESP32-C2 or ESP32-C3.
  #else
-  #warning This audio reactive usermod does not support ESP32-C2, ESP32-C3 or ESP32-S2.
+  #warning This audio reactive usermod does not support ESP32-C2 and ESP32-C3.
  #endif
 #endif

@@ -219,10 +219,15 @@ class I2SSource : public AudioSource {
          #endif
        #endif
        #if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3)
-        // example from espressif: https://github.com/espressif/esp-idf/blob/release/v4.4/examples/peripherals/i2s/i2s_audio_recorder_sdcard/main/i2s_recorder_main.c
        // This is an I2S PDM microphone, these microphones only use a clock and
-        // data line, to make it simpler to debug, use the WS pin as CLK and SD
-        // pin as DATA
+        // data line, to make it simpler to debug, use the WS pin as CLK and SD pin as DATA
+        // example from espressif: https://github.com/espressif/esp-idf/blob/release/v4.4/examples/peripherals/i2s/i2s_audio_recorder_sdcard/main/i2s_recorder_main.c
+
+        // note to self: PDM has known bugs on S3, and does not work on C3 
+        //  * S3: PDM sample rate only at 50% of expected rate: https://github.com/espressif/esp-idf/issues/9893
+        //  * S3: I2S PDM has very low amplitude: https://github.com/espressif/esp-idf/issues/8660
+        //  * C3: does not support PDM to PCM input. SoC would allow PDM RX, but there is no hardware to directly convert to PCM so it will not work. https://github.com/espressif/esp-idf/issues/8796
+
        _config.mode = i2s_mode_t(I2S_MODE_MASTER | I2S_MODE_RX | I2S_MODE_PDM); // Change mode to pdm if clock pin not provided. PDM is not supported on ESP32-S2. PDM RX not supported on ESP32-C3
        _config.channel_format =I2S_PDM_MIC_CHANNEL;                             // seems that PDM mono mode always uses left channel.
        _config.use_apll = true;                                                 // experimental - use aPLL clock source to improve sampling quality
@@ -425,7 +430,7 @@ class ES7243 : public I2SSource {
      Wire.write((uint8_t)val);
      uint8_t i2cErr = Wire.endTransmission();  // i2cErr == 0 means OK
      if (i2cErr != 0) {
-        DEBUGSR_PRINTF("AR: ES7243 I2C write failed with error=%d  (addr=0x%X, reg 0x%X, val 0x%X).\n", ES7243_ADDR, i2cErr, reg, val);
+        DEBUGSR_PRINTF("AR: ES7243 I2C write failed with error=%d  (addr=0x%X, reg 0x%X, val 0x%X).\n", i2cErr, ES7243_ADDR, reg, val);
      }
    }

@@ -605,7 +610,7 @@ class I2SAdcSource : public I2SSource {
      // Determine Analog channel. Only Channels on ADC1 are supported
      int8_t channel = digitalPinToAnalogChannel(_audioPin);
      if (channel > 9) {
-        ERRORSR_PRINTF("Incompatible GPIO used for analog audio input: %d\n", _audioPin);
+        USER_PRINTF("AR: Incompatible GPIO used for analog audio input: %d\n", _audioPin);
        return;
      } else {
        adc_gpio_init(ADC_UNIT_1, adc_channel_t(channel));
@@ -624,7 +629,7 @@ class I2SAdcSource : public I2SSource {
      // Enable I2S mode of ADC
      err = i2s_set_adc_mode(ADC_UNIT_1, adc1_channel_t(channel));
      if (err != ESP_OK) {
-        DEBUGSR_PRINTF("Failed to set i2s adc mode: %d\n", err);
+        USER_PRINTF("AR: Failed to set i2s adc mode: %d\n", err);
        return;
      }

--- a/usermods/audioreactive/readme.md
+++ b/usermods/audioreactive/readme.md
@@ -1,36 +1,73 @@
 # Audioreactive usermod

-This usermod allows controlling LEDs using audio input. Audio input can be either microphone or analog-in (AUX) using appropriate adapter.
+Enabless controlling LEDs via audio input. Audio source can be a microphone or analog-in (AUX) using an appropriate adapter.
 Supported microphones range from analog (MAX4466, MAX9814, ...) to digital (INMP441, ICS-43434, ...).

-The usermod does audio processing and provides data structure that specially written effect can use.
+Does audio processing and provides data structure that specially written effects can use.

-The usermod **does not** provide effects or draws anything to LED strip/matrix.
+**does not** provide effects or draw anything to an LED strip/matrix.

+## Additional Documentation
+This usermod is an evolution of [SR-WLED](https://github.com/atuline/WLED), and a lot of documentation and information can be found in the [SR-WLED wiki](https://github.com/atuline/WLED/wiki):
+* [getting started with audio](https://github.com/atuline/WLED/wiki/First-Time-Setup#sound)
+* [Sound settings](https://github.com/atuline/WLED/wiki/Sound-Settings) - similar to options on the usemod settings page in WLED.
+* [Digital Audio](https://github.com/atuline/WLED/wiki/Digital-Microphone-Hookup)
+* [Analog Audio](https://github.com/atuline/WLED/wiki/Analog-Audio-Input-Options)
+* [UDP Sound sync](https://github.com/atuline/WLED/wiki/UDP-Sound-Sync)
+
+
+## Supported MCUs
+This audioreactive usermod works best on "classic ESP32" (dual core), and on ESP32-S3 which also has dual core and hardware floating point support. 
+
+It will compile succesfully for ESP32-S2 and ESP32-C3, however might not work well, as other WLED functions will become slow. Audio processing requires a lot of computing power, which can be problematic on smaller MCUs like -S2 and -C3. 
+
+Analog audio is only possible on "classic" ESP32, but not on other MCUs like ESP32-S3.
+
+Currently ESP8266 is not supported, due to low speed and small RAM of this chip. 
+There are however plans to create a lightweight audioreactive for the 8266, with reduced features.
 ## Installation 

-Add `-D USERMOD_AUDIOREACTIVE` to your PlatformIO environment as well as `arduinoFFT` to your `lib_deps`.
+### using customised _arduinoFFT_ library for use with this usermod
+Add `-D USERMOD_AUDIOREACTIVE` to your PlatformIO environment `build_flags`, as well as `https://github.com/blazoncek/arduinoFFT.git` to your `lib_deps`.
 If you are not using PlatformIO (which you should) try adding `#define USERMOD_AUDIOREACTIVE` to *my_config.h* and make sure you have _arduinoFFT_ library downloaded and installed.

 Customised _arduinoFFT_ library for use with this usermod can be found at https://github.com/blazoncek/arduinoFFT.git

+### using latest (develop) _arduinoFFT_ library
+Alternatively, you can use the latest arduinoFFT development version.
+ArduinoFFT `develop` library is slightly more accurate, and slighly faster than our customised library, however also needs additional 2kB RAM.
+
+* `build_flags` = `-D USERMOD_AUDIOREACTIVE` `-D UM_AUDIOREACTIVE_USE_NEW_FFT`
+* `lib_deps`= `https://github.com/kosme/arduinoFFT#develop @ 1.9.2`
+
 ## Configuration

-All parameters are runtime configurable though some may require hard boot after change (I2S microphone or selected GPIOs).
+All parameters are runtime configurable. Some may require a hard reset after changing them (I2S microphone or selected GPIOs).

-If you want to define default GPIOs during compile time use the following (default values in parentheses):
+If you want to define default GPIOs during compile time, use the following (default values in parentheses):

- `SR_DMTYPE=x` : defines digital microphone type: 0=analog, 1=generic I2S, 2=ES7243 I2S, 3=SPH0645 I2S, 4=generic I2S with master clock, 5=PDM I2S
- `AUDIOPIN=x` : GPIO for analog microphone/AUX-in (36)
- `I2S_SDPIN=x` : GPIO for SD pin on digital mcrophone (32)
- `I2S_WSPIN=x` : GPIO for WS pin on digital mcrophone (15)
- `I2S_CKPIN=x` : GPIO for SCK pin on digital mcrophone (14)
- `ES7243_SDAPIN` : GPIO for I2C SDA pin on ES7243 microphone (-1)
- `ES7243_SCLPIN` : GPIO for I2C SCL pin on ES7243 microphone (-1)
- `MCLK_PIN=x` : GPIO for master clock pin on digital mcrophone (-1)
+- `-D SR_DMTYPE=x` : defines digital microphone type: 0=analog, 1=generic I2S (default), 2=ES7243 I2S, 3=SPH0645 I2S, 4=generic I2S with master clock, 5=PDM I2S
+- `-D AUDIOPIN=x`  : GPIO for analog microphone/AUX-in (36)
+- `-D I2S_SDPIN=x` : GPIO for SD pin on digital microphone (32)
+- `-D I2S_WSPIN=x` : GPIO for WS pin on digital microphone (15)
+- `-D I2S_CKPIN=x` : GPIO for SCK pin on digital microphone (14)
+- `-D MCLK_PIN=x`  : GPIO for master clock pin on digital Line-In boards (-1)
+- `-D ES7243_SDAPIN` : GPIO for I2C SDA pin on ES7243 microphone (-1)
+- `-D ES7243_SCLPIN` : GPIO for I2C SCL pin on ES7243 microphone (-1)

-**NOTE** Due to the fact that usermod uses I2S peripherial for analog audio sampling, use of analog *buttons* (i.e. potentiometers) is disabled while running this usermod with analog microphone.
+**NOTE** I2S is used for analog audio sampling. Hence, the analog *buttons* (i.e. potentiometers) are disabled when running this usermod with an analog microphone.
+
+### Advanced Compile-Time Options
+You can use the following additional flags in your `build_flags`
+* `-D SR_SQUELCH=x`  : Default "squelch" setting (10)
+* `-D SR_GAIN=x`     : Default "gain" setting (60)
+* `-D I2S_USE_RIGHT_CHANNEL`: Use RIGHT instead of LEFT channel (not recommended unless you strictly need this).
+* `-D I2S_USE_16BIT_SAMPLES`: Use 16bit instead of 32bit for internal sample buffers. Reduces sampling quality, but frees some RAM ressources (not recommended unless you absolutely need this).
+* `-D I2S_GRAB_ADC1_COMPLETELY`: Experimental: continously sample analog ADC microphone. Only effective on ESP32. WARNING this _will_ cause conflicts(lock-up) with any analogRead() call.
+* `-D MIC_LOGGER`     : (debugging) Logs samples from the microphone to serial USB. Use with serial plotter (Arduino IDE)
+* `-D SR_DEBUG`       : (debugging) Additional error diagnostics and debug info on serial USB.

 ## Release notes

-2022-06 Ported from [soundreactive](https://github.com/atuline/WLED) by @blazoncek (AKA Blaz Kristan)
+* 2022-06 Ported from [soundreactive WLED](https://github.com/atuline/WLED) - by @blazoncek (AKA Blaz Kristan) and the [SR-WLED team](https://github.com/atuline/WLED/wiki#sound-reactive-wled-fork-team).
+* 2022-11 Updated to align with "[MoonModules/WLED](https://amg.wled.me)" audioreactive usermod - by @softhack007 (AKA Frank M&ouml;hle).
--- a/usermods/battery_status_basic/assets/battery_info_screen.png
+++ b/usermods/battery_status_basic/assets/battery_info_screen.png
--- a/usermods/battery_status_basic/readme.md
+++ b/usermods/battery_status_basic/readme.md
@@ -1,69 +0,0 @@
-# :battery: Battery status/level Usermod :battery:
-
-This Usermod allows you to monitor the battery level of your battery powered project.
-
-You can see the battery level and voltage in the `info modal`. 
-
-For this to work the positive side of the (18650) battery must be connected to pin `A0` of the d1mini/esp8266 with a 100k ohm resistor (see [Useful Links](#useful-links)).
-
-If you have a esp32 board it is best to connect the positive side of the battery to ADC1 (GPIO32 - GPIO39)
-
-<p align="center">
-  <img width="300" src="assets/battery_info_screen.png">
-</p>
-
-## Installation
-
-define `USERMOD_BATTERY_STATUS_BASIC` in `my_config.h`
-
-### Basic wiring diagram
-<p align="center">
-  <img width="300" src="assets/battery_connection_schematic_01.png">
-</p>
-
-### Define Your Options
-
-* `USERMOD_BATTERY_STATUS_BASIC`                   - define this (in `my_config.h`) to have this user mod included wled00\usermods_list.cpp
-* `USERMOD_BATTERY_MEASUREMENT_PIN`                - defaults to A0 on esp8266 and GPIO32 on esp32
-* `USERMOD_BATTERY_MEASUREMENT_INTERVAL`           - the frequency to check the battery, defaults to 30 seconds
-* `USERMOD_BATTERY_MIN_VOLTAGE`                    - minimum voltage of the Battery used, default is 2.6 (18650 battery standard)
-* `USERMOD_BATTERY_MAX_VOLTAGE`                    - maximum voltage of the Battery used, default is 4.2 (18650 battery standard)
-
-All parameters can be configured at runtime using Usermods settings page.
-
-## Important :warning:
-* Make sure you know your battery specification ! not every battery is the same !
-* Example:
-
-| Your battery specification table  |                 | Options you can define        | 
-| :-------------------------------- |:--------------- | :---------------------------- |
-| Capacity                          | 3500mAh 12,5 Wh |                               |
-| Minimum capacity                  | 3350mAh 11,9 Wh |                               |
-| Rated voltage                     | 3.6V - 3.7V     |                               |
-| **Charging end voltage**          | **4,2V ± 0,05** | `USERMOD_BATTERY_MAX_VOLTAGE` |
-| **Discharge voltage**             | **2,5V**        | `USERMOD_BATTERY_MIN_VOLTAGE` |
-| Max. discharge current (constant) | 10A (10000mA)   |                               |
-| max. charging current             | 1.7A (1700mA)   |                               |
-| ...                               | ...             | ...                           |
-| ..                                | ..              | ..                            |
-
-Specification from:  [Molicel INR18650-M35A, 3500mAh 10A Lithium-ion battery, 3.6V - 3.7V](https://www.akkuteile.de/lithium-ionen-akkus/18650/molicel/molicel-inr18650-m35a-3500mah-10a-lithium-ionen-akku-3-6v-3-7v_100833)
-
-## Useful Links
-* https://lazyzero.de/elektronik/esp8266/wemos_d1_mini_a0/start
-* https://arduinodiy.wordpress.com/2016/12/25/monitoring-lipo-battery-voltage-with-wemos-d1-minibattery-shield-and-thingspeak/
-
-## Change Log
-2021-09-02
-* added "Battery voltage" to info
-* added circuit diagram to readme
-* added MQTT support, sending battery voltage
-* minor fixes
-
-2021-08-15
-* changed `USERMOD_BATTERY_MIN_VOLTAGE` to 2.6 volt as default for 18650 batteries
-* Updated readme, added specification table
-
-2021-08-10
-* Created
-
--- a/usermods/battery_status_basic/usermod_v2_battery_status_basic.h
+++ b/usermods/battery_status_basic/usermod_v2_battery_status_basic.h
@@ -1,398 +0,0 @@
-#pragma once
-
-#include "wled.h"
-
-
-
-
-// pin defaults
-// for the esp32 it is best to use the ADC1: GPIO32 - GPIO39
-// https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-reference/peripherals/adc.html
-#ifndef USERMOD_BATTERY_MEASUREMENT_PIN
-  #ifdef ARDUINO_ARCH_ESP32
-    #define USERMOD_BATTERY_MEASUREMENT_PIN 32
-  #else //ESP8266 boards
-    #define USERMOD_BATTERY_MEASUREMENT_PIN A0
-  #endif
-#endif
-
-// esp32 has a 12bit adc resolution
-// esp8266 only 10bit
-#ifndef USERMOD_BATTERY_ADC_PRECISION
-  #ifdef ARDUINO_ARCH_ESP32
-    // 12 bits
-    #define USERMOD_BATTERY_ADC_PRECISION 4095.0f
-  #else
-    // 10 bits
-    #define USERMOD_BATTERY_ADC_PRECISION 1024.0f
-  #endif
-#endif
-
-
-// the frequency to check the battery, 30 sec
-#ifndef USERMOD_BATTERY_MEASUREMENT_INTERVAL
-  #define USERMOD_BATTERY_MEASUREMENT_INTERVAL 30000
-#endif
-
-
-// default for 18650 battery
-// https://batterybro.com/blogs/18650-wholesale-battery-reviews/18852515-when-to-recycle-18650-batteries-and-how-to-start-a-collection-center-in-your-vape-shop
-// Discharge voltage: 2.5 volt + .1 for personal safety
-#ifndef USERMOD_BATTERY_MIN_VOLTAGE
-  #define USERMOD_BATTERY_MIN_VOLTAGE 2.6f
-#endif
-
-#ifndef USERMOD_BATTERY_MAX_VOLTAGE
-  #define USERMOD_BATTERY_MAX_VOLTAGE 4.2f
-#endif
-
-class UsermodBatteryBasic : public Usermod 
-{
-  private:
-    // battery pin can be defined in my_config.h
-    int8_t batteryPin = USERMOD_BATTERY_MEASUREMENT_PIN;
-    // how often to read the battery voltage
-    unsigned long readingInterval = USERMOD_BATTERY_MEASUREMENT_INTERVAL;
-    unsigned long nextReadTime = 0;
-    unsigned long lastReadTime = 0;
-    // battery min. voltage
-    float minBatteryVoltage = USERMOD_BATTERY_MIN_VOLTAGE;
-    // battery max. voltage
-    float maxBatteryVoltage = USERMOD_BATTERY_MAX_VOLTAGE;
-    // 0 - 1024 for esp8266 (10-bit resolution)
-    // 0 - 4095 for esp32 (Default is 12-bit resolution)
-    float adcPrecision = USERMOD_BATTERY_ADC_PRECISION;
-    // raw analog reading 
-    float rawValue = 0.0;
-    // calculated voltage            
-    float voltage = 0.0;
-    // mapped battery level based on voltage
-    long batteryLevel = 0;
-    bool initDone = false;
-    bool initializing = true;
-
-
-    // strings to reduce flash memory usage (used more than twice)
-    static const char _name[];
-    static const char _readInterval[];
-    
-
-    // custom map function
-    // https://forum.arduino.cc/t/floating-point-using-map-function/348113/2
-    double mapf(double x, double in_min, double in_max, double out_min, double out_max) 
-    {
-      return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min;
-    }
-
-    float truncate(float val, byte dec) 
-    {
-      float x = val * pow(10, dec);
-      float y = round(x);
-      float z = x - y;
-      if ((int)z == 5)
-      {
-          y++;
-      }
-      x = y / pow(10, dec);
-      return x;
-    }
-
-
-
-  public:
-    //Functions called by WLED
-
-    /*
-     * setup() is called once at boot. WiFi is not yet connected at this point.
-     * You can use it to initialize variables, sensors or similar.
-     */
-    void setup() 
-    {
-      #ifdef ARDUINO_ARCH_ESP32
-        DEBUG_PRINTLN(F("Allocating battery pin..."));
-        if (batteryPin >= 0 && pinManager.allocatePin(batteryPin, false)) 
-        {
-          DEBUG_PRINTLN(F("Battery pin allocation succeeded."));
-        } else {
-          if (batteryPin >= 0) DEBUG_PRINTLN(F("Battery pin allocation failed."));
-          batteryPin = -1;  // allocation failed
-        }
-      #else //ESP8266 boards have only one analog input pin A0
-
-        pinMode(batteryPin, INPUT);
-      #endif
-
-      nextReadTime = millis() + readingInterval;
-      lastReadTime = millis();
-
-      initDone = true;
-    }
-
-
-    /*
-     * connected() is called every time the WiFi is (re)connected
-     * Use it to initialize network interfaces
-     */
-    void connected() 
-    {
-      //Serial.println("Connected to WiFi!");
-    }
-
-
-    /*
-     * loop() is called continuously. Here you can check for events, read sensors, etc.
-     * 
-     */
-    void loop() 
-    {
-      if(strip.isUpdating()) return;
-
-      // check the battery level every USERMOD_BATTERY_MEASUREMENT_INTERVAL (ms)
-      if (millis() < nextReadTime) return;
-
-
-      nextReadTime = millis() + readingInterval;
-      lastReadTime = millis();
-      initializing = false;
-
-      // read battery raw input
-      rawValue = analogRead(batteryPin);
-
-      // calculate the voltage     
-      voltage = (rawValue / adcPrecision) * maxBatteryVoltage ;
-      // check if voltage is within specified voltage range
-      voltage = voltage<minBatteryVoltage||voltage>maxBatteryVoltage?-1.0f:voltage;
-
-      // translate battery voltage into percentage
-      /*
-        the standard "map" function doesn't work
-        https://www.arduino.cc/reference/en/language/functions/math/map/  notes and warnings at the bottom
-      */
-      batteryLevel = mapf(voltage, minBatteryVoltage, maxBatteryVoltage, 0, 100);
-
-
-      // SmartHome stuff
-      if (WLED_MQTT_CONNECTED) {
-        char subuf[64];
-        strcpy(subuf, mqttDeviceTopic);
-        strcat_P(subuf, PSTR("/voltage"));
-        mqtt->publish(subuf, 0, false, String(voltage).c_str());
-      }
-
-    }
-
-
-    /*
-     * addToJsonInfo() can be used to add custom entries to the /json/info part of the JSON API.
-     * Creating an "u" object allows you to add custom key/value pairs to the Info section of the WLED web UI.
-     * Below it is shown how this could be used for e.g. a light sensor
-     */
-    void addToJsonInfo(JsonObject& root)
-    {
-      
-      JsonObject user = root["u"];
-      if (user.isNull()) user = root.createNestedObject("u");
-
-      // info modal display names
-      JsonArray batteryPercentage = user.createNestedArray("Battery level");
-      JsonArray batteryVoltage = user.createNestedArray("Battery voltage");
-
-      if (initializing) {
-        batteryPercentage.add((nextReadTime - millis()) / 1000);
-        batteryPercentage.add(" sec");
-        batteryVoltage.add((nextReadTime - millis()) / 1000);
-        batteryVoltage.add(" sec");
-        return;
-      }
-
-      if(batteryLevel < 0) {
-        batteryPercentage.add(F("invalid"));
-      } else {
-        batteryPercentage.add(batteryLevel);
-      }
-      batteryPercentage.add(F(" %"));
-
-      if(voltage < 0) {
-        batteryVoltage.add(F("invalid"));
-      } else {
-        batteryVoltage.add(truncate(voltage, 2));
-      }
-      batteryVoltage.add(F(" V"));
-    }
-
-
-    /*
-     * addToJsonState() can be used to add custom entries to the /json/state part of the JSON API (state object).
-     * Values in the state object may be modified by connected clients
-     */
-    /*
-    void addToJsonState(JsonObject& root)
-    {
-
-    }
-    */
-
-
-    /*
-     * readFromJsonState() can be used to receive data clients send to the /json/state part of the JSON API (state object).
-     * Values in the state object may be modified by connected clients
-     */
-    /*
-    void readFromJsonState(JsonObject& root)
-    {
-    }
-    */
-
-
-    /*
-     * addToConfig() can be used to add custom persistent settings to the cfg.json file in the "um" (usermod) object.
-     * It will be called by WLED when settings are actually saved (for example, LED settings are saved)
-     * If you want to force saving the current state, use serializeConfig() in your loop().
-     * 
-     * CAUTION: serializeConfig() will initiate a filesystem write operation.
-     * It might cause the LEDs to stutter and will cause flash wear if called too often.
-     * Use it sparingly and always in the loop, never in network callbacks!
-     * 
-     * addToConfig() will make your settings editable through the Usermod Settings page automatically.
-     *
-     * Usermod Settings Overview:
-     * - Numeric values are treated as floats in the browser.
-     *   - If the numeric value entered into the browser contains a decimal point, it will be parsed as a C float
-     *     before being returned to the Usermod.  The float data type has only 6-7 decimal digits of precision, and
-     *     doubles are not supported, numbers will be rounded to the nearest float value when being parsed.
-     *     The range accepted by the input field is +/- 1.175494351e-38 to +/- 3.402823466e+38.
-     *   - If the numeric value entered into the browser doesn't contain a decimal point, it will be parsed as a
-     *     C int32_t (range: -2147483648 to 2147483647) before being returned to the usermod.
-     *     Overflows or underflows are truncated to the max/min value for an int32_t, and again truncated to the type
-     *     used in the Usermod when reading the value from ArduinoJson.
-     * - Pin values can be treated differently from an integer value by using the key name "pin"
-     *   - "pin" can contain a single or array of integer values
-     *   - On the Usermod Settings page there is simple checking for pin conflicts and warnings for special pins
-     *     - Red color indicates a conflict.  Yellow color indicates a pin with a warning (e.g. an input-only pin)
-     *   - Tip: use int8_t to store the pin value in the Usermod, so a -1 value (pin not set) can be used
-     *
-     * See usermod_v2_auto_save.h for an example that saves Flash space by reusing ArduinoJson key name strings
-     * 
-     * If you need a dedicated settings page with custom layout for your Usermod, that takes a lot more work.  
-     * You will have to add the setting to the HTML, xml.cpp and set.cpp manually.
-     * See the WLED Soundreactive fork (code and wiki) for reference.  https://github.com/atuline/WLED
-     * 
-     * I highly recommend checking out the basics of ArduinoJson serialization and deserialization in order to use custom settings!
-     */
-    void addToConfig(JsonObject& root)
-    {
-      // created JSON object: 
-      /*
-      {
-        "Battery-Level": {
-          "pin": "A0",              <--- only when using esp32 boards
-          "minBatteryVoltage": 2.6, 
-          "maxBatteryVoltage": 4.2,
-          "read-interval-ms": 30000  
-        }
-      }
-      */ 
-      JsonObject battery = root.createNestedObject(FPSTR(_name)); // usermodname
-      #ifdef ARDUINO_ARCH_ESP32
-        battery["pin"] = batteryPin;                              // usermodparam
-      #endif
-      battery["minBatteryVoltage"] = minBatteryVoltage;           // usermodparam
-      battery["maxBatteryVoltage"] = maxBatteryVoltage;           // usermodparam
-      battery[FPSTR(_readInterval)] = readingInterval;
-
-      DEBUG_PRINTLN(F("Battery config saved."));
-    }
-
-
-    /*
-     * readFromConfig() can be used to read back the custom settings you added with addToConfig().
-     * This is called by WLED when settings are loaded (currently this only happens immediately after boot, or after saving on the Usermod Settings page)
-     * 
-     * readFromConfig() is called BEFORE setup(). This means you can use your persistent values in setup() (e.g. pin assignments, buffer sizes),
-     * but also that if you want to write persistent values to a dynamic buffer, you'd need to allocate it here instead of in setup.
-     * If you don't know what that is, don't fret. It most likely doesn't affect your use case :)
-     * 
-     * Return true in case the config values returned from Usermod Settings were complete, or false if you'd like WLED to save your defaults to disk (so any missing values are editable in Usermod Settings)
-     * 
-     * getJsonValue() returns false if the value is missing, or copies the value into the variable provided and returns true if the value is present
-     * The configComplete variable is true only if the "exampleUsermod" object and all values are present.  If any values are missing, WLED will know to call addToConfig() to save them
-     * 
-     * This function is guaranteed to be called on boot, but could also be called every time settings are updated
-     */
-    bool readFromConfig(JsonObject& root)
-    {
-      // looking for JSON object: 
-      /*
-      {
-        "BatteryLevel": {
-          "pin": "A0",              <--- only when using esp32 boards
-          "minBatteryVoltage": 2.6, 
-          "maxBatteryVoltage": 4.2,
-          "read-interval-ms": 30000  
-        }
-      }
-      */
-      #ifdef ARDUINO_ARCH_ESP32
-        int8_t newBatteryPin = batteryPin;
-      #endif
-
-      JsonObject battery = root[FPSTR(_name)];
-      if (battery.isNull()) 
-      {
-        DEBUG_PRINT(FPSTR(_name));
-        DEBUG_PRINTLN(F(": No config found. (Using defaults.)"));
-        return false;
-      }
-
-      #ifdef ARDUINO_ARCH_ESP32
-        newBatteryPin     = battery["pin"] | newBatteryPin;
-      #endif
-      minBatteryVoltage   = battery["minBatteryVoltage"] | minBatteryVoltage;
-      //minBatteryVoltage = min(12.0f, (int)readingInterval);
-      maxBatteryVoltage   = battery["maxBatteryVoltage"] | maxBatteryVoltage;
-      //maxBatteryVoltage = min(14.4f, max(3.3f,(int)readingInterval));
-      readingInterval     = battery["read-interval-ms"] | readingInterval;
-      readingInterval     = max(3000, (int)readingInterval); // minimum repetition is >5000ms (5s)
-
-      DEBUG_PRINT(FPSTR(_name));
-
-      #ifdef ARDUINO_ARCH_ESP32
-        if (!initDone) 
-        {
-          // first run: reading from cfg.json
-          newBatteryPin = batteryPin;
-          DEBUG_PRINTLN(F(" config loaded."));
-        } 
-        else 
-        {
-          DEBUG_PRINTLN(F(" config (re)loaded."));
-
-          // changing paramters from settings page
-          if (newBatteryPin != batteryPin) 
-          {
-            // deallocate pin
-            pinManager.deallocatePin(batteryPin);
-            batteryPin = newBatteryPin;
-            // initialise
-            setup();
-          }
-        }
-      #endif
-
-      return !battery[FPSTR(_readInterval)].isNull();
-    }
-
-   
-    /*
-     * getId() allows you to optionally give your V2 usermod an unique ID (please define it in const.h!).
-     * This could be used in the future for the system to determine whether your usermod is installed.
-     */
-    uint16_t getId()
-    {
-      return USERMOD_ID_BATTERY_STATUS_BASIC;
-    }
-};
-
-// strings to reduce flash memory usage (used more than twice)
-const char UsermodBatteryBasic::_name[]         PROGMEM = "Battery-level";
-const char UsermodBatteryBasic::_readInterval[] PROGMEM = "read-interval-ms";
--- a/usermods/blynk_relay_control/README.md
+++ b/usermods/blynk_relay_control/README.md
@@ -1,11 +1,11 @@
 # Blynk controllable relay
-This usermod allows controlling a relay state from the user variables. It also allows the user variables to be set over Blynk.
+Enables controlling a relay state via user variables. Allows the user variables to be set via Blynk.

-Optionally, the servo can have a reset timer to go back to it's default state after an interval. This interval is set through userVar1.
+Optionally, the servo can have a reset timer to return to its default state after a user definable interval. The interval is set via userVar1.

 ## Instalation

-Replace the WLED06_usermod.ino file in Aircoookies WLED folder with the one here.
+Replace the WLED06_usermod.ino file in Aircoookies WLED folder, with the one here.

 ## Customizations

@@ -16,13 +16,13 @@ Update the following parameters in WLED06_usermod.ino to configure the mod's beh
 #define RELAY_PIN 5
 //Which pin state should the relay default to
 #define RELAY_PIN_DEFAULT LOW
-//If >0 The controller returns to RELAY_PIN_DEFAULT after this time in milliseconds
+//If >0 The controller returns to RELAY_PIN_DEFAULT after this time, in milliseconds
 #define RELAY_PIN_TIMER_DEFAULT 3000

 //Blynk virtual pin for controlling relay
 #define BLYNK_USER_VAR0_PIN V9
 //Blynk virtual pin for controlling relay timer
 #define BLYNK_USER_VAR1_PIN V10
-//Number of milliseconds between updating blynk
+//Number of milliseconds between Blynk updates
 #define BLYNK_RELAY_UPDATE_INTERVAL 5000
 ```
--- a/usermods/boblight/boblight.h
+++ b/usermods/boblight/boblight.h
@@ -0,0 +1,461 @@
+#pragma once
+
+#include "wled.h"
+
+/*
+ * Usermod that implements BobLight "ambilight" protocol
+ * 
+ * See the accompanying README.md file for more info.
+ */
+
+#ifndef BOB_PORT
+  #define BOB_PORT 19333       // Default boblightd port
+#endif
+
+class BobLightUsermod : public Usermod {
+  typedef struct _LIGHT {
+    char lightname[5];
+    float hscan[2];
+    float vscan[2];
+  } light_t;
+
+  private:
+    unsigned long lastTime = 0;
+    bool enabled  = false;
+    bool initDone = false;
+
+    light_t *lights = nullptr;
+    uint16_t numLights = 0;  // 16 + 9 + 16 + 9
+    uint16_t top, bottom, left, right;  // will be filled in readFromConfig()
+    uint16_t pct;
+
+    WiFiClient bobClient;
+    WiFiServer *bob;
+    uint16_t   bobPort = BOB_PORT;
+
+    static const char _name[];
+    static const char _enabled[];
+
+    /*
+    # boblight
+    # Copyright (C) Bob  2009 
+    #
+    # makeboblight.sh created by Adam Boeglin <adamrb@gmail.com>
+    #
+    # boblight is free software: you can redistribute it and/or modify it
+    # under the terms of the GNU General Public License as published by the
+    # Free Software Foundation, either version 3 of the License, or
+    # (at your option) any later version.
+    # 
+    # boblight is distributed in the hope that it will be useful, but
+    # WITHOUT ANY WARRANTY; without even the implied warranty of
+    # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+    # See the GNU General Public License for more details.
+    # 
+    # You should have received a copy of the GNU General Public License along
+    # with this program.  If not, see <http://www.gnu.org/licenses/>.
+    */
+
+    // fills the lights[] array with position & depth of scan for each LED
+    void fillBobLights(int bottom, int left, int top, int right, float pct_scan) {
+
+      int lightcount = 0;
+      int total = top+left+right+bottom;
+      int bcount;
+
+      if (total > strip.getLengthTotal()) {
+        DEBUG_PRINTLN(F("BobLight: Too many lights."));
+        return;
+      }
+
+      // start left part of bottom strip (clockwise direction, 1st half)
+      if (bottom > 0) {
+        bcount = 1;
+        float brange = 100.0/bottom;
+        float bcurrent = 50.0;
+        if (bottom < top) {
+          int diff = top - bottom;
+          brange = 100.0/top;
+          bcurrent -= (diff/2)*brange;
+        }
+        while (bcount <= bottom/2) {
+          float btop = bcurrent - brange;
+          String name = "b"+String(bcount);
+          strncpy(lights[lightcount].lightname, name.c_str(), 4);
+          lights[lightcount].hscan[0] = btop;
+          lights[lightcount].hscan[1] = bcurrent;
+          lights[lightcount].vscan[0] = 100 - pct_scan;
+          lights[lightcount].vscan[1] = 100;
+          lightcount+=1;
+          bcurrent = btop;
+          bcount+=1;
+        }
+      }
+
+      // left side
+      if (left > 0) {
+        int lcount = 1;
+        float lrange = 100.0/left;
+        float lcurrent = 100.0;
+        while (lcount <= left) {
+          float ltop = lcurrent - lrange;
+          String name = "l"+String(lcount);
+          strncpy(lights[lightcount].lightname, name.c_str(), 4);
+          lights[lightcount].hscan[0] = 0;
+          lights[lightcount].hscan[1] = pct_scan;
+          lights[lightcount].vscan[0] = ltop;
+          lights[lightcount].vscan[1] = lcurrent;
+          lightcount+=1;
+          lcurrent = ltop;
+          lcount+=1;
+        }
+      }
+
+      // top side
+      if (top > 0) {
+        int tcount = 1;
+        float trange = 100.0/top;
+        float tcurrent = 0;
+        while (tcount <= top) {
+          float ttop = tcurrent + trange;
+          String name = "t"+String(tcount);
+          strncpy(lights[lightcount].lightname, name.c_str(), 4);
+          lights[lightcount].hscan[0] = tcurrent;
+          lights[lightcount].hscan[1] = ttop;
+          lights[lightcount].vscan[0] = 0;
+          lights[lightcount].vscan[1] = pct_scan;
+          lightcount+=1;
+          tcurrent = ttop;
+          tcount+=1;
+        }
+      }
+
+      // right side
+      if (right > 0) {
+        int rcount = 1;
+        float rrange = 100.0/right;
+        float rcurrent = 0;
+        while (rcount <= right) {
+          float rtop = rcurrent + rrange;
+          String name = "r"+String(rcount);
+          strncpy(lights[lightcount].lightname, name.c_str(), 4);
+          lights[lightcount].hscan[0] = 100-pct_scan;
+          lights[lightcount].hscan[1] = 100;
+          lights[lightcount].vscan[0] = rcurrent;
+          lights[lightcount].vscan[1] = rtop;
+          lightcount+=1;
+          rcurrent = rtop;
+          rcount+=1;
+        }
+      }
+      
+      // right side of bottom strip (2nd half)
+      if (bottom > 0) {
+        float brange = 100.0/bottom;
+        float bcurrent = 100;
+        if (bottom < top) {
+          brange = 100.0/top;
+        }
+        while (bcount <= bottom) {
+          float btop = bcurrent - brange;
+          String name = "b"+String(bcount);
+          strncpy(lights[lightcount].lightname, name.c_str(), 4);
+          lights[lightcount].hscan[0] = btop;
+          lights[lightcount].hscan[1] = bcurrent;
+          lights[lightcount].vscan[0] = 100 - pct_scan;
+          lights[lightcount].vscan[1] = 100;
+          lightcount+=1;
+          bcurrent = btop;
+          bcount+=1;
+        }
+      }
+
+      numLights = lightcount;
+
+      #if WLED_DEBUG
+      DEBUG_PRINTLN(F("Fill light data: "));
+      DEBUG_PRINTF(" lights %d\n", numLights);
+      for (int i=0; i<numLights; i++) {
+        DEBUG_PRINTF(" light %s scan %2.1f %2.1f %2.1f %2.1f\n", lights[i].lightname, lights[i].vscan[0], lights[i].vscan[1], lights[i].hscan[0], lights[i].hscan[1]);
+      }
+      #endif
+    }
+
+    void BobSync()  { yield(); } // allow other tasks, should also be used to force pixel redraw (not with WLED)
+    void BobClear() { for (size_t i=0; i<numLights; i++) setRealtimePixel(i, 0, 0, 0, 0); }
+    void pollBob();
+
+  public:
+
+    void setup() {
+      uint16_t totalLights = bottom + left + top + right;
+      if ( totalLights > strip.getLengthTotal() ) {
+        DEBUG_PRINTLN(F("BobLight: Too many lights."));
+        DEBUG_PRINTF("%d+%d+%d+%d>%d\n", bottom, left, top, right, strip.getLengthTotal());
+        totalLights = strip.getLengthTotal();
+        top = bottom = (uint16_t) roundf((float)totalLights * 16.0f / 50.0f);
+        left = right = (uint16_t) roundf((float)totalLights *  9.0f / 50.0f);
+      }
+      lights = new light_t[totalLights];
+      if (lights) fillBobLights(bottom, left, top, right, float(pct)); // will fill numLights
+      else        enable(false);
+      initDone = true;
+    }
+
+    void connected() {
+      // we can only start server when WiFi is connected
+      if (!bob) bob = new WiFiServer(bobPort, 1);
+      bob->begin();
+      bob->setNoDelay(true);
+    }
+
+    void loop() {
+      if (!enabled || strip.isUpdating()) return;
+      if (millis() - lastTime > 10) {
+        lastTime = millis();
+        pollBob();
+      }
+    }
+
+    void enable(bool en) { enabled = en; }
+    
+#ifndef WLED_DISABLE_MQTT
+    /**
+     * handling of MQTT message
+     * topic only contains stripped topic (part after /wled/MAC)
+     * topic should look like: /swipe with amessage of [up|down]
+     */
+    bool onMqttMessage(char* topic, char* payload) {
+      //if (strlen(topic) == 6 && strncmp_P(topic, PSTR("/subtopic"), 6) == 0) {
+      //  String action = payload;
+      //  if (action == "on") {
+      //    enable(true);
+      //    return true;
+      //  } else if (action == "off") {
+      //    enable(false);
+      //    return true;
+      //  }
+      //}
+      return false;
+    }
+
+    /**
+     * subscribe to MQTT topic for controlling usermod
+     */
+    void onMqttConnect(bool sessionPresent) {
+      //char subuf[64];
+      //if (mqttDeviceTopic[0] != 0) {
+      //  strcpy(subuf, mqttDeviceTopic);
+      //  strcat_P(subuf, PSTR("/subtopic"));
+      //  mqtt->subscribe(subuf, 0);
+      //}
+    }
+#endif
+
+    void addToJsonInfo(JsonObject& root)
+    {
+      JsonObject user = root["u"];
+      if (user.isNull()) user = root.createNestedObject("u");
+
+      JsonArray infoArr = user.createNestedArray(FPSTR(_name));
+      String uiDomString = F("<button class=\"btn btn-xs\" onclick=\"requestJson({");
+      uiDomString += FPSTR(_name);
+      uiDomString += F(":{");
+      uiDomString += FPSTR(_enabled);
+      uiDomString += enabled ? F(":false}});\">") : F(":true}});\">");
+      uiDomString += F("<i class=\"icons ");
+      uiDomString += enabled ? "on" : "off";
+      uiDomString += F("\">&#xe08f;</i></button>");
+      infoArr.add(uiDomString);
+    }
+
+    /*
+     * addToJsonState() can be used to add custom entries to the /json/state part of the JSON API (state object).
+     * Values in the state object may be modified by connected clients
+     */
+    void addToJsonState(JsonObject& root)
+    {
+    }
+
+    /*
+     * readFromJsonState() can be used to receive data clients send to the /json/state part of the JSON API (state object).
+     * Values in the state object may be modified by connected clients
+     */
+    void readFromJsonState(JsonObject& root) {
+      if (!initDone) return;  // prevent crash on boot applyPreset()
+      bool en = enabled;
+      JsonObject um = root[FPSTR(_name)];
+      if (!um.isNull()) {
+        if (um[FPSTR(_enabled)].is<bool>()) {
+          en = um[FPSTR(_enabled)].as<bool>();
+        } else {
+          String str = um[FPSTR(_enabled)]; // checkbox -> off or on
+          en = (bool)(str!="off"); // off is guaranteed to be present
+        }
+        if (en != enabled && lights) {
+          enable(en);
+          if (!enabled && bob && bob->hasClient()) {
+            if (bobClient) bobClient.stop();
+            bobClient = bob->available();
+            BobClear();
+            exitRealtime();
+          }
+        }
+      }
+    }
+
+    void appendConfigData() {
+      oappend(SET_F("addHB('BobLight');"));
+
+      //oappend(SET_F("dd=addDropdown('usermod','selectfield');"));
+      //oappend(SET_F("addOption(dd,'1st value',0);"));
+      //oappend(SET_F("addOption(dd,'2nd value',1);"));
+      oappend(SET_F("addInfo('BobLight:top',1,'LEDs');"));                // 0 is field type, 1 is actual field
+      oappend(SET_F("addInfo('BobLight:bottom',1,'LEDs');"));             // 0 is field type, 1 is actual field
+      oappend(SET_F("addInfo('BobLight:left',1,'LEDs');"));               // 0 is field type, 1 is actual field
+      oappend(SET_F("addInfo('BobLight:right',1,'LEDs');"));              // 0 is field type, 1 is actual field
+      oappend(SET_F("addInfo('BobLight:pct',1,'Depth of scan [%]');"));   // 0 is field type, 1 is actual field
+    }
+
+    void addToConfig(JsonObject& root) {
+      JsonObject umData = root.createNestedObject(FPSTR(_name));
+      umData[FPSTR(_enabled)] = enabled;
+      umData[F("port")]       = bobPort;
+      umData[F("top")]        = top;
+      umData[F("bottom")]     = bottom;
+      umData[F("left")]       = left;
+      umData[F("right")]      = right;
+      umData[F("pct")]        = pct;
+    }
+
+    bool readFromConfig(JsonObject& root) {
+      JsonObject umData = root[FPSTR(_name)];
+      bool configComplete = !umData.isNull();
+
+      bool en = enabled;
+      configComplete &= getJsonValue(umData[FPSTR(_enabled)], en);
+      enable(en);
+
+      configComplete &= getJsonValue(umData[F("port")],   bobPort);
+      configComplete &= getJsonValue(umData[F("bottom")], bottom,    16);
+      configComplete &= getJsonValue(umData[F("top")],    top,       16);
+      configComplete &= getJsonValue(umData[F("left")],   left,       9);
+      configComplete &= getJsonValue(umData[F("right")],  right,      9);
+      configComplete &= getJsonValue(umData[F("pct")],    pct,        5); // Depth of scan [%]
+      pct = MIN(50,MAX(1,pct));
+
+      uint16_t totalLights = bottom + left + top + right;
+      if (initDone && numLights != totalLights) {
+        if (lights) delete[] lights;
+        setup();
+      }
+      return configComplete;
+    }
+
+    /*
+     * handleOverlayDraw() is called just before every show() (LED strip update frame) after effects have set the colors.
+     * Use this to blank out some LEDs or set them to a different color regardless of the set effect mode.
+     * Commonly used for custom clocks (Cronixie, 7 segment)
+     */
+    void handleOverlayDraw() {
+      //strip.setPixelColor(0, RGBW32(0,0,0,0)) // set the first pixel to black
+    }
+
+    uint16_t getId() { return USERMOD_ID_BOBLIGHT; }
+
+};
+
+// strings to reduce flash memory usage (used more than twice)
+const char BobLightUsermod::_name[]    PROGMEM = "BobLight";
+const char BobLightUsermod::_enabled[] PROGMEM = "enabled";
+
+// main boblight handling (definition here prevents inlining)
+void BobLightUsermod::pollBob() {
+  
+  //check if there are any new clients
+  if (bob && bob->hasClient()) {
+    //find free/disconnected spot
+    if (!bobClient || !bobClient.connected()) {
+      if (bobClient) bobClient.stop();
+      bobClient = bob->available();
+      DEBUG_PRINTLN(F("Boblight: Client connected."));
+    }
+    //no free/disconnected spot so reject
+    WiFiClient bobClientTmp = bob->available();
+    bobClientTmp.stop();
+    BobClear();
+    exitRealtime();
+  }
+  
+  //check clients for data
+  if (bobClient && bobClient.connected()) {
+    realtimeLock(realtimeTimeoutMs); // lock strip as we have a client connected
+
+    //get data from the client
+    while (bobClient.available()) {
+      String input = bobClient.readStringUntil('\n');
+      // DEBUG_PRINT("Client: "); DEBUG_PRINTLN(input); // may be to stressful on Serial
+      if (input.startsWith(F("hello"))) {
+        DEBUG_PRINTLN(F("hello"));
+        bobClient.print(F("hello\n"));
+      } else if (input.startsWith(F("ping"))) {
+        DEBUG_PRINTLN(F("ping 1"));
+        bobClient.print(F("ping 1\n"));
+      } else if (input.startsWith(F("get version"))) {
+        DEBUG_PRINTLN(F("version 5"));
+        bobClient.print(F("version 5\n"));
+      } else if (input.startsWith(F("get lights"))) {
+        char tmp[64];
+        String answer = "";
+        sprintf_P(tmp, PSTR("lights %d\n"), numLights);
+        DEBUG_PRINT(tmp);
+        answer.concat(tmp);
+        for (int i=0; i<numLights; i++) {
+          sprintf_P(tmp, PSTR("light %s scan %2.1f %2.1f %2.1f %2.1f\n"), lights[i].lightname, lights[i].vscan[0], lights[i].vscan[1], lights[i].hscan[0], lights[i].hscan[1]);
+          DEBUG_PRINT(tmp);
+          answer.concat(tmp);
+        }
+        bobClient.print(answer);
+      } else if (input.startsWith(F("set priority"))) {
+        DEBUG_PRINTLN(F("set priority not implemented"));
+        // not implemented
+      } else if (input.startsWith(F("set light "))) { // <id> <cmd in rgb, speed, interpolation> <value> ...
+        input.remove(0,10);
+        String tmp = input.substring(0,input.indexOf(' '));
+        
+        int light_id = -1;
+        for (uint16_t i=0; i<numLights; i++) {
+          if (strncmp(lights[i].lightname, tmp.c_str(), 4) == 0) {
+            light_id = i;
+            break;
+          }
+        }
+        if (light_id == -1) return;
+
+        input.remove(0,input.indexOf(' ')+1);
+        if (input.startsWith(F("rgb "))) {
+          input.remove(0,4);
+          tmp = input.substring(0,input.indexOf(' '));
+          uint8_t red = (uint8_t)(255.0f*tmp.toFloat());
+          input.remove(0,input.indexOf(' ')+1);        // remove first float value
+          tmp = input.substring(0,input.indexOf(' '));
+          uint8_t green = (uint8_t)(255.0f*tmp.toFloat());
+          input.remove(0,input.indexOf(' ')+1);        // remove second float value
+          tmp = input.substring(0,input.indexOf(' '));
+          uint8_t blue = (uint8_t)(255.0f*tmp.toFloat());
+
+          //strip.setPixelColor(light_id, RGBW32(red, green, blue, 0));
+          setRealtimePixel(light_id, red, green, blue, 0);
+        } // currently no support for interpolation or speed, we just ignore this
+      } else if (input.startsWith(F("sync"))) {
+        BobSync();
+      } else {
+        // Client sent gibberish
+        DEBUG_PRINTLN(F("Client sent gibberish."));
+        bobClient.stop();
+        bobClient = bob->available();
+        BobClear();
+      }
+    }
+  }
+}
--- a/usermods/boblight/readme.md
+++ b/usermods/boblight/readme.md
@@ -0,0 +1,37 @@
+# BobLight usermod
+
+This usermod allows displaying BobLight ambilight protocol on WLED device with a limited command set (not a full implementation).
+BobLight protocol uses a TCP connection which guarantees packet delivery at the possible expense of latency delays. It is not very efficient (as it uses plaintext comands) so is not suited for large number of LEDs.
+
+This implementation is intended for TV backlight in combination with XBMC/Kodi BobLight add-on.
+
+The LEDs can be configured in usermod settings page. The configuration is simple: you enter the number of LED pixels on each side of your TV (top, right, bottom, left).
+The LEDs should be wired in a clockwise orientation starting in the middle of bottom side (left half of bottom leds is where the string should start).
+
+```
+-------->-------+
+|                |
+^                v
+|                |
+---<--+  ---<---+
+       ^
+     start
+```
+
+## Installation 
+
+Add `-D USERMOD_BOBLIGHT` to your PlatformIO environment.
+If you are not using PlatformIO (which you should) try adding `#define USERMOD_BOBLIGHT` to *my_config.h*.
+
+## Configuration
+
+All parameters are runtime configurable though changing port may require reboot.
+
+If you want to define default port during compile time use the following (default values in parentheses):
+
+- `BOB_PORT=x` : defines default TCP port for usermod to listen on (19333)
+
+
+## Release notes
+
+2022-11 Initial implementation by @blazoncek (AKA Blaz Kristan)
--- a/usermods/customeffects/arti.h
+++ b/usermods/customeffects/arti.h
@@ -3,6 +3,7 @@
   @file    arti.h
   @date    20220818
   @author  Ewoud Wijma
+   @Copyright (c) 2023 Ewoud Wijma
   @repo    https://github.com/ewoudwijma/ARTI
   @remarks
          - #define ARDUINOJSON_DEFAULT_NESTING_LIMIT 100 //set this in ArduinoJson!!!, currently not necessary...
@@ -2506,9 +2507,9 @@ public:
    JsonObject::iterator objectIterator = definitionJson.begin();
    JsonObject metaData = objectIterator->value();
    const char * version = metaData["version"];
-    if (strcmp(version, "v032") != 0) 
+    if (strcmp(version, "v033") != 0) 
    {
-      ERROR_ARTI("Version of definition.json file (%s) should be v032.\nPress Download wled json\n", version);
+      ERROR_ARTI("Version of definition.json file (%s) should be v033.\nPress Download wled json\n", version);
      return false;
    }
    const char * startNode = metaData["start"];
--- a/usermods/customeffects/arti_wled.h
+++ b/usermods/customeffects/arti_wled.h
@@ -1,8 +1,9 @@
 /*
   @title   Arduino Real Time Interpreter (ARTI)
-   @file    arti_wled_plugin.h
+   @file    arti_wled.h
   @date    20220818
   @author  Ewoud Wijma
+   @Copyright (c) 2023 Ewoud Wijma
   @repo    https://github.com/ewoudwijma/ARTI
 */

@@ -55,7 +56,8 @@ enum Externals
  F_custom1Slider,
  F_custom2Slider,
  F_custom3Slider,
-  F_sampleAvg,
+  F_volume,
+  F_fftResult,

  F_shift,
  F_circle2D,
@@ -146,6 +148,18 @@ float ARTI::arti_external_function(uint8_t function, float par1, float par2, flo
      case F_segcolor:
        return SEGCOLOR((uint8_t)par1);

+      case F_fftResult:
+      {
+        um_data_t *um_data;
+        if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
+          // add support for no audio
+          um_data = simulateSound(SEGMENT.soundSim);
+        }
+        uint8_t *fftResult = (uint8_t*)um_data->u_data[2];
+
+        return fftResult[(uint8_t)par1%16];
+      }
+
      case F_shift: {
        uint32_t saveFirstPixel = SEGMENT.getPixelColor(0);
        for (uint16_t i=0; i<SEGLEN-1; i++)
@@ -156,13 +170,13 @@ float ARTI::arti_external_function(uint8_t function, float par1, float par2, flo
        return floatNull;
      }
      case F_circle2D: {
-        uint16_t circleLength = min(strip.matrixWidth, strip.matrixHeight);
+        uint16_t circleLength = min(Segment::maxWidth, Segment::maxHeight);
        uint16_t deltaWidth=0, deltaHeight=0;

-        if (circleLength < strip.matrixHeight) //portrait
-          deltaHeight = (strip.matrixHeight - circleLength) / 2;
-        if (circleLength < strip.matrixWidth) //portrait
-          deltaWidth = (strip.matrixWidth - circleLength) / 2;
+        if (circleLength < Segment::maxHeight) //portrait
+          deltaHeight = (Segment::maxHeight - circleLength) / 2;
+        if (circleLength < Segment::maxWidth) //portrait
+          deltaWidth = (Segment::maxWidth - circleLength) / 2;

        float halfLength = (circleLength-1)/2.0;

@@ -175,10 +189,12 @@ float ARTI::arti_external_function(uint8_t function, float par1, float par2, flo
        SEGMENT.drawLine(par1, par2, par3, par4, par5);
        return floatNull;
      case F_drawArc:
-        if (par5 == floatNull)
-          SEGMENT.drawArc(par1, par2, par3, par4);
-        else
-          SEGMENT.drawArc(par1, par2, par3, par4, par5); //fillColor
+        #ifndef WLED_DISABLE_2D
+          if (par5 == floatNull)
+            SEGMENT.drawArc(par1, par2, par3, par4);
+          else
+            SEGMENT.drawArc(par1, par2, par3, par4, par5); //fillColor
+        #endif
        return floatNull;
      case F_constrain:
        return constrain(par1, par2, par3);
@@ -231,6 +247,9 @@ float ARTI::arti_external_function(uint8_t function, float par1, float par2, flo
      case F_segcolor:
        return par1;

+      case F_fftResult:
+        return par1;
+
      case F_shift:
        PRINT_ARTI("%s(%f)\n", "shift", par1);
        return floatNull;
@@ -350,14 +369,14 @@ float ARTI::arti_get_external_variable(uint8_t variable, float par1, float par2,
        return SEGMENT.custom2;
      case F_custom3Slider:
        return SEGMENT.custom3;
-      case F_sampleAvg:
+      case F_volume:
      {
        um_data_t *um_data;
        if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
          // add support for no audio
          um_data = simulateSound(SEGMENT.soundSim);
        }
-        float   volumeSmth  = *(float*)   um_data->u_data[0]; //ewowi: use instead of sampleAvg???
+        float   volumeSmth  = *(float*)   um_data->u_data[0];

        return volumeSmth;
      }
@@ -400,8 +419,8 @@ float ARTI::arti_get_external_variable(uint8_t variable, float par1, float par2,
        return F_custom2Slider;
      case F_custom3Slider:
        return F_custom3Slider;
-      case F_sampleAvg:
-        return F_sampleAvg;
+      case F_volume:
+        return F_volume;

      case F_hour:
        return F_hour;
@@ -507,9 +526,12 @@ bool ARTI::loop()

      for (int i = 0; i< arti_get_external_variable(F_ledCount); i++)
      {
-        ar->set(function_symbol->function_scope->symbols[0]->scope_index, i%strip.matrixWidth); // set x
-        if (function_symbol->function_scope->nrOfFormals == 2) // 2D
-          ar->set(function_symbol->function_scope->symbols[1]->scope_index, i/strip.matrixWidth); // set y
+        if (function_symbol->function_scope->nrOfFormals == 2) {// 2D
+          ar->set(function_symbol->function_scope->symbols[0]->scope_index, i%Segment::maxWidth); // set x
+          ar->set(function_symbol->function_scope->symbols[1]->scope_index, i/Segment::maxWidth); // set y
+        }
+        else
+          ar->set(function_symbol->function_scope->symbols[0]->scope_index, i); // set x

        this->callStack->push(ar);

--- a/usermods/customeffects/customeffects.js
+++ b/usermods/customeffects/customeffects.js
@@ -9,7 +9,7 @@ function toggleCEEditor(name, segID) {
    d.getElementById('ceEditor').style.transform = (isCEEditor) ? "translateY(0px)":"translateY(100%)";
 }

-function fetchAndExecute(url, name, callback)
+function fetchAndExecute(url, name, callback, callError)
 {
  fetch
  (url+name, {
@@ -17,8 +17,8 @@ function fetchAndExecute(url, name, callback)
  })
  .then(res => {
    if (!res.ok) {
-       showToast("File " + name + " not found", true);
-       return "";
+		callError("File " + name + " not found");
+    	return "";
    }
    return res.text();
  })
@@ -26,10 +26,7 @@ function fetchAndExecute(url, name, callback)
    callback(text);
  })
  .catch(function (error) {
-    showToast("Error getting " + name, true);
-    // showToast(error, true);
-    // console.log(error);
-    presetError(false);
+    callError("Error getting " + name);
  })
  .finally(() => {
    // if (callback) setTimeout(callback,99);
@@ -53,6 +50,9 @@ function loadLogFile(name, attempt) {
      }
      else
        ceLogArea.value = logtext;
+    }, function(error){
+      showToast(error);
+      console.log(error);
    });
 }

@@ -98,15 +98,17 @@ function populateCEEditor(name, segID)
            <textarea class="ceTextarea" id="ceProgramArea">${text}</textarea><br>
            <button class="btn infobtn" onclick="toggleCEEditor()">Close</button>
            <button class="btn infobtn" onclick="saveCE('${name}.wled', ${segID})">Save and Run</button><br>
-            <button class="btn infobtn" onclick="downloadCEFile('${name}.wled')">Download ${name}.wled</button>
+            <button class="btn infobtn" onclick="downloadCEFile('CE','${name}.wled')">Download ${name}.wled</button>
            <button class="btn infobtn" onclick="loadCETemplate('${name}')">Load template</button><br>
-            <button class="btn infobtn" onclick="downloadCEFile('wledv032.json')">Download wled json</button>
-            <button class="btn infobtn" onclick="downloadCEFile('presets.json')">Download presets.json</button><br>
-            <a href="https://github.com/MoonModules/WLED-Effects/tree/master/CustomEffects/wled" target="_blank">Custom Effects Library</a><br>
-            <a href="https://github.com/atuline/WLED/wiki/WLED-Custom-effects" target="_blank">Custom Effects Help</a><br>
+            <button class="btn infobtn" onclick="downloadCEFile('CE','wledv033.json')">Download wled json</button>
+            <button class="btn infobtn" onclick="downloadCEFile('CE','presets.json')">Download presets.json</button><br>
+            <button class="btn infobtn" onclick="location.href='https://github.com/MoonModules/WLED-Effects/tree/master/CustomEffects/wled'" type="button">Custom Effects Library</button>
+            <button class="btn infobtn btn-xs" onclick="location.href='https://mm.kno.wled.ge/moonmodules/custom-effects'" type="button">?</button><br>
            <br><i>Compile and Run Log</i><br>
            <textarea class="ceTextarea" id="ceLogArea"></textarea><br>
-            <i>Run log > 3 seconds is send to Serial Ouput.</i>`;
+            <i>Run log > 3 seconds is send to Serial Ouput.</i><br>
+            <a href="#" onclick="downloadCEFile('HBB','presets.json');return false;" title="Download HBaas Base presets">🥚</a>
+            <a href="#" onclick="downloadCEFile('HBE','presets.json');return false;" title="Download HBaas Effects presets">🥚</a>`;

    d.getElementById('kceEditor').innerHTML = cn;

@@ -114,14 +116,19 @@ function populateCEEditor(name, segID)
    ceLogArea.value = ".";
    loadLogFile(name + ".wled.log", 1);

+  }, function(error){
+    showToast(error);
+    console.log(error);
  });
 }

-function downloadCEFile(name) {
-    var url = "https://raw.githubusercontent.com/MoonModules/WLED-Effects/master/CustomEffects/wled/";
+function downloadCEFile(url, name) {
+    if (url == "CE") url = "https://raw.githubusercontent.com/MoonModules/WLED-Effects/master/CustomEffects/wled/";
+    if (url == "HBB") url = "https://raw.githubusercontent.com/MoonModules/WLED-Effects/master/Presets/HB_PresetPack210808_32x32_16seg/Base%20pack/";
+    if (url == "HBE") url = "https://raw.githubusercontent.com/MoonModules/WLED-Effects/master/Presets/HB_PresetPack210808_32x32_16seg/Effects%20pack/";

    fetchAndExecute(url, name, function(text) {
-        if (name == "wledv032.json" || name == "presets.json") {
+        if (name == "wledv033.json" || name == "presets.json") {
            if (!confirm('Are you sure to download/overwrite ' + name + '?'))
              return;
            uploadFileWithText("/" + name, text);
@@ -131,13 +138,16 @@ function downloadCEFile(name) {
          var ceProgramArea = d.getElementById("ceProgramArea");
          ceProgramArea.value = text;
        }
+    }, function(error){
+      showToast(error);
+      console.log(error);
    });

    return;
  
    var request = new XMLHttpRequest();
    request.onload = function() {
-      if (name == "wledv032.json" || name == "presets.json") {
+      if (name == "wledv033.json" || name == "presets.json") {
          if (!confirm('Are you sure to download ' + name + '?'))
            return;
          uploadFileWithText("/" + name, request.response);
--- a/usermods/customeffects/usermod_v2_customeffects.h
+++ b/usermods/customeffects/usermod_v2_customeffects.h
@@ -1,3 +1,12 @@
+/*
+   @title   Usermod Custom Effects (CE)
+   @file    usermod_v2_customeffects.h
+   @date    20220818
+   @author  Ewoud Wijma
+   @Copyright (c) 2023 Ewoud Wijma
+   @repo    https://github.com/ewoudwijma/ARTI
+ */
+
 #pragma once

 #include "wled.h"
@@ -14,8 +23,10 @@ uint16_t mode_customEffect(void) {
  static bool notEnoughHeap;

  static char previousEffect[charLength];
-  if (SEGENV.call == 0)
+  if (SEGENV.call == 0) {
    strcpy(previousEffect, ""); //force init
+    SEGMENT.fill(BLACK); //in case not all leds used e.g. when using expand 1d Circle. Tbd: fill black should never be used to allow for blends/transitions
+  }

  char currentEffect[charLength];
  strcpy(currentEffect, (SEGMENT.name != nullptr)?SEGMENT.name:"default"); //note: switching preset with segment name to preset without does not clear the SEGMENT.name variable, but not gonna solve here ;-)
@@ -40,7 +51,7 @@ uint16_t mode_customEffect(void) {
    strcat(programFileName, currentEffect);
    strcat(programFileName, ".wled");

-    succesful = arti->setup("/wledv032.json", programFileName);
+    succesful = arti->setup("/wledv033.json", programFileName);

    if (!succesful)
      ERROR_ARTI("Setup not succesful\n");
@@ -88,7 +99,7 @@ uint16_t mode_customEffect(void) {
  return FRAMETIME;
 }

-static const char _data_FX_MODE_CUSTOMEFFECT[] PROGMEM = "⚙️ Custom Effect@Speed,Intensity,Custom 1, Custom 2, Custom 3;!;!;mp12=0,1d";
+static const char _data_FX_MODE_CUSTOMEFFECT[] PROGMEM = "⚙️ Custom Effect ☾@Speed,Intensity,Custom 1, Custom 2, Custom 3;!;!;1;mp12=0";

 class CustomEffectsUserMod : public Usermod {
  private:
@@ -122,12 +133,6 @@ class CustomEffectsUserMod : public Usermod {
     */
    void addToJsonInfo(JsonObject& root)
    {
-      JsonObject user = root["u"];
-      if (user.isNull()) user = root.createNestedObject("u");
-
-      JsonArray infoArr = user.createNestedArray(FPSTR(_name));
-      infoArr.add(errorMessage); //value
-      // infoArr.add(""); //unit
    }


--- a/usermods/mpu6050_imu/readme.md
+++ b/usermods/mpu6050_imu/readme.md
@@ -1,13 +1,13 @@
 # MPU-6050 Six-Axis (Gyro + Accelerometer) Driver

-This usermod-v2 modification allows the connection of a MPU-6050 IMU sensor to
-allow for effects that are controlled by the orientation or motion of the WLED Device.
+v2 of this usermod enables connection of a MPU-6050 IMU sensor to
+work with effects controlled by the orientation or motion of the WLED Device.

-The MPU6050 has a built in "Digital Motion Processor" which does a lot of the heavy
-lifting in integrating the gyro and accel measurements to get potentially more
+The MPU6050 has a built in "Digital Motion Processor" which does the "heavy lifting"
+integrating the gyro and accelerometer measurements to get potentially more
 useful gravity vector and orientation output.

-It is pretty straightforward to comment out some of the variables being read off the device if they're not needed to save CPU/Mem/Bandwidth.
+It is fairly straightforward to comment out variables being read from the device if they're not needed. Saves CPU/Memory/Bandwidth.

 _Story:_

--- a/usermods/mpu6050_imu/usermod_mpu6050_imu.h
+++ b/usermods/mpu6050_imu/usermod_mpu6050_imu.h
@@ -1,11 +1,16 @@
 #pragma once

+#include <Arduino.h>   // WLEDMM: make sure that I2C drivers have the "right" Wire Object
+#include <Wire.h>
+
 #include "wled.h"

+  // #define MPU6050_INT_GPIO 13  // WLEDMM - better choice on ESP32
+
 #ifdef WLED_DEBUG
-  #define DEBUG_PRINT_IMU(x) Serial.print(x)
-  #define DEBUG_PRINT_IMULN(x) Serial.println(x)
-  #define DEBUG_PRINT_IMUF(x...) Serial.printf(x)
+  #define DEBUG_PRINT_IMU(x) DEBUG_PRINT(x)
+  #define DEBUG_PRINT_IMULN(x) DEBUG_PRINTLN(x)
+  #define DEBUG_PRINT_IMUF(x...) DEBUG_PRINTF(x)
 #else
  #define DEBUG_PRINT_IMU(x)
  #define DEBUG_PRINT_IMULN(x)
@@ -42,14 +47,37 @@
  5. Wire up the MPU6050 as detailed above.
 */

-#include "I2Cdev.h"
+// WLEDMM: make sure that the "standard" Wire object is used
+#define I2CDEV_IMPLEMENTATION       I2CDEV_ARDUINO_WIRE

-#include "MPU6050_6Axis_MotionApps20.h"
+// WLEDMM avoid stupid warnings
+#undef DEBUG_PRINT
+#undef DEBUG_PRINTLN
+#undef DEBUG_PRINTF
+
+#include <I2Cdev.h>
+
+#include <MPU6050_6Axis_MotionApps20.h>
+
+// WLEDMM - need to re-define WLED DEBUG_PRINT maros, because the were overwritten by MPU6050_6Axis_MotionApps20.h
+#undef DEBUG_PRINT
+#undef DEBUG_PRINTLN
+#undef DEBUG_PRINTF
+
+#ifdef WLED_DEBUG
+  #define DEBUG_PRINT(x) DEBUGOUT.print(x)
+  #define DEBUG_PRINTLN(x) DEBUGOUT.println(x)
+  #define DEBUG_PRINTF(x...) DEBUGOUT.printf(x)
+#else
+  #define DEBUG_PRINT(x)
+  #define DEBUG_PRINTLN(x)
+  #define DEBUG_PRINTF(x...)
+#endif

 // Arduino Wire library is required if I2Cdev I2CDEV_ARDUINO_WIRE implementation
 // is used in I2Cdev.h
 #if I2CDEV_IMPLEMENTATION == I2CDEV_ARDUINO_WIRE
-    #include "Wire.h"
+    //#include "Wire.h"        // WLEDMM not necessary
 #endif

 // ================================================================
@@ -84,19 +112,45 @@ class MPU6050Driver : public Usermod {
    VectorInt16 aaReal;     // [x, y, z]            gravity-free accel sensor measurements
    VectorInt16 aaWorld;    // [x, y, z]            world-frame accel sensor measurements
    VectorFloat gravity;    // [x, y, z]            gravity vector
-    float euler[3];         // [psi, theta, phi]    Euler angle container
-    float ypr[3];           // [yaw, pitch, roll]   yaw/pitch/roll container and gravity vector
+    float euler[3] = {0.0f};// [psi, theta, phi]    Euler angle container
+    float ypr[3]  = {0.0f}; // [yaw, pitch, roll]   yaw/pitch/roll container and gravity vector

-    static const int INTERRUPT_PIN = 15; // use pin 15 on ESP8266
+    #if !defined(ARDUINO_ARCH_ESP32) || !defined(MPU6050_INT_GPIO)
+    static const int INTERRUPT_PIN = -1; // WLEDMM: not use pin 15 (on ESP8266) as can and will cause conflict with other pins
+    #else
+    static const int INTERRUPT_PIN = MPU6050_INT_GPIO;       // WLEDMM
+    #endif

    void setup() {
-      DEBUG_PRINT_IMULN("mpu setup");
+    // WLEDMM begin
+      USER_PRINTLN(F("mpu setup"));
      PinManagerPinType pins[2] = { { i2c_scl, true }, { i2c_sda, true } };
-      if (!pinManager.allocateMultiplePins(pins, 2, PinOwner::HW_I2C)) { enabled = false; return; }
+      if ((i2c_scl < 0) || (i2c_sda < 0)) {
+        //enabled = false;
+        USER_PRINTF("mpu6050: warning - ivalid I2C pins: sda=%d scl=%d\n", i2c_sda, i2c_scl);
+        //return;
+      }
+
+      if (pins[1].pin < 0 || pins[0].pin < 0)  { enabled=false; dmpReady = false; return; }  //WLEDMM bugfix - ensure that "final" GPIO are valid and no "-1" sneaks trough
+      //if (!pinManager.allocateMultiplePins(pins, 2, PinOwner::HW_I2C)) {       
+
+      // WLEDMM join I2C HW wire
+      if (!pinManager.joinWire()) {
+        enabled = false;
+        dmpReady = false;
+        USER_PRINTF("mpu6050: failed to allocate I2C sda=%d scl=%d\n", i2c_sda, i2c_scl);
+        return;
+      }
+      // WLEDMM end

      // join I2C bus (I2Cdev library doesn't do this automatically)
      #if I2CDEV_IMPLEMENTATION == I2CDEV_ARDUINO_WIRE
-          Wire.begin();
+#if defined(ARDUINO_ARCH_ESP32)
+      //Wire.begin(pins[1].pin, pins[0].pin);        // WLEDMM fix - need to use proper pins, in case that Wire was not started yet. Call will silently fail if Wire is initialized already.
+#else
+      //Wire.begin();  // WLEDMM - i2c pins on 8266 are fixed.
+#endif
+
          Wire.setClock(400000); // 400kHz I2C clock. Comment this line if having compilation difficulties
      #elif I2CDEV_IMPLEMENTATION == I2CDEV_BUILTIN_FASTWIRE
          Fastwire::setup(400, true);
@@ -116,12 +170,21 @@ class MPU6050Driver : public Usermod {

      // initialize device
      DEBUG_PRINT_IMULN(F("Initializing I2C devices..."));
+      // WLEDMM begin
+      if (!pinManager.allocatePin(INTERRUPT_PIN, false, PinOwner::UM_Unspecified))
+      {
+        //enabled = false;
+        USER_PRINTF("mpu6050: warning - failed to allocate interrupt GPIO %d\n", INTERRUPT_PIN);
+        //return;
+      }
+      // WLEDMM end
+
      mpu.initialize();
      pinMode(INTERRUPT_PIN, INPUT);

      // verify connection
      DEBUG_PRINT_IMULN(F("Testing device connections..."));
-      DEBUG_PRINT_IMULN(mpu.testConnection() ? F("MPU6050 connection successful") : F("MPU6050 connection failed"));
+      USER_PRINTLN(mpu.testConnection() ? F("MPU6050 connection successful") : F("MPU6050 connection failed"));

      // // wait for ready
      // DEBUG_PRINT_IMULN(F("\nSend any character to begin DMP programming and demo: "));
@@ -165,13 +228,13 @@ class MPU6050Driver : public Usermod {
          // get expected DMP packet size for later comparison
          packetSize = mpu.dmpGetFIFOPacketSize();
      } else {
-          // ERROR!
-          // 1 = initial memory load failed
-          // 2 = DMP configuration updates failed
-          // (if it's going to break, usually the code will be 1)
-          DEBUG_PRINT_IMU(F("DMP Initialization failed (code "));
-          DEBUG_PRINT_IMU(devStatus);
-          DEBUG_PRINT_IMULN(F(")"));
+        // ERROR!
+        // 1 = initial memory load failed
+        // 2 = DMP configuration updates failed
+        // (if it's going to break, usually the code will be 1)
+        DEBUG_PRINT(F("DMP Initialization failed (code "));
+        DEBUG_PRINT(devStatus);
+        DEBUG_PRINTLN(")");
      }
    }

@@ -205,7 +268,7 @@ class MPU6050Driver : public Usermod {
      JsonObject user = root["u"];
      if (user.isNull()) user = root.createNestedObject("u");

-      StaticJsonDocument<600> doc; //measured 528
+      StaticJsonDocument<800> doc; //measured 528  // WLEDMM added some margin (was 600)

      JsonObject imu_meas = doc.createNestedObject("IMU");
      #ifdef WLED_DEBUG
@@ -243,12 +306,15 @@ class MPU6050Driver : public Usermod {
      orient_json.add(ypr[0] * 180/M_PI);
      orient_json.add(ypr[1] * 180/M_PI);
      orient_json.add(ypr[2] * 180/M_PI);
- 
-      char stringBuffer[300]; // measured 266
+      char stringBuffer[400]; // measured 266 // WLEDMM added some margin (was 300)
      serializeJson(imu_meas, stringBuffer);
      JsonArray mainObject = user.createNestedArray("IMU");
-      mainObject.add(stringBuffer);
-
+      if (!dmpReady || !enabled) {       // WLEDMM
+        if (!dmpReady) mainObject.add(F("Sensor Not Found"));
+        else if (!enabled) mainObject.add(F("usermod disabled"));
+      } else {
+        mainObject.add(stringBuffer);
+      }
      // Serial.printf("imu_meas %u (%u %u) stringBuffer %u\n", (unsigned int)imu_meas.memoryUsage(), (unsigned int)imu_meas.size(), (unsigned int)imu_meas.nesting(), strlen(stringBuffer));

    }
--- a/usermods/multi_relay/readme.md
+++ b/usermods/multi_relay/readme.md
@@ -1,37 +1,37 @@
 # Multi Relay

-This usermod-v2 modification allows the connection of multiple relays each with individual delay and on/off mode.
+This usermod-v2 modification allows the connection of multiple relays, each with individual delay and on/off mode.

 ## HTTP API
-All responses are returned as JSON. 
+All responses are returned in JSON format. 

 * Status Request: `http://[device-ip]/relays`
 * Switch Command: `http://[device-ip]/relays?switch=1,0,1,1`

-The number of numbers behind the switch parameter must correspond to the number of relays. The number 1 switches the relay on. The number 0 switches the relay off. 
+The number of values behind the switch parameter must correspond to the number of relays. The value 1 switches the relay on, 0 switches it off. 

 * Toggle Command: `http://[device-ip]/relays?toggle=1,0,1,1`

-The number of numbers behind the parameter switch must correspond to the number of relays. The number 1 causes a toggling of the relay. The number 0 leaves the state of the device.
+The number of values behind the parameter switch must correspond to the number of relays. The value 1 causes the relay to toggle, 0 leaves its state unchanged.

-Examples
+Examples:
 1. total of 4 relays, relay 2 will be toggled: `http://[device-ip]/relays?toggle=0,1,0,0`
 2. total of 3 relays, relay 1&3 will be switched on: `http://[device-ip]/relays?switch=1,0,1`

 ## JSON API
-You can switch relay state using the following JSON object transmitted to: `http://[device-ip]/json`
-
+You can toggle the relay state by sending the following JSON object to: `http://[device-ip]/json`

 Switch relay 0 on: `{"MultiRelay":{"relay":0,"on":true}}`

-Switch relay4 3 & 4 off: `{"MultiRelay":[{"relay":2,"on":false},{"relay":3,"on":false}]}`
+Switch relay 3 and 4 off: `{"MultiRelay":[{"relay":2,"on":false},{"relay":3,"on":false}]}`
+

 ## MQTT API

 * `wled`/_deviceMAC_/`relay`/`0`/`command` `on`|`off`|`toggle`
 * `wled`/_deviceMAC_/`relay`/`1`/`command` `on`|`off`|`toggle`

-When relay is switched it will publish a message:
+When a relay is switched, a message is published:

 * `wled`/_deviceMAC_/`relay`/`0` `on`|`off`

@@ -42,7 +42,7 @@ When relay is switched it will publish a message:
 or
 2. Use `#define USERMOD_MULTI_RELAY` in wled.h or `-D USERMOD_MULTI_RELAY` in your platformio.ini

-You can override the default maximum number (4) of relays by defining MULTI_RELAY_MAX_RELAYS.
+You can override the default maximum number of relays (which is 4) by defining MULTI_RELAY_MAX_RELAYS.

 Example **usermods_list.cpp**:

@@ -78,15 +78,15 @@ void registerUsermods()

 ## Configuration

-Usermod can be configured in Usermods settings page.
+Usermod can be configured via the Usermods settings page.

 * `enabled` - enable/disable usermod
-* `pin` - GPIO pin where relay is attached to ESP (can be configured at compile time `-D MULTI_RELAY_PINS=xx,xx,...`)
+* `pin` - ESP GPIO pin the relay is connected to (can be configured at compile time `-D MULTI_RELAY_PINS=xx,xx,...`)
 * `delay-s` - delay in seconds after on/off command is received
-* `active-high` - toggle high/low activation of relay (can be used to reverse relay states)
-* `external` - if enabled WLED does not control relay, it can only be triggered by external command (MQTT, HTTP, JSON or button)
+* `active-high` - assign high/low activation of relay (can be used to reverse relay states)
+* `external` - if enabled, WLED does not control relay, it can only be triggered by an external command (MQTT, HTTP, JSON or button)
 * `button` - button (from LED Settings) that controls this relay
-* `broadcast`- time in seconds between state broadcasts using MQTT
+* `broadcast`- time in seconds between MQTT relay-state broadcasts
 * `HA-discovery`- enable Home Assistant auto discovery

 If there is no MultiRelay section, just save current configuration and re-open Usermods settings page. 
@@ -99,4 +99,4 @@ Have fun - @blazoncek

 2021-11
 * Added information about dynamic configuration options
-* Added button support.
+* Added button support.
--- a/usermods/multi_relay/usermod_multi_relay.h
+++ b/usermods/multi_relay/usermod_multi_relay.h
@@ -66,12 +66,14 @@ class MultiRelay : public Usermod {
    static const char _HAautodiscovery[];

    void publishMqtt(int relay) {
+#ifndef WLED_DISABLE_MQTT
      //Check if MQTT Connected, otherwise it will crash the 8266
      if (WLED_MQTT_CONNECTED){
        char subuf[64];
        sprintf_P(subuf, PSTR("%s/relay/%d"), mqttDeviceTopic, relay);
        mqtt->publish(subuf, 0, false, _relay[relay].state ? "on" : "off");
      }
+#endif
    }

    /**
@@ -182,7 +184,7 @@ class MultiRelay : public Usermod {
     */
    MultiRelay() {
      const int8_t defPins[] = {MULTI_RELAY_PINS};
-      for (int i=0; i<MULTI_RELAY_MAX_RELAYS; i++) {
+      for (size_t i=0; i<MULTI_RELAY_MAX_RELAYS; i++) {
        _relay[i].pin      = i<sizeof(defPins) ? defPins[i] : -1;
        _relay[i].delay    = 0;
        _relay[i].mode     = false;
@@ -232,6 +234,7 @@ class MultiRelay : public Usermod {

    //Functions called by WLED

+#ifndef WLED_DISABLE_MQTT
    /**
     * handling of MQTT message
     * topic only contains stripped topic (part after /wled/MAC)
@@ -313,6 +316,7 @@ class MultiRelay : public Usermod {
        mqtt->publish(buf, 0, true, json_str, payload_size);
      }
    }
+#endif

    /**
     * setup() is called once at boot. WiFi is not yet connected at this point.
@@ -571,6 +575,11 @@ class MultiRelay : public Usermod {
      DEBUG_PRINTLN(F("MultiRelay config saved."));
    }

+    void appendConfigData()
+    {
+      oappend(SET_F("addHB('MultiRelay');"));
+    }
+
    /**
     * restore the changeable values
     * readFromConfig() is called before setup() to populate properties from values stored in cfg.json
--- a/usermods/photoresistor_sensor_mqtt_v1/README.md
+++ b/usermods/photoresistor_sensor_mqtt_v1/README.md
@@ -1,10 +1,12 @@
 # Photoresister sensor with MQTT

-This simple usermod allows attaching a photoresistor sensor like the KY-018 and publish the readings in percentage over MQTT. The frequency of MQTT messages can be modified, and there is a threshold value that can be set so that significant changes in the readings can be published immediately instead of waiting for the next update. This was found to be a good compromise between spamming MQTT messages and delayed updates.
+Enables attaching a photoresistor sensor like the KY-018 and publishing the readings as a percentage, via MQTT. The frequency of MQTT messages is user definable.
+A threshold value can be set so significant changes in the readings are published immediately vice waiting for the next update. This was found to be a good compromise between excessive MQTT traffic and delayed updates.

-I also found it useful to limit the frequency of analog pin reads because otherwise the board hangs.
+I also found it useful to limit the frequency of analog pin reads, otherwise the board hangs.

-This usermod has only been tested with the KY-018 sensor though should work for any other analog pin sensor. Note that this does not control the LED strip directly, it only publishes MQTT readings for use with other integrations like Home Assistant.
+This usermod has only been tested with the KY-018 sensor though it should work for any other analog pin sensor.
+Note: this does not control the LED strip directly, it only publishes MQTT readings for use with other integrations like Home Assistant.

 ## Installation

--- a/usermods/project_cars_shiftlight/readme.md
+++ b/usermods/project_cars_shiftlight/readme.md
@@ -1,12 +1,11 @@
 ### Shift Light for Project Cars

 Turn your WLED lights into a rev light and shift indicator for Project Cars.
+It's easy to use.

-It is pretty straight forward to use.
+1. Make sure your WLED device and your PC/console are on the same network and can talk to each other

-1. Make sure, your WLED device and your PC/console are on the same network and can talk to each other
-
-2. Go to the gameplay settings menu in PCARS and enable UDP. There are 9 numbers you can choose from. This is the refresh rate. The lower the number, the better. But you might run into problems at faster rates.
+2. Go to the gameplay settings menu in PCARS and enable UDP. There are 9 numbers you can choose from. This is the refresh rate. The lower the number, the better. However, you might run into problems at faster rates.

 | Number | Updates/Second |
 | ------ | -------------- |
@@ -20,4 +19,5 @@ It is pretty straight forward to use.
 | 8      | 05             |
 | 9      | 1              |

-3. once you enter a race, WLED should automatically shift to PCARS mode. Done.
+3. Once you enter a race, WLED should automatically shift to PCARS mode.
+4. Done.
--- a/usermods/pwm_outputs/readme.md
+++ b/usermods/pwm_outputs/readme.md
@@ -0,0 +1,27 @@
+# PWM outputs
+
+v2 Usermod to add generic PWM outputs to WLED. Usermode could be used to control servo motors, LED brightness or any other device controlled by PWM signal.
+
+## Installation
+
+Add the compile-time option `-D USERMOD_PWM_OUTPUTS` to your `platformio.ini` (or `platformio_override.ini`). By default upt to 3 PWM outputs could be configured, to increase that limit add build argument `-D USERMOD_PWM_OUTPUT_PINS=10` (replace 10 by desired amount).
+
+Currently only ESP32 is supported.
+
+## Configuration
+
+By default PWM outputs are disabled, navigate to Usermods settings and configure desired PWM pins and frequencies.
+
+## Usage
+
+If PWM output is configured, it starts to publish its duty cycle value (0-1) both to state JSON and to info JSON (visible in UI info panel). To set PWM duty cycle, use JSON api (over HTTP or over Serial)
+
+```json
+{
+    "pwm": {
+        "0": {"duty": 0.1},
+        "1": {"duty": 0.2},
+        ...
+    }
+}
+```
--- a/usermods/pwm_outputs/usermod_pwm_outputs.h
+++ b/usermods/pwm_outputs/usermod_pwm_outputs.h
@@ -0,0 +1,221 @@
+#pragma once
+#include "wled.h"
+
+#ifndef ESP32
+  #error This usermod does not support the ESP8266.
+#endif
+
+#ifndef USERMOD_PWM_OUTPUT_PINS
+  #define USERMOD_PWM_OUTPUT_PINS 3
+#endif
+
+
+class PwmOutput {
+  public:
+
+    void open(int8_t pin, uint32_t freq) {
+
+      if (enabled_) {
+        if (pin == pin_ && freq == freq_) {
+          return;  // PWM output is already open
+        } else {
+          close();  // Config has changed, close and reopen
+        }
+      }
+
+      pin_ = pin;
+      freq_ = freq;
+      if (pin_ < 0)
+        return;
+
+      DEBUG_PRINTF("pwm_output[%d]: setup to freq %d\n", pin_, freq_);
+      if (!pinManager.allocatePin(pin_, true, PinOwner::UM_PWM_OUTPUTS))
+        return;
+      
+      channel_ = pinManager.allocateLedc(1);
+      if (channel_ == 255) {
+        DEBUG_PRINTF("pwm_output[%d]: failed to quire ledc\n", pin_);
+        pinManager.deallocatePin(pin_, PinOwner::UM_PWM_OUTPUTS);
+        return;
+      }
+
+      ledcSetup(channel_, freq_, bit_depth_);
+      ledcAttachPin(pin_, channel_);
+      DEBUG_PRINTF("pwm_output[%d]: init successful\n", pin_);
+      enabled_ = true;
+    }
+
+    void close() {
+      DEBUG_PRINTF("pwm_output[%d]: close\n", pin_);
+      if (!enabled_)
+        return;
+      pinManager.deallocatePin(pin_, PinOwner::UM_PWM_OUTPUTS);
+      if (channel_ != 255)
+        pinManager.deallocateLedc(channel_, 1);
+      channel_ = 255;
+      duty_ = 0.0f;
+      enabled_ = false;
+    }
+
+    void setDuty(const float duty) {
+      DEBUG_PRINTF("pwm_output[%d]: set duty %f\n", pin_, duty);
+      if (!enabled_)
+        return;
+      duty_ = min(1.0f, max(0.0f, duty));
+      const uint32_t value = static_cast<uint32_t>((1 << bit_depth_) * duty_);
+      ledcWrite(channel_, value);
+    }
+
+    void setDuty(const uint16_t duty) {
+      setDuty(static_cast<float>(duty) / 65535.0f);
+    }
+
+    bool isEnabled() const {
+      return enabled_;
+    }
+
+    void addToJsonState(JsonObject& pwmState) const {
+      pwmState[F("duty")] = duty_;
+    }
+
+    void readFromJsonState(JsonObject& pwmState) {
+      if (pwmState.isNull()) {
+        return;
+      }
+      float duty;
+      if (getJsonValue(pwmState[F("duty")], duty)) {
+        setDuty(duty);
+      }
+    }
+
+    void addToJsonInfo(JsonObject& user) const {
+      if (!enabled_)
+        return;
+      char buffer[12];
+      sprintf_P(buffer, PSTR("PWM pin %d"), pin_);
+      JsonArray data = user.createNestedArray(buffer);
+      data.add(1e2f * duty_);
+      data.add(F("%"));
+    }
+
+    void addToConfig(JsonObject& pwmConfig) const {
+      pwmConfig[F("pin")] = pin_;
+      pwmConfig[F("freq")] = freq_;
+    }
+
+    bool readFromConfig(JsonObject& pwmConfig) {
+      if (pwmConfig.isNull())
+        return false;
+        
+      bool configComplete = true;
+      int8_t newPin = pin_;
+      uint32_t newFreq = freq_;
+      configComplete &= getJsonValue(pwmConfig[F("pin")], newPin);  
+      configComplete &= getJsonValue(pwmConfig[F("freq")], newFreq);
+
+      open(newPin, newFreq);
+
+      return configComplete;
+    }
+
+  private:
+    int8_t pin_ {-1};
+    uint32_t freq_ {50};
+    static const uint8_t bit_depth_ {12};
+    uint8_t channel_ {255};
+    float duty_ {0.0f};
+    bool enabled_ {false};
+};
+
+
+class PwmOutputsUsermod : public Usermod {
+  public:
+
+    static const char USERMOD_NAME[];
+    static const char PWM_STATE_NAME[];
+
+    void setup() {
+      // By default all PWM outputs are disabled, no setup do be done
+    }
+
+    void loop() {
+    }
+
+    void addToJsonState(JsonObject& root) {
+      JsonObject pwmStates = root.createNestedObject(PWM_STATE_NAME);
+      for (int i = 0; i < USERMOD_PWM_OUTPUT_PINS; i++) {
+        const PwmOutput& pwm = pwms_[i];
+        if (!pwm.isEnabled())
+          continue;
+        char buffer[4];
+        sprintf_P(buffer, PSTR("%d"), i);
+        JsonObject pwmState = pwmStates.createNestedObject(buffer);
+        pwm.addToJsonState(pwmState);
+      }
+    }
+
+    void readFromJsonState(JsonObject& root) {
+      JsonObject pwmStates = root[PWM_STATE_NAME];
+      if (pwmStates.isNull())
+        return;
+
+      for (int i = 0; i < USERMOD_PWM_OUTPUT_PINS; i++) {
+        PwmOutput& pwm = pwms_[i];
+        if (!pwm.isEnabled())
+          continue;
+        char buffer[4];
+        sprintf_P(buffer, PSTR("%d"), i);
+        JsonObject pwmState = pwmStates[buffer];
+        pwm.readFromJsonState(pwmState);
+      }
+    }
+
+    void addToJsonInfo(JsonObject& root) {
+      JsonObject user = root[F("u")];
+      if (user.isNull())
+        user = root.createNestedObject(F("u"));
+
+      for (int i = 0; i < USERMOD_PWM_OUTPUT_PINS; i++) {
+        const PwmOutput& pwm = pwms_[i];
+        pwm.addToJsonInfo(user);
+      }
+    }
+
+    void addToConfig(JsonObject& root) {
+      JsonObject top = root.createNestedObject(USERMOD_NAME);
+      for (int i = 0; i < USERMOD_PWM_OUTPUT_PINS; i++) {
+        const PwmOutput& pwm = pwms_[i];
+        char buffer[8];
+        sprintf_P(buffer, PSTR("PWM %d"), i);
+        JsonObject pwmConfig = top.createNestedObject(buffer);
+        pwm.addToConfig(pwmConfig);
+      }
+    }
+
+    bool readFromConfig(JsonObject& root) {
+      JsonObject top = root[USERMOD_NAME];
+      if (top.isNull())
+        return false;
+
+      bool configComplete = true;
+      for (int i = 0; i < USERMOD_PWM_OUTPUT_PINS; i++) {
+        PwmOutput& pwm = pwms_[i];
+        char buffer[8];
+        sprintf_P(buffer, PSTR("PWM %d"), i);
+        JsonObject pwmConfig = top[buffer];
+        configComplete &= pwm.readFromConfig(pwmConfig);
+      }
+      return configComplete;
+    }
+
+    uint16_t getId() {
+      return USERMOD_ID_PWM_OUTPUTS;
+    }
+
+  private:
+    PwmOutput pwms_[USERMOD_PWM_OUTPUT_PINS];
+
+};
+
+const char PwmOutputsUsermod::USERMOD_NAME[] PROGMEM = "PwmOutputs";
+const char PwmOutputsUsermod::PWM_STATE_NAME[] PROGMEM = "pwm";
--- a/usermods/quinled-an-penta/readme.md
+++ b/usermods/quinled-an-penta/readme.md
@@ -1,5 +1,5 @@
 # QuinLED-An-Penta
-The (un)official usermod to get the best out of the QuinLED-An-Penta (https://quinled.info/quinled-an-penta/), like using the OLED and the SHT30 temperature/humidity sensor.
+The (un)official usermod to get the best out of the QuinLED-An-Penta (https://quinled.info/quinled-an-penta/), e.g. using the OLED and the SHT30 temperature/humidity sensor.

 ## Requirements
 * "u8gs" by olikraus, v2.28 or higher: https://github.com/olikraus/u8g2
@@ -31,15 +31,15 @@ lib_deps = ${esp32.lib_deps}
 ## Some words about the (optional) OLED
 This mod has been optimized for an SSD1306 driven 128x64 OLED. Using a smaller OLED or an OLED using a different driver will result in unexpected results.
 I highly recommend using these "two color monochromatic OLEDs", which have the first 16 pixels in a different color than the other 48, e.g. a yellow/blue OLED.
-Also note, you need to have an **SPI** driven OLED, **not i2c**!
+Note: you _must_ use an **SPI** driven OLED, **not an i2c one**!

 ### Limitations combined with Ethernet
-The initial development of this mod had been done with a beta version of the QuinLED-An-Penta, which had a different IO layout for the OLED: The CS pin used to be IO_0, but has been changed to IO27 with the first v1 public release. Unfortunately, IO27 is used by the Ethernet boards, so WLED will not let you enable the OLED screen, if you're using it with Ethernet. This unfortunately makes the development I've done to support/show Ethernet information void, as it cannot be used.
-However (and I've not tried this, as I don't own a v1 board): You can try to modify this mod and try to use IO27 for the OLED and share it with the Ethernet board. It is "just" the chip select pin, so there is a chance that both can coexist and use the same IO. You need to skip WLEDs PinManager for the CS pin, so WLED will not block using it. If you don't know how this works: Leave it. If you know what I'm talking about: Try it and please let me know on the Intermit.Tech (QuinLED) Discord server: https://discord.gg/WdbAauG
+The initial development of this mod was done with a beta version of the QuinLED-An-Penta, which had a different IO layout for the OLED: The CS pin _was_ IO_0, but has been changed to IO27 with the first v1 public release. Unfortunately, IO27 is used by Ethernet boards, so WLED will not let you enable the OLED screen, if you're using it with Ethernet. Unfortunately, that makes the development I've done to support/show Ethernet information invalid, as it cannot be used.
+However, (and I've not tried this, as I don't own a v1 board) you can modify this usermod and try to use IO27 for the OLED and share it with the Ethernet board. It is "just" the chip select pin, so there is a chance that both can coexist and use the same IO. You need to skip WLEDs PinManager for the CS pin, so WLED will not block using it. If you don't know how this works, don't change it. If you know what I'm talking about, try it and please let me know on the Intermit.Tech (QuinLED) Discord server: https://discord.gg/WdbAauG

 ### My OLED flickers after some time, what should I do?
-That's a tricky one: During development I saw that the OLED sometimes starts to "bug out" / flicker and won't work anymore. This seems to be caused by the high PWM interference the board produces. It seems to loose its settings and then doesn't know how to draw anymore. Turns out the only way to fix this is to call the libraries `begin()` method again which will re-initialize the display.
-If you're facing this issue, you can enable a setting I've added which will call the `begin()` roughly every 60 seconds between a page change. This will make the page change take ~500ms, but will fix the display.
+That's a tricky one. During development I saw that the OLED sometimes starts to "drop out" / flicker and won't work anymore. This seems to be caused by the high PWM interference the board produces. It seems to lose its settings then doesn't know how to draw anymore. Turns out the only way to fix this is to call the libraries `begin()` method again which re-initializes the display.
+If you're facing this issue, you can enable a setting which will call the `begin()` roughly every 60 seconds between page changes. This will make the page change take ~500ms, but will fix the display.


 ## Configuration
@@ -53,11 +53,11 @@ Navigate to the "Config" and then to the "Usermods" section. If you compiled WLE
  * Possible values: Enabled/Disabled
  * Default: Disabled
 * OLED-Flip-Screen-180:
-  * What it does: Flips the screen 180° / upside-down
+  * What it does: Flips the screen 180°
  * Possible values: Enabled/Disabled
  * Default: Disabled
 * OLED-Seconds-Per-Page:
-  * What it does: Defines how long the OLED should stay on one page in seconds before changing to the next
+  * What it does: Number of seconds the OLED should stay on one page before changing pages
  * Possible values: Enabled/Disabled
  * Default: 10
 * OLED-Fix-Bugged-Screen:
@@ -76,4 +76,4 @@ Navigate to the "Config" and then to the "Usermods" section. If you compiled WLE
 * First implementation.

 ## Credits
-ezcGman | Andy: Find me on the Intermit.Tech (QuinLED) Discord server: https://discord.gg/WdbAauG
+ezcGman | Andy: Find me on the Intermit.Tech (QuinLED) Discord server: https://discord.gg/WdbAauG
--- a/usermods/readme.md
+++ b/usermods/readme.md
@@ -2,17 +2,17 @@

 This folder serves as a repository for usermods (custom `usermod.cpp` files)!

-If you have created an usermod that you believe is useful (for example to support a particular sensor, display, feature...), feel free to contribute by opening a pull request!
+If you have created a usermod you believe is useful (for example to support a particular sensor, display, feature...), feel free to contribute by opening a pull request!

 In order for other people to be able to have fun with your usermod, please keep these points in mind:

 -   Create a folder in this folder with a descriptive name (for example `usermod_ds18b20_temp_sensor_mqtt`)  
 -   Include your custom files 
-   If your usermod requires changes to other WLED files, please write a `readme.md` outlining the steps one has to take to use the usermod  
+-   If your usermod requires changes to other WLED files, please write a `readme.md` outlining the steps one needs to take  
 -   Create a pull request!  
 -   If your feature is useful for the majority of WLED users, I will consider adding it to the base code!  

-While I do my best to not break too much, keep in mind that as WLED is being updated, usermods might break.  
+While I do my best to not break too much, keep in mind that as WLED is updated, usermods might break.  
 I am not actively maintaining any usermod in this directory, that is your responsibility as the creator of the usermod.

 For new usermods, I would recommend trying out the new v2 usermod API, which allows installing multiple usermods at once and new functions!
--- a/usermods/rgb-rotary-encoder/readme.md
+++ b/usermods/rgb-rotary-encoder/readme.md
@@ -5,8 +5,8 @@ This usermod-v2 adds support for the awesome RGB Rotary Encoder Board by Adam Ze
 https://user-images.githubusercontent.com/3090131/124680599-0180ab80-dec7-11eb-9065-a6d08ebe0287.mp4

 ## Credits
-The actual / original code that does the different LED modes is from Adam Zeloof. So I don't take credit for these. But I ported it to WLED, which involved replacing the LED library he used (because, guess what, WLED already has one; so no need to add another one, but use whatever WLED uses), plus the rotary encoder library, because that one was not compatible with ESP, only Arduino.
-So it was quite more work than I hoped, but I got there eventually :)
+The actual / original code that controls the LED modes is from Adam Zeloof. I take no credit for it. I ported it to WLED, which involved replacing the LED library he used, (because WLED already has one, so no need to add another one) plus the rotary encoder library because it was not compatible with ESP, only Arduino.
+It was quite a bit more work than I hoped, but I got there eventually :)

 ## Requirements
 * "ESP Rotary" by Lennart Hennigs, v1.5.0 or higher: https://github.com/LennartHennigs/ESPRotary
@@ -33,25 +33,25 @@ lib_deps = ${esp8266.lib_deps}
 ```

 ## How to connect the board to your ESP
-We gonna need (minimum) three or (maximum) four GPIOs for the board:
-* "ea": Basically tells if the encoder goes into one or the other direction
-* "eb": Same thing, but the other direction
-* "di": LED data in. To actually control the LEDs
-* *(optional)* "sw": The integrated switch in the rotary encoder. Can be omitted for the bare functionality of just controlling the brightness
+We'll need (minimum) three or (maximum) four GPIOs for the board:
+* "ea": reports the encoder direction
+* "eb": Same thing, opposite direction
+* "di": LED data in.
+* *(optional)* "sw": The integrated switch in the rotary encoder. Can be omitted for the bare functionality of controlling only the brightness

-We also gonna need some power, so:
+We'll also need power:

 * "vdd": Needs to be connected to **+5V**.
-* "gnd": Well, it's GND.
+* "gnd": Ground.

-You can freely pick the GPIOs, it doesn't matter. Those will be configured in the "Usermods" section in the WLED web panel:
+You can freely pick the GPIOs, it doesn't matter. Those will be configured in the "Usermods" section of the WLED web panel:

 ## Configuration
-Navigate to the "Config" and then to the "Usermods" section. If you compiled WLED with `-D RGB_ROTARY_ENCODER`, you will see the config for it there. The settings there are the GPIOs we mentioned before (*Note: The switch pin is not there, as this can just be configured the "normal" button on the "LED Preferences" page*), plus a few more:
+Navigate to the "Config" and then to the "Usermods" section. If you compiled WLED with `-D RGB_ROTARY_ENCODER`, you will see the config for it there. The settings there are the aforementioned GPIOs, (*Note: The switch pin is not there, as this can just be configured the "normal" button on the "LED Preferences" page*) plus a few more:
 * LED pin:
  * Possible values: Any valid and available GPIO
  * Default: 3
-  * What it does: Pin to control the LED ring
+  * What it does: controls the LED ring
 * ea pin:
  * Possible values: Any valid and available GPIO
  * Default: 15
@@ -63,7 +63,7 @@ Navigate to the "Config" and then to the "Usermods" section. If you compiled WLE
 * LED Mode:
  * Possible values: 1-3
  * Default: 3
-  * What it does: The usermod provides three different modes of how the LEDs can look like. Here's an example: https://github.com/isotope-engineering/RGB-Encoder-Board/blob/master/images/rgb-encoder-animations.gif
+  * What it does: The usermod provides three different modes of how the LEDs can appear. Here's an example: https://github.com/isotope-engineering/RGB-Encoder-Board/blob/master/images/rgb-encoder-animations.gif
    * Up left is "1"
    * Up right is not supported / doesn't make sense for brightness control
    * Bottom left is "2"
@@ -71,15 +71,15 @@ Navigate to the "Config" and then to the "Usermods" section. If you compiled WLE
 * LED Brightness:
  * Possible values: 1-255
  * Default: 64
-  * What it does: Brightness of the LED ring
+  * What it does: sets LED ring Brightness
 * Steps per click:
  * Possible values: Any positive number
  * Default: 4
-  * What it does: With each "click", a rotary encoder actually increments it's "steps". Most rotary encoder do four "steps" per "click". I know this sounds super weird, so just leave this the default value, unless your rotary encoder behaves weirdly, like with one click, it makes two LEDs light up, or you sometimes need two click for one LED. Then you should play around with this value or write a small sketch using the same "ESP Rotary" library and read out the steps it does.
+  * What it does: With each "click", a rotary encoder actually increments its "steps". Most rotary encoders produce four "steps" per "click". Leave this at the default value unless your rotary encoder behaves strangely. e.g. with one click, it makes two LEDs light up, or you need two clicks for one LED. If that's the case, adjust this value or write a small sketch using the same "ESP Rotary" library and read out the steps it produce.
 * Increment per click:
  * Possible values: Any positive number
  * Default: 5
-  * What it does: Most rotary encoder have 20 "clicks", so basically 20 positions. This value should be set to 100 / `number of clicks`
+  * What it does: Most rotary encoders have 20 "clicks" or positions. This value should be set to 100/`number of clicks`

 ## Change log
 2021-07
--- a/usermods/sensors_to_mqtt/readme.md
+++ b/usermods/sensors_to_mqtt/readme.md
@@ -1,12 +1,12 @@
-# Sensors To Home Assistant (or mqtt)
+# Send sensor data To Home Assistant

-This usermod will publish values of the BMP280, CCS811 and Si7021 sensors to Home Assistant via MQTT.
+Publishes BMP280, CCS811 and Si7021 measurements to Home Assistant via MQTT.

-Its using home assistant automatic device discovery feature.
+Uses Home Assistant Automatic Device Discovery.

-The use of Home Assistant is not mandatory; it will publish the sensor values via MQTT just fine without it.
+The use of Home Assistant is not mandatory. The mod will publish sensor values via MQTT just fine without it.

-Its resusing the mqtt connection set in the WLED web user interface.
+Uses the MQTT connection set in the WLED web user interface.

 ## Maintainer

@@ -15,12 +15,12 @@ twitter.com/mpronk89
 ## Features

 - Reads BMP280, CCS811 and Si7021 senors
- Publishes via MQTT, configured via webui of wled
+- Publishes via MQTT, configured via WLED webUI
 - Announces device in Home Assistant for easy setup
 - Efficient energy usage
 - Updates every 60 seconds

-## Example mqtt topics:
+## Example MQTT topics:

 `$mqttDeviceTopic` is set in webui of WLED!

@@ -40,7 +40,7 @@ IAQ:  $mqttDeviceTopic/iaq
 ### Requirements

 1. BMP280/CCS811/Si7021 sensor. E.g. https://aliexpress.com/item/32979998543.html
-2. A microcontroller which can talk i2c, e.g. esp32
+2. A microcontroller that supports i2c. e.g. esp32

 ### installation

@@ -77,7 +77,7 @@ SDA_PIN = 4;
  adafruit/Adafruit Si7021 Library @ 1.4.0
 ```

-The #ifdefs in `usermods_list.cpp` should do the rest :)
+The #ifdefs in `usermods_list.cpp` should do the rest

 # Credits

--- a/usermods/sensors_to_mqtt/usermod_v2_SensorsToMqtt.h
+++ b/usermods/sensors_to_mqtt/usermod_v2_SensorsToMqtt.h
@@ -1,3 +1,7 @@
+#ifndef WLED_ENABLE_MQTT
+#error "This user mod requires MQTT to be enabled."
+#endif
+
 #pragma once

 #include "wled.h"
--- a/usermods/seven_segment_display/readme.md
+++ b/usermods/seven_segment_display/readme.md
@@ -1,25 +1,25 @@
 # Seven Segment Display

-Usermod that uses the overlay feature to create a configurable seven segment display.  
-This has only been tested on a single configuration. Colon support is entirely  untested. 
+Uses the overlay feature to create a configurable seven segment display.  
+This has only been tested on a single configuration. Colon support has _not_ been tested. 

 ## Installation

 Add the compile-time option `-D USERMOD_SEVEN_SEGMENT` to your `platformio.ini` (or `platformio_override.ini`) or use `#define USERMOD_SEVEN_SEGMENT` in `my_config.h`.

 ## Settings
-Settings can be controlled through both the usermod setting page and through MQTT with a raw payload.
+Settings can be controlled via both the usermod setting page and through MQTT with a raw payload.
 ##### Example
 Topic ```<mqttDeviceTopic||mqttGroupTopic>/sevenSeg/perSegment/set```  
 Payload ```3```
 #### perSegment -- ssLEDPerSegment
-The number of individual LEDs per segment. There are 7 segments per digit.  
+The number of individual LEDs per segment. 7 segments per digit.  
 #### perPeriod -- ssLEDPerPeriod
-The number of individual LEDs per period. A ':' has 2x periods.
+The number of individual LEDs per period. A ':' (colon) has two periods.
 #### startIdx -- ssStartLED
-Index of the LED that the display starts at. Allows a seven segment display to be in the middle of a string.
+Index of the LED the display starts at. Enabless a seven segment display to be in the middle of a string.
 #### timeEnable -- ssTimeEnabled
-When true, when displayMask is configured for a time output and no message is set the time will  be displayed.
+When true, when displayMask is configured for a time output and no message is set, the time will be displayed.
 #### scrollSpd -- ssScrollSpeed
 Time, in milliseconds, between message shifts when the length of displayMsg exceeds the length of the displayMask.
 #### displayMask -- ssDisplayMask
@@ -35,9 +35,9 @@ All others for alpha numeric, (will be blank when displaying time)
 ```HHMMSS ```  
 ```hh:MM:SS ```
 #### displayMsg -- ssDisplayMessage
-Message to be displayed across the display. If the length exceeds the length of the displayMask the message will scroll at scrollSpd. To 'remove' a message or revert  back to time, if timeEnabled is true, set the message to '~'.
+Message to be displayed. If the message length exceeds the length of displayMask, the message will scroll at scrollSpd. To 'remove' a message or revert  back to time, if timeEnabled is true, set the message to '~'.
 #### displayCfg -- ssDisplayConfig
-The order that your LEDs are configured. All seven segments in the display need to be wired the same way.
+The order your LEDs are configured in. All segments in the display need to be wired the same way.
 <pre>
           -------
         /   A   /          0 - EDCGFAB
--- a/usermods/seven_segment_display/usermod_v2_seven_segment_display.h
+++ b/usermods/seven_segment_display/usermod_v2_seven_segment_display.h
@@ -1,3 +1,7 @@
+#ifndef WLED_ENABLE_MQTT
+#error "This user mod requires MQTT to be enabled."
+#endif
+
 #pragma once

 #include "wled.h"
--- a/usermods/seven_segment_display_reloaded/readme.md
+++ b/usermods/seven_segment_display_reloaded/readme.md
@@ -1,6 +1,6 @@
 # Seven Segment Display Reloaded

-Usermod that uses the overlay feature to create a configurable seven segment display.
+Uses the overlay feature to create a configurable seven segment display.
 Optimized for maximum configurability and use with seven segment clocks by parallyze (https://www.instructables.com/member/parallyze/instructables/)
 Very loosely based on the existing usermod "seven segment display".

@@ -12,26 +12,26 @@ Add the compile-time option `-D USERMOD_SSDR` to your `platformio.ini` (or `plat
 For the auto brightness option, the usermod SN_Photoresistor has to be installed as well. See SN_Photoresistor/readme.md for instructions.

 ## Settings
-All settings can be controlled the usermod setting page.
+All settings can be controlled via the usermod settings page.
 Part of the settings can be controlled through MQTT with a raw payload or through a json request to /json/state.

 ### enabled
-Enables/disables this overlay usermod
+Enables/disables this usermod

 ### inverted
-Enables the inverted mode in which the background should be enabled and the digits should be black (leds off)
+Enables the inverted mode in which the background should be enabled and the digits should be black (LEDs off)

 ### Colon-blinking
 Enables the blinking colon(s) if they are defined

 ### enable-auto-brightness
-Enables the auto brightness feature. Can be only used with the usermod SN_Photoresistor installed.
+Enables the auto brightness feature. Can be used only when the usermod SN_Photoresistor is installed.

 ### auto-brightness-min / auto-brightness-max
 The lux value calculated from usermod SN_Photoresistor will be mapped to the values defined here.
-The mapping is 0 - 1000 lux will be mapped to auto-brightness-min - auto-brightness-max
+The mapping, 0 - 1000 lux, will be mapped to auto-brightness-min and auto-brightness-max

-The mA current protection of WLED will override the calculated value if it is too high.
+WLED current protection will override the calculated value if it is too high.

 ### Display-Mask
 Defines the type of the time/date display. 
@@ -61,7 +61,7 @@ See following example for usage.

 ## Example

-Example for Leds definition
+Example of an LED definition:
 ```
  <  A  >
 /\       /\
@@ -74,15 +74,15 @@ E        C
  <  D  >
 ```

-Leds or Range of Leds are seperated by a comma ","
+LEDs or Range of LEDs are separated by a comma ","

-Segments are seperated by a semicolon ";" and are read as A;B;C;D;E;F;G
+Segments are separated by a semicolon ";" and are read as A;B;C;D;E;F;G

-Digits are seperated by colon ":" -> A;B;C;D;E;F;G:A;B;C;D;E;F;G
+Digits are separated by colon ":" -> A;B;C;D;E;F;G:A;B;C;D;E;F;G

 Ranges are defined as lower to higher (lower first)

-For example, an clock definition for the following clock (https://www.instructables.com/Lazy-7-Quick-Build-Edition/) is
+For example, a clock definition for the following clock (https://www.instructables.com/Lazy-7-Quick-Build-Edition/) is

 - hour "59,46;47-48;50-51;52-53;54-55;57-58;49,56:0,13;1-2;4-5;6-7;8-9;11-12;3,10"

@@ -96,18 +96,18 @@ or

 depending on the orientation.

-# The example detailed:
+# Example details:
 hour "59,46;47-48;50-51;52-53;54-55;57-58;49,56:0,13;1-2;4-5;6-7;8-9;11-12;3,10"

-there are two digits seperated by ":"
+there are two digits separated by ":"

 - 59,46;47-48;50-51;52-53;54-55;57-58;49,56
 - 0,13;1-2;4-5;6-7;8-9;11-12;3,10

 In the first digit, 
-the **segment A** consists of the leds number **59 and 46**., **segment B** consists of the leds number **47, 48** and so on
+the **segment A** consists of the LEDs number **59 and 46**., **segment B** consists of the LEDs number **47, 48** and so on

-The second digit starts again with **segment A** and leds **0 and 13**, **segment B** consists of the leds number **1 and 2** and so on
+The second digit starts again with **segment A** and LEDs **0 and 13**, **segment B** consists of the LEDs number **1 and 2** and so on

 ### first digit of the hour
 - Segment A: 59, 46
@@ -126,4 +126,4 @@ The second digit starts again with **segment A** and leds **0 and 13**, **segmen
 - Segment D: 6, 7
 - Segment E: 8, 9
 - Segment F: 11, 12
- Segment G: 3, 10
+- Segment G: 3, 10
--- a/usermods/seven_segment_display_reloaded/usermod_seven_segment_reloaded.h
+++ b/usermods/seven_segment_display_reloaded/usermod_seven_segment_reloaded.h
@@ -1,3 +1,7 @@
+#ifndef WLED_ENABLE_MQTT
+#error "This user mod requires MQTT to be enabled."
+#endif
+
 #pragma once

 #include "wled.h"
--- a/usermods/sht/readme.md
+++ b/usermods/sht/readme.md
@@ -0,0 +1,56 @@
+# SHT
+Usermod to support various SHT i2c sensors like the SHT30, SHT31, SHT35 and SHT85
+
+## Requirements
+* "SHT85" by Rob Tillaart, v0.2 or higher: https://github.com/RobTillaart/SHT85
+
+## Usermod installation
+Simply copy the below block (build task) to your `platformio_override.ini` and compile WLED using this new build task. Or use an existing one, add the buildflag `-D USERMOD_SHT` and the below library dependencies.
+
+ESP32:
+```
+[env:custom_esp32dev_usermod_sht]
+extends = env:esp32dev
+build_flags = ${common.build_flags_esp32}
+  -D USERMOD_SHT
+lib_deps = ${esp32.lib_deps}
+    robtillaart/SHT85@~0.3.3
+```
+
+ESP8266:
+```
+[env:custom_d1_mini_usermod_sht]
+extends = env:d1_mini
+build_flags = ${common.build_flags_esp8266}
+  -D USERMOD_SHT
+lib_deps = ${esp8266.lib_deps}
+    robtillaart/SHT85@~0.3.3
+```
+
+## MQTT Discovery for Home Assistant
+If you're using Home Assistant and want to have the temperature and humidity available as entities in HA, you can tick the "Add-To-Home-Assistant-MQTT-Discovery" option in the usermod settings. If you have an MQTT broker configured under "Sync Settings" and it is connected, the mod will publish the auto discovery message to your broker and HA will instantly find it and create an entity each for the temperature and humidity.
+
+### Publishing readings via MQTT
+Regardless of having MQTT discovery ticked or not, the mod will always report temperature and humidity to the WLED MQTT topic of that instance, if you have a broker configured and it's connected.
+
+## Configuration
+Navigate to the "Config" and then to the "Usermods" section. If you compiled WLED with `-D USERMOD_SHT`, you will see the config for it there:
+* SHT-Type:
+  * What it does: Select the SHT sensor type you want to use
+  * Possible values: SHT30, SHT31, SHT35, SHT85
+  * Default: SHT30
+* Unit:
+  * What it does: Select which unit should be used to display the temperature in the info section. Also used when sending via MQTT discovery, see below.
+  * Possible values: Celsius, Fahrenheit
+  * Default: Celsius
+* Add-To-HA-MQTT-Discovery:
+  * What it does: Makes the temperature and humidity available via MQTT discovery, so they're automatically added to Home Assistant, because that way it's typesafe.
+  * Possible values: Enabled/Disabled
+  * Default: Disabled
+
+## Change log
+2022-12
+* First implementation.
+
+## Credits
+ezcGman | Andy: Find me on the Intermit.Tech (QuinLED) Discord server: https://discord.gg/WdbAauG
--- a/usermods/sht/usermod_sht.h
+++ b/usermods/sht/usermod_sht.h
@@ -0,0 +1,485 @@
+#ifndef WLED_ENABLE_MQTT
+#error "This user mod requires MQTT to be enabled."
+#endif
+
+#pragma once
+
+#include "SHT85.h"
+
+#define USERMOD_SHT_TYPE_SHT30 0
+#define USERMOD_SHT_TYPE_SHT31 1
+#define USERMOD_SHT_TYPE_SHT35 2
+#define USERMOD_SHT_TYPE_SHT85 3
+
+class ShtUsermod : public Usermod
+{
+  private:
+    bool enabled = false; // Is usermod enabled or not
+    bool firstRunDone = false; // Remembers if the first config load run had been done
+    bool pinAllocDone = true; // Remembers if we have allocated pins
+    bool initDone = false; // Remembers if the mod has been completely initialised
+    bool haMqttDiscovery = false; // Is MQTT discovery enabled or not
+    bool haMqttDiscoveryDone = false; // Remembers if we already published the HA discovery topics
+
+    // SHT vars
+    SHT *shtTempHumidSensor; // Instance of SHT lib
+    byte shtType = 0; // SHT sensor type to be used. Default: SHT30
+    byte unitOfTemp = 0; // Temperature unit to be used. Default: Celsius (0 = Celsius, 1 = Fahrenheit)
+    bool shtInitDone = false; // Remembers if SHT sensor has been initialised
+    bool shtReadDataSuccess = false; // Did we have a successful data read and is a valid temperature and humidity available?
+    const byte shtI2cAddress = 0x44; // i2c address of the sensor. 0x44 is the default for all SHT sensors. Change this, if needed
+    unsigned long shtLastTimeUpdated = 0; // Remembers when we read data the last time
+    bool shtDataRequested = false; // Reading data is done async. This remembers if we asked the sensor to read data
+    float shtCurrentTempC = 0.0f; // Last read temperature in Celsius
+    float shtCurrentHumidity = 0.0f; // Last read humidity in RH%
+
+
+    void initShtTempHumiditySensor();
+    void cleanupShtTempHumiditySensor();
+    void cleanup();
+    bool isShtReady();
+
+    void publishTemperatureAndHumidityViaMqtt();
+    void publishHomeAssistantAutodiscovery();
+    void appendDeviceToMqttDiscoveryMessage(JsonDocument& root);
+
+  public:
+    // Strings to reduce flash memory usage (used more than twice)
+    static const char _name[];
+    static const char _enabled[];
+    static const char _shtType[];
+    static const char _unitOfTemp[];
+    static const char _haMqttDiscovery[];
+
+    void setup();
+    void loop();
+    void onMqttConnect(bool sessionPresent);
+    void appendConfigData();
+    void addToConfig(JsonObject &root);
+    bool readFromConfig(JsonObject &root);
+    void addToJsonInfo(JsonObject& root);
+
+    bool isEnabled() { return enabled; }
+
+    float getTemperature();
+    float getTemperatureC() { return roundf(shtCurrentTempC * 10.0f) / 10.0f; }
+    float getTemperatureF() { return (getTemperatureC() * 1.8f) + 32.0f; }
+    float getHumidity() { return roundf(shtCurrentHumidity * 10.0f) / 10.0f; }
+    const char* getUnitString();
+
+    uint16_t getId() { return USERMOD_ID_SHT; }
+};
+
+// Strings to reduce flash memory usage (used more than twice)
+const char ShtUsermod::_name[]            PROGMEM = "SHT-Sensor";
+const char ShtUsermod::_enabled[]         PROGMEM = "Enabled";
+const char ShtUsermod::_shtType[]         PROGMEM = "SHT-Type";
+const char ShtUsermod::_unitOfTemp[]      PROGMEM = "Unit";
+const char ShtUsermod::_haMqttDiscovery[] PROGMEM = "Add-To-HA-MQTT-Discovery";
+
+/**
+ * Initialise SHT sensor.
+ *
+ * Using the correct constructor according to config and initialises it using the
+ * global i2c pins.
+ *
+ * @return void
+ */
+void ShtUsermod::initShtTempHumiditySensor()
+{
+  switch (shtType) {
+    case USERMOD_SHT_TYPE_SHT30: shtTempHumidSensor = (SHT *) new SHT30(); break;
+    case USERMOD_SHT_TYPE_SHT31: shtTempHumidSensor = (SHT *) new SHT31(); break;
+    case USERMOD_SHT_TYPE_SHT35: shtTempHumidSensor = (SHT *) new SHT35(); break;
+    case USERMOD_SHT_TYPE_SHT85: shtTempHumidSensor = (SHT *) new SHT85(); break;
+  }
+
+  shtTempHumidSensor->begin(shtI2cAddress, i2c_sda, i2c_scl);
+  if (shtTempHumidSensor->readStatus() == 0xFFFF) {
+    DEBUG_PRINTF("[%s] SHT init failed!\n", _name);
+    cleanup();
+    return;
+  }
+
+  shtInitDone = true;
+}
+
+/**
+ * Cleanup the SHT sensor.
+ *
+ * Properly calls "reset" for the sensor then releases it from memory.
+ *
+ * @return void
+ */
+void ShtUsermod::cleanupShtTempHumiditySensor()
+{
+  if (isShtReady()) shtTempHumidSensor->reset();
+  delete shtTempHumidSensor;
+  shtInitDone = false;
+}
+
+/**
+ * Cleanup the mod completely.
+ *
+ * Calls ::cleanupShtTempHumiditySensor() to cleanup the SHT sensor and
+ * deallocates pins.
+ *
+ * @return void
+ */
+void ShtUsermod::cleanup()
+{
+  cleanupShtTempHumiditySensor();
+
+  if (pinAllocDone) {
+    PinManagerPinType pins[2] = { { i2c_sda, true }, { i2c_scl, true } };
+    pinManager.deallocateMultiplePins(pins, 2, PinOwner::HW_I2C);
+    pinAllocDone = false;
+  }
+
+  enabled = false;
+}
+
+/**
+ * Checks if the SHT sensor has been initialised.
+  *
+ * @return bool
+ */
+bool ShtUsermod::isShtReady()
+{
+  return shtInitDone;
+}
+
+/**
+ * Publish temperature and humidity to WLED device topic.
+ *
+ * Will add a "/temperature" and "/humidity" topic to the WLED device topic.
+ * Temperature will be written in configured unit.
+ *
+ * @return void
+ */
+void ShtUsermod::publishTemperatureAndHumidityViaMqtt() {
+  if (!WLED_MQTT_CONNECTED) return;
+  char buf[128];
+
+  snprintf_P(buf, 127, PSTR("%s/temperature"), mqttDeviceTopic);
+  mqtt->publish(buf, 0, false, String(getTemperature()).c_str());
+  snprintf_P(buf, 127, PSTR("%s/humidity"), mqttDeviceTopic);
+  mqtt->publish(buf, 0, false, String(getHumidity()).c_str());
+}
+
+/**
+ * If enabled, publishes HA MQTT device discovery topics.
+ *
+ * Will make Home Assistant add temperature and humidity as entities automatically.
+ *
+ * Note: Whenever usermods are part of the WLED integration in HA, this can be dropped.
+ *
+ * @return void
+ */
+void ShtUsermod::publishHomeAssistantAutodiscovery() {
+  if (!WLED_MQTT_CONNECTED) return;
+
+  char json_str[1024], buf[128];
+  size_t payload_size;
+  StaticJsonDocument<1024> json;
+
+  snprintf_P(buf, 127, PSTR("%s Temperature"), serverDescription);
+  json[F("name")] = buf;
+  snprintf_P(buf, 127, PSTR("%s/temperature"), mqttDeviceTopic);
+  json[F("stat_t")] = buf;
+  json[F("dev_cla")] = F("temperature");
+  json[F("stat_cla")] = F("measurement");
+  snprintf_P(buf, 127, PSTR("%s-temperature"), escapedMac.c_str());
+  json[F("uniq_id")] = buf;
+  json[F("unit_of_meas")] = unitOfTemp ? F("°F") : F("°C");
+  appendDeviceToMqttDiscoveryMessage(json);
+  payload_size = serializeJson(json, json_str);
+  snprintf_P(buf, 127, PSTR("homeassistant/sensor/%s/%s-temperature/config"), escapedMac.c_str(), escapedMac.c_str());
+  mqtt->publish(buf, 0, true, json_str, payload_size);
+
+  json.clear();
+
+  snprintf_P(buf, 127, PSTR("%s Humidity"), serverDescription);
+  json[F("name")] = buf;
+  snprintf_P(buf, 127, PSTR("%s/humidity"), mqttDeviceTopic);
+  json[F("stat_t")] = buf;
+  json[F("dev_cla")] = F("humidity");
+  json[F("stat_cla")] = F("measurement");
+  snprintf_P(buf, 127, PSTR("%s-humidity"), escapedMac.c_str());
+  json[F("uniq_id")] = buf;
+  json[F("unit_of_meas")] = F("%");
+  appendDeviceToMqttDiscoveryMessage(json);
+  payload_size = serializeJson(json, json_str);
+  snprintf_P(buf, 127, PSTR("homeassistant/sensor/%s/%s-humidity/config"), escapedMac.c_str(), escapedMac.c_str());
+  mqtt->publish(buf, 0, true, json_str, payload_size);
+
+  haMqttDiscoveryDone = true;
+}
+
+/**
+ * Helper to add device information to MQTT discovery topic.
+ *
+ * @return void
+ */
+void ShtUsermod::appendDeviceToMqttDiscoveryMessage(JsonDocument& root) {
+  JsonObject device = root.createNestedObject(F("dev"));
+  device[F("ids")] = escapedMac.c_str();
+  device[F("name")] = serverDescription;
+  device[F("sw")] = versionString;
+  device[F("mdl")] = ESP.getChipModel();
+  device[F("mf")] = F("espressif");
+}
+
+/**
+ * Setup the mod.
+ *
+ * Allocates i2c pins as PinOwner::HW_I2C, so they can be allocated multiple times.
+ * And calls ::initShtTempHumiditySensor() to initialise the sensor.
+ *
+ * @see Usermod::setup()
+ * @see UsermodManager::setup()
+ *
+ * @return void
+ */
+void ShtUsermod::setup()
+{
+  if (enabled) {
+    PinManagerPinType pins[2] = { { i2c_sda, true }, { i2c_scl, true } };
+    // GPIOs can be set to -1 and allocateMultiplePins() will return true, so check they're gt zero
+    if (i2c_sda < 0 || i2c_scl < 0 || !pinManager.allocateMultiplePins(pins, 2, PinOwner::HW_I2C)) {
+      DEBUG_PRINTF("[%s] SHT pin allocation failed!\n", _name);
+      cleanup();
+      return;
+    }
+    pinAllocDone = true;
+
+    initShtTempHumiditySensor();
+
+    initDone = true;
+  }
+
+  firstRunDone = true;
+}
+
+/**
+ * Actually reading data (async) from the sensor every 30 seconds.
+ *
+ * If last reading is at least 30 seconds, it will trigger a reading using
+ * SHT::requestData(). We will then continiously check SHT::dataReady() if
+ * data is ready to be read. If so, it's read, stored locally and published
+ * via MQTT.
+ *
+ * @see Usermod::loop()
+ * @see UsermodManager::loop()
+ *
+ * @return void
+ */
+void ShtUsermod::loop()
+{
+  if (!enabled || !initDone || strip.isUpdating()) return;
+
+  if (isShtReady()) {
+    if (millis() - shtLastTimeUpdated > 30000 && !shtDataRequested) {
+      shtTempHumidSensor->requestData();
+      shtDataRequested = true;
+
+      shtLastTimeUpdated = millis();
+    }
+
+    if (shtDataRequested) {
+      if (shtTempHumidSensor->dataReady()) {
+        if (shtTempHumidSensor->readData(false)) {
+          shtCurrentTempC = shtTempHumidSensor->getTemperature();
+          shtCurrentHumidity = shtTempHumidSensor->getHumidity();
+
+          publishTemperatureAndHumidityViaMqtt();
+          shtReadDataSuccess = true;
+        } else {
+          shtReadDataSuccess = false;
+        }
+
+        shtDataRequested = false;
+      }
+    }
+  }
+}
+
+/**
+ * Whenever MQTT is connected, publish HA autodiscovery topics.
+ *
+ * Is only donce once.
+ *
+ * @see Usermod::onMqttConnect()
+ * @see UsermodManager::onMqttConnect()
+ *
+ * @return void
+ */
+void ShtUsermod::onMqttConnect(bool sessionPresent) {
+  if (haMqttDiscovery && !haMqttDiscoveryDone) publishHomeAssistantAutodiscovery();
+}
+
+/**
+ * Add dropdown for sensor type and unit to UM config page.
+ *
+ * @see Usermod::appendConfigData()
+ * @see UsermodManager::appendConfigData()
+ *
+ * @return void
+ */
+void ShtUsermod::appendConfigData() {
+  oappend(SET_F("dd=addDropdown('"));
+  oappend(_name);
+  oappend(SET_F("','"));
+  oappend(_shtType);
+  oappend(SET_F("');"));
+  oappend(SET_F("addOption(dd,'SHT30',0);"));
+  oappend(SET_F("addOption(dd,'SHT31',1);"));
+  oappend(SET_F("addOption(dd,'SHT35',2);"));
+  oappend(SET_F("addOption(dd,'SHT85',3);"));
+  oappend(SET_F("dd=addDropdown('"));
+  oappend(_name);
+  oappend(SET_F("','"));
+  oappend(_unitOfTemp);
+  oappend(SET_F("');"));
+  oappend(SET_F("addOption(dd,'Celsius',0);"));
+  oappend(SET_F("addOption(dd,'Fahrenheit',1);"));
+}
+
+/**
+ * Add config data to be stored in cfg.json.
+ *
+ * @see Usermod::addToConfig()
+ * @see UsermodManager::addToConfig()
+ *
+ * @return void
+ */
+void ShtUsermod::addToConfig(JsonObject &root)
+{
+  JsonObject top = root.createNestedObject(FPSTR(_name)); // usermodname
+
+  top[FPSTR(_enabled)] = enabled;
+  top[FPSTR(_shtType)] = shtType;
+  top[FPSTR(_unitOfTemp)] = unitOfTemp;
+  top[FPSTR(_haMqttDiscovery)] = haMqttDiscovery;
+}
+
+/**
+ * Apply config on boot or save of UM config page.
+ *
+ * This is called whenever WLED boots and loads cfg.json, or when the UM config
+ * page is saved. Will properly re-instantiate the SHT class upon type change and
+ * publish HA discovery after enabling.
+ *
+ * @see Usermod::readFromConfig()
+ * @see UsermodManager::readFromConfig()
+ *
+ * @return bool
+ */
+bool ShtUsermod::readFromConfig(JsonObject &root)
+{
+  JsonObject top = root[FPSTR(_name)];
+  if (top.isNull()) {
+    DEBUG_PRINTF("[%s] No config found. (Using defaults.)\n", _name);
+    return false;
+  }
+
+  bool oldEnabled = enabled;
+  byte oldShtType = shtType;
+  byte oldUnitOfTemp = unitOfTemp;
+  bool oldHaMqttDiscovery = haMqttDiscovery;
+
+  getJsonValue(top[FPSTR(_enabled)], enabled);
+  getJsonValue(top[FPSTR(_shtType)], shtType);
+  getJsonValue(top[FPSTR(_unitOfTemp)], unitOfTemp);
+  getJsonValue(top[FPSTR(_haMqttDiscovery)], haMqttDiscovery);
+
+  // First run: reading from cfg.json, nothing to do here, will be all done in setup()
+  if (!firstRunDone) {
+    DEBUG_PRINTF("[%s] First run, nothing to do\n", _name);
+  }
+  // Check if mod has been en-/disabled
+  else if (enabled != oldEnabled) {
+    enabled ? setup() : cleanup();
+    DEBUG_PRINTF("[%s] Usermod has been en-/disabled\n", _name);
+  }
+  // Config has been changed, so adopt to changes
+  else if (enabled) {
+    if (oldShtType != shtType) {
+      cleanupShtTempHumiditySensor();
+      initShtTempHumiditySensor();
+    }
+
+    if (oldUnitOfTemp != unitOfTemp) {
+      publishTemperatureAndHumidityViaMqtt();
+      publishHomeAssistantAutodiscovery();
+    }
+
+    if (oldHaMqttDiscovery != haMqttDiscovery && haMqttDiscovery) {
+      publishHomeAssistantAutodiscovery();
+    }
+
+    DEBUG_PRINTF("[%s] Config (re)loaded\n", _name);
+  }
+
+  return true;
+}
+
+/**
+ * Adds the temperature and humidity actually to the info section and /json info.
+ *
+ * This is called every time the info section is opened ot /json is called.
+ *
+ * @see Usermod::addToJsonInfo()
+ * @see UsermodManager::addToJsonInfo()
+ *
+ * @return void
+ */
+void ShtUsermod::addToJsonInfo(JsonObject& root)
+{
+  if (!enabled && !isShtReady()) {
+    return;
+  }
+
+  JsonObject user = root["u"];
+  if (user.isNull()) user = root.createNestedObject("u");
+
+  JsonArray jsonTemp = user.createNestedArray(F("Temperature"));
+  JsonArray jsonHumidity = user.createNestedArray(F("Humidity"));
+
+  if (shtLastTimeUpdated == 0 || !shtReadDataSuccess) {
+    jsonTemp.add(0);
+    jsonHumidity.add(0);
+    if (shtLastTimeUpdated == 0) {
+      jsonTemp.add(F(" Not read yet"));
+      jsonHumidity.add(F(" Not read yet"));
+    } else {
+      jsonTemp.add(F(" Error"));
+      jsonHumidity.add(F(" Error"));
+    }
+    return;
+  }
+
+  jsonHumidity.add(getHumidity());
+  jsonHumidity.add(F(" RH"));
+
+  jsonTemp.add(getTemperature());
+  jsonTemp.add(unitOfTemp ? "°F" : "°C");
+}
+
+/**
+ * Getter for last read temperature for configured unit.
+ *
+ * @return float
+ */
+float ShtUsermod::getTemperature() {
+  return unitOfTemp ? getTemperatureF() : getTemperatureC();
+}
+
+/**
+ * Returns the current configured unit as human readable string.
+ *
+ * @return const char*
+ */
+const char* ShtUsermod::getUnitString() {
+  return unitOfTemp ? "°F" : "°C";
+}
--- a/usermods/smartnest/readme.md
+++ b/usermods/smartnest/readme.md
@@ -1,6 +1,6 @@
 # Smartnest

-This usermod-v2 modification allows integration with `smartnest.cz` service which provides MQTT integration with voice assistants.
+Enables integration with `smartnest.cz` service which provides MQTT integration with voice assistants.
 In order to setup Smartnest follow the [documentation](https://www.docu.smartnest.cz/).

 ## MQTT API
@@ -49,7 +49,7 @@ void registerUsermods()

 ## Configuration

-Usermod has no configuration but relies on the MQTT configuration.\
+Usermod has no configuration, but it relies on the MQTT configuration.\
 Under Config > Sync Interfaces > MQTT:
 * Enable MQTT check box
 * Set the `Broker` field to: `smartnest.cz`
--- a/usermods/smartnest/usermod_smartnest.h
+++ b/usermods/smartnest/usermod_smartnest.h
@@ -1,3 +1,7 @@
+#ifndef WLED_ENABLE_MQTT
+#error "This user mod requires MQTT to be enabled."
+#endif
+
 #pragma once

 #include "wled.h"
--- a/usermods/stairway_wipe_basic/readme.md
+++ b/usermods/stairway_wipe_basic/readme.md
@@ -2,13 +2,13 @@

 Quick usermod to accomplish something similar to [this video](https://www.youtube.com/watch?v=NHkju5ncC4A).

-This usermod allows you to add a lightstrip alongside or on the steps of a staircase.
+This usermod enables you to add a lightstrip alongside or on the steps of a staircase.
 When the `userVar0` variable is set, the LEDs will gradually turn on in a Wipe effect.
 Both directions are supported by setting userVar0 to 1 and 2, respectively (HTTP API commands `U0=1` and `U0=2`).

-After the Wipe is complete, the light will either stay on (Solid effect) indefinitely or after `userVar1` seconds have elapsed.
-If userVar0 is updated (e.g. by triggering a second sensor) the light will slowly fade off.
-This could be extended to also run a Wipe effect in reverse order to turn the LEDs back off.
+After the Wipe is complete, the light will either stay on (Solid effect) indefinitely or extinguish after `userVar1` seconds have elapsed.
+If userVar0 is updated (e.g. by triggering a second sensor) the light will fade slowly until it's off.
+This could be extended to also run a Wipe effect in reverse order to turn the LEDs off.

 This is just a basic version to accomplish this using HTTP API calls `U0` and `U1` and/or macros.
-It should be easy to adapt this code however to interface with motion sensors or other input devices.
+It should be easy to adapt this code to interface with motion sensors or other input devices.
--- a/usermods/usermod_rotary_brightness_color/README.md
+++ b/usermods/usermod_rotary_brightness_color/README.md
@@ -1,18 +1,18 @@
 # Rotary Encoder (Brightness and Color)

-V2 usermod that allows changing brightness and color using a rotary encoder, 
+V2 usermod that enables changing brightness and color using a rotary encoder 
 change between modes by pressing a button (many encoders have one included)

-but it will wait for AUTOSAVE_SETTLE_MS milliseconds, a "settle" 
+it will wait for AUTOSAVE_SETTLE_MS milliseconds. a "settle" 
 period in case there are other changes (any change will 
-extend the "settle" window).
+extend the "settle" period).

 It will additionally load preset AUTOSAVE_PRESET_NUM at startup.
 during the first `loop()`.  Reasoning below.

 AutoSaveUsermod is standalone, but if FourLineDisplayUsermod is installed, it will notify the user of the saved changes.

-Note: I don't love that WLED doesn't respect the brightness of the preset being auto loaded, so the AutoSaveUsermod will set the AUTOSAVE_PRESET_NUM preset in the first loop, so brightness IS honored. This means WLED will effectively ignore Default brightness and Apply N preset at boot when the AutoSaveUsermod is installed.
+Note: WLED doesn't respect the brightness of the preset being auto loaded, so the AutoSaveUsermod will set the AUTOSAVE_PRESET_NUM preset in the first loop, so brightness IS honored. This means WLED will effectively ignore Default brightness and Apply N preset at boot when the AutoSaveUsermod is installed.

 ## Installation

--- a/usermods/usermod_v2_auto_save/readme.md
+++ b/usermods/usermod_v2_auto_save/readme.md
@@ -9,13 +9,13 @@ to preset number AUTOSAVE_PRESET_NUM after a change to any of:
 * palette

 but it will wait for AUTOSAVE_AFTER_SEC seconds,
-a "settle" period in case there are other changes (any change will extend the "settle" window).
+a "settle" period in case there are other changes (any change will extend the "settle" period).

 It will additionally load preset AUTOSAVE_PRESET_NUM at startup during the first `loop()`.

 AutoSaveUsermod is standalone, but if FourLineDisplayUsermod is installed, it will notify the user of the saved changes.

-Note: I don't love that WLED doesn't respect the brightness of the preset being auto loaded, so the AutoSaveUsermod will set the AUTOSAVE_PRESET_NUM preset in the first loop, so brightness IS honored. This means WLED will effectively ignore Default brightness and Apply N preset at boot when the AutoSaveUsermod is installed.
+Note: WLED doesn't respect the brightness of the preset being auto loaded, so the AutoSaveUsermod will set the AUTOSAVE_PRESET_NUM preset in the first loop, so brightness IS honored. This means WLED will effectively ignore Default brightness and Apply N preset at boot when the AutoSaveUsermod is installed.

 ## Installation

@@ -25,7 +25,7 @@ This file should be placed in the same directory as `platformio.ini`.

 ### Define Your Options

-* `USERMOD_AUTO_SAVE`           - define this to have this the Auto Save usermod included wled00\usermods_list.cpp
+* `USERMOD_AUTO_SAVE`           - define this to have this usermod included wled00\usermods_list.cpp
 * `AUTOSAVE_AFTER_SEC`          - define the delay time after the settings auto-saving routine should be executed
 * `AUTOSAVE_PRESET_NUM`         - define the preset number used by autosave usermod
 * `USERMOD_AUTO_SAVE_ON_BOOT`   - define if autosave should be enabled on boot
@@ -52,4 +52,4 @@ Note: the Four Line Display usermod requires the libraries `U8g2` and `Wire`.
 2021-02
 * First public release
 2021-04
-* Adaptation for runtime configuration.
+* Adaptation for runtime configuration.
--- a/usermods/usermod_v2_auto_save/usermod_v2_auto_save.h
+++ b/usermods/usermod_v2_auto_save/usermod_v2_auto_save.h
@@ -204,6 +204,10 @@ class AutoSaveUsermod : public Usermod {
      }
    }

+    void appendConfigData() {
+      oappend(SET_F("addHB('Autosave');"));
+    }
+
    /*
     * addToConfig() can be used to add custom persistent settings to the cfg.json file in the "um" (usermod) object.
     * It will be called by WLED when settings are actually saved (for example, LED settings are saved)
--- a/usermods/usermod_v2_four_line_display/readme.md
+++ b/usermods/usermod_v2_four_line_display/readme.md
@@ -2,9 +2,9 @@

 First, thanks to the authors of the ssd11306_i2c_oled_u8g2 mod.

-This usermod provides a four line display using either
+Provides a four line display using either
 128x32 or 128x64 OLED displays.
-It's can operate independently, but starts to provide
+It can operate independently, but starts to provide
 a relatively complete on-device UI when paired with the 
 Rotary Encoder UI usermod. I strongly encourage you to use 
 them together.
@@ -19,11 +19,11 @@ This file should be placed in the same directory as `platformio.ini`.

 ### Define Your Options

-* `USERMOD_FOUR_LINE_DISPLAY`  - define this to have this the Four Line Display mod included wled00\usermods_list.cpp - also tells Rotary Encoder usermod, if installed, that the display is available
+* `USERMOD_FOUR_LINE_DISPLAY`  - define this to have this mod included wled00\usermods_list.cpp - also tells Rotary Encoder usermod, if installed, the display is available
 * `FLD_PIN_SCL`                - The display SCL pin, defaults to 5
 * `FLD_PIN_SDA`                - The display SDA pin, defaults to 4

-All of the parameters can be configured using Usermods settings page, inluding GPIO pins.
+All of the parameters can be configured via the Usermods settings page, inluding GPIO pins.

 ### PlatformIO requirements

@@ -44,7 +44,7 @@ UI usermod folder for how to include these using `platformio_override.ini`.
    * 6 = SPI SSD1306 128x32
    * 7 = SPI SSD1306 128x64 (4 double-height lines)
 * `contrast` - set display contrast (higher contrast may reduce display lifetime)
-* `refreshRateSec` - time in seconds for display refresh
+* `refreshRateSec` - display refresh time in seconds
 * `screenTimeOutSec` - screen saver time-out in seconds
 * `flip` - flip/rotate display 180°
 * `sleepMode` - enable/disable screen saver
@@ -60,4 +60,4 @@ UI usermod folder for how to include these using `platformio_override.ini`.
 * Adaptation for runtime configuration.

 2021-11
-* Added configuration option description.
+* Added configuration option description.
--- a/usermods/usermod_v2_four_line_display/usermod_v2_four_line_display.h
+++ b/usermods/usermod_v2_four_line_display/usermod_v2_four_line_display.h
@@ -33,8 +33,8 @@
 #ifndef FLD_PIN_CLOCKSPI
  #define FLD_PIN_CLOCKSPI spi_sclk
 #endif
-  #ifndef FLD_PIN_DATASPI
-  #define FLD_PIN_DATASPI spi_mosi
+  #ifndef FLD_PIN_MOSISPI //WLEDMM renamed from HW_PIN_DATASPI
+  #define FLD_PIN_MOSISPI spi_mosi
 #endif   
 #ifndef FLD_PIN_CS
  #define FLD_PIN_CS spi_cs
@@ -109,7 +109,7 @@ class FourLineDisplayUsermod : public Usermod {
    int8_t ioPin[5] = {FLD_PIN_SCL, FLD_PIN_SDA, -1, -1, -1};        // I2C pins: SCL, SDA
    uint32_t ioFrequency = 400000;  // in Hz (minimum is 100000, baseline is 400000 and maximum should be 3400000)
    #else
-    int8_t ioPin[5] = {FLD_PIN_CLOCKSPI, FLD_PIN_DATASPI, FLD_PIN_CS, FLD_PIN_DC, FLD_PIN_RESET}; // SPI pins: CLK, MOSI, CS, DC, RST
+    int8_t ioPin[5] = {FLD_PIN_CLOCKSPI, FLD_PIN_MOSISPI, FLD_PIN_CS, FLD_PIN_DC, FLD_PIN_RESET}; // SPI pins: CLK, MOSI, CS, DC, RST
    uint32_t ioFrequency = 1000000;  // in Hz (minimum is 500kHz, baseline is 1MHz and maximum should be 20MHz)
    #endif
    DisplayType type = FLD_TYPE;    // display type
@@ -120,8 +120,11 @@ class FourLineDisplayUsermod : public Usermod {
    uint32_t screenTimeout = SCREEN_TIMEOUT_MS;       // in ms
    bool sleepMode = true;          // allow screen sleep?
    bool clockMode = false;         // display clock
+#if defined(ARDUINO_ARCH_ESP32) && ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 0, 0)
+    bool enabled = false;  // WLEDMM workaround for I2C bugs in IDF v4.4.1
+#else
    bool enabled = true;
-
+#endif
    // Next variables hold the previous known values to determine if redraw is
    // required.
    String knownSsid = "";
@@ -177,9 +180,9 @@ class FourLineDisplayUsermod : public Usermod {
        isHW = (ioPin[0]==i2c_scl && ioPin[1]==i2c_sda);
        //isHW = true;
        if (isHW) po = PinOwner::HW_I2C;  // allow multiple allocations of HW I2C bus pins
-        if (ioPin[0] < 0 || ioPin[1] < 0)  { type=NONE; return; }  //WLEDMM bugfix - ensure that "final" GPIO are valid
+        if (ioPin[0] < 0 || ioPin[1] < 0)  { type=NONE; enabled = false; return; }  //WLEDMM bugfix - ensure that "final" GPIO are valid
        PinManagerPinType pins[2] = { { ioPin[0], true }, { ioPin[1], true } };
-        if (!pinManager.allocateMultiplePins(pins, 2, po)) { type=NONE; return; }
+        if (!pinManager.allocateMultiplePins(pins, 2, po)) { type=NONE; enabled = false; return; }
      }

      DEBUG_PRINTLN(F("Allocating display."));
@@ -224,14 +227,14 @@ class FourLineDisplayUsermod : public Usermod {
      }

      if (nullptr == u8x8) {
-          DEBUG_PRINTLN(F("Display init failed."));
+          USER_PRINTLN(F("Display init failed."));
          pinManager.deallocateMultiplePins((const uint8_t*)ioPin, (type == SSD1306_SPI || type == SSD1306_SPI64) ? 5 : 2, po);
          type = NONE;
          return;
      }

      initDone = true;
-      DEBUG_PRINTLN(F("Starting display."));
+      USER_PRINTLN(F("Starting display."));
      /*if (!(type == SSD1306_SPI || type == SSD1306_SPI64))*/ u8x8->setBusClock(ioFrequency);  // can be used for SPI too
      u8x8->begin();
      setFlipMode(flip);
@@ -636,6 +639,7 @@ class FourLineDisplayUsermod : public Usermod {
      JsonObject top   = root.createNestedObject(FPSTR(_name));
      top[FPSTR(_enabled)]       = enabled;
      JsonArray io_pin = top.createNestedArray("pin");
+      #warning WLEDMM: this causes global pin hijacking
      for (byte i=0; i<5; i++) io_pin.add(ioPin[i]);
      top["help4Pins"]           = F("Clk,Data,CS,DC,RST"); // help for Settings page
      top["type"]                = type;
--- a/usermods/usermod_v2_four_line_display_ALT/readme.md
+++ b/usermods/usermod_v2_four_line_display_ALT/readme.md
@@ -4,12 +4,12 @@ Thank you to the authors of the original version of these usermods. It would not
 "usermod_v2_four_line_display"
 "usermod_v2_rotary_encoder_ui"

-The core of these usermods are a copy of the originals. The main changes are done to the FourLineDisplay usermod.
+The core of these usermods are a copy of the originals. The main changes are to the FourLineDisplay usermod.
 The display usermod UI has been completely changed.


 The changes made to the RotaryEncoder usermod were made to support the new UI in the display usermod. 
-Without the display it functions identical to the original.
+Without the display it, functions identical to the original.
 The original "usermod_v2_auto_save" will not work with the display just yet.

 Press the encoder to cycle through the options:
@@ -22,7 +22,7 @@ Press the encoder to cycle through the options:
    *Saturation (only if display is used)

 Press and hold the encoder to display Network Info
-    if AP is active then it will display AP ssid and Password
+    if AP is active, it will display AP, SSID and password

 Also shows if the timer is enabled

@@ -31,8 +31,8 @@ Also shows if the timer is enabled
 ## Installation

 Please refer to the original `usermod_v2_rotary_encoder_ui` readme for the main instructions
-Then to activate this alternative usermod add `#define USE_ALT_DISPlAY` to the `usermods_list.cpp` file,
-                                        or add `-D USE_ALT_DISPlAY` to the original `platformio_override.ini.sample` file
+Then to activate this alternative usermod add `#define USE_ALT_DISPLAY` to the `usermods_list.cpp` file,
+                                        or add `-D USE_ALT_DISPLAY` to the original `platformio_override.ini.sample` file


 ### PlatformIO requirements
@@ -42,4 +42,4 @@ Note: the Four Line Display usermod requires the libraries `U8g2` and `Wire`.
 ## Change Log

 2021-10
-* First public release
+* First public release
--- a/usermods/usermod_v2_four_line_display_ALT/usermod_v2_four_line_display_ALT.h
+++ b/usermods/usermod_v2_four_line_display_ALT/usermod_v2_four_line_display_ALT.h
@@ -1,9 +1,18 @@
 #pragma once

+#include <Arduino.h>              // WLEDMM: make sure that I2C drivers have the "right" Wire Object
+#include <Wire.h>
+#undef U8X8_NO_HW_I2C             // WLEDMM: we do want I2C hardware drivers - if possible
+//#define WIRE_INTERFACES_COUNT 2   // experimental - tell U8x8Lib that there is a econd Wire unit
+
 #include "wled.h"
 #include <U8x8lib.h> // from https://github.com/olikraus/u8g2/
 #include "4LD_wled_fonts.c"

+#ifndef FLD_ESP32_NO_THREADS
+#define FLD_ESP32_USE_THREADS  // comment out to use 0.13.x behviour without parallel update task - slower, but more robust. May delay other tasks like LEDs or audioreactive!!
+#endif
+
 //
 // Insired by the usermod_v2_four_line_display
 //
@@ -26,35 +35,26 @@

 //The SCL and SDA pins are defined here. 
 #ifndef FLD_PIN_SCL
-  #define FLD_PIN_SCL i2c_scl
+  #define FLD_PIN_SCL -1
 #endif
 #ifndef FLD_PIN_SDA
-  #define FLD_PIN_SDA i2c_sda
+  #define FLD_PIN_SDA -1
 #endif
 #ifndef FLD_PIN_CLOCKSPI
-  #define FLD_PIN_CLOCKSPI spi_sclk
+  #define FLD_PIN_CLOCKSPI -1
 #endif
-  #ifndef FLD_PIN_DATASPI
-  #define FLD_PIN_DATASPI spi_mosi
+#ifndef FLD_PIN_MOSISPI //WLEDMM renamed from HW_PIN_DATASPI
+  #define FLD_PIN_MOSISPI -1
 #endif   
 #ifndef FLD_PIN_CS
-  #define FLD_PIN_CS spi_cs
+  #define FLD_PIN_CS -1
 #endif

-#ifdef ARDUINO_ARCH_ESP32
-  #ifndef FLD_PIN_DC
-    #define FLD_PIN_DC 19
-  #endif
-  #ifndef FLD_PIN_RESET
-    #define FLD_PIN_RESET 26
-  #endif
-#else
-  #ifndef FLD_PIN_DC
-    #define FLD_PIN_DC 12
-  #endif
-  #ifndef FLD_PIN_RESET
-    #define FLD_PIN_RESET 16
-  #endif
+#ifndef FLD_PIN_DC
+  #define FLD_PIN_DC -1
+#endif
+#ifndef FLD_PIN_RESET
+  #define FLD_PIN_RESET -1
 #endif

 #ifndef FLD_TYPE
@@ -98,14 +98,19 @@ typedef enum {

 class FourLineDisplayUsermod : public Usermod {
  public:
+#ifdef ARDUINO_ARCH_ESP32
    FourLineDisplayUsermod() { if (!instance) instance = this; }
    static FourLineDisplayUsermod* getInstance(void) { return instance; }
+#endif

  private:

    static FourLineDisplayUsermod *instance;
    bool initDone = false;
-    volatile bool drawing = false;
+    volatile bool drawing = false;          // true of overlay drawing is active
+    volatile bool reDrawing = false;        // true if redraw ongoing (on esp32, this happens in a separate task)
+
+    char errorMessage[100] = ""; //WLEDMM: show error in um settings if occurred

    // HW interface & configuration
    U8X8 *u8x8 = nullptr;           // pointer to U8X8 display object
@@ -114,11 +119,12 @@ class FourLineDisplayUsermod : public Usermod {
    int8_t ioPin[5] = {FLD_PIN_SCL, FLD_PIN_SDA, -1, -1, -1};        // I2C pins: SCL, SDA
    uint32_t ioFrequency = 400000;  // in Hz (minimum is 100000, baseline is 400000 and maximum should be 3400000)
    #else
-    int8_t ioPin[5] = {FLD_PIN_CLOCKSPI, FLD_PIN_DATASPI, FLD_PIN_CS, FLD_PIN_DC, FLD_PIN_RESET}; // SPI pins: CLK, MOSI, CS, DC, RST
+    int8_t ioPin[5] = {FLD_PIN_CLOCKSPI, FLD_PIN_MOSISPI, FLD_PIN_CS, FLD_PIN_DC, FLD_PIN_RESET}; // SPI pins: CLK, MOSI, CS, DC, RST
    uint32_t ioFrequency = 1000000;  // in Hz (minimum is 500kHz, baseline is 1MHz and maximum should be 20MHz)
    #endif

    DisplayType type = FLD_TYPE;    // display type
+    bool typeOK = false;             //WLEDMM: instead of type == NULL and type=NULL. Intially false, as display was not initialized yet
    bool flip = false;              // flip display 180°
    uint8_t contrast = 10;          // screen contrast
    uint8_t lineHeight = 1;         // 1 row or 2 rows
@@ -127,7 +133,15 @@ class FourLineDisplayUsermod : public Usermod {
    bool sleepMode = true;          // allow screen sleep?
    bool clockMode = false;         // display clock
    bool showSeconds = true;        // display clock with seconds
+#if defined(ARDUINO_ARCH_ESP32) 
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 0, 0)
+    bool enabled = false;  // WLEDMM workaround for I2C bugs in IDF v4.4.1
+#else
    bool enabled = true;
+#endif
+#else
+    bool enabled = true;
+#endif
    bool contrastFix = false;

    // Next variables hold the previous known values to determine if redraw is
@@ -178,6 +192,9 @@ class FourLineDisplayUsermod : public Usermod {

    // some displays need this to properly apply contrast
    void setVcomh(bool highContrast) {
+      if (!typeOK || !enabled) return;    // WLEDMM make sure the display is initialized before we try to draw on it
+      if (!canDraw()) return;              // don't interfere with ongoing draw
+
      u8x8_t *u8x8_struct = u8x8->getU8x8();
      u8x8_cad_StartTransfer(u8x8_struct);
      u8x8_cad_SendCmd(u8x8_struct, 0x0db); //address of value
@@ -189,45 +206,46 @@ class FourLineDisplayUsermod : public Usermod {
     * Wrappers for screen drawing
     */
    void setFlipMode(uint8_t mode) {
-      if (type == NONE || !enabled) return;
-      u8x8->setFlipMode(mode);
+      if (!typeOK || !enabled) return;    // WLEDMM make sure the display is initialized before we try to draw on it
+      if (canDraw()) u8x8->setFlipMode(mode);
    }
    void setContrast(uint8_t contrast) {
-      if (type == NONE || !enabled) return;
-      u8x8->setContrast(contrast);
+      if (!typeOK || !enabled) return;    // WLEDMM make sure the display is initialized before we try to draw on it
+      if (canDraw()) u8x8->setContrast(contrast);
    }
    void drawString(uint8_t col, uint8_t row, const char *string, bool ignoreLH=false) {
-      if (type == NONE || !enabled) return;
-      u8x8->setFont(u8x8_font_chroma48medium8_r);
-      if (!ignoreLH && lineHeight==2) u8x8->draw1x2String(col, row, string);
+      if (!typeOK || !enabled) return;    // WLEDMM make sure the display is initialized before we try to draw on it
+      u8x8->setFont(u8x8_font_chroma48medium8_r);  // crashes randomly on ESP32
+      if (!ignoreLH && lineHeight==2) u8x8->draw1x2String(col, row, string); // crashes randomly on ESP32
      else                            u8x8->drawString(col, row, string);
    }
    void draw2x2String(uint8_t col, uint8_t row, const char *string) {
-      if (type == NONE || !enabled) return;
+      if (!typeOK || !enabled) return;
      u8x8->setFont(u8x8_font_chroma48medium8_r);
      u8x8->draw2x2String(col, row, string);
    }
    void drawGlyph(uint8_t col, uint8_t row, char glyph, const uint8_t *font, bool ignoreLH=false) {
-      if (type == NONE || !enabled) return;
+      if (!typeOK || !enabled) return;
      u8x8->setFont(font);
      if (!ignoreLH && lineHeight==2) u8x8->draw1x2Glyph(col, row, glyph);
      else                            u8x8->drawGlyph(col, row, glyph);
    }
    void draw2x2Glyph(uint8_t col, uint8_t row, char glyph, const uint8_t *font) {
-      if (type == NONE || !enabled) return;
+      if (!typeOK || !enabled) return;
      u8x8->setFont(font);
      u8x8->draw2x2Glyph(col, row, glyph);
    }
    uint8_t getCols() {
-      if (type==NONE || !enabled) return 0;
+      if (!typeOK || !enabled) return 0;
      return u8x8->getCols();
    }
    void clear() {
-      if (type == NONE || !enabled) return;
-      u8x8->clear();
+      if (!typeOK || !enabled) return;
+      if (nullptr == u8x8) return;  // prevents some crashes
+      u8x8->clear();         // crashes randomly on ESP32
    }
    void setPowerSave(uint8_t save) {
-      if (type == NONE || !enabled) return;
+      if (!typeOK || !enabled) return;    // WLEDMM make sure the display is initialized before we try to draw on it
      u8x8->setPowerSave(save);
    }

@@ -238,6 +256,7 @@ class FourLineDisplayUsermod : public Usermod {
    }

    void draw2x2GlyphIcons() {
+      if (!typeOK || !enabled) return;    // WLEDMM make sure the display is initialized before we try to draw on it
      if (lineHeight == 2) {
        drawGlyph( 1,            0, 1, u8x8_4LineDisplay_WLED_icons_2x2, true); //brightness icon
        drawGlyph( 5,            0, 2, u8x8_4LineDisplay_WLED_icons_2x2, true); //speed icon
@@ -259,13 +278,13 @@ class FourLineDisplayUsermod : public Usermod {
     * the useAMPM configuration.
     */
    void showTime() {
-      if (type == NONE || !enabled || !displayTurnedOff) return;
+      if (!typeOK || !enabled || !displayTurnedOff) return;

      unsigned long now = millis();
      while (drawing && millis()-now < 250) delay(1); // wait if someone else is drawing
      drawing = true;

-      char lineBuffer[LINE_BUFFER_SIZE];
+      char lineBuffer[LINE_BUFFER_SIZE] = { '\0' };
      static byte lastSecond;
      byte secondCurrent = second(localTime);
      byte minuteCurrent = minute(localTime);
@@ -281,10 +300,10 @@ class FourLineDisplayUsermod : public Usermod {
        }
        if (knownHour != hourCurrent) {
          // only update date when hour changes
-          sprintf_P(lineBuffer, PSTR("%s %2d "), monthShortStr(month(localTime)), day(localTime)); 
+          snprintf_P(lineBuffer, LINE_BUFFER_SIZE, PSTR("%s %2d "), monthShortStr(month(localTime)), day(localTime)); 
          draw2x2String(2, lineHeight==1 ? 0 : lineHeight, lineBuffer); // adjust for 8 line displays, draw month and day
        }
-        sprintf_P(lineBuffer,PSTR("%2d:%02d"), (useAMPM ? AmPmHour : hourCurrent), minuteCurrent);
+        snprintf_P(lineBuffer,LINE_BUFFER_SIZE, PSTR("%2d:%02d"), (useAMPM ? AmPmHour : hourCurrent), minuteCurrent);
        draw2x2String(2, lineHeight*2, lineBuffer); //draw hour, min. blink ":" depending on odd/even seconds
        if (useAMPM) drawString(12, lineHeight*2, (isitAM ? "AM" : "PM"), true); //draw am/pm if using 12 time

@@ -296,7 +315,7 @@ class FourLineDisplayUsermod : public Usermod {
      if (showSeconds && secondCurrent != lastSecond) {
        lastSecond = secondCurrent;
        draw2x2String(6, lineHeight*2, secondCurrent%2 ? " " : ":");
-        sprintf_P(lineBuffer, PSTR("%02d"), secondCurrent);
+        snprintf_P(lineBuffer, LINE_BUFFER_SIZE, PSTR("%02d"), secondCurrent);
        drawString(12, lineHeight*2+1, lineBuffer, true); // even with double sized rows print seconds in 1 line
      }
      drawing = false;
@@ -307,40 +326,43 @@ class FourLineDisplayUsermod : public Usermod {
    // gets called once at boot. Do all initialization that doesn't depend on
    // network here
    void setup() {
-      if (type == NONE || !enabled) return;
+      if (!enabled) return;   // typeOK = true will be set after successfull setup

      bool isHW, isSPI = (type == SSD1306_SPI || type == SSD1306_SPI64);
      PinOwner po = PinOwner::UM_FourLineDisplay;
      if (isSPI) {
-        uint8_t hw_sclk = spi_sclk<0 ? HW_PIN_CLOCKSPI : spi_sclk;
-        uint8_t hw_mosi = spi_mosi<0 ? HW_PIN_DATASPI : spi_mosi;
        if (ioPin[0] < 0 || ioPin[1] < 0) {
-          ioPin[0] = hw_sclk;
-          ioPin[1] = hw_mosi;
+          ioPin[0] = spi_sclk;
+          ioPin[1] = spi_mosi;
        }
-        isHW = (ioPin[0]==hw_sclk && ioPin[1]==hw_mosi);
+        isHW = (ioPin[0]==spi_sclk && ioPin[1]==spi_mosi);
        PinManagerPinType cspins[3] = { { ioPin[2], true }, { ioPin[3], true }, { ioPin[4], true } };
-        if (!pinManager.allocateMultiplePins(cspins, 3, PinOwner::UM_FourLineDisplay)) { type=NONE; return; }
+        if (!pinManager.allocateMultiplePins(cspins, 3, PinOwner::UM_FourLineDisplay)) { typeOK=false; strcpy(errorMessage, PSTR("SPI3 alloc pins failed")); return; }
        if (isHW) po = PinOwner::HW_SPI;  // allow multiple allocations of HW I2C bus pins
        PinManagerPinType pins[2] = { { ioPin[0], true }, { ioPin[1], true } };
        if (!pinManager.allocateMultiplePins(pins, 2, po)) {
          pinManager.deallocateMultiplePins(cspins, 3, PinOwner::UM_FourLineDisplay);
-          type = NONE;
+          typeOK=false;
+          strcpy(errorMessage, PSTR("SPI2 alloc pins failed"));
          return;
        }
      } else {
-        uint8_t hw_scl = i2c_scl<0 ? HW_PIN_SCL : i2c_scl;
-        uint8_t hw_sda = i2c_sda<0 ? HW_PIN_SDA : i2c_sda;
        if (ioPin[0] < 0 || ioPin[1] < 0) {
-          ioPin[0] = hw_scl;
-          ioPin[1] = hw_sda;
+          ioPin[0] = i2c_scl;
+          ioPin[1] = i2c_sda;
        }
-        isHW = (ioPin[0]==hw_scl && ioPin[1]==hw_sda);
+        isHW = (ioPin[0]==i2c_scl && ioPin[1]==i2c_sda);
        // isHW = true;
        if (isHW) po = PinOwner::HW_I2C;  // allow multiple allocations of HW I2C bus pins
        PinManagerPinType pins[2] = { {ioPin[0], true }, { ioPin[1], true } };
-        if (ioPin[0] < 0 || ioPin[1] < 0)  { type=NONE; return; }  //WLEDMM bugfix - ensure that "final" GPIO are valid
-        if (!pinManager.allocateMultiplePins(pins, 2, po)) { type=NONE; return; }
+
+        if (ioPin[0] < 0 || ioPin[1] < 0)  { typeOK=false; strcpy(errorMessage, PSTR("I2C No Pins defined")); return; }  //WLEDMM bugfix - ensure that "final" GPIO are valid
+
+        if (isHW) {
+          if (!pinManager.joinWire(ioPin[1], ioPin[0])) { typeOK=false; strcpy(errorMessage, PSTR("I2C init failed")); return; }  // WLEDMM join the HW bus
+        } else {
+          if (!pinManager.allocateMultiplePins(pins, 2, po)) { typeOK=false; strcpy(errorMessage, PSTR("I2C Alloc pins failed")); return; } // WLEDMM use software bus
+        }
      }

      DEBUG_PRINTLN(F("Allocating display."));
@@ -371,7 +393,8 @@ class FourLineDisplayUsermod : public Usermod {
          u8x8_Setup(u8x8.getU8x8(), u8x8_d_ssd1306_128x64_noname, u8x8_cad_001, u8x8_byte_arduino_4wire_sw_spi, u8x8_gpio_and_delay_arduino);
          break;
        default:
-          type = NONE;
+          typeOK=false;
+          strcpy(errorMessage, PSTR("No valid type"));
          return;
      }
      if (isSPI) {
@@ -418,16 +441,24 @@ class FourLineDisplayUsermod : public Usermod {
      }

      if (nullptr == u8x8) {
-          DEBUG_PRINTLN(F("Display init failed."));
+          USER_PRINTLN(F("Display init failed."));
          pinManager.deallocateMultiplePins((const uint8_t*)ioPin, isSPI ? 5 : 2, po);
-          type = NONE;
+          typeOK=false;
+          strcpy(errorMessage, PSTR("Display init failed"));
          return;
      }

      lineHeight = u8x8->getRows() > 4 ? 2 : 1;
-      DEBUG_PRINTLN(F("Starting display."));
+      if (isSPI) {
+        USER_PRINTLN(isHW ? F("Starting display (SPI HW).") : F("Starting display (SPI Soft)."));
+      } else {
+        USER_PRINTLN(isHW ? F("Starting display (I2C HW).") : F("Starting display (I2C Soft)."));
+      }
      u8x8->setBusClock(ioFrequency);  // can be used for SPI too
      u8x8->begin();
+      typeOK = true;
+      drawing = false;
+      reDrawing = false;
      setFlipMode(flip);
      setVcomh(contrastFix);
      setContrast(contrast); //Contrast setup will help to preserve OLED lifetime. In case OLED need to be brighter increase number up to 255
@@ -450,12 +481,17 @@ class FourLineDisplayUsermod : public Usermod {
     * Da loop.
     */
    void loop() {
-    #ifndef ARDUINO_ARCH_ESP32
-      if (!enabled || strip.isUpdating()) return;
+    #if !defined(ARDUINO_ARCH_ESP32) || !defined(FLD_ESP32_USE_THREADS)
+      static unsigned long lastRunTime = 0;
      unsigned long now = millis();
+      if (!enabled || !typeOK || (strip.isUpdating() && (now - lastRunTime < 50))) return;
+      lastRunTime = now;
+
      if (now < nextUpdate) return;
      nextUpdate = now + ((displayTurnedOff && clockMode && showSeconds) ? 1000 : refreshRate);
+      reDrawing = true;
      redraw(false);
+      reDrawing = false;
    #endif
    }

@@ -464,15 +500,47 @@ class FourLineDisplayUsermod : public Usermod {
      lastRedraw = millis();
    }

+    //function to to check if a redraw or overlay draw is active. Needed for UM Rotary, to avoid random/concurrent drawing
+    bool canDraw(void) {
+    #if defined(ARDUINO_ARCH_ESP32) && defined(FLD_ESP32_USE_THREADS) // only necessary on ESP32
+      if (drawing) return(false);          // overlay draws someting
+      if (reDrawing) return(false);        // redraw task draws something
+    #endif
+      return(true);
+    }
+
    /**
     * Redraw the screen (but only if things have changed
     * or if forceRedraw).
     */
    void redraw(bool forceRedraw) {
+    #if defined(ARDUINO_ARCH_ESP32) && defined(FLD_ESP32_USE_THREADS)
+        // use a wrapper onESP32, to ensure the functions is not running several times in parallel !
+        static bool doForceRedraw = false;  // for delaying "force redraw"
+
+        if ((overlayUntil > 0) && (millis() >= overlayUntil)) {
+          forceRedraw = true; // Time to display the overlay has elapsed, force redraw needed
+        }
+
+        if (forceRedraw) doForceRedraw = true;
+        if (reDrawing) return; // redraw already active
+        if (drawing) return;   // overlay draw active
+
+        reDrawing = true;    // set redraw lock
+        if (doForceRedraw) forceRedraw = true;
+        redraw_core(forceRedraw);
+        if (overlayUntil == 0) doForceRedraw = false;   // redraw was skipped if overlay is still visible
+        reDrawing = false;     // reset activity flag, as redraw has too many early returns that don't take care of this
+    }
+
+    void redraw_core(bool forceRedraw) {
+#endif
      bool needRedraw = false;
      unsigned long now = millis();
+
+      if (!typeOK || !enabled) return;    // WLEDMM make sure the display is initialized before we try to draw on it
+      if (nullptr == u8x8) return;        // prevent crash in case u8x8 is re-initialized (du to user changing setings)
 
-      if (type == NONE || !enabled) return;
      if (overlayUntil > 0) {
        if (now >= overlayUntil) {
          // Time to display the overlay has elapsed.
@@ -561,6 +629,8 @@ class FourLineDisplayUsermod : public Usermod {
      knownnightlight      = nightlightActive;
      wificonnected        = interfacesInited;

+      while (drawing && millis()-now < 150) delay(8); // wait if someone else is drawing
+
      // Do the actual drawing
      // First row: Icons
      draw2x2GlyphIcons();
@@ -584,7 +654,7 @@ class FourLineDisplayUsermod : public Usermod {
      if (overlayUntil == 0) {
        brightness100 = ((uint16_t)bri*100)/255;
        char lineBuffer[4];
-        sprintf_P(lineBuffer, PSTR("%-3d"), brightness100);
+        snprintf_P(lineBuffer, 4, PSTR("%-3d"), brightness100);
        drawString(1, lineHeight, lineBuffer);
        //lastRedraw = millis();
      }
@@ -595,7 +665,7 @@ class FourLineDisplayUsermod : public Usermod {
      if (overlayUntil == 0) {
        fxspeed100 = ((uint16_t)effectSpeed*100)/255;
        char lineBuffer[4];
-        sprintf_P(lineBuffer, PSTR("%-3d"), fxspeed100);
+        snprintf_P(lineBuffer, 4, PSTR("%-3d"), fxspeed100);
        drawString(5, lineHeight, lineBuffer);
        //lastRedraw = millis();
      }
@@ -606,7 +676,7 @@ class FourLineDisplayUsermod : public Usermod {
      if (overlayUntil == 0) {
        fxintensity100 = ((uint16_t)effectIntensity*100)/255;
        char lineBuffer[4];
-        sprintf_P(lineBuffer, PSTR("%-3d"), fxintensity100);
+        snprintf_P(lineBuffer, 4, PSTR("%-3d"), fxintensity100);
        drawString(9, lineHeight, lineBuffer);
        //lastRedraw = millis();
      }
@@ -640,10 +710,12 @@ class FourLineDisplayUsermod : public Usermod {
    //Display the current effect or palette (desiredEntry) 
    // on the appropriate line (row). 
    void showCurrentEffectOrPalette(int inputEffPal, const char *qstring, uint8_t row) {
-      char lineBuffer[MAX_JSON_CHARS];
+      char lineBuffer[MAX_JSON_CHARS] = { '\0' };
+      if (!typeOK || !enabled) return;    // WLEDMM make sure the display is initialized before we try to draw on it
      if (overlayUntil == 0) {
        // Find the mode name in JSON
        uint8_t printedChars = extractModeName(inputEffPal, qstring, lineBuffer, MAX_JSON_CHARS-1);
+        if (printedChars < 2) strcpy(lineBuffer, "invalid");  // catch possible error
        if (lineBuffer[0]=='*' && lineBuffer[1]==' ') {
          // remove "* " from dynamic palettes
          for (byte i=2; i<=printedChars; i++) lineBuffer[i-2] = lineBuffer[i]; //include '\0'
@@ -654,8 +726,8 @@ class FourLineDisplayUsermod : public Usermod {
          printedChars -= 5;
        }
        if (lineHeight == 2) {                                 // use this code for 8 line display
-          char smallBuffer1[MAX_MODE_LINE_SPACE];
-          char smallBuffer2[MAX_MODE_LINE_SPACE];
+          char smallBuffer1[MAX_MODE_LINE_SPACE+1] = { '\0' };
+          char smallBuffer2[MAX_MODE_LINE_SPACE+1] = { '\0' };
          uint8_t smallChars1 = 0;
          uint8_t smallChars2 = 0;
          if (printedChars < MAX_MODE_LINE_SPACE) {            // use big font if the text fits
@@ -682,13 +754,15 @@ class FourLineDisplayUsermod : public Usermod {
            }
            while (smallChars1 < (MAX_MODE_LINE_SPACE-1)) smallBuffer1[smallChars1++]=' ';
            smallBuffer1[smallChars1] = 0;
+            smallBuffer1[MAX_MODE_LINE_SPACE -1] = '\0';   // ensure the string ends where it should  (while loop avove can overshoot by 1)
            drawString(1, row*lineHeight, smallBuffer1, true);
            while (smallChars2 < (MAX_MODE_LINE_SPACE-1)) smallBuffer2[smallChars2++]=' '; 
            smallBuffer2[smallChars2] = 0;
+            smallBuffer2[MAX_MODE_LINE_SPACE -1] = '\0';   // ensure the string ends where it should  (while loop avove can overshoot by 1)
            drawString(1, row*lineHeight+1, smallBuffer2, true);
          }
        } else {                                             // use this code for 4 ling displays
-          char smallBuffer3[MAX_MODE_LINE_SPACE+1];          // uses 1x1 icon for mode/palette
+          char smallBuffer3[MAX_MODE_LINE_SPACE+1] = {'\0'}; // uses 1x1 icon for mode/palette
          uint8_t smallChars3 = 0;
          for (uint8_t i = 0; i < MAX_MODE_LINE_SPACE; i++) smallBuffer3[smallChars3++] = (i >= printedChars) ? ' ' : lineBuffer[i];
          smallBuffer3[smallChars3] = 0;
@@ -704,7 +778,7 @@ class FourLineDisplayUsermod : public Usermod {
     * to wake up the screen.
     */
    bool wakeDisplay() {
-      if (type == NONE || !enabled) return false;
+      if (!typeOK || !enabled) return false;
      if (displayTurnedOff) {
        unsigned long now = millis();
        while (drawing && millis()-now < 250) delay(1); // wait if someone else is drawing
@@ -725,8 +799,10 @@ class FourLineDisplayUsermod : public Usermod {
     * Used in Rotary Encoder usermod.
     */
    void overlay(const char* line1, long showHowLong, byte glyphType) {
+      if (!typeOK || !enabled) return;   // WLEDMM make sure the display is initialized before we try to draw on it
      unsigned long now = millis();
      while (drawing && millis()-now < 250) delay(1); // wait if someone else is drawing
+      while ((reDrawing && overlayUntil == 0) && (millis()-now < 250)) delay(10); // wait if someone else is re-drawing
      drawing = true;
      // Turn the display back on
      if (!wakeDisplay()) clear();
@@ -749,6 +825,7 @@ class FourLineDisplayUsermod : public Usermod {
     * Clears the screen and prints.
     */
    void overlayLogo(long showHowLong) {
+      if (!typeOK || !enabled) return;   // WLEDMM make sure the display is initialized before we try to draw on it
      unsigned long now = millis();
      while (drawing && millis()-now < 250) delay(1); // wait if someone else is drawing
      drawing = true;
@@ -810,8 +887,10 @@ class FourLineDisplayUsermod : public Usermod {
     * Used in Auto Save usermod
     */
    void overlay(const char* line1, const char* line2, long showHowLong) {
+      if (!typeOK || !enabled) return;   // WLEDMM make sure the display is initialized before we try to draw on it
      unsigned long now = millis();
      while (drawing && millis()-now < 250) delay(1); // wait if someone else is drawing
+      while ((reDrawing && overlayUntil == 0) && (millis()-now < 250)) delay(10); // wait if someone else is re-drawing
      drawing = true;
      // Turn the display back on
      if (!wakeDisplay()) clear();
@@ -831,6 +910,7 @@ class FourLineDisplayUsermod : public Usermod {
    }

    void networkOverlay(const char* line1, long showHowLong) {
+      if (!typeOK || !enabled) return;   // WLEDMM make sure the display is initialized before we try to draw on it
      unsigned long now = millis();
      while (drawing && millis()-now < 250) delay(1); // wait if someone else is drawing
      drawing = true;
@@ -968,7 +1048,7 @@ class FourLineDisplayUsermod : public Usermod {
    #endif
    #endif
    void onUpdateBegin(bool init) {
-    #ifdef ARDUINO_ARCH_ESP32
+    #if defined(ARDUINO_ARCH_ESP32) && defined(FLD_ESP32_USE_THREADS)
      if (init && Display_Task) {
        vTaskSuspend(Display_Task);   // update is about to begin, disable task to prevent crash
      } else {
@@ -976,7 +1056,7 @@ class FourLineDisplayUsermod : public Usermod {
        if (Display_Task)
          vTaskResume(Display_Task);
        else
-          xTaskCreatePinnedToCore(
+          xTaskCreateUniversal(               // this is guaranteed to work on any ESP32 (single or dual core)
            [](void * par) {                  // Function to implement the task
              // see https://www.freertos.org/vtaskdelayuntil.html
              const TickType_t xFrequency = REFRESH_RATE_MS * portTICK_PERIOD_MS / 2;  
@@ -984,12 +1064,14 @@ class FourLineDisplayUsermod : public Usermod {
              for(;;) {
                delay(1); // DO NOT DELETE THIS LINE! It is needed to give the IDLE(0) task enough time and to keep the watchdog happy.
                          // taskYIELD(), yield(), vTaskDelay() and esp_task_wdt_feed() didn't seem to work.
-                vTaskDelayUntil(&xLastWakeTime, xFrequency); // release CPU, by doing nothing for REFRESH_RATE_MS millis
+                xLastWakeTime = xTaskGetTickCount();         // workaround for vTaskDelayUntil bug: it does not always keep the last time so we refresh it explicitly
                FourLineDisplayUsermod::getInstance()->redraw(false);
+                vTaskDelayUntil(&xLastWakeTime, xFrequency); // release CPU, by doing nothing until next REFRESH_RATE_MS millis
              }
            },
            "4LD",                // Name of the task
-            3072,                 // Stack size in words
+//            3072,                 // Stack size in words
+            4096,                 // bigger Stack size in words
            NULL,                 // Task input parameter
            1,                    // Priority of the task (not idle)
            &Display_Task,        // Task handle
@@ -1027,6 +1109,8 @@ class FourLineDisplayUsermod : public Usermod {
    //}

    void appendConfigData() {
+      oappend(SET_F("addHB('4LineDisplay');"));
+      
      oappend(SET_F("dd=addDropdown('4LineDisplay','type');"));
      oappend(SET_F("addOption(dd,'None',0);"));
      oappend(SET_F("addOption(dd,'SSD1306',1);"));
@@ -1036,11 +1120,50 @@ class FourLineDisplayUsermod : public Usermod {
      oappend(SET_F("addOption(dd,'SSD1305 128x64',5);"));
      oappend(SET_F("addOption(dd,'SSD1306 SPI',6);"));
      oappend(SET_F("addOption(dd,'SSD1306 SPI 128x64',7);"));
-      oappend(SET_F("addInfo('4LineDisplay:pin[]',0,'I2C/SPI CLK','<i>-1 use global</i>');"));
-      oappend(SET_F("addInfo('4LineDisplay:pin[]',1,'I2C/SPI DTA','<i>-1 use global</i>');"));
-      oappend(SET_F("addInfo('4LineDisplay:pin[]',2,'SPI CS',' ');"));
-      oappend(SET_F("addInfo('4LineDisplay:pin[]',3,'SPI DC',' ');"));
-      oappend(SET_F("addInfo('4LineDisplay:pin[]',4,'SPI RST',' ');"));
+      bool isSPI = (type == SSD1306_SPI || type == SSD1306_SPI64);
+      // WLEDMM add defaults
+      oappend(SET_F("addInfo('4LineDisplay:pin[]',0,'','I2C/SPI CLK');"));
+      oappend(SET_F("dRO('4LineDisplay:pin[]',0);")); // disable read only pins
+      if (isSPI) {
+        oappend(SET_F("rOpt('4LineDisplay:pin[]',0,'use global (")); oappendi(spi_sclk); oappend(")',-1);"); 
+        #ifdef FLD_PIN_CLOCKSPI
+          oappend(SET_F("xOpt('4LineDisplay:pin[]',0,' ⎌',")); oappendi(FLD_PIN_CLOCKSPI); oappend(");"); 
+        #endif
+      } else {
+        oappend(SET_F("rOpt('4LineDisplay:pin[]',0,'use global (")); oappendi(i2c_scl); oappend(")',-1);"); 
+        #ifdef FLD_PIN_SCL
+          oappend(SET_F("xOpt('4LineDisplay:pin[]',0,' ⎌',")); oappendi(FLD_PIN_SCL); oappend(");"); 
+        #endif
+      }
+      oappend(SET_F("addInfo('4LineDisplay:pin[]',1,'','I2C/SPI DTA');"));
+      if (isSPI) {
+        oappend(SET_F("rOpt('4LineDisplay:pin[]',1,'use global (")); oappendi(spi_mosi); oappend(")',-1);"); 
+        #ifdef FLD_PIN_MOSISPI
+          oappend(SET_F("xOpt('4LineDisplay:pin[]',1,' ⎌',")); oappendi(FLD_PIN_MOSISPI); oappend(");"); 
+        #endif
+      } else {
+        oappend(SET_F("rOpt('4LineDisplay:pin[]',1,'use global (")); oappendi(i2c_sda); oappend(")',-1);"); 
+        #ifdef FLD_PIN_SDA
+          oappend(SET_F("xOpt('4LineDisplay:pin[]',1,' ⎌',")); oappendi(FLD_PIN_SDA); oappend(");"); 
+        #endif
+      }
+      oappend(SET_F("addInfo('4LineDisplay:pin[]',2,'','SPI CS');"));
+      #ifdef FLD_PIN_CS
+        oappend(SET_F("xOpt('4LineDisplay:pin[]',2,' ⎌',")); oappendi(FLD_PIN_CS); oappend(");"); 
+      #endif
+      oappend(SET_F("addInfo('4LineDisplay:pin[]',3,'','SPI DC');"));
+      #ifdef FLD_PIN_DC
+        oappend(SET_F("xOpt('4LineDisplay:pin[]',3,' ⎌',")); oappendi(FLD_PIN_DC); oappend(");"); 
+      #endif
+      oappend(SET_F("addInfo('4LineDisplay:pin[]',4,'','SPI RST');"));
+      #ifdef FLD_PIN_RESET
+        oappend(SET_F("xOpt('4LineDisplay:pin[]',4,' ⎌',")); oappendi(FLD_PIN_RESET); oappend(");"); 
+      #endif
+
+      //WLEDMM add errorMessage to um settings
+      if (strcmp(errorMessage, "") != 0) {
+        oappend(SET_F("addInfo('errorMessage', 0, '<i>error: ")); oappend(errorMessage); oappend("! Correct and reboot</i>');");
+      }
    }

    /*
@@ -1061,11 +1184,11 @@ class FourLineDisplayUsermod : public Usermod {
      // determine if we are using global HW pins (data & clock)
      int8_t hw_dta, hw_clk;
      if ((type == SSD1306_SPI || type == SSD1306_SPI64)) {
-        hw_clk = spi_sclk<0 ? HW_PIN_CLOCKSPI : spi_sclk;
-        hw_dta = spi_mosi<0 ? HW_PIN_DATASPI : spi_mosi;
+        hw_clk = spi_sclk;
+        hw_dta = spi_mosi;
      } else {
-        hw_clk = i2c_scl<0 ? HW_PIN_SCL : i2c_scl;
-        hw_dta = i2c_sda<0 ? HW_PIN_SDA : i2c_sda;
+        hw_clk = i2c_scl;
+        hw_dta = i2c_sda;
      }

      JsonObject top   = root.createNestedObject(FPSTR(_name));
@@ -1081,7 +1204,7 @@ class FourLineDisplayUsermod : public Usermod {
      top[FPSTR(_flip)]          = (bool) flip;
      top[FPSTR(_contrast)]      = contrast;
      top[FPSTR(_contrastFix)]   = (bool) contrastFix;
-      #ifndef ARDUINO_ARCH_ESP32
+      #if !defined(ARDUINO_ARCH_ESP32) || !defined(FLD_ESP32_USE_THREADS)
      top[FPSTR(_refreshRate)]   = refreshRate;
      #endif
      top[FPSTR(_screenTimeOut)] = screenTimeout/1000;
@@ -1117,7 +1240,7 @@ class FourLineDisplayUsermod : public Usermod {
      for (byte i=0; i<5; i++) ioPin[i] = top["pin"][i] | ioPin[i];
      flip          = top[FPSTR(_flip)] | flip;
      contrast      = top[FPSTR(_contrast)] | contrast;
-      #ifndef ARDUINO_ARCH_ESP32
+      #if !defined(ARDUINO_ARCH_ESP32) || !defined(FLD_ESP32_USE_THREADS)
      refreshRate   = top[FPSTR(_refreshRate)] | refreshRate;
      refreshRate   = min(5000, max(250, (int)refreshRate));
      #endif
@@ -1141,20 +1264,28 @@ class FourLineDisplayUsermod : public Usermod {
        // changing parameters from settings page
        bool pinsChanged = false;
        for (byte i=0; i<5; i++) if (ioPin[i] != oldPin[i]) { pinsChanged = true; break; }
+        #if defined(ARDUINO_ARCH_ESP32) && defined(FLD_ESP32_USE_THREADS)
+        unsigned long now = millis();
+        while ((drawing || reDrawing) && millis()-now < 300) delay(10); // wait if someone else is drawing
+        #endif
+        drawing = false;
+        reDrawing = false;
+
        if (pinsChanged || type!=newType) {
-          if (type != NONE) delete u8x8;
+          if (typeOK) {
+            typeOK = false;
+            if (u8x8 != nullptr) delete u8x8;
+            u8x8 = nullptr;
+            USER_PRINTLN(F("Display terminated."));
+          }
          PinOwner po = PinOwner::UM_FourLineDisplay;
          bool isSPI = (type == SSD1306_SPI || type == SSD1306_SPI64);
          if (isSPI) {
            pinManager.deallocateMultiplePins((const uint8_t *)(&oldPin[2]), 3, po);
-            uint8_t hw_sclk = spi_sclk<0 ? HW_PIN_CLOCKSPI : spi_sclk;
-            uint8_t hw_mosi = spi_mosi<0 ? HW_PIN_DATASPI : spi_mosi;
-            bool isHW = (oldPin[0]==hw_sclk && oldPin[1]==hw_mosi);
+            bool isHW = (oldPin[0]==spi_sclk && oldPin[1]==spi_mosi);
            if (isHW) po = PinOwner::HW_SPI;
          } else {
-            uint8_t hw_scl = i2c_scl<0 ? HW_PIN_SCL : i2c_scl;
-            uint8_t hw_sda = i2c_sda<0 ? HW_PIN_SDA : i2c_sda;
-            bool isHW = (oldPin[0]==hw_scl && oldPin[1]==hw_sda);
+            bool isHW = (oldPin[0]==i2c_scl && oldPin[1]==i2c_sda);
            if (isHW) po = PinOwner::HW_I2C;
          }
          pinManager.deallocateMultiplePins((const uint8_t *)oldPin, 2, po);
@@ -1162,10 +1293,12 @@ class FourLineDisplayUsermod : public Usermod {
          setup();
          needsRedraw |= true;
        } else {
-          u8x8->setBusClock(ioFrequency); // can be used for SPI too
-          setVcomh(contrastFix);
-          setContrast(contrast);
-          setFlipMode(flip);
+          if (enabled && typeOK && (nullptr != u8x8)) { // WLEDMM ensure we have a valid, active driver
+            u8x8->setBusClock(ioFrequency); // can be used for SPI too
+            setVcomh(contrastFix);
+            setContrast(contrast);
+            setFlipMode(flip);
+          }
        }
        knownHour = 99;
        if (needsRedraw && !wakeDisplay()) redraw(true);
@@ -1197,4 +1330,6 @@ const char FourLineDisplayUsermod::_showSeconds[]     PROGMEM = "showSeconds";
 const char FourLineDisplayUsermod::_busClkFrequency[] PROGMEM = "i2c-freq-kHz";
 const char FourLineDisplayUsermod::_contrastFix[]     PROGMEM = "contrastFix";

+#ifdef ARDUINO_ARCH_ESP32
 FourLineDisplayUsermod *FourLineDisplayUsermod::instance = nullptr;
+#endif
--- a/Show More
+++ b/Show More