mirror of
https://github.com/arendst/Tasmota.git
synced 2025-07-23 10:46:31 +00:00
Theo Arends
GitHub
commit
46afd9da43
@ -76,5 +76,6 @@ Module | Description
|
||||
70 Sonoff L1 | Sonoff L1 light strip
|
||||
71 Sonoff iFan03 | Sonoff iFan03 Wifi Smart Ceiling Fan with Light
|
||||
72 EXS Dimmer | EXS Wifi Dimmer v4
|
||||
73 PWM Dimmer | Martin Jerry/acenx/Tessan/NTONPOWER SD0x PWM Dimmer Switches
|
||||
|
||||
Over 600 additional devices are supported using [templates](TEMPLATES.md).
|
||||
|
||||
229
PWM_Dimmer.md
Normal file
229
PWM_Dimmer.md
Normal file
@ -0,0 +1,229 @@
|
||||
# PWM Dimmer
|
||||
|
||||
The PWM Dimmer module adds support for Martin Jerry/acenx/Tessan/NTONPOWER SD0x PWM dimmer switches. The brightness of the load for these dimmers is controlled by a PWM GPIO pin. They typically have power, up and down buttons, a powered-on LED, five brightness LEDs and another status LED. Examples are:[ https://www.amazon.com/dp/B07FXYSVR1](https://www.amazon.com/dp/B07FXYSVR1),[ https://www.amazon.com/dp/B07V26Q3VD](https://www.amazon.com/dp/B07V26Q3VD),[ https://www.amazon.com/dp/B07K67D43J](https://www.amazon.com/dp/B07K67D43J),[ https://www.amazon.com/dp/B07TTGFWFM](https://www.amazon.com/dp/B07TTGFWFM)
|
||||
|
||||
To include PWM dimmer support in the build, define USE_PWM_DIMMER in your user_config_override. This adds 4.5K to the code size. The light module is not required for PWM dimmer operation so you can #undef USE_LIGHT to reduce the firmware bin size.
|
||||
|
||||
To enable PWM dimmer operation, select the PWM Dimmer module.
|
||||
|
||||
|
||||
## PWM Dimmer Operation
|
||||
|
||||
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.
|
||||
|
||||
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.
|
||||
|
||||
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.
|
||||
|
||||
|
||||
<table>
|
||||
<tr>
|
||||
<td>Taps
|
||||
</td>
|
||||
<td>Down Button
|
||||
</td>
|
||||
<td>Up Button
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>1
|
||||
</td>
|
||||
<td>Set fixed color<sup>1</sup>
|
||||
</td>
|
||||
<td>Publish MQTT event<sup>2</sup>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>2
|
||||
</td>
|
||||
<td>Adjust minimum brightness
|
||||
</td>
|
||||
<td>Adjust fade speed
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>3
|
||||
</td>
|
||||
<td>Adjust low brightness preset
|
||||
</td>
|
||||
<td>Adjust high brightness preset
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
|
||||
1. Setting the previous/next color only functions when remote device mode is enabled (see below) and only when the switch is in a device group with an RGB light. The color sequence as defined by the Light module is red, green, blue, orange, light green, light blue, amber, cyan, purple, yellow, pink, white using RGB channels, white using CT channels.
|
||||
|
||||
2. The MQTT topic has the format %group-topic%/cmnd/Event, where %group-topic% is the group topic set by the GroupTopic command. The MQTT payload is SwitchTrigger#, where # is 1 if the down button is held or 2 if the up button is held. These triggers can be used in rules on remote devices (ON Event#SwitchTrigger1) or by automation software to trigger automations such as scene changes. For example, the Event topic SwitchTrigger1 payload could trigger the automation software to turn on the previous scene in a list and the SwitchTrigger2 payload could trigger the automation software to turn on the next scene in a list.
|
||||
|
||||
Holding the power button, pressing the down/up buttons a given number of times and then releasing the power button toggles options according to the table below. Note that you must press a down or up button within 0.5 seconds to prevent the power button hold action from taking place.
|
||||
|
||||
|
||||
<table>
|
||||
<tr>
|
||||
<td>Presses
|
||||
</td>
|
||||
<td>Down Button
|
||||
</td>
|
||||
<td>Up Button
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>1
|
||||
</td>
|
||||
<td>Toggle powered-off LED
|
||||
</td>
|
||||
<td>Toggle brightness LED timeout
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>2
|
||||
</td>
|
||||
<td>Toggle fading
|
||||
</td>
|
||||
<td>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
|
||||
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.
|
||||
|
||||
|
||||
### Commands
|
||||
|
||||
|
||||
<table>
|
||||
<tr>
|
||||
<td><strong>Command</strong>
|
||||
</td>
|
||||
<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> <low>,<high> = set brightness low and high presets
|
||||
<p>
|
||||
1..255 = set brightness preset
|
||||
<p>
|
||||
+ = increase brightness preset
|
||||
<p>
|
||||
- = decrease brightness preset
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Dimmer
|
||||
</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>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>SetOption86
|
||||
</td>
|
||||
<td>Set brightness LED timeout
|
||||
<p>
|
||||
0 = disable timeout (default)
|
||||
<p>
|
||||
1 = enable timeout
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>SetOption87
|
||||
</td>
|
||||
<td>Set powered-off LED (nightlight)
|
||||
<p>
|
||||
0 = disable powered-off LED (default)
|
||||
<p>
|
||||
1 = enable powered-off LED
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>SetOption88
|
||||
</td>
|
||||
<td>Set remote device mode
|
||||
<p>
|
||||
0 = disable remote device mode(default)
|
||||
<p>
|
||||
1 = enable remote device mode
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
|
||||
|
||||
### Remote Device Mode
|
||||
|
||||
Remote device mode allows PWM Dimmer switches to control remote devices. With remote device mode enabled, each button controls a different device. Note that dimmer switches with toggle-style down/up buttons have limited functionality as remote device mode switches because you can not push the down and up buttons simultaneously.
|
||||
|
||||
To include remote device mode support in the build, define USE_PWM_DIMMER_REMOTE in your user_config_override. Remote device mode support requires device group support so USE_DEVICE_GROUPS is automatically defined if USE_PWM_DIMMER_REMOTE is defined. Remote device mode support adds 0.7K to the code size in addition to the code size required for device groups support.
|
||||
|
||||
To enable remote device mode, set Option88 to 1. Each remote device must be running firmware with device group support and have remote device support enabled. The remote devices do not need to be built with PWM dimmer support nor do they need to be switches.
|
||||
|
||||
If a remote device is a PWM dimmer, the device acts like a 3-way dimmer switch would and may or may not have a load connected to it. It’s also possible to use a PWM dimmer switch without a load to act as a wall switch to control the power, brightness and color of one or more smart lights with Tasmota with device group support loaded on them.
|
||||
|
||||
With remote device mode enabled, button 1 is the power button for the local device while buttons 2 and 3 are the power buttons for remote devices. Group names for buttons 2 and 3 are set by the GroupTopic2 and GroupTopic3 commands respectively. Note that the button numbers are defined by the module template and can be in any physical order on the switch (button 1 can be defined as the top button, the middle button or the bottom button).
|
||||
|
||||
Pressing and releasing a power button toggles the power on all devices in the group assigned to the button. When the power is on, holding the button alternately increases or decreases the brightness. When the power is off, holding the button turns the power on at a temporary brightness of the low level set by the BriPreset command (default =10).
|
||||
|
||||
While holding a power button, the other two buttons act like the down and up buttons for the remote device. All the functions performed by the down and up buttons in non-remote device mode are available in remote device mode. While holding button 1, button 2 performs the functions of the down button and button 3 performs the functions of the up button. While holding button 2, button 1 performs the functions of the down button and button 3 performs the functions of the up button. While holding button 3, button 1 performs the functions of the down button and button 2 performs the functions of the up button.
|
||||
@ -130,6 +130,7 @@ Kingart Touch {"NAME":"PS-16-DZ","GPIO":[255,148,255,149,255,255,0,0,255
|
||||
Moes DS01 {"NAME":"MOES - DS01","GPIO":[255,255,255,255,255,255,0,0,255,108,255,107,255],"FLAG":0,"BASE":54}
|
||||
Moes QS-WiFi-D01 Dimmer 150W {"NAME":"WiFi-Dimmer","GPIO":[0,148,0,149,0,0,0,0,0,42,37,0,0],"FLAG":0,"BASE":18}
|
||||
PS-16-DZ {"NAME":"PS-16-DZ","GPIO":[255,148,255,149,255,255,0,0,255,52,255,255,255],"FLAG":0,"BASE":58}
|
||||
PWM Dimmer {"NAME":"PWM Dimmer","GPIO":[19,18,0,59,158,58,0,0,57,37,56,122,29],"FLAG":0,"BASE":73}
|
||||
Zemismart KS-7011 {"NAME":"KS-7011 Dimmer","GPIO":[255,107,255,108,255,255,0,0,255,255,255,255,255],"FLAG":0,"BASE":54}
|
||||
```
|
||||
|
||||
|
||||
@ -535,6 +535,14 @@
|
||||
// Commands xdrv_32_hotplug.ino
|
||||
#define D_CMND_HOTPLUG "HotPlug"
|
||||
|
||||
// Commands xdrv_34_pwm_dimmer.ino
|
||||
#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
|
||||
#define D_CMND_ADCPARAM "AdcParam"
|
||||
|
||||
|
||||
@ -415,7 +415,9 @@
|
||||
//#define USE_EXS_DIMMER // Add support for ES-Store WiFi Dimmer (+1k5 code)
|
||||
// #define EXS_MCU_CMNDS // Add command to send MCU commands (+0k8 code)
|
||||
//#define USE_HOTPLUG // Add support for sensor HotPlug
|
||||
//#define USE_DEVICE_GROUPS // Add support for device groups (+5k6 code)
|
||||
#define USE_DEVICE_GROUPS // Add support for device groups (+3k5 code)
|
||||
#define USE_PWM_DIMMER // Add support for MJ-SD01/acenx/NTONPOWER PWM dimmers (+4k5 code)
|
||||
#define USE_PWM_DIMMER_REMOTE // Add support for remote switches to PWM Dimmer, also adds device groups support (+0k7 code, also includes device groups)
|
||||
|
||||
// -- Optional light modules ----------------------
|
||||
#define USE_WS2812 // WS2812 Led string using library NeoPixelBus (+5k code, +1k mem, 232 iram) - Disable by //
|
||||
|
||||
@ -469,9 +469,8 @@ struct SYSCFG {
|
||||
uint8_t bri_min; // F05
|
||||
uint8_t bri_preset_low; // F06
|
||||
uint8_t bri_preset_high; // F07
|
||||
uint8_t button_devices; // F08
|
||||
|
||||
uint8_t free_f05[195]; // F09
|
||||
uint8_t free_f05[196]; // F08
|
||||
|
||||
uint32_t device_group_share_in; // FCC - Bitmask of device group items imported
|
||||
uint32_t device_group_share_out; // FD0 - Bitmask of device group items exported
|
||||
|
||||
@ -640,6 +640,12 @@ void MqttShowState(void)
|
||||
break;
|
||||
}
|
||||
#endif // USE_SONOFF_IFAN
|
||||
#ifdef USE_PWM_DIMMER
|
||||
if (PWM_DIMMER == my_module_type) {
|
||||
ResponseAppend_P(PSTR(",\"" D_CMND_DIMMER "\":%d,\"" D_CMND_FADE "\":\"%s\",\"" D_CMND_SPEED "\":%d"),
|
||||
Settings.light_dimmer, GetStateText(Settings.light_fade), Settings.light_speed);
|
||||
}
|
||||
#endif // USE_PWM_DIMMER
|
||||
#ifdef USE_LIGHT
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -73,6 +73,16 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
|
||||
#define MODULE SONOFF_BASIC // [Module] Select default model
|
||||
#endif
|
||||
|
||||
#ifdef USE_PWM_DIMMER_REMOTE
|
||||
#ifdef USE_PWM_DIMMER
|
||||
#ifndef USE_DEVICE_GROUPS
|
||||
#define USE_DEVICE_GROUPS
|
||||
#endif // USE_DEVICE_GROUPS
|
||||
#else // USE_PWM_DIMMER
|
||||
#undef USE_PWM_DIMMER_REMOTE
|
||||
#endif // USE_PWM_DIMMER
|
||||
#endif // USE_PWM_DIMMER_REMOTE
|
||||
|
||||
/*********************************************************************************************\
|
||||
* [tasmota-sensors.bin]
|
||||
* Provide an image with useful supported sensors enabled
|
||||
@ -250,6 +260,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
|
||||
#undef USE_EMULATION_HUE // Disable Hue Bridge emulation for Alexa (+14k code, +2k mem common)
|
||||
#undef USE_EMULATION_WEMO // Disable Belkin WeMo emulation for Alexa (+6k code, +2k mem common)
|
||||
#undef USE_DEVICE_GROUPS // Disable support for device groups (+3k5 code)
|
||||
#undef USE_PWM_DIMMER_REMOTE // Disbale support for remote switches to PWM Dimmer
|
||||
#undef DEBUG_THEO // Disable debug code
|
||||
#undef USE_DEBUG_DRIVER // Disable debug code
|
||||
#endif // FIRMWARE_KNX_NO_EMULATION
|
||||
@ -288,6 +299,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
|
||||
#undef USE_EXS_DIMMER // Disable support for EX-Store WiFi Dimmer
|
||||
#undef USE_HOTPLUG // Disable support for HotPlug
|
||||
#undef USE_DEVICE_GROUPS // Disable support for device groups (+3k5 code)
|
||||
#undef USE_PWM_DIMMER_REMOTE // Disbale support for remote switches to PWM Dimmer
|
||||
|
||||
#undef USE_ENERGY_SENSOR // Disable energy sensors (-14k code)
|
||||
#undef USE_PZEM004T // Disable PZEM004T energy sensor
|
||||
@ -365,6 +377,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
|
||||
#undef USE_EXS_DIMMER // Disable support for EX-Store WiFi Dimmer
|
||||
#undef USE_HOTPLUG // Disable support for HotPlug
|
||||
#undef USE_DEVICE_GROUPS // Disable support for device groups (+3k5 code)
|
||||
#undef USE_PWM_DIMMER_REMOTE // Disbale support for remote switches to PWM Dimmer
|
||||
|
||||
// -- Optional light modules ----------------------
|
||||
//#undef USE_LIGHT // Also disable all Dimmer/Light support
|
||||
@ -587,6 +600,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
|
||||
#undef USE_EXS_DIMMER // Disable support for EX-Store WiFi Dimmer
|
||||
#undef USE_HOTPLUG // Disable support for HotPlug
|
||||
#undef USE_DEVICE_GROUPS // Disable support for device groups (+3k5 code)
|
||||
#undef USE_PWM_DIMMER_REMOTE // Disbale support for remote switches to PWM Dimmer
|
||||
|
||||
// -- Optional light modules ----------------------
|
||||
#undef USE_LIGHT // Disable support for lights
|
||||
|
||||
@ -418,6 +418,7 @@ enum SupportedModules {
|
||||
SONOFF_L1,
|
||||
SONOFF_IFAN03,
|
||||
EXS_DIMMER,
|
||||
PWM_DIMMER,
|
||||
MAXMODULE};
|
||||
|
||||
#define USER_MODULE 255
|
||||
@ -864,6 +865,9 @@ const uint8_t kModuleNiceList[] PROGMEM = {
|
||||
#endif
|
||||
#ifdef USE_EXS_DIMMER
|
||||
EXS_DIMMER,
|
||||
#endif
|
||||
#ifdef USE_PWM_DIMMER
|
||||
PWM_DIMMER,
|
||||
#endif
|
||||
H801, // Light Devices
|
||||
MAGICHOME,
|
||||
@ -2204,6 +2208,33 @@ const mytmplt kModules[MAXMODULE] PROGMEM = {
|
||||
GPIO_USER, // GPIO14
|
||||
0, // GPIO15
|
||||
0, 0
|
||||
},
|
||||
{ "PWM Dimmer", // PWM_DIMMER - Support for Martin Jerry/acenx/Tessan/NTONPOWER SD0x PWM
|
||||
// dimmer switches. The brightness of the load for these dimmers is
|
||||
// controlled by a PWM GPIO pin. There are typically power, up & down
|
||||
// buttons and 4 LED's. Examples are:
|
||||
// https://www.amazon.com/dp/B07FXYSVR1
|
||||
// https://www.amazon.com/dp/B07V26Q3VD
|
||||
// https://www.amazon.com/dp/B07K67D43J
|
||||
// https://www.amazon.com/dp/B07TTGFWFM
|
||||
GPIO_KEY3, // GPIO00 Up button
|
||||
GPIO_KEY2, // GPIO01 Down button
|
||||
0, // GPIO02
|
||||
GPIO_LED4_INV, // GPIO03 Level 5 LED
|
||||
GPIO_LEDLNK_INV, // GPIO04 LED Link
|
||||
GPIO_LED3_INV, // GPIO05 Level 4 LED
|
||||
// GPIO06 (SD_CLK Flash)
|
||||
// GPIO07 (SD_DATA0 Flash QIO/DIO/DOUT)
|
||||
// GPIO08 (SD_DATA1 Flash QIO/DIO/DOUT)
|
||||
0, // GPIO09 (SD_DATA2 Flash QIO or ESP8285)
|
||||
0, // GPIO10 (SD_DATA3 Flash QIO or ESP8285)
|
||||
// GPIO11 (SD_CMD Flash)
|
||||
GPIO_LED2_INV, // GPIO12 Level 3 LED
|
||||
GPIO_PWM1, // GPIO13 Dimmer PWM
|
||||
GPIO_LED1_INV, // GPIO12 Level 2 LED
|
||||
GPIO_KEY1_INV, // GPIO15 Power button
|
||||
GPIO_REL1_INV, // GPIO16 Power relay/Level 1 LED
|
||||
0
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@ -1123,6 +1123,17 @@ void HandleRoot(void)
|
||||
} // Settings.flag3.pwm_multi_channels
|
||||
}
|
||||
#endif // USE_LIGHT
|
||||
#ifdef USE_PWM_DIMMER
|
||||
if (PWM_DIMMER == my_module_type) {
|
||||
WSContentSend_P(HTTP_MSG_SLIDER_GRADIENT, // Brightness - Black to White
|
||||
"c", // c - Unique HTML id
|
||||
"#000", "#fff", // Black to White
|
||||
4, // sl4 - Unique range HTML id - Used as source for Saturation begin color
|
||||
Settings.flag3.slider_dimmer_stay_on, 100, // Range 0/1 to 100%
|
||||
Settings.light_dimmer,
|
||||
'd', 0); // d0 - Value id is related to lc("d0", value) and WebGetArg("d0", tmp, sizeof(tmp));
|
||||
}
|
||||
#endif // USE_PWM_DIMMER
|
||||
#ifdef USE_SHUTTER
|
||||
if (Settings.flag3.shutter_mode) { // SetOption80 - Enable shutter support
|
||||
for (uint32_t i = 0; i < shutters_present; i++) {
|
||||
|
||||
@ -2588,6 +2588,8 @@ void CmndRgbwwTable(void)
|
||||
ResponseCmndChar(scolor);
|
||||
}
|
||||
|
||||
#endif // USE_LIGHT
|
||||
#if defined(USE_LIGHT) || defined(USE_PWM_DIMMER)
|
||||
void CmndFade(void)
|
||||
{
|
||||
// Fade - Show current Fade state
|
||||
@ -2606,7 +2608,9 @@ void CmndFade(void)
|
||||
#ifdef USE_DEVICE_GROUPS
|
||||
if (XdrvMailbox.payload >= 0 && XdrvMailbox.payload <= 2) SendLocalDeviceGroupMessage(DGR_MSGTYP_UPDATE, DGR_ITEM_LIGHT_FADE, Settings.light_fade);
|
||||
#endif // USE_DEVICE_GROUPS
|
||||
#ifdef USE_LIGHT
|
||||
if (!Settings.light_fade) { Light.fade_running = false; }
|
||||
#endif // USE_LIGHT
|
||||
ResponseCmndStateText(Settings.light_fade);
|
||||
}
|
||||
|
||||
@ -2632,6 +2636,8 @@ void CmndSpeed(void)
|
||||
}
|
||||
ResponseCmndNumber(Settings.light_speed);
|
||||
}
|
||||
#endif // #if defined(USE_LIGHT) || defined(USE_PWM_DIMMER)
|
||||
#ifdef USE_LIGHT
|
||||
|
||||
void CmndWakeupDuration(void)
|
||||
{
|
||||
@ -2664,7 +2670,10 @@ bool Xdrv04(uint8_t function)
|
||||
bool result = false;
|
||||
|
||||
if (FUNC_MODULE_INIT == function) {
|
||||
return LightModuleInit();
|
||||
#ifdef USE_PWM_DIMMER
|
||||
if (PWM_DIMMER != my_module_type)
|
||||
#endif // USE_PWM_DIMMER
|
||||
return LightModuleInit();
|
||||
}
|
||||
else if (light_type) {
|
||||
switch (function) {
|
||||
|
||||
@ -200,8 +200,8 @@ void HAssAnnounceRelayLight(void)
|
||||
TryResponseAppend_P(HASS_DISCOVER_RELAY, command_topic, value_template, SettingsText(SET_STATE_TXT1), SettingsText(SET_STATE_TXT2));
|
||||
TryResponseAppend_P(HASS_DISCOVER_DEVICE_INFO_SHORT, unique_id, ESP.getChipId(), WiFi.macAddress().c_str());
|
||||
|
||||
#ifdef USE_LIGHT
|
||||
if (is_light)
|
||||
#if defined(USE_LIGHT) || defined(USE_PWM_DIMMER)
|
||||
if (is_light || PWM_DIMMER == my_module_type)
|
||||
{
|
||||
char *brightness_command_topic = stemp1;
|
||||
|
||||
@ -209,6 +209,7 @@ void HAssAnnounceRelayLight(void)
|
||||
strncpy_P(stemp3, Settings.flag.not_power_linked ? PSTR("last") : PSTR("brightness"), sizeof(stemp3)); // SetOption20 - Control power in relation to Dimmer/Color/Ct changes
|
||||
TryResponseAppend_P(HASS_DISCOVER_LIGHT_DIMMER, brightness_command_topic, state_topic, stemp3);
|
||||
|
||||
#ifdef USE_LIGHT
|
||||
if (Light.subtype >= LST_RGB)
|
||||
{
|
||||
char *rgb_command_topic = stemp1;
|
||||
@ -234,8 +235,9 @@ void HAssAnnounceRelayLight(void)
|
||||
GetTopic_P(color_temp_command_topic, CMND, mqtt_topic, D_CMND_COLORTEMPERATURE);
|
||||
TryResponseAppend_P(HASS_DISCOVER_LIGHT_CT, color_temp_command_topic, state_topic);
|
||||
}
|
||||
#endif // USE_LIGHT
|
||||
}
|
||||
#endif // USE_LIGHT
|
||||
#endif // defined(USE_LIGHT) || defined(USE_PWM_DIMMER)
|
||||
TryResponseAppend_P(PSTR("}"));
|
||||
}
|
||||
MqttPublish(stopic, true);
|
||||
|
||||
1137
tasmota/xdrv_35_pwm_dimmer.ino
Normal file
1137
tasmota/xdrv_35_pwm_dimmer.ino
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user