[chip-tool] Print DeviceType names next to ids

examples/chip-tool/templates/logging/DataModelLogger-src.zapt

@@ -1,6 +1,7 @@
 {{> header}}
 
 #include <commands/clusters/DataModelLogger.h>
+#include <zap-generated/cluster/logging/EntryToText.h>
 
 using namespace chip::app::Clusters;
 

examples/chip-tool/templates/logging/EntryToText-src.zapt

@@ -81,4 +81,16 @@ char const * GeneratedCommandIdToText(chip::ClusterId cluster, chip::CommandId i
 {{/zcl_clusters}}
 		default: return "Unknown";
 	}
+}
+
+char const * DeviceTypeIdToText(chip::DeviceTypeId id) {
+	switch(id)
+	{
+{{#zcl_device_types}}
+{{#if class}}
+		case {{asHex code 8}}: return "{{caption}}";
+{{/if}}
+{{/zcl_device_types}}
+		default: return "Unknown";
+	}
 }

examples/chip-tool/templates/logging/EntryToText.zapt

@@ -10,4 +10,6 @@ char const * AttributeIdToText(chip::ClusterId cluster, chip::AttributeId id);
 
 char const * AcceptedCommandIdToText(chip::ClusterId cluster, chip::CommandId id);
 
-char const * GeneratedCommandIdToText(chip::ClusterId cluster, chip::CommandId id);
+char const * GeneratedCommandIdToText(chip::ClusterId cluster, chip::CommandId id);
+
+char const * DeviceTypeIdToText(chip::DeviceTypeId id);

examples/chip-tool/templates/partials/StructLoggerImpl.zapt

@@ -3,16 +3,37 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const ch
   DataModelLogger::LogString(label, indent, "{");
 {{#zcl_struct_items}}
   {
+{{#if (isEqual label "DeviceType") }}
+{{#if (isEqual parent.name "DeviceTypeStruct") }}
+      std::string item = std::to_string(value.{{asLowerCamelCase label}}) + " (" + DeviceTypeIdToText(value.{{asLowerCamelCase label}}) + ")";
+      DataModelLogger::LogString("{{asUpperCamelCase label}}", indent + 1, item);
+{{else}}
+      if (value.{{asLowerCamelCase label}}.IsNull())
+      {
+          CHIP_ERROR err = LogValue("{{asUpperCamelCase label}}", indent + 1, value.{{asLowerCamelCase label}});
+          if (err != CHIP_NO_ERROR)
+          {
+              DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for '{{asUpperCamelCase label}}'");
+              return err;
+          }
+      }
+      else
+      {
+          std::string item = std::to_string(value.{{asLowerCamelCase label}}.Value()) + " (" + DeviceTypeIdToText(value.{{asLowerCamelCase label}}.Value()) + ")";
+          DataModelLogger::LogString("{{asUpperCamelCase label}}", indent + 1, item);
+      }
+{{/if}}
+{{else}}
       CHIP_ERROR err = LogValue("{{asUpperCamelCase label}}", indent + 1, value.{{asLowerCamelCase label}});
       if (err != CHIP_NO_ERROR)
       {
           DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for '{{asUpperCamelCase label}}'");
           return err;
       }
+{{/if}}
   }
 {{/zcl_struct_items}}
   DataModelLogger::LogString(indent, "}");
 
   return CHIP_NO_ERROR;
 }
-