Updated usermod readme and usability enhancements.

usermods/Animated_Staircase/Animated_Staircase.h

@@ -10,29 +10,27 @@
 #pragma once
 #include "wled.h"
 
-#define USERMOD_ID_ANIMATED_STAIRCASE 1011
-
 class Animated_Staircase : public Usermod {
   private:
 
     /* configuration (available in API and stored in flash) */
     bool enabled = false;                   // Enable this usermod
     unsigned long segment_delay_ms = 150;   // Time between switching each segment
-  unsigned long on_time_ms = 5 * 1000;  // The time for the light to stay on
+    unsigned long on_time_ms       = 30000; // The time for the light to stay on
     int8_t topPIRorTriggerPin      = -1;    // disabled
     int8_t bottomPIRorTriggerPin   = -1;    // disabled
     int8_t topEchoPin              = -1;    // disabled
     int8_t bottomEchoPin           = -1;    // disabled
     bool useUSSensorTop            = false; // using PIR or UltraSound sensor?
     bool useUSSensorBottom         = false; // using PIR or UltraSound sensor?
-  unsigned int topMaxTimeUs = 1749;     // default echo timout, top
+    unsigned int topMaxDist        = 50;    // default maximum measured distance in cm, top
-  unsigned int bottomMaxTimeUs = 1749;  // default echo timout, bottom
+    unsigned int bottomMaxDist     = 50;    // default maximum measured distance in cm, bottom
 
     /* runtime variables */
     bool initDone = false;
 
     // Time between checking of the sensors
-  const unsigned int scanDelay = 50;
+    const unsigned int scanDelay = 100;
 
     // Lights on or off.
     // Flipping this will start a transition.
@@ -76,6 +74,8 @@ class Animated_Staircase : public Usermod {
     bool topSensorWrite    = false;
     bool bottomSensorRead  = false;
     bool bottomSensorWrite = false;
+    bool topSensorState    = false;
+    bool bottomSensorState = false;
 
     // strings to reduce flash memory usage (used more than twice)
     static const char _name[];
@@ -88,13 +88,21 @@ class Animated_Staircase : public Usermod {
     static const char _useBottomUltrasoundSensor[];
     static const char _bottomPIRorTrigger_pin[];
     static const char _bottomEcho_pin[];
-  static const char _topEchoTime[];
+    static const char _topEchoCm[];
-  static const char _bottomEchoTime[];
+    static const char _bottomEchoCm[];
-  static const char _[];
+    
+    void publishMqtt(bool bottom, const char* state)
+    {
+      //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);
+      }
+    }
 
     void updateSegments() {
-//    mainSegmentId = strip.getMainSegmentId();
+      mainSegmentId = strip.getMainSegmentId();
-//    WS2812FX::Segment mainsegment = strip.getSegment(mainSegmentId);
       WS2812FX::Segment* segments = strip.getSegments();
       for (int i = 0; i < MAX_NUM_SEGMENTS; i++, segments++) {
         if (!segments->isActive()) {
@@ -140,28 +148,46 @@ class Animated_Staircase : public Usermod {
     *    50 cm = 2915 uS
     *   100 cm = 5831 uS
     */
-  bool ultrasoundRead(uint8_t signalPin,
+    bool ultrasoundRead(int8_t signalPin, int8_t echoPin, unsigned int maxTimeUs) {
-                      uint8_t echoPin,
+      if (signalPin<0 || echoPin<0) return false;
-                      unsigned int maxTimeUs) {
+      digitalWrite(signalPin, LOW);
+      delayMicroseconds(2);
       digitalWrite(signalPin, HIGH);
       delayMicroseconds(10);
       digitalWrite(signalPin, LOW);
       return pulseIn(echoPin, HIGH, maxTimeUs) > 0;
     }
 
-  void checkSensors() {
+    bool checkSensors() {
+      bool sensorChanged = false;
+
       if ((millis() - lastScanTime) > scanDelay) {
         lastScanTime = millis();
 
-    if (!useUSSensorBottom)
+        bottomSensorRead = bottomSensorWrite ||
-      bottomSensorRead = bottomSensorWrite || (digitalRead(bottomPIRorTriggerPin) == HIGH);
+          (!useUSSensorBottom ?
-    else
+            (bottomPIRorTriggerPin<0 ? false : digitalRead(bottomPIRorTriggerPin)) :
-      bottomSensorRead = bottomSensorWrite || ultrasoundRead(bottomPIRorTriggerPin, bottomEchoPin, bottomMaxTimeUs);
+            ultrasoundRead(bottomPIRorTriggerPin, bottomEchoPin, bottomMaxDist*59)  // cm to us
+          );
+        topSensorRead = topSensorWrite ||
+          (!useUSSensorTop ?
+            (topPIRorTriggerPin<0 ? false : digitalRead(topPIRorTriggerPin)) :
+            ultrasoundRead(topPIRorTriggerPin, topEchoPin, topMaxDist*59)   // cm to us
+          );
 
-    if (!useUSSensorTop)
+        if (bottomSensorRead != bottomSensorState) {
-      topSensorRead = topSensorWrite || (digitalRead(topPIRorTriggerPin) == HIGH);
+          bottomSensorState = bottomSensorRead; // change previous state
-    else
+          sensorChanged = true;
-      topSensorRead = topSensorWrite || ultrasoundRead(topPIRorTriggerPin, topEchoPin, topMaxTimeUs);
+          publishMqtt(true, bottomSensorState ? "on" : "off");
+          DEBUG_PRINTLN(F("Bottom sensor changed."));
+        }
+
+        if (topSensorRead != topSensorState) {
+          topSensorState = topSensorRead; // change previous state
+          sensorChanged = true;
+          publishMqtt(false, topSensorState ? "on" : "off");
+          DEBUG_PRINTLN(F("Top sensor changed."));
+        }
 
         // Values read, reset the flags for next API call
         topSensorWrite = false;
@@ -176,11 +202,8 @@ class Animated_Staircase : public Usermod {
             // If the bottom sensor triggered, we need to swipe up, ON
             swipe = bottomSensorRead;
 
-          if (swipe) {
+            DEBUG_PRINT(F("ON -> Swipe "));
-            DEBUG_PRINTLN(F("ON -> Swipe up."));
+            DEBUG_PRINTLN(swipe ? F("up.") : F("down."));
-          } else {
-            DEBUG_PRINTLN(F("ON -> Swipe down."));
-          }
 
             if (onIndex == offIndex) {
               // Position the indices for a correct on-swipe
@@ -195,20 +218,20 @@ class Animated_Staircase : public Usermod {
           }
         }
       }
+      return sensorChanged;
     }
 
     void autoPowerOff() {
-    // TODO: add logic to wait until PIR sensor deactivates
       if (on && ((millis() - lastSwitchTime) > on_time_ms)) {
+        // if sensors are still on, do nothing
+        if (bottomSensorState || topSensorState) return;
+
         // Swipe OFF in the direction of the last sensor detection
         swipe = lastSensor;
         on = false;
 
-      if (swipe) {
+        DEBUG_PRINT(F("OFF -> Swipe "));
-        DEBUG_PRINTLN(F("OFF -> Swipe up."));
+        DEBUG_PRINTLN(swipe ? F("up.") : F("down."));
-      } else {
-        DEBUG_PRINTLN(F("OFF -> Swipe down."));
-      }
       }
     }
 
@@ -216,9 +239,6 @@ class Animated_Staircase : public Usermod {
       if ((millis() - lastTime) > segment_delay_ms) {
         lastTime = millis();
 
-//      byte oldOnIndex = onIndex;
-//      byte oldOffIndex = offIndex;
-
         if (on) {
           // Turn on all segments
           onIndex = MAX(mainSegmentId, onIndex - 1);
@@ -230,7 +250,6 @@ class Animated_Staircase : public Usermod {
             offIndex = MAX(onIndex, offIndex - 1);
           }
         }
-
         updateSegments();
       }
     }
@@ -243,8 +262,8 @@ class Animated_Staircase : public Usermod {
 
     // allow overrides from JSON API
     void readSensorsFromJson(JsonObject& staircase) {
-    bottomSensorWrite = bottomSensorRead || (staircase[F("bottom-sensor")].as<bool>());
+      bottomSensorWrite = bottomSensorState || (staircase[F("bottom-sensor")].as<bool>());
-    topSensorWrite = topSensorRead || (staircase[F("top-sensor")].as<bool>());
+      topSensorWrite    = topSensorState    || (staircase[F("top-sensor")].as<bool>());
     }
 
     void enable(bool enable) {
@@ -256,23 +275,21 @@ class Animated_Staircase : public Usermod {
         DEBUG_PRINT(on_time_ms / 1000);
         DEBUG_PRINTLN(F(" seconds."));
 
-      // TODO: attach interrupts
         if (!useUSSensorBottom)
-        pinMode(bottomPIRorTriggerPin, INPUT);
+          pinMode(bottomPIRorTriggerPin, INPUT_PULLUP);
         else {
           pinMode(bottomPIRorTriggerPin, OUTPUT);
           pinMode(bottomEchoPin, INPUT);
         }
 
         if (!useUSSensorTop)
-        pinMode(topPIRorTriggerPin, INPUT);
+          pinMode(topPIRorTriggerPin, INPUT_PULLUP);
         else {
           pinMode(topPIRorTriggerPin, OUTPUT);
           pinMode(topEchoPin, INPUT);
         }
       } else {
         // Restore segment options
-//      WS2812FX::Segment mainsegment = strip.getSegment(mainSegmentId);
         WS2812FX::Segment* segments = strip.getSegments();
         for (int i = 0; i < MAX_NUM_SEGMENTS; i++, segments++) {
           if (!segments->isActive()) {
@@ -303,22 +320,15 @@ class Animated_Staircase : public Usermod {
           bottomPIRorTriggerPin = -1;
       }
       if (bottomEchoPin >= 0) {
-      if (!pinManager.allocatePin(bottomPIRorTriggerPin,false))
+        if (!pinManager.allocatePin(bottomEchoPin,false))
           bottomEchoPin = -1;
       }
-    // TODO: attach interrupts in enable()
-
-    // validate pins
-    if ( topPIRorTriggerPin < 0 || bottomPIRorTriggerPin < 0 ||
-        (useUSSensorTop && topEchoPin < 0) || (useUSSensorBottom && bottomEchoPin < 0) )
-      enabled = false;
-
       enable(enabled);
       initDone = true;
     }
 
     void loop() {
-    if (!enabled) return;
+      if (!enabled || strip.isUpdating()) return;
       checkSensors();
       autoPowerOff();
       updateSwipe();
@@ -326,6 +336,44 @@ class Animated_Staircase : public Usermod {
 
     uint16_t getId() { return USERMOD_ID_ANIMATED_STAIRCASE; }
 
+    /**
+     * 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("/swipe"), 6) == 0) {
+        String action = payload;
+        if (action == "up") {
+          bottomSensorWrite = true;
+          return true;
+        } else if (action == "down") {
+          topSensorWrite = true;
+          return true;
+        } else 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) {
+      //(re)subscribe to required topics
+      char subuf[64];
+      if (mqttDeviceTopic[0] != 0) {
+        strcpy(subuf, mqttDeviceTopic);
+        strcat_P(subuf, PSTR("/swipe"));
+        mqtt->subscribe(subuf, 0);
+      }
+    }
+
     void addToJsonState(JsonObject& root) {
       JsonObject staircase = root[FPSTR(_name)];
       if (staircase.isNull()) {
@@ -349,7 +397,7 @@ class Animated_Staircase : public Usermod {
           String str = staircase[FPSTR(_enabled)]; // checkbox -> off or on
           enabled = (bool)(str!="off"); // off is guaranteed to be present
         }
-      readSensorsFromJson(root);
+        readSensorsFromJson(staircase);
         DEBUG_PRINTLN(F("Staircase sensor state read from API."));
       }
     }
@@ -371,8 +419,8 @@ class Animated_Staircase : public Usermod {
       staircase[FPSTR(_useBottomUltrasoundSensor)] = useUSSensorBottom;
       staircase[FPSTR(_bottomPIRorTrigger_pin)]    = bottomPIRorTriggerPin;
       staircase[FPSTR(_bottomEcho_pin)]            = useUSSensorBottom ? bottomEchoPin : -1;
-    staircase[FPSTR(_topEchoTime)]               = topMaxTimeUs;
+      staircase[FPSTR(_topEchoCm)]                 = topMaxDist;
-    staircase[FPSTR(_bottomEchoTime)]            = bottomMaxTimeUs;
+      staircase[FPSTR(_bottomEchoCm)]              = bottomMaxDist;
       DEBUG_PRINTLN(F("Staircase config saved."));
     }
 
@@ -416,16 +464,17 @@ class Animated_Staircase : public Usermod {
         }
         bottomPIRorTriggerPin = min(39,max(-1,staircase[FPSTR(_bottomPIRorTrigger_pin)].as<int>()));
         bottomEchoPin         = min(39,max(-1,staircase[FPSTR(_bottomEcho_pin)].as<int>()));
-      topMaxTimeUs          = min(18000,max(300,staircase[FPSTR(_topEchoTime)].as<int>()));     // max distnace ~3m (a noticable lag of 18ms may be expected)
+        topMaxDist            = min(150,max(30,staircase[FPSTR(_topEchoCm)].as<int>()));     // max distnace ~1.5m (a lag of 9ms may be expected)
-      bottomMaxTimeUs       = min(18000,max(300,staircase[FPSTR(_bottomEchoTime)].as<int>()));  // max distance ~3m (a noticable lag of 18ms may be expected)
+        bottomMaxDist         = min(150,max(30,staircase[FPSTR(_bottomEchoCm)].as<int>()));  // max distance ~1.5m (a lag of 9ms may be expected)
-      DEBUG_PRINTLN(F("Staircase config (re)loaded."));
       } else {
         DEBUG_PRINTLN(F("No config found. (Using defaults.)"));
       }
       if (!initDone) {
         // first run: reading from cfg.json
+        DEBUG_PRINTLN(F("Staircase config loaded."));
       } else {
         // changing paramters from settings page
+        DEBUG_PRINTLN(F("Staircase config (re)loaded."));
         bool changed = false;
         if ((oldUseUSSensorTop != useUSSensorTop) ||
             (oldUseUSSensorBottom != useUSSensorBottom) ||
@@ -453,21 +502,17 @@ class Animated_Staircase : public Usermod {
         staircase = root.createNestedObject("u");
       }
 
+      JsonArray usermodEnabled = staircase.createNestedArray(F("Staircase"));  // name
+      String btn = F("<button class=\"btn infobtn\" onclick=\"requestJson({staircase:{enabled:");
       if (enabled) {
-      JsonArray usermodEnabled = staircase.createNestedArray(F("Staircase enabled"));  // name
+        btn += F("false}},false,false);loadInfo();\">");
-      usermodEnabled.add("yes");                             // value
+        btn += F("enabled");
-
-      JsonArray segmentDelay = staircase.createNestedArray(F("Delay between stairs"));  // name
-      segmentDelay.add(segment_delay_ms);                       // value
-      segmentDelay.add("ms");                        // unit
-
-      JsonArray onTime = staircase.createNestedArray(F("Power-off stairs after"));  // name
-      onTime.add(on_time_ms / 1000);                              // value
-      onTime.add("s");                                     // unit
       } else {
-      JsonArray usermodEnabled = staircase.createNestedArray(F("Staircase enabled"));  // name
+        btn += F("true}},false,false);loadInfo();\">");
-      usermodEnabled.add("no");                              // value
+        btn += F("disabled");
       }
+      btn += F("</button>");
+      usermodEnabled.add(btn);                             // value
     }
 };
 
@@ -482,5 +527,5 @@ const char Animated_Staircase::_topEcho_pin[]               PROGMEM = "topEcho_p
 const char Animated_Staircase::_useBottomUltrasoundSensor[] PROGMEM = "useBottomUltrasoundSensor";
 const char Animated_Staircase::_bottomPIRorTrigger_pin[]    PROGMEM = "bottomPIRorTrigger_pin";
 const char Animated_Staircase::_bottomEcho_pin[]            PROGMEM = "bottomEcho_pin";
-const char Animated_Staircase::_topEchoTime[]               PROGMEM = "top-echo-us";
+const char Animated_Staircase::_topEchoCm[]                 PROGMEM = "top-dist-cm";
-const char Animated_Staircase::_bottomEchoTime[]            PROGMEM = "bottom-echo-us";
+const char Animated_Staircase::_bottomEchoCm[]              PROGMEM = "bottom-dist-cm";

usermods/Animated_Staircase/README.md

@@ -56,9 +56,6 @@ or remove them and put everything on one line.
 | Setting          | Description                                                   | Default |
 |------------------|---------------------------------------------------------------|---------|
 | enabled          | Enable or disable the usermod                                 | true    |
-| segment-delay-ms | Delay (milliseconds) between switching on/off each step       | 150     |
-| on-time-s        | Time (seconds) the stairs stay lit after last detection       | 5       |
-| bottom-echo-us   | Detection range of ultrasonic sensor                          | 1749    |
 | bottom-sensor    | Manually trigger a down to up animation via API               | false   | 
 | top-sensor       | Manually trigger an up to down animation via API              | false   |
 
@@ -72,8 +69,6 @@ The staircase settings and sensor states are inside the WLED status element:
     "state": {
         "staircase": {
             "enabled": true,
-            "segment-delay-ms": 150,
-            "on-time-s": 5,
             "bottom-sensor": false,
             "tops-ensor": false
         },
@@ -94,58 +89,16 @@ curl -X POST -H "Content-Type: application/json" \
 
 To enable the usermod again, use `"enabled":true`.
 
-### Changing animation parameters
+Alternatively you can use _Usermod_ Settings page where you can change other parameters as well.
-To change the delay between the steps to (for example) 100 milliseconds and the on-time to
-10 seconds:
 
-```bash
+### Changing animation parameters and detection range of the ultrasonic HC-SR04 sensor
-curl -X POST -H "Content-Type: application/json" \
+Using _Usermod_ Settings page you can define different usermod parameters, includng sensor pins, delay between segment activation and so on.
-     -d '{"staircase":{"segment-delay-ms":100,"on-time-s":10}}' \
-     xxx.xxx.xxx.xxx/json/state
-```
 
-### Changing detection range of the ultrasonic HC-SR04 sensor
+When an ultrasonic sensor is enabled you can enter maximum detection distance in centimeters separately for top and bottom sensors.
-When an ultrasonic sensor is enabled in `Animated_Staircase_config.h`, you'll see a 
-`bottom-echo-us` setting appear in the json api:
-
-```json
-{
-    "state": {
-        "staircase": {
-            "enabled": true,
-            "segment-delay-ms": 150,
-            "on-time-s": 5,
-            "bottom-echo-us": 1749
-        },
-}
-```
-
-If the HC-SR04 sensor detects an echo within 1749 microseconds (corresponding to ~30 cm 
-detection range from the sensor), it will trigger switching on the staircase. This setting 
-can be changed through the API with an HTTP POST:
-
-```bash
-curl -X POST -H "Content-Type: application/json" \
-     -d '{"staircase":{"bottom-echo-us":1166}}' \
-     xxx.xxx.xxx.xxx/json/state
-```
-
-Calculating the detection range can be performed as follows: The speed of sound is 343m/s at 20 
-degrees Centigrade. Since the sound has to travel back and forth, the detection range for the
-sensor in cm is (0.0343 * maxTimeUs) / 2. To get you started, please find delays and distances below:
-
-| Distance | Detection time  |
-|---------:|----------------:|
-|     5 cm |          292 uS |
-|    10 cm |          583 uS |
-|    20 cm |         1166 uS |
-|    30 cm |         1749 uS |
-|    50 cm |         2915 uS |
-|   100 cm |         5831 uS |
 
 **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
-a less responsive web interface. It is therefore advised to keep the detection time as short as possible.
+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
@@ -164,10 +117,15 @@ curl -X POST -H "Content-Type: application/json" \
      -d '{"staircase":{"top-sensor":true}}' \
      xxx.xxx.xxx.xxx/json/state
 ```
+**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.
 
 Have fun with this usermod.<br/>
 www.rolfje.com
 
+Modifications @blazoncek
+
 ## Change log
 2021-04
 * Adaptation for runtime configuration.

usermods/PIR_sensor_switch/readme.md

@@ -9,9 +9,7 @@ The LED strip is switched [using a relay](https://github.com/Aircoookie/WLED/wik
 
 ## Webinterface
 
-The info page in the web interface shows the items below
+The info page in the web interface shows the remaining time of the off timer. 
-- the remaining time of the off timer. 
-**I recommend to deactivate the sensor before an OTA update and activate it again afterwards**.
 
 ## Sensor connection
 
@@ -65,6 +63,9 @@ void registerUsermods()
 
 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).
+
 ### 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'

usermods/PIR_sensor_switch/usermod_PIR_sensor_switch.h

@@ -48,11 +48,11 @@ public:
   /**
    * Enable/Disable the PIR sensor
    */
-  void EnablePIRsensor(bool enable) { m_PIRenabled = enable; }
+  void EnablePIRsensor(bool en) { enabled = en; }
   /**
    * Get PIR sensor enabled/disabled state
    */
-  bool PIRsensorEnabled() { return m_PIRenabled; }
+  bool PIRsensorEnabled() { return enabled; }
 
 private:
   // PIR sensor pin
@@ -64,39 +64,68 @@ private:
   // off timer start time
   uint32_t m_offTimerStart = 0;
   // current PIR sensor pin state
-  byte m_PIRsensorPinState = LOW;
+  byte sensorPinState = LOW;
-  // PIR sensor enabled - ISR attached
+  // PIR sensor enabled
-  bool m_PIRenabled = true;
+  bool enabled = true;
   // status of initialisation
   bool initDone = false;
+  // on and off presets
+  uint8_t m_onPreset = 0;
+  uint8_t m_offPreset = 0;
+  // flag to indicate that PIR sensor should activate WLED during nighttime only
+  bool m_nightTimeOnly = false;
+  // flag to send MQTT message only (assuming it is enabled)
+  bool m_mqttOnly = false;
+
+  unsigned long lastLoop = 0;
 
   // strings to reduce flash memory usage (used more than twice)
   static const char _name[];
   static const char _switchOffDelay[];
   static const char _enabled[];
+  static const char _onPreset[];
+  static const char _offPreset[];
+  static const char _nightTime[];
+  static const char _mqttOnly[];
 
   /**
-   * return or change if new PIR sensor state is available
+   * check if it is daytime
+   * if sunrise/sunset is not defined (no NTP or lat/lon) default to nighttime
    */
-  static volatile bool newPIRsensorState(bool changeState = false, bool newState = false);
+  bool isDayTime() {
+    bool isDayTime = false;
+    updateLocalTime();
+    uint8_t hr = hour(localTime);
+    uint8_t mi = minute(localTime);
 
-  /**
+    if (sunrise && sunset) {
-   * PIR sensor state has changed
+      if (hour(sunrise)<hr && hour(sunset)>hr) {
-   */
+        isDayTime = true;
-  static void IRAM_ATTR ISR_PIRstateChange();
+      } else {
+        if (hour(sunrise)==hr && minute(sunrise)<mi) {
+          isDayTime = true;
+        }
+        if (hour(sunset)==hr && minute(sunset)>mi) {
+          isDayTime = true;
+        }
+      }
+    }
+    return isDayTime;
+  }
 
   /**
    * switch strip on/off
    */
   void switchStrip(bool switchOn)
   {
-    if (switchOn && bri == 0)
+    if (switchOn && m_onPreset) {
-    {
+      applyPreset(m_onPreset);
+    } else if (!switchOn && m_offPreset) {
+      applyPreset(m_offPreset);
+    } else if (switchOn && bri == 0) {
       bri = briLast;
       colorUpdated(NotifyUpdateMode);
-    }
+    } else if (!switchOn && bri != 0) {
-    else if (!switchOn && bri != 0)
-    {
       briLast = bri;
       bri = 0;
       colorUpdated(NotifyUpdateMode);
@@ -110,7 +139,7 @@ private:
       char subuf[64];
       strcpy(subuf, mqttDeviceTopic);
       strcat_P(subuf, PSTR("/motion"));
-      mqtt->publish(subuf, 0, true, state);
+      mqtt->publish(subuf, 0, false, state);
     }
   }
 
@@ -120,22 +149,18 @@ private:
    */
   bool updatePIRsensorState()
   {
-    if (newPIRsensorState())
+    bool pinState = digitalRead(PIRsensorPin);
-    {
+    if (pinState != sensorPinState) {
-      m_PIRsensorPinState = digitalRead(PIRsensorPin);
+      sensorPinState = pinState; // change previous state
 
-      if (m_PIRsensorPinState == HIGH)
+      if (sensorPinState == HIGH) {
-      {
         m_offTimerStart = 0;
-        switchStrip(true);
+        if (!m_mqttOnly && (!m_nightTimeOnly || (m_nightTimeOnly && !isDayTime()))) switchStrip(true);
         publishMqtt("on");
-      }
+      } else /*if (bri != 0)*/ {
-      else if (bri != 0)
-      {
         // start switch off timer
         m_offTimerStart = millis();
       }
-      newPIRsensorState(true, false);
       return true;
     }
     return false;
@@ -148,9 +173,9 @@ private:
   {
     if (m_offTimerStart > 0 && millis() - m_offTimerStart > m_switchOffDelay)
     {
-      if (m_PIRenabled == true)
+      if (enabled == true)
       {
-        switchStrip(false);
+        if (!m_mqttOnly && (!m_nightTimeOnly || (m_nightTimeOnly && !isDayTime()))) switchStrip(false);
         publishMqtt("off");
       }
       m_offTimerStart = 0;
@@ -171,14 +196,13 @@ public:
     // pin retrieved from cfg.json (readFromConfig()) prior to running setup()
     if (!pinManager.allocatePin(PIRsensorPin,false)) {
       PIRsensorPin = -1;  // allocation failed
-      m_PIRenabled = false;
+      enabled = false;
       DEBUG_PRINTLN(F("PIRSensorSwitch pin allocation failed."));
     } else {
       // PIR Sensor mode INPUT_PULLUP
       pinMode(PIRsensorPin, INPUT_PULLUP);
-      if (m_PIRenabled) {
+      if (enabled) {
-        // assign interrupt function and set CHANGE mode
+        sensorPinState = digitalRead(PIRsensorPin);
-        attachInterrupt(digitalPinToInterrupt(PIRsensorPin), ISR_PIRstateChange, CHANGE);
       }
     }
     initDone = true;
@@ -197,6 +221,11 @@ public:
    */
   void loop()
   {
+    // only check sensors 10x/s
+    unsigned long now = millis();
+    if (now - lastLoop < 100) return;
+    lastLoop = now;
+
     if (!updatePIRsensorState()) {
       handleOffTimer();
     }
@@ -210,38 +239,10 @@ public:
   void addToJsonInfo(JsonObject &root)
   {
     JsonObject user = root["u"];
-    if (user.isNull())
+    if (user.isNull()) user = root.createNestedObject("u");
-      user = root.createNestedObject("u");
-/*
-    JsonArray infoArr = user.createNestedArray(F("<i class=\"icons\">&#xe08f;</i> PIR sensor state")); //name
-    String uiDomString = F("<button class=\"btn infobtn\" onclick=\"requestJson({PIRenabled:");
-    String sensorStateInfo;
 
-    // PIR sensor state
+    if (enabled)
-    if (m_PIRenabled)
     {
-      uiDomString += "false";
-      sensorStateInfo = (m_PIRsensorPinState != LOW ? FPSTR(F("active")) : FPSTR(F("inactive"))); //value
-    }
-    else
-    {
-      uiDomString += "true";
-      sensorStateInfo = F("Disabled!");
-    }
-    uiDomString += F("});return false;\">");
-    uiDomString += sensorStateInfo;
-    uiDomString += F("</button>");
-    infoArr.add(uiDomString); //value
-*/
-    if (m_PIRenabled)
-    {
-/*
-      JsonArray infoArr = user.createNestedArray(F("PIR switch-off timer after")); //name
-      String uiDomString = F("<input type=\"number\" min=\"1\" max=\"720\" value=\"");
-      uiDomString += (m_switchOffDelay / 60000);
-      uiDomString += F("\" onchange=\"requestJson({PIRoffSec:parseInt(this.value)*60});\">min");
-      infoArr.add(uiDomString);
-*/
       // off timer
       String uiDomString = F("PIR <i class=\"icons\">&#xe325;</i>");
       JsonArray infoArr = user.createNestedArray(uiDomString); // timer value
@@ -271,66 +272,34 @@ public:
         uiDomString += (offSeconds);
         infoArr.add(uiDomString + F("s"));
       } else {
-        infoArr.add(F("inactive"));
+        infoArr.add(sensorPinState ? F("sensor on") : F("inactive"));
       }
+    } else {
+      String uiDomString = F("PIR sensor");
+      JsonArray infoArr = user.createNestedArray(uiDomString);
+      infoArr.add(F("disabled"));
     }
   }
 
   /**
    * 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
-   * Add "PIRenabled" to json state. This can be used to disable/enable the sensor.
-   * Add "PIRoffSec" to json state. This can be used to adjust <m_switchOffDelay> milliseconds.
    */
+/*
   void addToJsonState(JsonObject &root)
   {
-    root[FPSTR(_enabled)] = m_PIRenabled;
-    root[FPSTR(_switchOffDelay)] = (m_switchOffDelay / 1000);
   }
+*/
 
   /**
    * 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
-   * Read "PIRenabled" from json state and switch enable/disable the PIR sensor.
-   * Read "PIRoffSec" from json state and adjust <m_switchOffDelay> milliseconds.
    */
+/*
   void readFromJsonState(JsonObject &root)
   {
-    if (root[FPSTR(_switchOffDelay)] != nullptr) {
-      m_switchOffDelay = (1000 * max(60UL, min(43200UL, root[FPSTR(_switchOffDelay)].as<unsigned long>())));
-    }
-/*
-    if (root["pin"] != nullptr) {
-      int8_t pin = (int)root["pin"];
-      // check if pin is OK
-      if (pin != PIRsensorPin && pin>=0 && pinManager.allocatePin(pin,false)) {
-        // deallocate old pin
-        pinManager.deallocatePin(PIRsensorPin);
-        // PIR Sensor mode INPUT_PULLUP
-        pinMode(pin, INPUT_PULLUP);
-        if (m_PIRenabled)
-        {
-          // remove old ISR
-          detachInterrupt(PIRsensorPin);
-          // assign interrupt function and set CHANGE mode
-          attachInterrupt(digitalPinToInterrupt(pin), ISR_PIRstateChange, CHANGE);
-          newPIRsensorState(true, true);
-        }
-        PIRsensorPin = pin;
-      }
-    }
-
-    if (root[FPSTR(_enabled)] != nullptr) {
-      if (root[FPSTR(_enabled)] && !m_PIRenabled && PIRsensorPin >= 0) {
-        attachInterrupt(digitalPinToInterrupt(PIRsensorPin), ISR_PIRstateChange, CHANGE);
-        newPIRsensorState(true, true);
-      } else if (m_PIRenabled && PIRsensorPin >= 0) {
-        detachInterrupt(PIRsensorPin);
-      }
-      m_PIRenabled = root[FPSTR(_enabled)];
   }
 */
-  }
 
   /**
    * provide the changeable values
@@ -338,9 +307,13 @@ public:
   void addToConfig(JsonObject &root)
   {
     JsonObject top = root.createNestedObject(FPSTR(_name));
-    top[FPSTR(_enabled)] = m_PIRenabled;
+    top[FPSTR(_enabled)]   = enabled;
     top[FPSTR(_switchOffDelay)] = m_switchOffDelay / 1000;
     top["pin"]             = PIRsensorPin;
+    top[FPSTR(_onPreset)]  = m_onPreset;
+    top[FPSTR(_offPreset)] = m_offPreset;
+    top[FPSTR(_nightTime)] = m_nightTimeOnly;
+    top[FPSTR(_mqttOnly)]  = m_mqttOnly;
     DEBUG_PRINTLN(F("PIR config saved."));
   }
 
@@ -350,7 +323,7 @@ public:
    */
   void readFromConfig(JsonObject &root)
   {
-    bool oldEnabled = m_PIRenabled;
+    bool oldEnabled = enabled;
     int8_t oldPin = PIRsensorPin;
 
     JsonObject top = root[FPSTR(_name)];
@@ -362,11 +335,11 @@ public:
 
     if (top[FPSTR(_enabled)] != nullptr) {
       if (top[FPSTR(_enabled)].is<bool>()) {
-        m_PIRenabled = top[FPSTR(_enabled)].as<bool>(); // reading from cfg.json
+        enabled = top[FPSTR(_enabled)].as<bool>(); // reading from cfg.json
       } else {
         // change from settings page
         String str = top[FPSTR(_enabled)]; // checkbox -> off or on
-        m_PIRenabled = (bool)(str!="off"); // off is guaranteed to be present
+        enabled = (bool)(str!="off"); // off is guaranteed to be present
       }
     }
 
@@ -374,15 +347,39 @@ public:
       m_switchOffDelay = (top[FPSTR(_switchOffDelay)].as<int>() * 1000);
     }
 
+    if (top[FPSTR(_onPreset)] != nullptr) {
+      m_onPreset = max(0,min(250,top[FPSTR(_onPreset)].as<int>()));
+    }
+
+    if (top[FPSTR(_offPreset)] != nullptr) {
+      m_offPreset = max(0,min(250,top[FPSTR(_offPreset)].as<int>()));
+    }
+
+    if (top[FPSTR(_nightTime)] != nullptr) {
+      if (top[FPSTR(_nightTime)].is<bool>()) {
+        m_nightTimeOnly = top[FPSTR(_nightTime)].as<bool>(); // reading from cfg.json
+      } else {
+        // change from settings page
+        String str = top[FPSTR(_nightTime)]; // checkbox -> off or on
+        m_nightTimeOnly = (bool)(str!="off"); // off is guaranteed to be present
+      }
+    }
+
+    if (top[FPSTR(_mqttOnly)] != nullptr) {
+      if (top[FPSTR(_mqttOnly)].is<bool>()) {
+        m_mqttOnly = top[FPSTR(_mqttOnly)].as<bool>(); // reading from cfg.json
+      } else {
+        // change from settings page
+        String str = top[FPSTR(_mqttOnly)]; // checkbox -> off or on
+        m_mqttOnly = (bool)(str!="off"); // off is guaranteed to be present
+      }
+    }
+
     if (!initDone) {
       // reading config prior to setup()
       DEBUG_PRINTLN(F("PIR config loaded."));
     } else {
-      if (oldPin != PIRsensorPin || oldEnabled != m_PIRenabled) {
+      if (oldPin != PIRsensorPin || oldEnabled != enabled) {
-        if (oldEnabled) {
-          // remove old ISR if disabling usermod
-          detachInterrupt(oldPin);
-        }
         // check if pin is OK
         if (oldPin != PIRsensorPin && oldPin >= 0) {
           // if we are changing pin in settings page
@@ -393,12 +390,11 @@ public:
           } else {
             // allocation failed
             PIRsensorPin = -1;
-            m_PIRenabled = false;
+            enabled = false;
           }
         }
-        if (m_PIRenabled) {
+        if (enabled) {
-          attachInterrupt(digitalPinToInterrupt(PIRsensorPin), ISR_PIRstateChange, CHANGE);
+          sensorPinState = digitalRead(PIRsensorPin);
-          newPIRsensorState(true, true);
         }
         DEBUG_PRINTLN(F("PIR config (re)loaded."));
       }
@@ -415,25 +411,11 @@ public:
   }
 };
 
-//////////////////////////////////////////////////////
-// PIRsensorSwitch static method implementations
-
-volatile bool PIRsensorSwitch::newPIRsensorState(bool changeState, bool newState)
-{
-  static volatile bool s_PIRsensorState = false;
-  if (changeState)
-  {
-    s_PIRsensorState = newState;
-  }
-  return s_PIRsensorState;
-}
-
-void IRAM_ATTR PIRsensorSwitch::ISR_PIRstateChange()
-{
-  newPIRsensorState(true, true);
-}
-
 // strings to reduce flash memory usage (used more than twice)
 const char PIRsensorSwitch::_name[]           PROGMEM = "PIRsensorSwitch";
 const char PIRsensorSwitch::_enabled[]        PROGMEM = "PIRenabled";
 const char PIRsensorSwitch::_switchOffDelay[] PROGMEM = "PIRoffSec";
+const char PIRsensorSwitch::_onPreset[]       PROGMEM = "on-preset";
+const char PIRsensorSwitch::_offPreset[]      PROGMEM = "off-preset";
+const char PIRsensorSwitch::_nightTime[]      PROGMEM = "nighttime-only";
+const char PIRsensorSwitch::_mqttOnly[]       PROGMEM = "mqtt-only";

usermods/Temperature/readme.md

@@ -3,7 +3,7 @@
 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 will be expanded with support for different sensor types in the future.
+This usermod 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.
 
@@ -16,18 +16,19 @@ Copy the example `platformio_override.ini` to the root directory.  This file sho
 * `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
 
-All parameters can be configured at runtime using Usermods settings page.
+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.
 
 ## Project link
 
 * [QuinLED-Dig-Uno](https://quinled.info/2018/09/15/quinled-dig-uno/) - Project link
+* [Srg74-WLED-Wemos-shield](https://github.com/srg74/WLED-wemos-shield) - another great DIY WLED board
 
 ### PlatformIO requirements
 
 If you are using `platformio_override.ini`, you should be able to refresh the task list and see your custom task, for example `env:d1_mini_usermod_dallas_temperature_C`.
 
 
-If you are not using `platformio_override.ini`, you might have to uncomment `DallasTemperature@~3.8.0`,`OneWire@~2.3.5 under` `[common]` section in `platformio.ini`:
+If you are not using `platformio_override.ini`, you might have to uncomment `OneWire@~2.3.5 under` `[common]` section in `platformio.ini`:
 
 ```ini
 # platformio.ini

usermods/Temperature/usermod_temperature.h

@@ -1,8 +1,6 @@
 #pragma once
 
 #include "wled.h"
-
-//#include <DallasTemperature.h> //DS18B20
 #include "OneWire.h"
 
 //Pin defaults for QuinLed Dig-Uno if not overriden
@@ -164,9 +162,9 @@ class UsermodTemperature : public Usermod {
             // the DallasTemperature library returns -127C or -196.6F when problem
             // reading the sensor
             strcat_P(subuf, PSTR("/temperature"));
-            mqtt->publish(subuf, 0, true, String(temperature).c_str());
+            mqtt->publish(subuf, 0, false, String(temperature).c_str());
             strcat_P(subuf, PSTR("_f"));
-            mqtt->publish(subuf, 0, true, String((float)temperature * 1.8f + 32).c_str());
+            mqtt->publish(subuf, 0, false, String((float)temperature * 1.8f + 32).c_str());
           } else {
             // publish something else to indicate status?
           }

usermods/multi_relay/readme.md

@@ -2,6 +2,30 @@
 
 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. 
+
+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. 
+
+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.
+
+Examples
+1. 4 relays at all, relay 2 will be toggled: `http://[device-ip]/relays?toggle=0,1,0,0`
+2. 3 relays at all, relay 1&3 will be switched on: `http://[device-ip]/relays?switch=1,0,1`
+
+## 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:
+
+wled/deviceMAC/relay/0 on|off
+
+
 ## Usermod installation
 
 1. Register the usermod by adding `#include "../usermods/multi_relay/usermod_multi_relay.h"` at the top and `usermods.add(new MultiRelay());` at the bottom of `usermods_list.cpp`.

usermods/multi_relay/usermod_multi_relay.h

@@ -56,7 +56,7 @@ class MultiRelay : public Usermod {
       if (WLED_MQTT_CONNECTED){
         char subuf[64];
         sprintf_P(subuf, PSTR("%s/relay/%d"), mqttDeviceTopic, relay);
-        mqtt->publish(subuf, 0, true, state);
+        mqtt->publish(subuf, 0, false, state);
       }
     }
 
@@ -88,7 +88,7 @@ class MultiRelay : public Usermod {
         DEBUG_PRINTLN("Relays: HTML API");
         String janswer;
         String error = "";
-        int params = request->params();
+        //int params = request->params();
         janswer = F("{\"NoOfRelays\":");
         janswer += String(MULTI_RELAY_MAX_RELAYS) + ",";
 
@@ -281,7 +281,7 @@ class MultiRelay : public Usermod {
      * loop() is called continuously. Here you can check for events, read sensors, etc.
      */
     void loop() {
-      if (!enabled) return;
+      if (!enabled || strip.isUpdating()) return;
 
       static unsigned long lastUpdate = 0;
       if (millis() - lastUpdate < 200) return;  // update only 5 times/s

usermods/usermod_v2_four_line_display/usermod_v2_four_line_display.h

@@ -313,11 +313,7 @@ class FourLineDisplayUsermod : public Usermod {
       }
 
       // Update last known values.
-      #if defined(ESP8266)
       knownSsid = apActive ? WiFi.softAPSSID() : WiFi.SSID();
-      #else
-      knownSsid = WiFi.SSID();
-      #endif
       knownIp = apActive ? IPAddress(4, 3, 2, 1) : WiFi.localIP();
       knownBrightness = bri;
       knownMode = strip.getMode();
@@ -409,9 +405,9 @@ class FourLineDisplayUsermod : public Usermod {
             if (!insideQuotes || (qComma != knownMode)) break;
             lineBuffer[printedChars++] = singleJsonSymbol;
         }
-        if ((qComma > knownMode) || (printedChars > getCols()-2) || printedChars > sizeof(lineBuffer)-2) break;
+        if ((qComma > knownMode) || (printedChars >= getCols()-2) || printedChars >= sizeof(lineBuffer)-2) break;
       }
-      for (;printedChars < getCols()-2 || printedChars > sizeof(lineBuffer)-2; printedChars++) lineBuffer[printedChars]=' ';
+      for (;printedChars < getCols()-2 && printedChars < sizeof(lineBuffer)-2; printedChars++) lineBuffer[printedChars]=' ';
       lineBuffer[printedChars] = 0;
       drawString(2, row*lineHeight, lineBuffer);
     }

wled00/const.h

@@ -46,6 +46,7 @@
 #define USERMOD_ID_MODE_SORT     11            //Usermod "usermod_v2_mode_sort.h"
 #define USERMOD_ID_VL53L0X       12            //Usermod "usermod_vl53l0x_gestures.h"
 #define USERMOD_ID_MULTI_RELAY  101            //Usermod "usermod_multi_relay.h"
+#define USERMOD_ID_ANIMATED_STAIRCASE 102      //Usermod "Animated_Staircase.h"
 
 //Access point behavior
 #define AP_BEHAVIOR_BOOT_NO_CONN  0            //Open AP when no connection after boot