fix identify init

project-chip · Oct 25, 2021 · 9b76e76 · 9b76e76
1 parent d47bbd9
commit 9b76e76
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/app/clusters/identify-server/identify-server.cpp b/src/app/clusters/identify-server/identify-server.cpp
@@ -88,6 +88,7 @@ static inline void reg(Identify * inst)
         if (nullptr == instances[i])
         {
             instances[i] = inst;
+            break;
         }
     }
 }
@@ -105,7 +106,7 @@ static inline void unreg(Identify * inst)
 
 void emberAfIdentifyClusterServerInitCallback(EndpointId endpoint)
 {
-    (void) endpoint;
+    (void) Clusters::Identify::Attributes::IdentifyType::Set(endpoint, inst(endpoint)->mIdentifyType);
 }
 
 static void onIdentifyClusterTick(chip::System::Layer * systemLayer, void * appState)
@@ -315,11 +316,10 @@ Identify::Identify(chip::EndpointId endpoint, onIdentifyStartCb onIdentifyStart,
                    EmberAfIdentifyIdentifyType identifyType, onEffectIdentifierCb onEffectIdentifier,
                    EmberAfIdentifyEffectIdentifier effectIdentifier, EmberAfIdentifyEffectVariant effectVariant) :
     mEndpoint(endpoint),
-    mOnIdentifyStart(onIdentifyStart), mOnIdentifyStop(onIdentifyStop), mOnEffectIdentifier(onEffectIdentifier),
-    mCurrentEffectIdentifier(effectIdentifier), mTargetEffectIdentifier(effectIdentifier),
+    mOnIdentifyStart(onIdentifyStart), mOnIdentifyStop(onIdentifyStop), mIdentifyType(identifyType),
+    mOnEffectIdentifier(onEffectIdentifier), mCurrentEffectIdentifier(effectIdentifier), mTargetEffectIdentifier(effectIdentifier),
     mEffectVariant(static_cast<uint8_t>(effectVariant))
 {
-    (void) Clusters::Identify::Attributes::IdentifyType::Set(endpoint, identifyType);
     reg(this);
 };
 

diff --git a/src/app/clusters/identify-server/identify-server.h b/src/app/clusters/identify-server/identify-server.h
@@ -53,6 +53,7 @@ struct Identify
     chip::EndpointId mEndpoint;
     onIdentifyStartCb mOnIdentifyStart = nullptr;
     onIdentifyStopCb mOnIdentifyStop   = nullptr;
+    EmberAfIdentifyIdentifyType mIdentifyType;
     onEffectIdentifierCb mOnEffectIdentifier;
     EmberAfIdentifyEffectIdentifier mCurrentEffectIdentifier;
     EmberAfIdentifyEffectIdentifier mTargetEffectIdentifier;