Merge pull request #84 from AryaHassanli/fix-zap-device-render

Fix zap device type rendering

Author: AryaHassanli

zap/render/composed.go

@@ -202,8 +202,8 @@ func getConformanceState(cxt conformance.Context, clusterRequirements []*matter.
 	}
 
 	switch req.Origin {
-	case matter.RequirementOriginBaseDeviceType, matter.RequirementOriginSubsetDeviceType:
-		// Normally, we do not include clusters from the Base Device Type or subset device types...
+	case matter.RequirementOriginSubsetDeviceType:
+		// Normally, we do not include clusters from subset device types...
 
 		var hasElements bool
 		ers := elementRequirements[req.ClusterRequirement.Cluster]

zap/render/conformance.go

@@ -11,9 +11,6 @@ import (
 
 func renderConformance(spec *spec.Specification, entity types.Entity, c conformance.Conformance, parent *etree.Element, alternatives ...string) error {
 	removeConformance(parent)
-	if conformance.IsMandatory(c) && !conformance.IsProvisional(c) {
-		return nil
-	}
 	conformanceElement, err := dm.CreateConformanceElement(c, nil)
 	if err != nil {
 		return err