mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Berry `FUNC_BUTTON_MULTI_PRESSED` event and make `FUNC_BUTTON_PRESSED` called only on state changes (#21709)

This commit is contained in:
s-hadinger 2024-06-30 19:14:32 +02:00 committed by GitHub
parent 65588b8126
commit 6842b53425
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -9,6 +9,7 @@ All notable changes to this project will be documented in this file.
- Berry `tasmota.rtc("config_time")` (#21698)
- Berry `math.min()` and `math.max()` (#21705)
- Berry `FUNC_ANY_KEY` event calling `any_key()` (#21708)
- Berry `FUNC_BUTTON_MULTI_PRESSED` event and make `FUNC_BUTTON_PRESSED` called only on state changes
### Breaking Changed

21
tasmota/tasmota_xdrv_driver/xdrv_52_9_berry.ino
View File

@ -946,6 +946,23 @@ bool Xdrv52(uint32_t function)
case FUNC_SET_DEVICE_POWER:
result = callBerryEventDispatcher(PSTR("set_power_handler"), nullptr, XdrvMailbox.index, nullptr);
break;
case FUNC_BUTTON_PRESSED:
// XdrvMailbox.index = button_index;
// XdrvMailbox.payload = button;
// XdrvMailbox.command_code = Button.last_state[button_index];
if (XdrvMailbox.payload != XdrvMailbox.command_code) { // fire event only when state changes
result = callBerryEventDispatcher(PSTR("button_pressed"), nullptr,
(XdrvMailbox.payload & 0xFF) << 16 | (XdrvMailbox.command_code & 0xFF) << 8 | (XdrvMailbox.index & 0xFF) ,
nullptr);
}
break;
case FUNC_BUTTON_MULTI_PRESSED:
// XdrvMailbox.index = button_index;
// XdrvMailbox.payload = Button.press_counter[button_index];
result = callBerryEventDispatcher(PSTR("button_multi_pressed"), nullptr,
(XdrvMailbox.payload & 0xFF) << 8 | (XdrvMailbox.index & 0xFF) ,
nullptr);
break;
case FUNC_ANY_KEY:
// XdrvMailbox.payload = device_save << 24 | key << 16 | state << 8 | device;
// key 0 = KEY_BUTTON = button_topic
@ -1014,10 +1031,6 @@ bool Xdrv52(uint32_t function)
callBerryEventDispatcher(PSTR("after_teleperiod"), nullptr, 0, nullptr);
break;
case FUNC_BUTTON_PRESSED:
callBerryEventDispatcher(PSTR("button_pressed"), nullptr, 0, nullptr);
break;
case FUNC_ACTIVE:
result = true;
break;