samples: matter: Fix Smoke CO alarm Feature Map value

doublemis1 · nordicjm · commit 321f8296fa83 · 2024-12-16T08:13:28.000Z
Current feature map value is out of avaliable range based on Matter 1.4

Signed-off-by: Michał Szablowski &lt;michal.szablowski@nordicsemi.no&gt;
diff --git a/samples/matter/smoke_co_alarm/src/default_zap/smoke_co_alarm.zap b/samples/matter/smoke_co_alarm/src/default_zap/smoke_co_alarm.zap
@@ -5208,7 +5208,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "7",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
diff --git a/samples/matter/smoke_co_alarm/src/default_zap/zap-generated/IMClusterCommandHandler.cpp b/samples/matter/smoke_co_alarm/src/default_zap/zap-generated/IMClusterCommandHandler.cpp
@@ -34,15 +34,12 @@ namespace chip
 {
 namespace app
 {
-
 	// Cluster specific command parsing
 
 	namespace Clusters
 	{
-
 		namespace AdministratorCommissioning
 		{
-
 			void DispatchServerCommand(CommandHandler *apCommandObj,
 						   const ConcreteCommandPath &aCommandPath, TLV::TLVReader &aDataTlv)
 			{
@@ -107,7 +104,6 @@ namespace app
 
 		namespace DiagnosticLogs
 		{
-
 			void DispatchServerCommand(CommandHandler *apCommandObj,
 						   const ConcreteCommandPath &aCommandPath, TLV::TLVReader &aDataTlv)
 			{
@@ -152,7 +148,6 @@ namespace app
 
 		namespace GeneralCommissioning
 		{
-
 			void DispatchServerCommand(CommandHandler *apCommandObj,
 						   const ConcreteCommandPath &aCommandPath, TLV::TLVReader &aDataTlv)
 			{
@@ -217,7 +212,6 @@ namespace app
 
 		namespace GeneralDiagnostics
 		{
-
 			void DispatchServerCommand(CommandHandler *apCommandObj,
 						   const ConcreteCommandPath &aCommandPath, TLV::TLVReader &aDataTlv)
 			{
@@ -272,7 +266,6 @@ namespace app
 
 		namespace GroupKeyManagement
 		{
-
 			void DispatchServerCommand(CommandHandler *apCommandObj,
 						   const ConcreteCommandPath &aCommandPath, TLV::TLVReader &aDataTlv)
 			{
@@ -346,7 +339,6 @@ namespace app
 
 		namespace IcdManagement
 		{
-
 			void DispatchServerCommand(CommandHandler *apCommandObj,
 						   const ConcreteCommandPath &aCommandPath, TLV::TLVReader &aDataTlv)
 			{
@@ -410,7 +402,6 @@ namespace app
 
 		namespace Identify
 		{
-
 			void DispatchServerCommand(CommandHandler *apCommandObj,
 						   const ConcreteCommandPath &aCommandPath, TLV::TLVReader &aDataTlv)
 			{
@@ -454,7 +445,6 @@ namespace app
 
 		namespace OtaSoftwareUpdateRequestor
 		{
-
 			void DispatchServerCommand(CommandHandler *apCommandObj,
 						   const ConcreteCommandPath &aCommandPath, TLV::TLVReader &aDataTlv)
 			{
@@ -499,7 +489,6 @@ namespace app
 
 		namespace OperationalCredentials
 		{
-
 			void DispatchServerCommand(CommandHandler *apCommandObj,
 						   const ConcreteCommandPath &aCommandPath, TLV::TLVReader &aDataTlv)
 			{
@@ -613,7 +602,6 @@ namespace app
 
 		namespace SmokeCoAlarm
 		{
-
 			void DispatchServerCommand(CommandHandler *apCommandObj,
 						   const ConcreteCommandPath &aCommandPath, TLV::TLVReader &aDataTlv)
 			{
@@ -657,7 +645,6 @@ namespace app
 
 		namespace ThreadNetworkDiagnostics
 		{
-
 			void DispatchServerCommand(CommandHandler *apCommandObj,
 						   const ConcreteCommandPath &aCommandPath, TLV::TLVReader &aDataTlv)
 			{
diff --git a/samples/matter/smoke_co_alarm/src/default_zap/zap-generated/endpoint_config.h b/samples/matter/smoke_co_alarm/src/default_zap/zap-generated/endpoint_config.h
@@ -483,7 +483,7 @@
 			{ ZAP_EMPTY_DEFAULT(), 0x00000005, 1, ZAP_TYPE(BOOLEAN), 0 }, /* TestInProgress */                             \
 			{ ZAP_EMPTY_DEFAULT(), 0x00000006, 1, ZAP_TYPE(BOOLEAN), 0 }, /* HardwareFaultAlert */                         \
 			{ ZAP_EMPTY_DEFAULT(), 0x00000007, 1, ZAP_TYPE(ENUM8), 0 }, /* EndOfServiceAlert */                            \
-			{ ZAP_SIMPLE_DEFAULT(7), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                              \
+			{ ZAP_SIMPLE_DEFAULT(3), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                              \
 			{ ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */                           \
 	}
 
@@ -924,10 +924,7 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE,
 // Array of device types
 #define FIXED_DEVICE_TYPES                                                                                             \
 	{                                                                                                              \
-		{ 0x00000011, 1 }, { 0x00000016, 3 }, { 0x00000011, 1 },                                               \
-		{                                                                                                      \
-			0x00000076, 1                                                                                  \
-		}                                                                                                      \
+		{ 0x00000011, 1 }, { 0x00000016, 3 }, { 0x00000011, 1 }, { 0x00000076, 1 }                             \
 	}
 
 // Array of device type offsets

Original file line number	Diff line number	Diff line change
`@@ -34,15 +34,12 @@ namespace chip`
`34`	`34`	`{`
`35`	`35`	`namespace app`
`36`	`36`	`{`
`37`		`-`
`38`	`37`	`// Cluster specific command parsing`
`39`	`38`
`40`	`39`	`namespace Clusters`
`41`	`40`	`{`
`42`		`-`
`43`	`41`	`namespace AdministratorCommissioning`
`44`	`42`	`{`
`45`		`-`
`46`	`43`	`void DispatchServerCommand(CommandHandler *apCommandObj,`
`47`	`44`	`const ConcreteCommandPath &aCommandPath, TLV::TLVReader &aDataTlv)`
`48`	`45`	`{`
`@@ -107,7 +104,6 @@ namespace app`
`107`	`104`
`108`	`105`	`namespace DiagnosticLogs`
`109`	`106`	`{`
`110`		`-`
`111`	`107`	`void DispatchServerCommand(CommandHandler *apCommandObj,`
`112`	`108`	`const ConcreteCommandPath &aCommandPath, TLV::TLVReader &aDataTlv)`
`113`	`109`	`{`
`@@ -152,7 +148,6 @@ namespace app`
`152`	`148`
`153`	`149`	`namespace GeneralCommissioning`
`154`	`150`	`{`
`155`		`-`
`156`	`151`	`void DispatchServerCommand(CommandHandler *apCommandObj,`
`157`	`152`	`const ConcreteCommandPath &aCommandPath, TLV::TLVReader &aDataTlv)`
`158`	`153`	`{`
`@@ -217,7 +212,6 @@ namespace app`
`217`	`212`
`218`	`213`	`namespace GeneralDiagnostics`
`219`	`214`	`{`
`220`		`-`
`221`	`215`	`void DispatchServerCommand(CommandHandler *apCommandObj,`
`222`	`216`	`const ConcreteCommandPath &aCommandPath, TLV::TLVReader &aDataTlv)`
`223`	`217`	`{`
`@@ -272,7 +266,6 @@ namespace app`
`272`	`266`
`273`	`267`	`namespace GroupKeyManagement`
`274`	`268`	`{`
`275`		`-`
`276`	`269`	`void DispatchServerCommand(CommandHandler *apCommandObj,`
`277`	`270`	`const ConcreteCommandPath &aCommandPath, TLV::TLVReader &aDataTlv)`
`278`	`271`	`{`
`@@ -346,7 +339,6 @@ namespace app`
`346`	`339`
`347`	`340`	`namespace IcdManagement`
`348`	`341`	`{`
`349`		`-`
`350`	`342`	`void DispatchServerCommand(CommandHandler *apCommandObj,`
`351`	`343`	`const ConcreteCommandPath &aCommandPath, TLV::TLVReader &aDataTlv)`
`352`	`344`	`{`
`@@ -410,7 +402,6 @@ namespace app`
`410`	`402`
`411`	`403`	`namespace Identify`
`412`	`404`	`{`
`413`		`-`
`414`	`405`	`void DispatchServerCommand(CommandHandler *apCommandObj,`
`415`	`406`	`const ConcreteCommandPath &aCommandPath, TLV::TLVReader &aDataTlv)`
`416`	`407`	`{`
`@@ -454,7 +445,6 @@ namespace app`
`454`	`445`
`455`	`446`	`namespace OtaSoftwareUpdateRequestor`
`456`	`447`	`{`
`457`		`-`
`458`	`448`	`void DispatchServerCommand(CommandHandler *apCommandObj,`
`459`	`449`	`const ConcreteCommandPath &aCommandPath, TLV::TLVReader &aDataTlv)`
`460`	`450`	`{`
`@@ -499,7 +489,6 @@ namespace app`
`499`	`489`
`500`	`490`	`namespace OperationalCredentials`
`501`	`491`	`{`
`502`		`-`
`503`	`492`	`void DispatchServerCommand(CommandHandler *apCommandObj,`
`504`	`493`	`const ConcreteCommandPath &aCommandPath, TLV::TLVReader &aDataTlv)`
`505`	`494`	`{`
`@@ -613,7 +602,6 @@ namespace app`
`613`	`602`
`614`	`603`	`namespace SmokeCoAlarm`
`615`	`604`	`{`
`616`		`-`
`617`	`605`	`void DispatchServerCommand(CommandHandler *apCommandObj,`
`618`	`606`	`const ConcreteCommandPath &aCommandPath, TLV::TLVReader &aDataTlv)`
`619`	`607`	`{`
`@@ -657,7 +645,6 @@ namespace app`
`657`	`645`
`658`	`646`	`namespace ThreadNetworkDiagnostics`
`659`	`647`	`{`
`660`		`-`
`661`	`648`	`void DispatchServerCommand(CommandHandler *apCommandObj,`
`662`	`649`	`const ConcreteCommandPath &aCommandPath, TLV::TLVReader &aDataTlv)`
`663`	`650`	`{`