jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-25 19:56:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reverse down/up tap order, Save settings only if local

Browse Source
This commit is contained in:
Paul C Diem 2020-03-15 13:56:26 -05:00
parent 322952a54f
commit 32448bd75e
1 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
tasmota/xdrv_35_pwm_dimmer.ino
View File

@ -260,12 +260,13 @@ void PWMDimmerHandleButton()
return; return;
} }
uint32_t button_index = XdrvMailbox.index; bool state_updated = false;
uint32_t now = millis();
uint8_t power_on_bri = 0; uint8_t power_on_bri = 0;
uint8_t dgr_item = 0; uint8_t dgr_item = 0;
uint8_t dgr_value; uint8_t dgr_value;
uint8_t dgr_more_to_come = false; uint8_t dgr_more_to_come = false;
uint32_t button_index = XdrvMailbox.index;
uint32_t now = millis();
// Set a bool indicating if the power is on. // Set a bool indicating if the power is on.
#ifdef USE_PWM_DIMMER_REMOTE #ifdef USE_PWM_DIMMER_REMOTE
@ -343,25 +344,25 @@ void PWMDimmerHandleButton()
invert_power_button_bri_direction = true; invert_power_button_bri_direction = true;
} }
// If the power is not on, turn it on using an initial brightness of bri_preset_low and // If the power is not on, turn it on using an initial brightness of bri_preset_low, set the
// set the power button hold dimmer direction to true so holding the power switch increases // power button hold dimmer direction to true so holding the power switch increases the
// the brightness. // brightness and the power button hold time to delay before we start increasing the
// brightness.
else { else {
#ifdef USE_PWM_DIMMER_REMOTE #ifdef USE_PWM_DIMMER_REMOTE
if (!active_device_is_local) { if (!active_device_is_local) {
power_on_bri = active_remote_pwm_dimmer->bri = active_remote_pwm_dimmer->bri_preset_low; power_on_bri = active_remote_pwm_dimmer->bri = active_remote_pwm_dimmer->bri_preset_low;
active_remote_pwm_dimmer->power_button_increases_bri = true; active_remote_pwm_dimmer->power_button_increases_bri = true;
button_hold_time[button_index] = now + 1000;
} }
else { else {
#endif // USE_PWM_DIMMER_REMOTE #endif // USE_PWM_DIMMER_REMOTE
power_on_bri = Settings.bri_preset_low; power_on_bri = Settings.bri_preset_low;
power_button_increases_bri = true; power_button_increases_bri = true;
button_hold_time[button_index] = now + 500;
#ifdef USE_PWM_DIMMER_REMOTE #ifdef USE_PWM_DIMMER_REMOTE
} }
#endif // USE_PWM_DIMMER_REMOTE #endif // USE_PWM_DIMMER_REMOTE
// Reset the power button hold time to delay before we start increasing the brightness.
button_hold_time[button_index] = now + 500;
} }
} }
} }
@ -458,17 +459,11 @@ void PWMDimmerHandleButton()
} }
} }
// If the power is on, the up or down button was not tapped while holding the power button // If the power is on and the up or down button was not tapped while holding the power button
// before this and the active device is not local or the power button is not also pressed, // before this, adjust the brightness. Set the direction based on which button is pressed. The
// adjust the brightness. Set the direction based on which button is pressed. The new // new brightness will be calculated below.
// brightness will be calculated below.
if (power_is_on && !tap_count) { if (power_is_on && !tap_count) {
#ifdef USE_PWM_DIMMER_REMOTE bri_direction = (is_down_button ? -1 : 1);
if (!active_device_is_local || !button_pressed[power_button_index])
#else // USE_PWM_DIMMER_REMOTE
if (!button_pressed[power_button_index])
#endif // USE_PWM_DIMMER_REMOTE
bri_direction = (is_down_button ? -1 : 1);
} }
} }
@ -545,6 +540,7 @@ void PWMDimmerHandleButton()
power_button_increases_bri ^= 1; power_button_increases_bri ^= 1;
#ifdef USE_PWM_DIMMER_REMOTE #ifdef USE_PWM_DIMMER_REMOTE
dgr_item = 255; dgr_item = 255;
state_updated = true;
#endif // USE_PWM_DIMMER_REMOTE #endif // USE_PWM_DIMMER_REMOTE
} }
@ -561,14 +557,14 @@ void PWMDimmerHandleButton()
// Toggle the powered-off LED option. // Toggle the powered-off LED option.
if (down_button_tapped) { if (down_button_tapped) {
Settings.flag4.powered_off_led ^= 1; Settings.flag4.led_timeout ^= 1;
PWMDimmerSetPoweredOffLed(); if (Light.power) PWMDimmerSetBrightnessLeds(Settings.flag4.led_timeout ? -1 : 0);
} }
// Toggle the LED timeout. // Toggle the LED timeout.
else { else {
Settings.flag4.led_timeout ^= 1; Settings.flag4.powered_off_led ^= 1;
if (Light.power) PWMDimmerSetBrightnessLeds(Settings.flag4.led_timeout ? -1 : 0); PWMDimmerSetPoweredOffLed();
} }
#ifdef USE_PWM_DIMMER_REMOTE #ifdef USE_PWM_DIMMER_REMOTE
} }
@ -620,6 +616,7 @@ void PWMDimmerHandleButton()
// message type. Send a final update. // message type. Send a final update.
if (power_is_on && !tap_count) { if (power_is_on && !tap_count) {
dgr_item = 255; dgr_item = 255;
state_updated = true;
// If the power button is also pressed, set the power button hold dimmer direction so // 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. // holding the power switch adjusts the brightness away from the brightness we just set.
@ -704,10 +701,16 @@ void PWMDimmerHandleButton()
if (dgr_item == 255) dgr_item = 0; if (dgr_item == 255) dgr_item = 0;
SendDeviceGroupMessage(power_button_index, (dgr_more_to_come ? DGR_MSGTYP_UPDATE_MORE_TO_COME : DGR_MSGTYP_UPDATE_DIRECT), dgr_item, dgr_value); SendDeviceGroupMessage(power_button_index, (dgr_more_to_come ? DGR_MSGTYP_UPDATE_MORE_TO_COME : DGR_MSGTYP_UPDATE_DIRECT), dgr_item, dgr_value);
#endif // USE_DEVICE_GROUPS #endif // USE_DEVICE_GROUPS
light_controller.saveSettings(); #ifdef USE_PWM_DIMMER_REMOTE
if (Settings.flag3.hass_tele_on_power) { // SetOption59 - Send tele/%topic%/STATE in addition to stat/%topic%/RESULT if (active_device_is_local) {
MqttPublishTeleState(); #endif // USE_PWM_DIMMER_REMOTE
light_controller.saveSettings();
if (state_updated && Settings.flag3.hass_tele_on_power) { // SetOption59 - Send tele/%topic%/STATE in addition to stat/%topic%/RESULT
MqttPublishTeleState();
}
#ifdef USE_PWM_DIMMER_REMOTE
} }
#endif // USE_PWM_DIMMER_REMOTE
} }
} }