From f77f77258f19426a9522bfa9dc75f4a861cf8dff Mon Sep 17 00:00:00 2001 From: Stephan Hadinger Date: Mon, 29 Nov 2021 23:11:25 +0100 Subject: [PATCH 1/3] Berry add `tasmota.global.devices_present` --- tasmota/xdrv_52_3_berry_tasmota_global.ino | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tasmota/xdrv_52_3_berry_tasmota_global.ino b/tasmota/xdrv_52_3_berry_tasmota_global.ino index affb2f19d..e5f3bad46 100644 --- a/tasmota/xdrv_52_3_berry_tasmota_global.ino +++ b/tasmota/xdrv_52_3_berry_tasmota_global.ino @@ -33,9 +33,10 @@ extern "C" { extern const be_ctypes_structure_t be_tasmota_global_struct = { sizeof(TasmotaGlobal), /* size in bytes */ - 1, /* number of elements */ + 2, /* number of elements */ nullptr, (const be_ctypes_structure_item_t[2]) { + { "devices_present", offsetof(TasmotaGlobal_t, devices_present), 0, 0, ctypes_u8, 0 }, { "sleep", offsetof(TasmotaGlobal_t, sleep), 0, 0, ctypes_u8, 0 }, }}; @@ -43,7 +44,7 @@ extern "C" { sizeof(TSettings), /* size in bytes */ 1, /* number of elements */ nullptr, - (const be_ctypes_structure_item_t[2]) { + (const be_ctypes_structure_item_t[1]) { { "sleep", offsetof(TSettings, sleep), 0, 0, ctypes_u8, 0 }, }}; From 38d834dda9abe0e2545898c664d6de3660503ad7 Mon Sep 17 00:00:00 2001 From: Stephan Hadinger Date: Mon, 29 Nov 2021 23:21:21 +0100 Subject: [PATCH 2/3] Add `set_power` event --- tasmota/xdrv_52_9_berry.ino | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tasmota/xdrv_52_9_berry.ino b/tasmota/xdrv_52_9_berry.ino index b59fa2f80..15d47011d 100644 --- a/tasmota/xdrv_52_9_berry.ino +++ b/tasmota/xdrv_52_9_berry.ino @@ -811,8 +811,9 @@ bool Xdrv52(uint8_t function) case FUNC_EVERY_SECOND: callBerryEventDispatcher(PSTR("every_second"), nullptr, 0, nullptr); break; - // case FUNC_SET_POWER: - // break; + case FUNC_SET_POWER: + callBerryEventDispatcher(PSTR("set_power"), nullptr, XdrvMailbox.index, nullptr); + break; #ifdef USE_WEBSERVER case FUNC_WEB_ADD_CONSOLE_BUTTON: if (XdrvMailbox.index) { From a290a1b5de2910e0f8c4d8ba27fe9d3803ad08c1 Mon Sep 17 00:00:00 2001 From: Stephan Hadinger Date: Mon, 29 Nov 2021 23:29:21 +0100 Subject: [PATCH 3/3] Rename to `set_power_handler` --- tasmota/xdrv_52_9_berry.ino | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasmota/xdrv_52_9_berry.ino b/tasmota/xdrv_52_9_berry.ino index 15d47011d..bee52522e 100644 --- a/tasmota/xdrv_52_9_berry.ino +++ b/tasmota/xdrv_52_9_berry.ino @@ -812,7 +812,7 @@ bool Xdrv52(uint8_t function) callBerryEventDispatcher(PSTR("every_second"), nullptr, 0, nullptr); break; case FUNC_SET_POWER: - callBerryEventDispatcher(PSTR("set_power"), nullptr, XdrvMailbox.index, nullptr); + callBerryEventDispatcher(PSTR("set_power_handler"), nullptr, XdrvMailbox.index, nullptr); break; #ifdef USE_WEBSERVER case FUNC_WEB_ADD_CONSOLE_BUTTON: