Matter support for Virtual Devices controllable via Rules or Berry

CHANGELOG.md

@@ -19,6 +19,7 @@ All notable changes to this project will be documented in this file.
 ### Added
 - Support for HDMI CEC protocol (#19434)
 - Support different baudrates on BL0942
+- Matter support for Virtual Devices controllable via Rules or Berry
 
 ### Changed
 - Berry fast_loop is now called every 5ms whatever the Sleep value (#19436)

lib/libesp32/berry_matter/src/embedded/Matter_Plugin_1_Device.be

@@ -172,5 +172,48 @@ class Matter_Plugin_Device : Matter_Plugin
     end
   end
 
+  #############################################################
+  # append_state_json
+  #
+  # Output the current state in JSON.
+  # The JSON is build via introspection to see what attributes
+  # exist and need to be output
+  # New values need to be appended with `,"key":value` (including prefix comma)
+  def append_state_json()
+    import introspect
+    var ret = ""
+
+    # ret: string
+    # attribute: attrbute name
+    # key: in json
+    def _stats_json_inner(attribute, key)
+      import introspect
+      import json
+      var val
+      if (val := introspect.get(self, attribute)) != nil
+        if type(val) == 'boot'    val = int(val)  end         # transform bool into 1/0
+        ret += f',"{key}":{json.dump(val)}'
+      end
+    end
+
+    # lights
+    # print(f'{self=} {type(self)} {introspect.members(self)=}')
+    _stats_json_inner("shadow_onoff",      "Power")
+    _stats_json_inner("shadow_bri",        "Bri")
+    _stats_json_inner("shadow_ct",         "CT")
+    _stats_json_inner("shadow_hue",        "Hue")
+    _stats_json_inner("shadow_sat",        "Sat")
+    # shutters
+    _stats_json_inner("shadow_shutter_pos",    "ShutterPos")
+    _stats_json_inner("shadow_shutter_target", "ShutterTarget")
+    _stats_json_inner("shadow_shutter_tilt",   "ShutterTilt")
+
+    # sensors
+    _stats_json_inner("shadow_contact",    "Contact")
+    _stats_json_inner("shadow_occupancy",  "Occupancy")
+    # print(ret)
+    return ret
+  end
+
 end
 matter.Plugin_Device = Matter_Plugin_Device

lib/libesp32/berry_matter/src/embedded/Matter_Plugin_2_Light0.be

@@ -146,15 +146,6 @@ class Matter_Plugin_Light0 : Matter_Plugin_Device
     return m.find(key_i)
   end
 
-  #############################################################
-  # append_state_json
-  #
-  # Output the current state in JSON
-  # New values need to be appended with `,"key":value` (including prefix comma)
-  def append_state_json()
-    return f',"Power":{int(self.shadow_onoff)}'
-  end
-
   #############################################################
   # update_virtual
   #

lib/libesp32/berry_matter/src/embedded/Matter_Plugin_2_OnOff.be

@@ -150,16 +150,6 @@ class Matter_Plugin_OnOff : Matter_Plugin_Device
 
   end
 
-  #############################################################
-  # append_state_json
-  #
-  # Output the current state in JSON
-  # Takes the JSON string prefix
-  # New values need to be appended with `,"key":value` (including prefix comma)
-  def append_state_json()
-    return f',"Power":{int(self.shadow_onoff)}'
-  end
-
   #############################################################
   # update_virtual
   #

lib/libesp32/berry_matter/src/embedded/Matter_Plugin_2_Shutter.be

@@ -41,7 +41,6 @@ class Matter_Plugin_Shutter : Matter_Plugin_Device
   var tasmota_shutter_index                         # Shutter number in Tasmota (zero based)
   var shadow_shutter_pos
   var shadow_shutter_target
-  var shadow_shutter_tilt
   var shadow_shutter_direction                      # 1=opening -1=closing 0=not moving TODO
   var shadow_shutter_inverted                       # 1=same as matter 0=matter must invert
 
@@ -225,14 +224,5 @@ class Matter_Plugin_Shutter : Matter_Plugin_Device
     end
   end
 
-  #############################################################
-  # append_state_json
-  #
-  # Output the current state in JSON
-  # New values need to be appended with `,"key":value` (including prefix comma)
-  def append_state_json(payload_str)
-    return f',"ShutterPos":{self.shadow_shutter_pos},"ShutterTarget":{self.shadow_shutter_target}'
-  end
-
 end
 matter.Plugin_Shutter = Matter_Plugin_Shutter

lib/libesp32/berry_matter/src/embedded/Matter_Plugin_3_Light1.be

@@ -189,16 +189,6 @@ class Matter_Plugin_Light1 : Matter_Plugin_Light0
     end
   end
 
-  #############################################################
-  # append_state_json
-  #
-  # Output the current state in JSON
-  # Takes the JSON string prefix
-  # New values need to be appended with `,"key":value` (including prefix comma)
-  def append_state_json()
-    return f',"Power":{int(self.shadow_onoff)},"Bri":{self.shadow_bri}'
-  end
-
   #############################################################
   # update_virtual
   #

lib/libesp32/berry_matter/src/embedded/Matter_Plugin_3_Sensor_Contact.be

@@ -96,14 +96,5 @@ class Matter_Plugin_Sensor_Contact : Matter_Plugin_Device
     end
   end
 
-  #############################################################
-  # append_state_json
-  #
-  # Output the current state in JSON
-  # New values need to be appended with `,"key":value` (including prefix comma)
-  def append_state_json()
-    return f',"Contact":{int(self.shadow_contact)}'
-  end
-
 end
 matter.Plugin_Sensor_Contact = Matter_Plugin_Sensor_Contact

lib/libesp32/berry_matter/src/embedded/Matter_Plugin_3_Sensor_Occupancy.be

@@ -97,14 +97,5 @@ class Matter_Plugin_Sensor_Occupancy : Matter_Plugin_Device
     end
   end
 
-  #############################################################
-  # append_state_json
-  #
-  # Output the current state in JSON
-  # New values need to be appended with `,"key":value` (including prefix comma)
-  def append_state_json()
-    return f',"Occupancy":{int(self.shadow_occupancy)}'
-  end
-
 end
 matter.Plugin_Sensor_Occupancy = Matter_Plugin_Sensor_Occupancy

lib/libesp32/berry_matter/src/embedded/Matter_Plugin_3_ShutterTilt.be

@@ -43,6 +43,7 @@ class Matter_Plugin_ShutterTilt : Matter_Plugin_Shutter
   # var shadow_shutter_target
   # var shadow_shutter_tilt
   # var shadow_shutter_direction                      # 1=opening -1=closing 0=not moving TODO
+  var shadow_shutter_tilt
   var tilt_min, tilt_max
 
   #############################################################
@@ -164,14 +165,5 @@ class Matter_Plugin_ShutterTilt : Matter_Plugin_Shutter
 
   end
 
-  #############################################################
-  # append_state_json
-  #
-  # Output the current state in JSON
-  # New values need to be appended with `,"key":value` (including prefix comma)
-  def append_state_json(payload_str)
-    return f',"ShutterPos":{self.shadow_shutter_pos},"ShutterTarget":{self.shadow_shutter_target},"ShutterTilt":{self.shadow_shutter_tilt}'
-  end
-
 end
 matter.Plugin_ShutterTilt = Matter_Plugin_ShutterTilt

lib/libesp32/berry_matter/src/embedded/Matter_Plugin_4_Light2.be

@@ -175,15 +175,6 @@ class Matter_Plugin_Light2 : Matter_Plugin_Light1
 
   end
 
-  #############################################################
-  # append_state_json
-  #
-  # Output the current state in JSON
-  # New values need to be appended with `,"key":value` (including prefix comma)
-  def append_state_json(payload_str)
-    return f',"Power":{int(self.shadow_onoff)},"Bri":{self.shadow_bri},"CT":{self.shadow_ct}'
-  end
-
   #############################################################
   # update_virtual
   #

lib/libesp32/berry_matter/src/embedded/Matter_Plugin_4_Light3.be

@@ -212,16 +212,6 @@ class Matter_Plugin_Light3 : Matter_Plugin_Light1
 
   end
 
-  #############################################################
-  # append_state_json
-  #
-  # Output the current state in JSON
-  # Takes the JSON string prefix
-  # New values need to be appended with `,"key":value` (including prefix comma)
-  def append_state_json(payload_str)
-    return f',"Power":{int(self.shadow_onoff)},"Bri":{self.shadow_bri},"Hue":{self.shadow_hue},"Sat":{self.shadow_sat}'
-  end
-
   #############################################################
   # update_virtual
   #