Michel2/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2026-07-27 20:05:46 +00:00
Code Issues Releases Activity

Matter Device non nullable attributes (#24764)

Browse Source
This commit is contained in:
s-hadinger
2026-05-18 10:01:12 +02:00
committed by GitHub
parent f4aa8ed67f
commit 3734308857
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/libesp32/berry_matter/src/embedded/Matter_Plugin_1_Device.be
+8 -8
View File
@@ -248,16 +248,16 @@ class Matter_Plugin_Device : Matter_Plugin
elif cluster == 0x0039 # ========== Bridged Device Basic Information 9.13 p.485 ==========
import string
if attribute == 0x0003 # ---------- ProductName / string ----------
if attribute == 0x0003 # ---------- ProductName / string (not nullable) ----------
if self.BRIDGE
var name = self.http_remote.get_info().find("name")
return tlv_solo.set_or_nil(0x0C #-TLV.UTF1-#, name)
var name = self.http_remote.get_info().find("name", "")
return tlv_solo.set(0x0C #-TLV.UTF1-#, name)
else
return tlv_solo.set(0x0C #-TLV.UTF1-#, tasmota.cmd("DeviceName", true)['DeviceName'])
end
elif attribute == 0x0005 # ---------- NodeLabel / string ----------
return tlv_solo.set(0x0C #-TLV.UTF1-#, self.get_name())
elif attribute == 0x000A # ---------- SoftwareVersionString / string ----------
elif attribute == 0x000A # ---------- SoftwareVersionString / string (not nullable) ----------
if self.BRIDGE
var version_full = self.http_remote.get_info().find("version")
if version_full
@@ -265,7 +265,7 @@ class Matter_Plugin_Device : Matter_Plugin
if version_end > 0 version_full = version_full[0..version_end - 1] end
return tlv_solo.set(0x0C #-TLV.UTF1-#, version_full)
else
return tlv_solo.set(0x14 #-TLV.NULL-#, nil)
return tlv_solo.set(0x0C #-TLV.UTF1-#, "") # spec is not nullable, return empty until first poll
end
else
var version_full = tasmota.cmd("Status 2", true)['StatusFWR']['Version']
@@ -273,10 +273,10 @@ class Matter_Plugin_Device : Matter_Plugin
if version_end > 0 version_full = version_full[0..version_end - 1] end
return tlv_solo.set(0x0C #-TLV.UTF1-#, version_full)
end
elif attribute == 0x000F || attribute == 0x0012 # ---------- SerialNumber / string ----------
elif attribute == 0x000F || attribute == 0x0012 # ---------- SerialNumber / UniqueID / string (not nullable) ----------
if self.BRIDGE
var mac = self.http_remote.get_info().find("mac")
return tlv_solo.set_or_nil(0x0C #-TLV.UTF1-#, mac)
var mac = self.http_remote.get_info().find("mac", "")
return tlv_solo.set(0x0C #-TLV.UTF1-#, mac)
else
return tlv_solo.set(0x0C #-TLV.UTF1-#, tasmota.wifi().find("mac", ""))
end