Handle remote switch updates, Make tap/hold functions available only when power is off

PWM_Dimmer.md

@@ -11,17 +11,17 @@ To enable PWM dimmer operation, select the PWM Dimmer module.
 
 Pressing and releasing the power button toggles the power on/off. If the toggle turns the power on, the load is returned to the last brightness it was adjusted to. If Fade is enabled, the load is faded on/off at the rate defined by the Speed setting.
 
-When the power is on, holding the down or up button decreases/increases the brightness (PWM value). The brightness is changed faster at higher brightnesses. The DimmerRange command set the minimum and maximum PWM values. Brightness values (0 - 255) are scaled to dimmerMin to dimmerMax. Typically, dimmerMin would be set to the lowest value at which the lights show visible light and dimmerMax would be set 1023. If you want to increase the lowest brightness level and/or decrease the highest brightness level, set higher dimmerMin and/or lower dimmerMax values.
+When the power is on, holding the down or up button decreases/increases the brightness (PWM value). The brightness is changed faster at higher brightnesses. The DimmerRange command sets the minimum and maximum PWM values. Brightness values (0 through 255) are scaled to dimmerMin through dimmerMax. Typically, dimmerMin would be set to the lowest value at which the lights show visible light and dimmerMax would be set 1023. If you want to increase the lowest brightness level and/or decrease the highest brightness level, set higher dimmerMin and/or lower dimmerMax values.
 
 The brightness can also be changed using just the power button. When the power is on, holding the power button alternately increases or decreases the brightness. Initially, holding the power button increases the brightness. Releasing and then holding the power button again decreases the brightness.
 
-When the power is off, holding the down or up button turns the power on at a temporary brightness of the low/high levels set by the BriPreset command (default =10,255). Turning the power on at the low preset can also be accomplished by holding the power button while the power is off. The brightness presets are intended to enable quickly turning on a light to a dim or bright level without changing the normal desired brightness. Turning the power on to a preset does not change the brightness the load will be set to when the switch is turned on the next time. For example, if the light is on and you adjust the brightness to 80 and then turn the light off, when you turn it back on, the brightness will return to 80. If you turn the power off again and then press the down button, the light will be turned on with a brightness of the low preset. If you then turn the light off and on again, the brightness will return to 80.
+When the power is off, pressing the down or up button turns the power on at a temporary brightness of the low/high levels set by the BriPreset command (default =10,255). Turning the power on at the low preset can also be accomplished by holding the power button while the power is off. The brightness presets are intended to enable quickly turning on a light to a dim or bright level without changing the normal desired brightness. Turning the power on to a preset does not change the brightness the load will be set to when the switch is turned on the next time. For example, if the light is on and you adjust the brightness to 80 and then turn the light off, when you turn it back on, the brightness will return to 80. If you turn the power off again and then press the down button, the light will be turned on with a brightness of the low preset. If you then turn the light off and on again, the brightness will return to 80.
 
 If there are LED’s defined in the template, they are turned on to indicate the current brightness. More LEDs are turned on at higher brightnesses. The LedTimeout command enables/disables an LED timeout. If LED timeout is enabled, the LED’s turn off five seconds after the last change in brightness. Note that the lowest LED and the blue power LED are always on when the power is on.
 
 The LEDLink LED can be used as a nightlight/powered-off indicator. The PoweredOffLed command enables/disables turning the LEDLink LED on when the power is off.
 
-Tapping (pressing and releasing quickly) the down or up buttons a given number of times and then holding the down or up button decreases or increases settings according to the table below. For example, tapping the down button once and then holding the up button sets all RGB lights in the device group to the next fixed color. Tapping the up button three times and then holding the down button decreases the high brightness preset.
+When the power is on, tapping (pressing and releasing quickly) the down or up buttons a given number of times and then holding the down or up button decreases or increases settings according to the table below. For example, tapping the down button once and then holding the up button sets all RGB lights in the device group to the next fixed color. Tapping the up button three times and then holding the down button decreases the high brightness preset.
 
 
 <table>

tasmota/support_device_groups.ino

@@ -502,7 +502,7 @@ void ProcessDeviceGroupMessage(char * packet, int packet_length)
     bool          grpflg
     bool          usridx
     uint16_t      command_code    Item code
-    uint32_t      index           Flags
+    uint32_t      index           0:15 Flags, 16:23 Device group index
     uint32_t      data_len        String item value length
     int32_t       payload         Integer item value
     char         *topic
@@ -510,7 +510,8 @@ void ProcessDeviceGroupMessage(char * packet, int packet_length)
     char         *command         nullptr
   */
   XdrvMailbox.command = nullptr;  // Indicates the source is a device group update
-  XdrvMailbox.index = flags;
+  XdrvMailbox.index = flags | device_group_index << 16;
+
   light_fade = Settings.light_fade;
   if (flags & (DGR_FLAG_MORE_TO_COME | DGR_FLAG_DIRECT)) Settings.light_fade = false;
 
@@ -526,12 +527,12 @@ void ProcessDeviceGroupMessage(char * packet, int packet_length)
       case DGR_ITEM_LIGHT_BRI:
       case DGR_ITEM_LIGHT_SCHEME:
       case DGR_ITEM_LIGHT_FIXED_COLOR:
-      case DGR_ITEM_BRI_MIN:
       case DGR_ITEM_BRI_PRESET_LOW:
       case DGR_ITEM_BRI_PRESET_HIGH:
       case DGR_ITEM_BRI_POWER_ON:
       case DGR_ITEM_POWER:
       case DGR_ITEM_LIGHT_CHANNELS:
+      case DGR_ITEM_DIMMER_RANGE:
         break;
       default:
         AddLog_P2(LOG_LEVEL_ERROR, PSTR("DGR: ********** invalid item=%u received from device group %s member %s"), item, device_group->group_name, IPAddressToString(remote_ip));

tasmota/xdrv_35_pwm_dimmer.ino

@@ -230,6 +230,12 @@ void PWMDimmerHandleDeviceGroupRequest()
 {
   static bool send_state = false;
   uint32_t value = XdrvMailbox.payload;
+#ifdef USE_PWM_DIMMER_REMOTE
+  uint8_t device_group_index = XdrvMailbox.index >> 16 & 0xff;
+  bool device_is_local = device_groups[device_group_index].local;
+  struct remote_pwm_dimmer * remote_pwm_dimmer = &remote_pwm_dimmers[device_group_index];
+#endif  // USE_PWM_DIMMER_REMOTE
+
   switch (XdrvMailbox.command_code) {
     case DGR_ITEM_EOL:
       if (send_state && !(XdrvMailbox.index & DGR_FLAG_MORE_TO_COME)) {
@@ -240,40 +246,87 @@ void PWMDimmerHandleDeviceGroupRequest()
       }
       break;
     case DGR_ITEM_LIGHT_BRI:
+#ifdef USE_PWM_DIMMER_REMOTE
+      if (!device_is_local) {
+        remote_pwm_dimmer->bri = value;
+      }
+      else
+#endif  // USE_PWM_DIMMER_REMOTE
       if (target_bri != value) {
         PWMDimmerSetBri(value);
         send_state = true;
       }
       break;
     case DGR_ITEM_LIGHT_SPEED:
+#ifdef USE_PWM_DIMMER_REMOTE
+      if (!device_is_local) {
+        remote_pwm_dimmer->light_speed = value;
+      }
+      else
+#endif  // USE_PWM_DIMMER_REMOTE
       if (Settings.light_speed != value && value > 0 && value <= 40) {
         Settings.light_speed = value;
         send_state = true;
       }
       break;
+    case DGR_ITEM_LIGHT_FIXED_COLOR:
+#ifdef USE_PWM_DIMMER_REMOTE
+      if (!device_is_local) {
+        remote_pwm_dimmer->fixed_color_index = value;
+      }
+      else
+#endif  // USE_PWM_DIMMER_REMOTE
+        fixed_color_index = value;
+      break;
     case DGR_ITEM_DIMMER_RANGE:
+#ifdef USE_PWM_DIMMER_REMOTE
+      if (!device_is_local)
+        remote_pwm_dimmer->dimmer_range = value;
+      else {
+#endif  // USE_PWM_DIMMER_REMOTE
         Settings.dimmer_hw_min = value & 0xffff;
         Settings.dimmer_hw_max = value >> 16;
+#ifdef USE_PWM_DIMMER_REMOTE
+      }
+#endif  // USE_PWM_DIMMER_REMOTE
       break;
     case DGR_ITEM_BRI_PRESET_LOW:
+#ifdef USE_PWM_DIMMER_REMOTE
+      if (!device_is_local)
+        remote_pwm_dimmer->bri_preset_low = value;
+      else
+#endif  // USE_PWM_DIMMER_REMOTE
       if (Settings.bri_preset_low != value) {
         Settings.bri_preset_low = value;
         send_state = true;
       }
       break;
     case DGR_ITEM_BRI_PRESET_HIGH:
+#ifdef USE_PWM_DIMMER_REMOTE
+      if (!device_is_local)
+        remote_pwm_dimmer->bri_preset_high = value;
+      else
+#endif  // USE_PWM_DIMMER_REMOTE
       if (Settings.bri_preset_high != value) {
         Settings.bri_preset_high = value;
         send_state = true;
       }
    break;
     case DGR_ITEM_BRI_POWER_ON:
+#ifdef USE_PWM_DIMMER_REMOTE
+      if (!device_is_local)
+        remote_pwm_dimmer->bri_power_on = value;
+      else
+#endif  // USE_PWM_DIMMER_REMOTE
       if (Settings.bri_power_on != value) {
         Settings.bri_power_on = value;
         send_state = true;
       }
       break;
     case DGR_ITEM_STATUS:
+#ifdef USE_PWM_DIMMER_REMOTE
+      if (device_is_local)
+#endif  // USE_PWM_DIMMER_REMOTE
         SendLocalDeviceGroupMessage(DGR_MSGTYP_UPDATE, DGR_ITEM_LIGHT_FADE, Settings.light_fade,
           DGR_ITEM_LIGHT_SPEED, Settings.light_speed, DGR_ITEM_LIGHT_BRI, target_bri,
           DGR_ITEM_BRI_PRESET_LOW, Settings.bri_preset_low, DGR_ITEM_BRI_PRESET_HIGH, Settings.bri_preset_high,
@@ -356,7 +409,7 @@ void PWMDimmerHandleButton()
 
       // If this is not about the power button, load the new hold time. Note that the hold time for
       // the power button is longer than the hold time for the other buttons.
-      button_hold_time[button_index] = now + 250;
+      button_hold_time[button_index] = now + 100;
     }
 
     // If the button is being held, send a button hold.
@@ -432,50 +485,50 @@ void PWMDimmerHandleButton()
         ignore_power_button_release = ignore_power_button_hold = true;
       }
 
-      // If the active device is local or the power button if also pressed, then if the down/up
+      // If the active device is local or the power button if also pressed, ...
-      // button has been held, handle the action based on the number of times the down or up button
-      // was pressed and released before holding it.
 #ifdef USE_PWM_DIMMER_REMOTE
       if (active_device_is_local == !button_pressed[power_button_index]) {
 #endif  // USE_PWM_DIMMER_REMOTE
-        if (button_hold_time[button_index] < now) {
+        bool is_down_button = (button_index == down_button_index);
+
+        // If the power is not on, turn it on using a temporary brightness of bri_preset_low if the
+        // down button is pressed or bri_preset_low if the up button is pressed.
+#ifdef USE_PWM_DIMMER_REMOTE
+        if ((!active_device_is_local ? !active_remote_pwm_dimmer->power : !power)) {
+#else // USE_PWM_DIMMER_REMOTE
+        if (!power) {
+#endif  // USE_PWM_DIMMER_REMOTE
+#ifdef USE_PWM_DIMMER_REMOTE
+          if (!active_device_is_local)
+            active_remote_pwm_dimmer->bri = (is_down_button ? active_remote_pwm_dimmer->bri_preset_low : active_remote_pwm_dimmer->bri_preset_high);
+          else
+#endif  // USE_PWM_DIMMER_REMOTE
+            target_bri = (is_down_button ? Settings.bri_preset_low : Settings.bri_preset_high);
+          toggle_power = true;
+          button_hold_time[button_index] = now + 500;
+
+          // If the power button is also pressed, set the power button hold dimmer direction
+          // so holding the power switch adjusts the brightness away from the brightness we
+          // just set.
+#ifdef USE_PWM_DIMMER_REMOTE
+          if (button_pressed[power_button_index]) active_remote_pwm_dimmer->power_button_increases_bri = is_down_button;
+#endif  // USE_PWM_DIMMER_REMOTE
+        }
+
+        // If the power is on and the down/up button has been held, handle the action based on the
+        // number of times the down or up button was pressed and released before holding it.
+        else if (button_hold_time[button_index] < now) {
           uint8_t uint8_value;
-          bool down_button_is_held = (button_index == down_button_index);
+          bool is_down_button = (button_index == down_button_index);
           bool down_button_was_tapped = (button_press_count[down_button_index] > 0);
           uint8_t tap_count = (down_button_was_tapped ? button_press_count[down_button_index] : button_press_count[up_button_index]);
           uint16_t uint16_value;
 
           switch (tap_count) {
             case 0:
-              // If the power is on, adjust the brightness. Set the direction based on which button is
+              // Adjust the brightness. Set the direction based on which button is pressed. The new
-              // pressed. The new brightness will be calculated below.
+              // brightness will be calculated below.
-#ifdef USE_PWM_DIMMER_REMOTE
+              bri_direction = (is_down_button ? -1 : 1);
-              if ((!active_device_is_local ? active_remote_pwm_dimmer->power : power)) {
-#else // USE_PWM_DIMMER_REMOTE
-              if (power) {
-#endif  // USE_PWM_DIMMER_REMOTE
-                bri_direction = (down_button_is_held ? -1 : 1);
-              }
-
-              // If the power is not on, turn it on using a temporary brightness of bri_preset_low if
-              // the down button is pressed or bri_preset_low if the up button is pressed.
-              else {
-#ifdef USE_PWM_DIMMER_REMOTE
-                if (!active_device_is_local)
-                  active_remote_pwm_dimmer->bri = (down_button_is_held ? active_remote_pwm_dimmer->bri_preset_low : active_remote_pwm_dimmer->bri_preset_high);
-                else
-#endif  // USE_PWM_DIMMER_REMOTE
-                  target_bri = (down_button_is_held ? Settings.bri_preset_low : Settings.bri_preset_high);
-                toggle_power = true;
-                button_hold_time[button_index] = now + 1000;
-
-                // If the power button is also pressed, set the power button hold dimmer direction
-                // so holding the power switch adjusts the brightness away from the brightness we
-                // just set.
-#ifdef USE_PWM_DIMMER_REMOTE
-                if (button_pressed[power_button_index]) active_remote_pwm_dimmer->power_button_increases_bri = down_button_is_held;
-#endif  // USE_PWM_DIMMER_REMOTE
-              }
               break;
 
             case 1:
@@ -488,7 +541,7 @@ void PWMDimmerHandleButton()
                 else
 #endif  // USE_PWM_DIMMER_REMOTE
                   uint8_value = fixed_color_index;
-                if (down_button_is_held) {
+                if (is_down_button) {
                   if (uint8_value)
                     uint8_value--;
                   else
@@ -519,7 +572,7 @@ void PWMDimmerHandleButton()
 #else  // USE_PWM_DIMMER_REMOTE
                 snprintf_P(topic, sizeof(topic), PSTR("%s/cmnd/Event"), SettingsText(SET_MQTT_GRP_TOPIC));
 #endif  // USE_PWM_DIMMER_REMOTE
-                sprintf_P(mqtt_data, PSTR("SwitchTrigger%u"), (down_button_is_held ? 1 : 2));
+                sprintf_P(mqtt_data, PSTR("SwitchTrigger%u"), (is_down_button ? 1 : 2));
                 MqttPublish(topic);
               }
               break;
@@ -533,7 +586,7 @@ void PWMDimmerHandleButton()
                 else
 #endif // USE_PWM_DIMMER_REMOTE
                   uint16_value = Settings.dimmer_hw_min;
-                if (down_button_is_held) {
+                if (is_down_button) {
                   if (uint16_value > 0) uint16_value--;
                 }
                 else if (uint16_value < 65535) {
@@ -561,7 +614,7 @@ void PWMDimmerHandleButton()
                 else
 #endif // USE_PWM_DIMMER_REMOTE
                   uint8_value = Settings.light_speed;
-                if (down_button_is_held) {
+                if (is_down_button) {
                   if (uint8_value > 1) uint8_value--;
                 }
                 else if (uint8_value < 40) {
@@ -587,7 +640,7 @@ void PWMDimmerHandleButton()
                 else
 #endif // USE_PWM_DIMMER_REMOTE
                   uint8_value = Settings.bri_preset_low;
-                if (down_button_is_held) {
+                if (is_down_button) {
                   if (uint8_value > 3) uint8_value--;
                 }
                 else if (uint8_value < 255) {
@@ -610,7 +663,7 @@ void PWMDimmerHandleButton()
                 else
 #endif // USE_PWM_DIMMER_REMOTE
                   uint8_value = Settings.bri_preset_high;
-                if (down_button_is_held) {
+                if (is_down_button) {
                   if (uint8_value > 3) uint8_value--;
                 }
                 else if (uint8_value < 255) {
@@ -630,18 +683,14 @@ void PWMDimmerHandleButton()
 
           button_was_held = true;
 
-          // If the button was tapped before it was held, reset the button hold time to one second and
+          // If the button was tapped before it was held, reset the button hold time to 1/2 second
-          // turn all the brightness LEDs on for 250ms.
+          // and turn all the brightness LEDs on for 250ms.
           if (tap_count > 0) {
-            button_hold_time[button_index] = now + 1000;
+            button_hold_time[button_index] = now + 500;
             turn_off_brightness_leds_time = now + 250;
             PWMDimmerSetBrightnessLeds(1);
           }
         }
-        else if (turn_off_brightness_leds_time && turn_off_brightness_leds_time < millis()) {
-          turn_off_brightness_leds_time = 0;
-          PWMDimmerSetBrightnessLeds(-1);
-        }
 #ifdef USE_PWM_DIMMER_REMOTE
       }
 #endif // USE_PWM_DIMMER_REMOTE
@@ -870,6 +919,11 @@ void PWMDimmerHandleButton()
       MqttPublishTeleState();
     }
   }
+
+  if (turn_off_brightness_leds_time && turn_off_brightness_leds_time < millis()) {
+    turn_off_brightness_leds_time = 0;
+    PWMDimmerSetBrightnessLeds(-1);
+  }
 }
 
 /*********************************************************************************************\