samples: matter: fix data model to be compliance

Fix data model for contact and temperature sensor

Signed-off-by: Michał Szablowski <[email protected]>

Author: doublemis1

samples/matter/contact_sensor/src/default_zap/contact_sensor.matter

@@ -802,257 +802,15 @@ cluster OtaSoftwareUpdateRequestor = 42 {
   command AnnounceOTAProvider(AnnounceOTAProviderRequest): DefaultSuccess = 0;
 }
 
-/** This cluster is used to describe the configuration and capabilities of a physical power source that provides power to the Node. */
-cluster PowerSource = 47 {
-  revision 1; // NOTE: Default/not specifically set
-
-  enum BatApprovedChemistryEnum : enum16 {
-    kUnspecified = 0;
-    kAlkaline = 1;
-    kLithiumCarbonFluoride = 2;
-    kLithiumChromiumOxide = 3;
-    kLithiumCopperOxide = 4;
-    kLithiumIronDisulfide = 5;
-    kLithiumManganeseDioxide = 6;
-    kLithiumThionylChloride = 7;
-    kMagnesium = 8;
-    kMercuryOxide = 9;
-    kNickelOxyhydride = 10;
-    kSilverOxide = 11;
-    kZincAir = 12;
-    kZincCarbon = 13;
-    kZincChloride = 14;
-    kZincManganeseDioxide = 15;
-    kLeadAcid = 16;
-    kLithiumCobaltOxide = 17;
-    kLithiumIon = 18;
-    kLithiumIonPolymer = 19;
-    kLithiumIronPhosphate = 20;
-    kLithiumSulfur = 21;
-    kLithiumTitanate = 22;
-    kNickelCadmium = 23;
-    kNickelHydrogen = 24;
-    kNickelIron = 25;
-    kNickelMetalHydride = 26;
-    kNickelZinc = 27;
-    kSilverZinc = 28;
-    kSodiumIon = 29;
-    kSodiumSulfur = 30;
-    kZincBromide = 31;
-    kZincCerium = 32;
-  }
-
-  enum BatChargeFaultEnum : enum8 {
-    kUnspecified = 0;
-    kAmbientTooHot = 1;
-    kAmbientTooCold = 2;
-    kBatteryTooHot = 3;
-    kBatteryTooCold = 4;
-    kBatteryAbsent = 5;
-    kBatteryOverVoltage = 6;
-    kBatteryUnderVoltage = 7;
-    kChargerOverVoltage = 8;
-    kChargerUnderVoltage = 9;
-    kSafetyTimeout = 10;
-  }
-
-  enum BatChargeLevelEnum : enum8 {
-    kOK = 0 [spec_name = "OK"];
-    kWarning = 1;
-    kCritical = 2;
-  }
-
-  enum BatChargeStateEnum : enum8 {
-    kUnknown = 0;
-    kIsCharging = 1;
-    kIsAtFullCharge = 2;
-    kIsNotCharging = 3;
-  }
-
-  enum BatCommonDesignationEnum : enum16 {
-    kUnspecified = 0;
-    kAAA = 1 [spec_name = "AAA"];
-    kAA = 2 [spec_name = "AA"];
-    kC = 3;
-    kD = 4;
-    k4v5 = 5;
-    k6v0 = 6;
-    k9v0 = 7;
-    k12AA = 8 [spec_name = "1_2AA"];
-    kAAAA = 9 [spec_name = "AAAA"];
-    kA = 10;
-    kB = 11;
-    kF = 12;
-    kN = 13;
-    kNo6 = 14;
-    kSubC = 15;
-    kA23 = 16;
-    kA27 = 17;
-    kBA5800 = 18 [spec_name = "BA5800"];
-    kDuplex = 19;
-    k4SR44 = 20 [spec_name = "4SR44"];
-    k523 = 21;
-    k531 = 22;
-    k15v0 = 23;
-    k22v5 = 24;
-    k30v0 = 25;
-    k45v0 = 26;
-    k67v5 = 27;
-    kJ = 28;
-    kCR123A = 29 [spec_name = "CR123A"];
-    kCR2 = 30 [spec_name = "CR2"];
-    k2CR5 = 31 [spec_name = "2CR5"];
-    kCRP2 = 32 [spec_name = "CR_P2"];
-    kCRV3 = 33 [spec_name = "CR_V3"];
-    kSR41 = 34 [spec_name = "SR41"];
-    kSR43 = 35 [spec_name = "SR43"];
-    kSR44 = 36 [spec_name = "SR44"];
-    kSR45 = 37 [spec_name = "SR45"];
-    kSR48 = 38 [spec_name = "SR48"];
-    kSR54 = 39 [spec_name = "SR54"];
-    kSR55 = 40 [spec_name = "SR55"];
-    kSR57 = 41 [spec_name = "SR57"];
-    kSR58 = 42 [spec_name = "SR58"];
-    kSR59 = 43 [spec_name = "SR59"];
-    kSR60 = 44 [spec_name = "SR60"];
-    kSR63 = 45 [spec_name = "SR63"];
-    kSR64 = 46 [spec_name = "SR64"];
-    kSR65 = 47 [spec_name = "SR65"];
-    kSR66 = 48 [spec_name = "SR66"];
-    kSR67 = 49 [spec_name = "SR67"];
-    kSR68 = 50 [spec_name = "SR68"];
-    kSR69 = 51 [spec_name = "SR69"];
-    kSR516 = 52 [spec_name = "SR516"];
-    kSR731 = 53 [spec_name = "SR731"];
-    kSR712 = 54 [spec_name = "SR712"];
-    kLR932 = 55 [spec_name = "LR932"];
-    kA5 = 56;
-    kA10 = 57;
-    kA13 = 58;
-    kA312 = 59;
-    kA675 = 60;
-    kAC41E = 61 [spec_name = "AC41E"];
-    k10180 = 62;
-    k10280 = 63;
-    k10440 = 64;
-    k14250 = 65;
-    k14430 = 66;
-    k14500 = 67;
-    k14650 = 68;
-    k15270 = 69;
-    k16340 = 70;
-    kRCR123A = 71 [spec_name = "RCR123A"];
-    k17500 = 72;
-    k17670 = 73;
-    k18350 = 74;
-    k18500 = 75;
-    k18650 = 76;
-    k19670 = 77;
-    k25500 = 78;
-    k26650 = 79;
-    k32600 = 80;
-  }
-
-  enum BatFaultEnum : enum8 {
-    kUnspecified = 0;
-    kOverTemp = 1;
-    kUnderTemp = 2;
-  }
-
-  enum BatReplaceabilityEnum : enum8 {
-    kUnspecified = 0;
-    kNotReplaceable = 1;
-    kUserReplaceable = 2;
-    kFactoryReplaceable = 3;
-  }
-
-  enum PowerSourceStatusEnum : enum8 {
-    kUnspecified = 0;
-    kActive = 1;
-    kStandby = 2;
-    kUnavailable = 3;
-  }
-
-  enum WiredCurrentTypeEnum : enum8 {
-    kAC = 0 [spec_name = "AC"];
-    kDC = 1 [spec_name = "DC"];
-  }
-
-  enum WiredFaultEnum : enum8 {
-    kUnspecified = 0;
-    kOverVoltage = 1;
-    kUnderVoltage = 2;
-  }
+/** Nodes should be expected to be deployed to any and all regions of the world. These global regions
+      may have differing common languages, units of measurements, and numerical formatting
+      standards. As such, Nodes that visually or audibly convey information need a mechanism by which
+      they can be configured to use a user’s preferred language, units, etc */
+cluster LocalizationConfiguration = 43 {
+  revision 1;
 
-  bitmap Feature : bitmap32 {
-    kWired = 0x1;
-    kBattery = 0x2;
-    kRechargeable = 0x4;
-    kReplaceable = 0x8;
-  }
-
-  struct BatChargeFaultChangeType {
-    BatChargeFaultEnum current[] = 0;
-    BatChargeFaultEnum previous[] = 1;
-  }
-
-  struct BatFaultChangeType {
-    BatFaultEnum current[] = 0;
-    BatFaultEnum previous[] = 1;
-  }
-
-  struct WiredFaultChangeType {
-    WiredFaultEnum current[] = 0;
-    WiredFaultEnum previous[] = 1;
-  }
-
-  info event WiredFaultChange = 0 {
-    WiredFaultEnum current[] = 0;
-    WiredFaultEnum previous[] = 1;
-  }
-
-  info event BatFaultChange = 1 {
-    BatFaultEnum current[] = 0;
-    BatFaultEnum previous[] = 1;
-  }
-
-  info event BatChargeFaultChange = 2 {
-    BatChargeFaultEnum current[] = 0;
-    BatChargeFaultEnum previous[] = 1;
-  }
-
-  readonly attribute PowerSourceStatusEnum status = 0;
-  readonly attribute int8u order = 1;
-  readonly attribute char_string<60> description = 2;
-  readonly attribute optional nullable int32u wiredAssessedInputVoltage = 3;
-  readonly attribute optional nullable int16u wiredAssessedInputFrequency = 4;
-  readonly attribute optional WiredCurrentTypeEnum wiredCurrentType = 5;
-  readonly attribute optional nullable int32u wiredAssessedCurrent = 6;
-  readonly attribute optional int32u wiredNominalVoltage = 7;
-  readonly attribute optional int32u wiredMaximumCurrent = 8;
-  readonly attribute optional boolean wiredPresent = 9;
-  readonly attribute optional WiredFaultEnum activeWiredFaults[] = 10;
-  readonly attribute optional nullable int32u batVoltage = 11;
-  readonly attribute optional nullable int8u batPercentRemaining = 12;
-  readonly attribute optional nullable int32u batTimeRemaining = 13;
-  readonly attribute optional BatChargeLevelEnum batChargeLevel = 14;
-  readonly attribute optional boolean batReplacementNeeded = 15;
-  readonly attribute optional BatReplaceabilityEnum batReplaceability = 16;
-  readonly attribute optional boolean batPresent = 17;
-  readonly attribute optional BatFaultEnum activeBatFaults[] = 18;
-  readonly attribute optional char_string<60> batReplacementDescription = 19;
-  readonly attribute optional BatCommonDesignationEnum batCommonDesignation = 20;
-  readonly attribute optional char_string<20> batANSIDesignation = 21;
-  readonly attribute optional char_string<20> batIECDesignation = 22;
-  readonly attribute optional BatApprovedChemistryEnum batApprovedChemistry = 23;
-  readonly attribute optional int32u batCapacity = 24;
-  readonly attribute optional int8u batQuantity = 25;
-  readonly attribute optional BatChargeStateEnum batChargeState = 26;
-  readonly attribute optional nullable int32u batTimeToFullCharge = 27;
-  readonly attribute optional boolean batFunctionalWhileCharging = 28;
-  readonly attribute optional nullable int32u batChargingCurrent = 29;
-  readonly attribute optional BatChargeFaultEnum activeBatChargeFaults[] = 30;
-  readonly attribute endpoint_no endpointList[] = 31;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
+  readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -2107,7 +1865,6 @@ cluster IcdManagement = 70 {
 
 endpoint 0 {
   device type ma_rootdevice = 22, version 3;
-  device type ma_powersource = 17, version 1;
   device type ma_otarequestor = 18, version 1;
 
   binding cluster OtaSoftwareUpdateProvider;
@@ -2158,6 +1915,7 @@ endpoint 0 {
     callback attribute capabilityMinima;
     callback attribute specificationVersion;
     callback attribute maxPathsPerInvoke;
+    ram      attribute configurationVersion default = 1;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2182,17 +1940,14 @@ endpoint 0 {
     handle command AnnounceOTAProvider;
   }
 
-  server cluster PowerSource {
-    ram      attribute status default = 1;
-    ram      attribute order default = 1;
-    ram      attribute description;
-    ram      attribute wiredCurrentType default = 1;
-    callback attribute endpointList;
+  server cluster LocalizationConfiguration {
+    ram      attribute activeLocale;
+    callback attribute supportedLocales;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 1;
-    ram      attribute clusterRevision default = 3;
+    ram      attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 1;
   }
 
   server cluster GeneralCommissioning {
@@ -2395,6 +2150,9 @@ endpoint 0 {
     handle command UpdateFabricLabel;
     handle command RemoveFabric;
     handle command AddTrustedRootCertificate;
+    handle command SetVIDVerificationStatement;
+    handle command SignVIDVerificationRequest;
+    handle command SignVIDVerificationResponse;
   }
 
   server cluster GroupKeyManagement {
@@ -2451,7 +2209,7 @@ endpoint 1 {
     callback attribute acceptedCommandList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 5;
+    ram      attribute clusterRevision default = 6;
 
     handle command Identify;
     handle command TriggerEffect;