From 17f8f784a03b855d70c6dc3dc300acb19a6ccc41 Mon Sep 17 00:00:00 2001 From: Vivien Nicolas Date: Sat, 15 Jan 2022 16:26:00 +0100 Subject: [PATCH] Update generated code --- .../all-clusters-app.matter | 2 +- .../bridge-common/bridge-app.matter | 2 +- .../door-lock-common/door-lock-app.matter | 2 +- .../lighting-common/lighting-app.matter | 2 +- examples/lock-app/lock-common/lock-app.matter | 2 +- examples/pump-app/pump-common/pump-app.matter | 2 +- .../pump-controller-app.matter | 2 +- .../esp32/main/temperature-measurement.matter | 2 +- .../thermostat-common/thermostat.matter | 2 +- examples/tv-app/tv-common/tv-app.matter | 2 +- .../tv-casting-common/tv-casting-app.matter | 2 +- examples/window-app/common/window-app.matter | 2 +- .../data_model/controller-clusters.matter | 2 +- .../python/chip/clusters/Objects.py | 6 +++--- .../CHIP/zap-generated/CHIPStructsObjc.h | 2 +- .../CHIP/zap-generated/CHIPStructsObjc.mm | 2 +- .../app-common/zap-generated/af-structs.h | 6 +++--- .../zap-generated/cluster-objects.cpp | 4 ++-- .../zap-generated/cluster-objects.h | 8 ++++---- .../app-common/zap-generated/enums.h | 20 +++++++++---------- .../zap-generated/cluster/Commands.h | 4 ++-- 21 files changed, 39 insertions(+), 39 deletions(-) diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter index eefb773e8c4683..a1a1d4914c0111 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter @@ -2418,7 +2418,7 @@ server cluster SoftwareDiagnostics = 52 { } info event SoftwareFault = 0 { - SoftwareFault softwareFault = 0; + SoftwareFaultStruct softwareFault = 0; } readonly attribute ThreadMetrics threadMetrics[] = 0; diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter index 45e395194c985e..2742e4d80d1116 100644 --- a/examples/bridge-app/bridge-common/bridge-app.matter +++ b/examples/bridge-app/bridge-common/bridge-app.matter @@ -650,7 +650,7 @@ server cluster SoftwareDiagnostics = 52 { } info event SoftwareFault = 0 { - SoftwareFault softwareFault = 0; + SoftwareFaultStruct softwareFault = 0; } readonly attribute ThreadMetrics threadMetrics[] = 0; diff --git a/examples/door-lock-app/door-lock-common/door-lock-app.matter b/examples/door-lock-app/door-lock-common/door-lock-app.matter index 8c1c766a42c188..ef93f7d527baaa 100644 --- a/examples/door-lock-app/door-lock-common/door-lock-app.matter +++ b/examples/door-lock-app/door-lock-common/door-lock-app.matter @@ -896,7 +896,7 @@ server cluster SoftwareDiagnostics = 52 { } info event SoftwareFault = 0 { - SoftwareFault softwareFault = 0; + SoftwareFaultStruct softwareFault = 0; } readonly attribute ThreadMetrics threadMetrics[] = 0; diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index ff7ef39e3ccd87..dbd2cead15f2ec 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -1182,7 +1182,7 @@ server cluster SoftwareDiagnostics = 52 { } info event SoftwareFault = 0 { - SoftwareFault softwareFault = 0; + SoftwareFaultStruct softwareFault = 0; } readonly attribute ThreadMetrics threadMetrics[] = 0; diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index 4590d1397a3087..d8432bb6335368 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -592,7 +592,7 @@ server cluster SoftwareDiagnostics = 52 { } info event SoftwareFault = 0 { - SoftwareFault softwareFault = 0; + SoftwareFaultStruct softwareFault = 0; } readonly attribute ThreadMetrics threadMetrics[] = 0; diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter index e17683ca3e9686..7a830d5bd07d88 100644 --- a/examples/pump-app/pump-common/pump-app.matter +++ b/examples/pump-app/pump-common/pump-app.matter @@ -733,7 +733,7 @@ server cluster SoftwareDiagnostics = 52 { } info event SoftwareFault = 0 { - SoftwareFault softwareFault = 0; + SoftwareFaultStruct softwareFault = 0; } readonly attribute ThreadMetrics threadMetrics[] = 0; diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter index 1d96e8b2fd7fdd..b0a1b88a5a877a 100644 --- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter +++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter @@ -728,7 +728,7 @@ server cluster SoftwareDiagnostics = 52 { } info event SoftwareFault = 0 { - SoftwareFault softwareFault = 0; + SoftwareFaultStruct softwareFault = 0; } readonly attribute ThreadMetrics threadMetrics[] = 0; diff --git a/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter b/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter index 479f7e31a74c86..dffc0f042d79bf 100644 --- a/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter +++ b/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter @@ -531,7 +531,7 @@ server cluster OperationalCredentials = 62 { server cluster SoftwareDiagnostics = 52 { info event SoftwareFault = 0 { - SoftwareFault softwareFault = 0; + SoftwareFaultStruct softwareFault = 0; } readonly attribute int64u currentHeapHighWatermark = 3; diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter index 0d404e5de6547d..f2454907651893 100644 --- a/examples/thermostat/thermostat-common/thermostat.matter +++ b/examples/thermostat/thermostat-common/thermostat.matter @@ -888,7 +888,7 @@ server cluster SoftwareDiagnostics = 52 { } info event SoftwareFault = 0 { - SoftwareFault softwareFault = 0; + SoftwareFaultStruct softwareFault = 0; } readonly attribute ThreadMetrics threadMetrics[] = 0; diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index 1b3865560806e3..0081790e4d77d3 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -1540,7 +1540,7 @@ server cluster SoftwareDiagnostics = 52 { } info event SoftwareFault = 0 { - SoftwareFault softwareFault = 0; + SoftwareFaultStruct softwareFault = 0; } readonly attribute ThreadMetrics threadMetrics[] = 0; diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter index 7b21dcfb623a0f..126d374f2271be 100644 --- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter +++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter @@ -2070,7 +2070,7 @@ server cluster SoftwareDiagnostics = 52 { } info event SoftwareFault = 0 { - SoftwareFault softwareFault = 0; + SoftwareFaultStruct softwareFault = 0; } readonly attribute ThreadMetrics threadMetrics[] = 0; diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter index 1091922c2ed06b..49e636136033c2 100644 --- a/examples/window-app/common/window-app.matter +++ b/examples/window-app/common/window-app.matter @@ -574,7 +574,7 @@ server cluster SoftwareDiagnostics = 52 { } info event SoftwareFault = 0 { - SoftwareFault softwareFault = 0; + SoftwareFaultStruct softwareFault = 0; } readonly attribute ThreadMetrics threadMetrics[] = 0; diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index fcb80bb3e6e29a..04ca0d00c4f6f8 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -2647,7 +2647,7 @@ client cluster SoftwareDiagnostics = 52 { } info event SoftwareFault = 0 { - SoftwareFault softwareFault = 0; + SoftwareFaultStruct softwareFault = 0; } readonly attribute ThreadMetrics threadMetrics[] = 0; diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index b66e5a9f8103ad..6c0fff9c47a3ac 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -9269,7 +9269,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: class Structs: @dataclass - class SoftwareFault(ClusterObject): + class SoftwareFaultStruct(ClusterObject): @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( @@ -9448,10 +9448,10 @@ def event_id(cls) -> int: def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="softwareFault", Tag=0, Type=SoftwareDiagnostics.Structs.SoftwareFault), + ClusterObjectFieldDescriptor(Label="softwareFault", Tag=0, Type=SoftwareDiagnostics.Structs.SoftwareFaultStruct), ]) - softwareFault: 'SoftwareDiagnostics.Structs.SoftwareFault' = field(default_factory=lambda: SoftwareDiagnostics.Structs.SoftwareFault()) + softwareFault: 'SoftwareDiagnostics.Structs.SoftwareFaultStruct' = field(default_factory=lambda: SoftwareDiagnostics.Structs.SoftwareFaultStruct()) @dataclass diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.h index 89785870930e26..91023e1cb7bf5a 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.h @@ -151,7 +151,7 @@ NS_ASSUME_NONNULL_BEGIN - (instancetype)init; @end -@interface CHIPSoftwareDiagnosticsClusterSoftwareFault : NSObject +@interface CHIPSoftwareDiagnosticsClusterSoftwareFaultStruct : NSObject @property (strong, nonatomic) NSNumber * _Nonnull id; @property (strong, nonatomic) NSString * _Nonnull name; @property (strong, nonatomic) NSData * _Nonnull faultRecording; diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.mm index 11c810d46e58ed..8da9ea4990687b 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.mm @@ -291,7 +291,7 @@ - (instancetype)init } @end -@implementation CHIPSoftwareDiagnosticsClusterSoftwareFault +@implementation CHIPSoftwareDiagnosticsClusterSoftwareFaultStruct - (instancetype)init { if (self = [super init]) { diff --git a/zzz_generated/app-common/app-common/zap-generated/af-structs.h b/zzz_generated/app-common/app-common/zap-generated/af-structs.h index e98a86ee3d6f22..905387a2660e57 100644 --- a/zzz_generated/app-common/app-common/zap-generated/af-structs.h +++ b/zzz_generated/app-common/app-common/zap-generated/af-structs.h @@ -492,13 +492,13 @@ typedef struct _SemanticTag uint16_t Value; } SemanticTag; -// Struct for SoftwareFault -typedef struct _SoftwareFault +// Struct for SoftwareFaultStruct +typedef struct _SoftwareFaultStruct { uint64_t Id; chip::CharSpan Name; chip::ByteSpan FaultRecording; -} SoftwareFault; +} SoftwareFaultStruct; // Struct for TargetInfo typedef struct _TargetInfo diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp index d462126bed1946..22d2bbb5dd0fff 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp @@ -7974,7 +7974,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } // namespace GeneralDiagnostics namespace SoftwareDiagnostics { namespace Structs { -namespace SoftwareFault { +namespace SoftwareFaultStruct { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -8017,7 +8017,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } -} // namespace SoftwareFault +} // namespace SoftwareFaultStruct namespace ThreadMetrics { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h index c20f928d7b2187..7e1870e4c09cab 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h @@ -11350,7 +11350,7 @@ struct DecodableType namespace SoftwareDiagnostics { namespace Structs { -namespace SoftwareFault { +namespace SoftwareFaultStruct { enum class Fields { kId = 0, @@ -11371,7 +11371,7 @@ struct Type using DecodableType = Type; -} // namespace SoftwareFault +} // namespace SoftwareFaultStruct namespace ThreadMetrics { enum class Fields { @@ -11564,7 +11564,7 @@ struct Type static constexpr EventId GetEventId() { return Events::SoftwareFault::Id; } static constexpr ClusterId GetClusterId() { return Clusters::SoftwareDiagnostics::Id; } - Structs::SoftwareFault::Type softwareFault; + Structs::SoftwareFaultStruct::Type softwareFault; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; }; @@ -11576,7 +11576,7 @@ struct DecodableType static constexpr EventId GetEventId() { return Events::SoftwareFault::Id; } static constexpr ClusterId GetClusterId() { return Clusters::SoftwareDiagnostics::Id; } - Structs::SoftwareFault::DecodableType softwareFault; + Structs::SoftwareFaultStruct::DecodableType softwareFault; CHIP_ERROR Decode(TLV::TLVReader & reader); }; diff --git a/zzz_generated/app-common/app-common/zap-generated/enums.h b/zzz_generated/app-common/app-common/zap-generated/enums.h index 84a5544f03018a..defa3fbcf7728e 100644 --- a/zzz_generated/app-common/app-common/zap-generated/enums.h +++ b/zzz_generated/app-common/app-common/zap-generated/enums.h @@ -982,16 +982,6 @@ enum EmberAfWiFiVersionType : uint8_t #define EMBER_AF_REMOTE_ENABLE_FLAGS_AND_DEVICE_STATUS2_DEVICE_STATUS2_STRUCTURE_OFFSET (4) #define EMBER_AF_SCENES_COPY_MODE_COPY_ALL_SCENES (1) #define EMBER_AF_SCENES_COPY_MODE_COPY_ALL_SCENES_OFFSET (0) -#define EMBER_AF_SECURITY_TYPE_UNENCRYPTED (1) -#define EMBER_AF_SECURITY_TYPE_UNENCRYPTED_OFFSET (0) -#define EMBER_AF_SECURITY_TYPE_WEP_PERSONAL (2) -#define EMBER_AF_SECURITY_TYPE_WEP_PERSONAL_OFFSET (1) -#define EMBER_AF_SECURITY_TYPE_WPA_PERSONAL (4) -#define EMBER_AF_SECURITY_TYPE_WPA_PERSONAL_OFFSET (2) -#define EMBER_AF_SECURITY_TYPE_WPA2_PERSONAL (8) -#define EMBER_AF_SECURITY_TYPE_WPA2_PERSONAL_OFFSET (3) -#define EMBER_AF_SECURITY_TYPE_WPA3_PERSONAL (16) -#define EMBER_AF_SECURITY_TYPE_WPA3_PERSONAL_OFFSET (4) #define EMBER_AF_SHADE_CLOSURE_STATUS_OPERATIONAL (1) #define EMBER_AF_SHADE_CLOSURE_STATUS_OPERATIONAL_OFFSET (0) #define EMBER_AF_SHADE_CLOSURE_STATUS_ADJUSTING (2) @@ -1162,3 +1152,13 @@ enum EmberAfWiFiVersionType : uint8_t #define EMBER_AF_WI_FI_NETWORK_DIAGNOSTICS_FEATURE_PACKET_COUNTS_OFFSET (0) #define EMBER_AF_WI_FI_NETWORK_DIAGNOSTICS_FEATURE_ERROR_COUNTS (2) #define EMBER_AF_WI_FI_NETWORK_DIAGNOSTICS_FEATURE_ERROR_COUNTS_OFFSET (1) +#define EMBER_AF_WI_FI_SECURITY_UNENCRYPTED (1) +#define EMBER_AF_WI_FI_SECURITY_UNENCRYPTED_OFFSET (0) +#define EMBER_AF_WI_FI_SECURITY_WEP_PERSONAL (2) +#define EMBER_AF_WI_FI_SECURITY_WEP_PERSONAL_OFFSET (1) +#define EMBER_AF_WI_FI_SECURITY_WPA_PERSONAL (4) +#define EMBER_AF_WI_FI_SECURITY_WPA_PERSONAL_OFFSET (2) +#define EMBER_AF_WI_FI_SECURITY_WPA2_PERSONAL (8) +#define EMBER_AF_WI_FI_SECURITY_WPA2_PERSONAL_OFFSET (3) +#define EMBER_AF_WI_FI_SECURITY_WPA3_PERSONAL (16) +#define EMBER_AF_WI_FI_SECURITY_WPA3_PERSONAL_OFFSET (4) diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index 37432392522eaf..ba02ffebc773d7 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -75,7 +75,7 @@ CHIP_ERROR LogValue(const char * label, size_t indent, CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterfaceType::DecodableType & value); CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::SoftwareDiagnostics::Structs::SoftwareFault::DecodableType & value); + const chip::app::Clusters::SoftwareDiagnostics::Structs::SoftwareFaultStruct::DecodableType & value); CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetrics::DecodableType & value); CHIP_ERROR LogValue(const char * label, size_t indent, @@ -1012,7 +1012,7 @@ CHIP_ERROR LogValue(const char * label, size_t indent, return CHIP_NO_ERROR; } CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::SoftwareDiagnostics::Structs::SoftwareFault::DecodableType & value) + const chip::app::Clusters::SoftwareDiagnostics::Structs::SoftwareFaultStruct::DecodableType & value) { ChipLogProgress(chipTool, "%s%s: {", IndentStr(indent).c_str(), label); {