From 76693722250aa1fcfd457e10dad448bfa75ce991 Mon Sep 17 00:00:00 2001 From: Dustin Crossman Date: Wed, 15 Dec 2021 10:36:57 -0800 Subject: [PATCH] Regen files. --- .../all-clusters-app/zap-generated/endpoint_config.h | 2 +- .../app-common/zap-generated/cluster-objects.h | 2 ++ .../bridge-app/zap-generated/endpoint_config.h | 2 +- .../zap-generated/endpoint_config.h | 2 +- .../lighting-app/zap-generated/endpoint_config.h | 2 +- .../lock-app/zap-generated/endpoint_config.h | 12 ++++++------ .../log-source-app/zap-generated/endpoint_config.h | 1 - .../ota-provider-app/zap-generated/endpoint_config.h | 2 +- .../zap-generated/endpoint_config.h | 2 +- .../placeholder/app1/zap-generated/endpoint_config.h | 2 +- .../placeholder/app2/zap-generated/endpoint_config.h | 2 +- .../pump-app/zap-generated/endpoint_config.h | 2 +- .../zap-generated/endpoint_config.h | 2 +- .../zap-generated/endpoint_config.h | 2 +- .../thermostat/zap-generated/endpoint_config.h | 2 +- zzz_generated/tv-app/zap-generated/endpoint_config.h | 2 +- .../tv-casting-app/zap-generated/endpoint_config.h | 2 +- .../window-app/zap-generated/endpoint_config.h | 2 +- 18 files changed, 23 insertions(+), 22 deletions(-) diff --git a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h index 516687991d8d99..962979b7b6ae59 100644 --- a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h +++ b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h @@ -2664,7 +2664,7 @@ // Array of device ids #define FIXED_DEVICE_IDS \ { \ - 0, 0, 0 \ + 22, 22, 22 \ } // Array of device versions 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 0cce044e3c0962..a200a0697c9128 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 @@ -6414,6 +6414,7 @@ struct Type DataModel::Nullable> targets; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; + bool MatchesFabricIndex(FabricIndex fabricIndex_) const { return fabricIndex == fabricIndex_; } }; struct DecodableType @@ -6443,6 +6444,7 @@ struct Type CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; CHIP_ERROR Decode(TLV::TLVReader & reader); + bool MatchesFabricIndex(FabricIndex fabricIndex_) const { return fabricIndex == fabricIndex_; } }; using DecodableType = Type; diff --git a/zzz_generated/bridge-app/zap-generated/endpoint_config.h b/zzz_generated/bridge-app/zap-generated/endpoint_config.h index 35f505fe8bb567..ace95aa8e33da6 100644 --- a/zzz_generated/bridge-app/zap-generated/endpoint_config.h +++ b/zzz_generated/bridge-app/zap-generated/endpoint_config.h @@ -962,7 +962,7 @@ // Array of device ids #define FIXED_DEVICE_IDS \ { \ - 0, 0 \ + 14, 257 \ } // Array of device versions diff --git a/zzz_generated/controller-clusters/zap-generated/endpoint_config.h b/zzz_generated/controller-clusters/zap-generated/endpoint_config.h index 7c368877afe5d2..ca02d5ae2a8fb7 100644 --- a/zzz_generated/controller-clusters/zap-generated/endpoint_config.h +++ b/zzz_generated/controller-clusters/zap-generated/endpoint_config.h @@ -525,7 +525,7 @@ // Array of device ids #define FIXED_DEVICE_IDS \ { \ - 0 \ + 22 \ } // Array of device versions diff --git a/zzz_generated/lighting-app/zap-generated/endpoint_config.h b/zzz_generated/lighting-app/zap-generated/endpoint_config.h index 25f2df9212baea..d908e4422a0922 100644 --- a/zzz_generated/lighting-app/zap-generated/endpoint_config.h +++ b/zzz_generated/lighting-app/zap-generated/endpoint_config.h @@ -1014,7 +1014,7 @@ // Array of device ids #define FIXED_DEVICE_IDS \ { \ - 0, 0, 0 \ + 22, 257, 259 \ } // Array of device versions diff --git a/zzz_generated/lock-app/zap-generated/endpoint_config.h b/zzz_generated/lock-app/zap-generated/endpoint_config.h index 07ebd702fecd3a..c4377e8acfcbab 100644 --- a/zzz_generated/lock-app/zap-generated/endpoint_config.h +++ b/zzz_generated/lock-app/zap-generated/endpoint_config.h @@ -625,7 +625,7 @@ #define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask // This is an array of EmberAfAttributeMetadata structures. -#define GENERATED_ATTRIBUTE_COUNT 182 +#define GENERATED_ATTRIBUTE_COUNT 201 #define GENERATED_ATTRIBUTES \ { \ \ @@ -897,7 +897,7 @@ }; #define ZAP_CLUSTER_MASK(mask) CLUSTER_MASK_##mask -#define GENERATED_CLUSTER_COUNT 19 +#define GENERATED_CLUSTER_COUNT 20 #define GENERATED_CLUSTERS \ { \ { 0x001D, ZAP_ATTRIBUTE_INDEX(0), 5, 0, ZAP_CLUSTER_MASK(SERVER), NULL }, /* Endpoint: 0, Cluster: Descriptor (server) */ \ @@ -962,7 +962,7 @@ 0x002F, ZAP_ATTRIBUTE_INDEX(173), 9, 133, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Power Source (server) */ \ { 0x0101, \ - ZAP_ATTRIBUTE_INDEX(180), \ + ZAP_ATTRIBUTE_INDEX(182), \ 19, \ 29, \ ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ @@ -974,7 +974,7 @@ // This is an array of EmberAfEndpointType structures. #define GENERATED_ENDPOINT_TYPES \ { \ - { ZAP_CLUSTER_INDEX(0), 16, 1070 }, { ZAP_CLUSTER_INDEX(16), 3, 146 }, \ + { ZAP_CLUSTER_INDEX(0), 16, 1070 }, { ZAP_CLUSTER_INDEX(16), 4, 175 }, \ } // Largest attribute size is needed for various buffers @@ -984,7 +984,7 @@ #define ATTRIBUTE_SINGLETONS_SIZE (246) // Total size of attribute storage -#define ATTRIBUTE_MAX_SIZE (1216) +#define ATTRIBUTE_MAX_SIZE (1245) // Number of fixed endpoints #define FIXED_ENDPOINT_COUNT (2) @@ -1005,7 +1005,7 @@ // Array of device ids #define FIXED_DEVICE_IDS \ { \ - 0, 0 \ + 22, 10 \ } // Array of device versions diff --git a/zzz_generated/log-source-app/zap-generated/endpoint_config.h b/zzz_generated/log-source-app/zap-generated/endpoint_config.h index 8b00660adcdd2e..08aab1cba33285 100644 --- a/zzz_generated/log-source-app/zap-generated/endpoint_config.h +++ b/zzz_generated/log-source-app/zap-generated/endpoint_config.h @@ -278,7 +278,6 @@ // Array of device ids #define FIXED_DEVICE_IDS \ { \ - 0 \ } // Array of device versions diff --git a/zzz_generated/ota-provider-app/zap-generated/endpoint_config.h b/zzz_generated/ota-provider-app/zap-generated/endpoint_config.h index 95093fbef2ae10..7fd4bfc6f4baa8 100644 --- a/zzz_generated/ota-provider-app/zap-generated/endpoint_config.h +++ b/zzz_generated/ota-provider-app/zap-generated/endpoint_config.h @@ -245,7 +245,7 @@ // Array of device ids #define FIXED_DEVICE_IDS \ { \ - 0 \ + 22 \ } // Array of device versions diff --git a/zzz_generated/ota-requestor-app/zap-generated/endpoint_config.h b/zzz_generated/ota-requestor-app/zap-generated/endpoint_config.h index 1244138f6f1927..7ad4ffc22348e3 100644 --- a/zzz_generated/ota-requestor-app/zap-generated/endpoint_config.h +++ b/zzz_generated/ota-requestor-app/zap-generated/endpoint_config.h @@ -288,7 +288,7 @@ // Array of device ids #define FIXED_DEVICE_IDS \ { \ - 0 \ + 22 \ } // Array of device versions diff --git a/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h b/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h index a339776cd7ba86..74cf92266b3b0f 100644 --- a/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h +++ b/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h @@ -412,7 +412,7 @@ // Array of device ids #define FIXED_DEVICE_IDS \ { \ - 0, 0 \ + 65280, 258 \ } // Array of device versions diff --git a/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h b/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h index 705aa23fff5e59..7a483790f3c56a 100644 --- a/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h +++ b/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h @@ -391,7 +391,7 @@ // Array of device ids #define FIXED_DEVICE_IDS \ { \ - 0, 0 \ + 65280, 257 \ } // Array of device versions diff --git a/zzz_generated/pump-app/zap-generated/endpoint_config.h b/zzz_generated/pump-app/zap-generated/endpoint_config.h index d4030cac21280d..ce516cc750f198 100644 --- a/zzz_generated/pump-app/zap-generated/endpoint_config.h +++ b/zzz_generated/pump-app/zap-generated/endpoint_config.h @@ -997,7 +997,7 @@ // Array of device ids #define FIXED_DEVICE_IDS \ { \ - 0, 0 \ + 771, 771 \ } // Array of device versions diff --git a/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h b/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h index 5b6a6a5a622402..825bde5e51efc5 100644 --- a/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h +++ b/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h @@ -886,7 +886,7 @@ // Array of device ids #define FIXED_DEVICE_IDS \ { \ - 0, 0 \ + 772, 772 \ } // Array of device versions diff --git a/zzz_generated/temperature-measurement-app/zap-generated/endpoint_config.h b/zzz_generated/temperature-measurement-app/zap-generated/endpoint_config.h index a92b625ccee3ec..1c080af22baf5e 100644 --- a/zzz_generated/temperature-measurement-app/zap-generated/endpoint_config.h +++ b/zzz_generated/temperature-measurement-app/zap-generated/endpoint_config.h @@ -508,7 +508,7 @@ // Array of device ids #define FIXED_DEVICE_IDS \ { \ - 0, 0 \ + 22, 22 \ } // Array of device versions diff --git a/zzz_generated/thermostat/zap-generated/endpoint_config.h b/zzz_generated/thermostat/zap-generated/endpoint_config.h index 9664878ccbc500..31e99d2499ab4a 100644 --- a/zzz_generated/thermostat/zap-generated/endpoint_config.h +++ b/zzz_generated/thermostat/zap-generated/endpoint_config.h @@ -1104,7 +1104,7 @@ // Array of device ids #define FIXED_DEVICE_IDS \ { \ - 0, 0 \ + 22, 769 \ } // Array of device versions diff --git a/zzz_generated/tv-app/zap-generated/endpoint_config.h b/zzz_generated/tv-app/zap-generated/endpoint_config.h index 3f315bee161133..69ffa9c6bb798d 100644 --- a/zzz_generated/tv-app/zap-generated/endpoint_config.h +++ b/zzz_generated/tv-app/zap-generated/endpoint_config.h @@ -1568,7 +1568,7 @@ // Array of device ids #define FIXED_DEVICE_IDS \ { \ - 0, 0, 0, 0, 0, 0 \ + 22, 35, 34, 36, 36, 36 \ } // Array of device versions diff --git a/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h b/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h index 96f34dc1f06bf9..7b99fc7b819629 100644 --- a/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h +++ b/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h @@ -1937,7 +1937,7 @@ // Array of device ids #define FIXED_DEVICE_IDS \ { \ - 0, 0, 0 \ + 22, 22, 22 \ } // Array of device versions diff --git a/zzz_generated/window-app/zap-generated/endpoint_config.h b/zzz_generated/window-app/zap-generated/endpoint_config.h index ebc99e7a77b882..6774540495e410 100644 --- a/zzz_generated/window-app/zap-generated/endpoint_config.h +++ b/zzz_generated/window-app/zap-generated/endpoint_config.h @@ -1003,7 +1003,7 @@ // Array of device ids #define FIXED_DEVICE_IDS \ { \ - 0, 0, 0 \ + 514, 514, 514 \ } // Array of device versions