From a5b4490ba097095119085f0b61a29d6261e81f81 Mon Sep 17 00:00:00 2001 From: s-hadinger <49731213+s-hadinger@users.noreply.github.com> Date: Thu, 19 Sep 2024 22:26:21 +0200 Subject: [PATCH] Matter small UI fixes (#22173) --- .../berry_matter/src/embedded/Matter_UI.be | 25 +- .../src/embedded/Matter_zz_Device.be | 4 +- .../src/solidify/solidified_Matter_UI.h | 2045 ++++++++--------- .../solidify/solidified_Matter_zz_Device.h | 211 +- 4 files changed, 1121 insertions(+), 1164 deletions(-) diff --git a/lib/libesp32/berry_matter/src/embedded/Matter_UI.be b/lib/libesp32/berry_matter/src/embedded/Matter_UI.be index cbd0de8db..7117500d2 100644 --- a/lib/libesp32/berry_matter/src/embedded/Matter_UI.be +++ b/lib/libesp32/berry_matter/src/embedded/Matter_UI.be @@ -47,6 +47,7 @@ class Matter_UI "|http_occupancy|http_contact|http_flow|http_rain|http_waterleak" "|http_airquality" var device + var matter_enabled # #################################################################################################### # Static function to compare two maps (shallow compare) @@ -66,8 +67,9 @@ class Matter_UI # #################################################################################################### # Constructor - def init(device) + def init(device, matter_enabled) self.device = device + self.matter_enabled = matter_enabled tasmota.add_driver(self) end @@ -83,13 +85,6 @@ class Matter_UI webserver.content_send(" Configure Matter
") end - #- ---------------------------------------------------------------------- -# - #- Is Matter enabled? - #- ---------------------------------------------------------------------- -# - def matter_enabled() - return bool(tasmota.get_option(matter.MATTER_OPTION)) - end - #- ---------------------------------------------------------------------- -# #- Show commissioning information and QR Code # @@ -104,11 +99,11 @@ class Matter_UI "