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

Rescale Bri to DimmerRange, Remove BriMin, LedTimeout and PoweredOffLed commands

Browse Source
This commit is contained in:
Paul C Diem 2020-02-27 13:38:33 -06:00
parent a32ed84bfc
commit a962662743
6 changed files with 75 additions and 229 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
PWM_Dimmer.md
View File

@ -11,7 +11,7 @@ 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 BriMin command defines the lowest value the brightness can be decreased to.
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.
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.
@ -99,7 +99,7 @@ Holding any button for over 10 seconds executes the WiFiConfig 2 command.
Pressing and releasing a button publishes an MQTT TOGGLE command. Holding a button publishes an MQTT HOLD command followed by an MQTT OFF command when the button is released.
When Device Groups are enabled, the PWM Dimmer minimum brightness, brightness presets, fade and speed settings are kept in sync across all switches in the group. The powered-off LED and LED timeout settings are specific to each switch. Changing them does not replicate the change to the other switches in the group.
When Device Groups are enabled, the PWM Dimmer brightness presets, dimmer minimum and maximum values, fade and speed settings are kept in sync across all switches in the group. The powered-off LED and LED timeout settings are specific to each switch. Changing them does not replicate the change to the other switches in the group.
### Commands
@ -112,99 +112,43 @@ When Device Groups are enabled, the PWM Dimmer minimum brightness, brightness pr
<td><strong>Parameters</strong>
</td>
</tr>
<tr>
<td>BriMin
</td>
<td>1..255 = set minimum brightness
<p>
+ = increase minimum brightness
<p>
- = decrease minimum brightness
</td>
</tr>
<tr>
<td>BriPreset
</td>
<td> &lt;low>,&lt;high> = set brightness low and high presets
<p>
1..255 = set brightness preset
<p>
+ = increase brightness preset
<p>
<td> &lt;low>,&lt;high> = set brightness low and high presets<br>
1..255 = set brightness preset<br>
+ = increase brightness preset<br>
- = decrease brightness preset
</td>
</tr>
<tr>
<td>Dimmer
<td>DimmerRange
</td>
<td>0..100 = set dimmer value from 0 to 100%
<p>
+ = increase by 10
<p>
- = decrease by 10
</td>
</tr>
<tr>
<td>Fade
</td>
<td>0 = do not use fade <em>(default)</em>
<p>
1 = use fade
</td>
</tr>
<tr>
<td>LedTimeout
</td>
<td>0 = disable LED timeout
<p>
1 = enable LED timeout
</td>
</tr>
<tr>
<td>PoweredOffLed
</td>
<td>0 = disable powered-off LED
<p>
1 = disable powered-off LED
</td>
</tr>
<tr>
<td>Speed
</td>
<td>1..20 = set fade speed from fast 1 to very slow 20
<p>
+ = increase speed
<p>
- = decrease speed
<td>Change dimming range<br>
<dimmerMin>,<DimmerMax> = set minimum and maximum PWM values. Dimmer/brightness is scaled to this range.<br>
</td>
</tr>
<tr>
<td>SetOption86
</td>
<td>Set brightness LED timeout
<p>
0 = disable timeout (default)
<p>
<td>Set brightness LED timeout<br>
0 = disable timeout (default)<br>
1 = enable timeout
</td>
</tr>
<tr>
<td>SetOption87
</td>
<td>Set powered-off LED (nightlight)
<p>
0 = disable powered-off LED (default)
<p>
<td>Set powered-off LED (nightlight)<br>
0 = disable powered-off LED (default)<br>
1 = enable powered-off LED
</td>
</tr>
<tr>
<td>SetOption88
</td>
<td>Set remote device mode
<p>
0 = disable remote device mode(default)
<p>
<td>Set remote device mode<br>
0 = disable remote device mode(default)<br>
1 = enable remote device mode
</td>
</tr>

2
tasmota/i18n.h
View File

@ -539,8 +539,6 @@
#ifdef USE_PWM_DIMMER
#define D_CMND_BRI_MIN "BriMin"
#define D_CMND_BRI_PRESET "BriPreset"
#define D_CMND_LED_TIMEOUT "LedTimeout"
#define D_CMND_POWERED_OFF_LED "PoweredOffLed"
#endif
// Commands xsns_02_analog.ino

4
tasmota/support_device_groups.ino
View File

@ -112,8 +112,8 @@ bool DeviceGroupItemShared(bool incoming, uint8_t item)
case DGR_ITEM_LIGHT_SPEED:
mask = DGR_SHARE_LIGHT_FADE;
break;
case DGR_ITEM_BRI_MIN:
mask = DGR_SHARE_BRI_MIN;
case DGR_ITEM_DIMMER_RANGE:
mask = DGR_SHARE_DIMMER_RANGE;
break;
}
return (!mask || ((incoming ? Settings.device_group_share_in : Settings.device_group_share_out) & mask));

6
tasmota/tasmota.h
View File

@ -309,14 +309,14 @@ enum DeviceGroupMessageFlag { DGR_FLAG_RESET = 1, DGR_FLAG_STATUS_REQUEST = 2, D
enum DeviceGroupItem { DGR_ITEM_EOL, DGR_ITEM_STATUS,
DGR_ITEM_LIGHT_FADE, DGR_ITEM_LIGHT_SPEED, DGR_ITEM_LIGHT_BRI, DGR_ITEM_LIGHT_SCHEME, DGR_ITEM_LIGHT_FIXED_COLOR,
DGR_ITEM_BRI_MIN, DGR_ITEM_BRI_PRESET_LOW, DGR_ITEM_BRI_PRESET_HIGH, DGR_ITEM_BRI_POWER_ON,
DGR_ITEM_BRI_PRESET_LOW, DGR_ITEM_BRI_PRESET_HIGH, DGR_ITEM_BRI_POWER_ON,
// Add new 8-bit items before this line
DGR_ITEM_LAST_8BIT, DGR_ITEM_MAX_8BIT = 63,
DGR_ITEM_ACK,
DGR_ITEM_ANALOG1, DGR_ITEM_ANALOG2, DGR_ITEM_ANALOG3, DGR_ITEM_ANALOG4, DGR_ITEM_ANALOG5,
// Add new 16-bit items before this line
DGR_ITEM_LAST_16BIT, DGR_ITEM_MAX_16BIT = 127,
DGR_ITEM_POWER,
DGR_ITEM_POWER, DGR_ITEM_DIMMER_RANGE,
// Add new 32-bit items before this line
DGR_ITEM_LAST_32BIT, DGR_ITEM_MAX_32BIT = 191,
// Add new string items before this line
@ -324,7 +324,7 @@ enum DeviceGroupItem { DGR_ITEM_EOL, DGR_ITEM_STATUS,
DGR_ITEM_LIGHT_CHANNELS };
enum DeviceGroupShareItem { DGR_SHARE_POWER = 1, DGR_SHARE_LIGHT_BRI = 2, DGR_SHARE_LIGHT_FADE = 4, DGR_SHARE_LIGHT_SCHEME = 8,
DGR_SHARE_LIGHT_COLOR = 16, DGR_SHARE_BRI_MIN = 32 };
DGR_SHARE_LIGHT_COLOR = 16, DGR_SHARE_DIMMER_RANGE = 32 };
enum CommandSource { SRC_IGNORE, SRC_MQTT, SRC_RESTART, SRC_BUTTON, SRC_SWITCH, SRC_BACKLOG, SRC_SERIAL, SRC_WEBGUI, SRC_WEBCOMMAND, SRC_WEBCONSOLE, SRC_PULSETIMER,
SRC_TIMER, SRC_RULE, SRC_MAXPOWER, SRC_MAXENERGY, SRC_OVERTEMP, SRC_LIGHT, SRC_KNX, SRC_DISPLAY, SRC_WEMO, SRC_HUE, SRC_RETRY, SRC_REMOTE, SRC_SHUTTER,

9
tasmota/xdrv_04_light.ino
View File

@ -2526,6 +2526,8 @@ void CmndDimmer(void)
}
}
#endif // USE_LIGHT
#if defined(USE_LIGHT) || defined(USE_PWM_DIMMER)
void CmndDimmerRange(void)
{
// DimmerRange - Show current dimmer range as used by Tuya and PS16DZ Dimmers
@ -2542,10 +2544,15 @@ void CmndDimmerRange(void)
Settings.dimmer_hw_min = parm[1];
Settings.dimmer_hw_max = parm[0];
}
restart_flag = 2;
#ifdef USE_DEVICE_GROUPS
SendLocalDeviceGroupMessage(DGR_MSGTYP_UPDATE, DGR_ITEM_DIMMER_RANGE, Settings.dimmer_hw_min | Settings.dimmer_hw_max << 16);
#endif // USE_DEVICE_GROUPS
if (PWM_DIMMER != my_module_type) restart_flag = 2;
}
Response_P(PSTR("{\"" D_CMND_DIMMER_RANGE "\":{\"Min\":%d,\"Max\":%d}}"), Settings.dimmer_hw_min, Settings.dimmer_hw_max);
}
#endif // #if defined(USE_LIGHT) || defined(USE_PWM_DIMMER)
#ifdef USE_LIGHT
void CmndLedTable(void)
{

199
tasmota/xdrv_35_pwm_dimmer.ino
View File

@ -36,20 +36,19 @@
#define MAX_FIXED_COLOR 12
#endif // MAX_FIXED_COLOR
// Note: CmndFade and CmndSpeed are in xdrv_04_light.
const char kPWMDimmerCommands[] PROGMEM = "|" // No prefix
D_CMND_BRI_MIN "|" D_CMND_BRI_PRESET "|" D_CMND_DIMMER "|" D_CMND_FADE "|" D_CMND_LED_TIMEOUT "|"
D_CMND_POWERED_OFF_LED "|" D_CMND_SPEED;
D_CMND_BRI_PRESET "|" D_CMND_DIMMER "|" D_CMND_DIMMER_RANGE "|" D_CMND_FADE "|" D_CMND_SPEED;
void (* const PWMDimmerCommand[])(void) PROGMEM = {
&CmndBriMin, &CmndBriPreset, &PWMDmmerCmndDimmer, &CmndFade, &CmndLedTimeout,
&CmndPoweredOffLed, &CmndSpeed };
CmndBriPreset, &PWMDmmerCmndDimmer, &CmndDimmerRange, &CmndFade, &CmndSpeed };
#ifdef USE_PWM_DIMMER_REMOTE
struct remote_pwm_dimmer {
power_t power;
uint32_t dimmer_range;
uint8_t light_speed;
uint8_t bri_power_on;
uint8_t bri_min;
uint8_t bri_preset_low;
uint8_t bri_preset_high;
uint8_t fixed_color_index;
@ -85,11 +84,6 @@ uint8_t buttons_pressed = 0;
bool active_device_is_local;
#endif // USE_PWM_DIMMER_REMOTE
void PWMDimmerCheckBri(uint8_t * value_ptr)
{
if (*value_ptr < Settings.bri_min) *value_ptr = Settings.bri_min;
}
void PWMModuleInit()
{
Settings.seriallog_level = 0;
@ -98,28 +92,22 @@ void PWMModuleInit()
Settings.flag.pwm_control = 0; // Use basic PWM control instead of Light
if (Settings.last_module != Settings.module) {
Settings.bri_min = 25;
Settings.dimmer_hw_min = 102;
Settings.dimmer_hw_max = 1023;
Settings.bri_power_on = 50;
Settings.bri_preset_low = 25;
Settings.bri_preset_high = 255;
Settings.last_module = Settings.module;
}
else {
if (Settings.bri_min < 1) Settings.bri_min = 25;
PWMDimmerCheckBri(&Settings.bri_power_on);
PWMDimmerCheckBri(&Settings.bri_preset_low);
PWMDimmerCheckBri(&Settings.bri_preset_high);
}
if (Settings.light_speed < 1) Settings.light_speed = 1;
target_bri = ((Settings.power & 1) ? changeUIntScale(Settings.light_dimmer, 0, 100, 0, 255) : 0);
PWMDimmerCheckBri(&target_bri);
current_bri = target_bri;
if (pin[GPIO_PWM1] < 99) {
uint32_t pwm_value = changeUIntScale(current_bri, 0, 255, 0, Settings.pwm_range);
analogWrite(pin[GPIO_PWM1], bitRead(pwm_inverted, 0) ? Settings.pwm_range - pwm_value : pwm_value);
uint32_t pwm_value = (current_bri ? changeUIntScale(current_bri, 1, 255, Settings.dimmer_hw_min, Settings.dimmer_hw_max) : 0);
analogWrite(pin[GPIO_PWM1], bitRead(pwm_inverted, 0) ? Settings.dimmer_hw_max - pwm_value : pwm_value);
}
relay_is_on = (current_bri > 0);
@ -149,7 +137,7 @@ void PWMDimmerInit(void)
void PWMDimmerSetBrightnessLeds(int32_t operation)
{
if (leds_present) {
uint32_t step = (!operation ? (255 - Settings.bri_min) / (leds_present + 1) : operation < 0 ? 255 : 0);
uint32_t step = (!operation ? 256 / (leds_present + 1) : operation < 0 ? 255 : 0);
uint32_t level = step;
SetLedPowerIdx(0, current_bri >= level);
if (leds_present > 1) {
@ -188,30 +176,23 @@ void PWMDimmerAnimate(bool no_fade)
// Advance the current brightness towards the target.
if (!no_fade && Settings.light_fade) {
if (current_bri < Settings.bri_min) {
current_bri = Settings.bri_min;
}
else {
uint8_t offset = current_bri / Settings.light_speed / 5 + 1;
uint8_t max_offset = abs(target_bri - current_bri);
if (offset > max_offset) offset = max_offset;
if (current_bri < target_bri)
current_bri += offset;
else
current_bri -= offset;
}
uint8_t offset = current_bri / Settings.light_speed / 5 + 1;
uint8_t max_offset = abs(target_bri - current_bri);
if (offset > max_offset) offset = max_offset;
if (current_bri < target_bri)
current_bri += offset;
else
current_bri -= offset;
}
else {
current_bri = target_bri;
}
// If the current brightness is now < bri_min, set the current and target brightness to 0.
if (current_bri < Settings.bri_min) current_bri = target_bri = 0;
// Sset the new PWM value.
// Set the new PWM value.
if (pin[GPIO_PWM1] < 99) {
uint32_t pwm_value = changeUIntScale(current_bri, 0, 255, 0, Settings.pwm_range);
analogWrite(pin[GPIO_PWM1], bitRead(pwm_inverted, 0) ? Settings.pwm_range - pwm_value : pwm_value);
uint32_t pwm_value = (current_bri ? changeUIntScale(current_bri, 1, 255, Settings.dimmer_hw_min, Settings.dimmer_hw_max) : 0);
//AddLog_P2(LOG_LEVEL_INFO, PSTR("PWMDimmerAnimate: current_bri=%u, pwm_value =%u"), current_bri, pwm_value);
analogWrite(pin[GPIO_PWM1], bitRead(pwm_inverted, 0) ? Settings.dimmer_hw_max - pwm_value : pwm_value);
}
// Handle a power state change.
@ -236,7 +217,6 @@ void PWMDimmerSetBri(uint8_t bri)
{
if (bri == target_bri) return;
target_bri = bri;
if (target_bri && target_bri < Settings.bri_min) target_bri = Settings.bri_min;
Settings.bri_power_on = target_bri;
Settings.light_dimmer = changeUIntScale(target_bri, 0, 255, 0, 100);
if (Settings.flag3.hass_tele_on_power) { // SetOption59 - Send tele/%topic%/STATE in addition to stat/%topic%/RESULT
@ -249,20 +229,7 @@ void PWMDimmerSetBri(uint8_t bri)
void PWMDimmerHandleDeviceGroupRequest()
{
static bool send_state = false;
uint8_t value = XdrvMailbox.payload;
switch (XdrvMailbox.command_code) {
case DGR_ITEM_BRI_MIN:
Settings.bri_min = 1;
case DGR_ITEM_BRI_PRESET_LOW:
case DGR_ITEM_BRI_PRESET_HIGH:
case DGR_ITEM_BRI_POWER_ON:
PWMDimmerCheckBri(&value);
break;
case DGR_ITEM_LIGHT_BRI:
if (value) PWMDimmerCheckBri(&value);
break;
}
uint32_t value = XdrvMailbox.payload;
switch (XdrvMailbox.command_code) {
case DGR_ITEM_EOL:
if (send_state && !(XdrvMailbox.index & DGR_FLAG_MORE_TO_COME)) {
@ -284,11 +251,9 @@ void PWMDimmerHandleDeviceGroupRequest()
send_state = true;
}
break;
case DGR_ITEM_BRI_MIN:
if (Settings.bri_min != value) {
Settings.bri_min = value;
send_state = true;
}
case DGR_ITEM_DIMMER_RANGE:
Settings.dimmer_hw_min = value & 0xffff;
Settings.dimmer_hw_max = value >> 16;
break;
case DGR_ITEM_BRI_PRESET_LOW:
if (Settings.bri_preset_low != value) {
@ -311,8 +276,9 @@ void PWMDimmerHandleDeviceGroupRequest()
case DGR_ITEM_STATUS:
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_MIN, Settings.bri_min, DGR_ITEM_BRI_PRESET_LOW, Settings.bri_preset_low,
DGR_ITEM_BRI_PRESET_HIGH, Settings.bri_preset_high, DGR_ITEM_BRI_POWER_ON, Settings.bri_power_on);
DGR_ITEM_BRI_PRESET_LOW, Settings.bri_preset_low, DGR_ITEM_BRI_PRESET_HIGH, Settings.bri_preset_high,
DGR_ITEM_DIMMER_RANGE, Settings.dimmer_hw_min | Settings.dimmer_hw_max << 16,
DGR_ITEM_BRI_POWER_ON, Settings.bri_power_on);
break;
}
}
@ -473,12 +439,12 @@ void PWMDimmerHandleButton()
if (active_device_is_local == !button_pressed[power_button_index]) {
#endif // USE_PWM_DIMMER_REMOTE
if (button_hold_time[button_index] < now) {
uint8_t uint8_value;
uint8_t min_uint8_value;
bool down_button_is_held = (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
@ -563,30 +529,29 @@ void PWMDimmerHandleButton()
// Decrease/increase the minimum brightness.
#ifdef USE_PWM_DIMMER_REMOTE
if (!active_device_is_local)
uint8_value = active_remote_pwm_dimmer->bri_min;
uint16_value = active_remote_pwm_dimmer->dimmer_range & 0xffff;
else
#endif // USE_PWM_DIMMER_REMOTE
uint8_value = Settings.bri_min;
uint16_value = Settings.dimmer_hw_min;
if (down_button_is_held) {
if (uint8_value > 4) uint8_value--;
if (uint16_value > 0) uint16_value--;
}
else if (uint8_value < 255) {
uint8_value++;
else if (uint16_value < 65535) {
uint16_value++;
}
#ifdef USE_PWM_DIMMER_REMOTE
dgr_item = DGR_ITEM_DIMMER_RANGE;
if (!active_device_is_local) {
active_remote_pwm_dimmer->bri_min = uint8_value;
if (active_remote_pwm_dimmer->bri_power_on < uint8_value) active_remote_pwm_dimmer->bri_power_on = uint8_value;
active_remote_pwm_dimmer->dimmer_range &= 0xffff0000 | uint16_value;
dgr_value = active_remote_pwm_dimmer->dimmer_range;
}
else {
#endif // USE_PWM_DIMMER_REMOTE
Settings.bri_min = uint8_value;
if (Settings.bri_power_on < uint8_value) Settings.bri_power_on = uint8_value;
Settings.dimmer_hw_min = uint16_value;
dgr_value = Settings.dimmer_hw_min | Settings.dimmer_hw_max << 16;
#ifdef USE_PWM_DIMMER_REMOTE
}
#endif // USE_PWM_DIMMER_REMOTE
dgr_item = DGR_ITEM_BRI_MIN;
dgr_value = uint8_value;
}
else {
// Decrease/increase the fade speed.
@ -617,19 +582,13 @@ void PWMDimmerHandleButton()
if (down_button_was_tapped) {
// Decrease/increase the low brightness preset.
#ifdef USE_PWM_DIMMER_REMOTE
if (!active_device_is_local) {
if (!active_device_is_local)
uint8_value = active_remote_pwm_dimmer->bri_preset_low;
min_uint8_value =active_remote_pwm_dimmer->bri_min;
}
else {
else
#endif // USE_PWM_DIMMER_REMOTE
uint8_value = Settings.bri_preset_low;
min_uint8_value = Settings.bri_min;
#ifdef USE_PWM_DIMMER_REMOTE
}
#endif // USE_PWM_DIMMER_REMOTE
if (down_button_is_held) {
if (uint8_value > min_uint8_value) uint8_value--;
if (uint8_value > 3) uint8_value--;
}
else if (uint8_value < 255) {
uint8_value++;
@ -652,7 +611,7 @@ void PWMDimmerHandleButton()
#endif // USE_PWM_DIMMER_REMOTE
uint8_value = Settings.bri_preset_high;
if (down_button_is_held) {
if (uint8_value > 4) uint8_value--;
if (uint8_value > 3) uint8_value--;
}
else if (uint8_value < 255) {
uint8_value++;
@ -706,7 +665,7 @@ void PWMDimmerHandleButton()
}
else {
new_bri = bri - offset;
if (new_bri < Settings.bri_min) new_bri = Settings.bri_min;
if (new_bri < 3) new_bri = 3;
}
if (new_bri != bri) {
#ifdef USE_DEVICE_GROUPS
@ -917,36 +876,6 @@ void PWMDimmerHandleButton()
* Commands
\*********************************************************************************************/
void CmndBriMin(void)
{
uint8_t new_bri_min = Settings.bri_min;
if (XdrvMailbox.payload > 0 && XdrvMailbox.payload <= 255) {
new_bri_min = (XdrvMailbox.payload < 4 ? 4 : XdrvMailbox.payload);
}
else if (1 == XdrvMailbox.data_len) {
if ('-' == XdrvMailbox.data[0]) {
if (new_bri_min > 4) new_bri_min--;
}
else if ('+' == XdrvMailbox.data[0] && new_bri_min < 255)
new_bri_min++;
}
if (new_bri_min != Settings.bri_min) {
Settings.bri_min = new_bri_min;
PWMDimmerCheckBri(&Settings.bri_power_on);
PWMDimmerCheckBri(&Settings.bri_preset_low);
PWMDimmerCheckBri(&Settings.bri_preset_high);
#ifdef DEVICE_GROUPS
SendLocalDeviceGroupMessage(DGR_MSGTYP_UPDATE, DGR_ITEM_BRI_MIN, Settings.bri_min,
DGR_ITEM_BRI_POWER_ON, Settings.bri_power_on, DGR_ITEM_BRI_PRESET_LOW, Settings.bri_preset_low,
DGR_ITEM_BRI_PRESET_HIGH, Settings.bri_preset_high);
#endif // DEVICE_GROUPS
}
ResponseCmndNumber(Settings.bri_min);
}
void CmndBriPreset(void)
{
if (XdrvMailbox.data_len > 0) {
@ -962,7 +891,7 @@ void CmndBriPreset(void)
if (parm[i] < 255) parm[i]++;
}
else if (*ptr == '-') {
if (parm[i] > Settings.bri_min) parm[i]--;
if (parm[i] > 0) parm[i]--;
}
else {
value = strtoul(ptr, &ptr, 0);
@ -971,7 +900,7 @@ void CmndBriPreset(void)
break;
}
parm[i] = value;
PWMDimmerCheckBri(&parm[i]);
if (*ptr != ',') break;
}
ptr++;
@ -985,9 +914,9 @@ void CmndBriPreset(void)
Settings.bri_preset_low = parm[1];
Settings.bri_preset_high = parm[0];
}
#ifdef DEVICE_GROUPS
#ifdef USE_DEVICE_GROUPS
SendLocalDeviceGroupMessage(DGR_MSGTYP_UPDATE, DGR_ITEM_BRI_PRESET_LOW, Settings.bri_preset_low, DGR_ITEM_BRI_PRESET_HIGH, Settings.bri_preset_high);
#endif // DEVICE_GROUPS
#endif // USE_DEVICE_GROUPS
}
}
Response_P(PSTR("{\"" D_CMND_BRI_PRESET "\":{\"Low\":%d,\"High\":%d}}"), Settings.bri_preset_low, Settings.bri_preset_high);
@ -1015,38 +944,6 @@ void PWMDmmerCmndDimmer(void)
ResponseCmndNumber(Settings.light_dimmer);
}
void CmndLedTimeout(void)
{
// Set the brightness LED timeout state.
switch (XdrvMailbox.payload) {
case 0: // Off
case 1: // On
Settings.flag4.led_timeout = XdrvMailbox.payload;
break;
case 2: // Toggle
Settings.flag4.led_timeout ^= 1;
break;
}
if (relay_is_on) PWMDimmerSetBrightnessLeds(0);
ResponseCmndStateText(Settings.flag4.led_timeout);
}
void CmndPoweredOffLed(void)
{
// Set the powered-off LED state.
switch (XdrvMailbox.payload) {
case 0: // Off
case 1: // On
Settings.flag4.powered_off_led = XdrvMailbox.payload;
break;
case 2: // Toggle
Settings.flag4.powered_off_led ^= 1;
break;
}
PWMDimmerSetPoweredOffLed();
ResponseCmndStateText(Settings.flag4.powered_off_led);
}
/*********************************************************************************************\
* Interface
\*********************************************************************************************/