Add a call to start status LED timer in lock and light app for efr32 (#21751)
* Add a call to start status LED timer in lock and light app for efr32
* Restyled by whitespace
* add calls to start status led timer when sleepy mode is enabled
Co-authored-by: Restyled.io <commits@restyled.io>
diff --git a/examples/light-switch-app/efr32/src/AppTask.cpp b/examples/light-switch-app/efr32/src/AppTask.cpp
index 26848ff..29d9e65 100644
--- a/examples/light-switch-app/efr32/src/AppTask.cpp
+++ b/examples/light-switch-app/efr32/src/AppTask.cpp
@@ -204,7 +204,7 @@
#if CHIP_DEVICE_CONFIG_ENABLE_SED == 1
sAppTask.StartStatusLEDTimer();
-#endif // CHIP_DEVICE_CONFIG_ENABLE_SED
+#endif
}
void AppTask::OnIdentifyStop(Identify * identify)
@@ -213,7 +213,7 @@
#if CHIP_DEVICE_CONFIG_ENABLE_SED == 1
sAppTask.StopStatusLEDTimer();
-#endif // CHIP_DEVICE_CONFIG_ENABLE_SED
+#endif
}
void AppTask::SwitchActionEventHandler(AppEvent * aEvent)
diff --git a/examples/lighting-app/efr32/src/AppTask.cpp b/examples/lighting-app/efr32/src/AppTask.cpp
index e0358b5..d8fe894 100644
--- a/examples/lighting-app/efr32/src/AppTask.cpp
+++ b/examples/lighting-app/efr32/src/AppTask.cpp
@@ -68,7 +68,12 @@
namespace {
void OnTriggerIdentifyEffectCompleted(chip::System::Layer * systemLayer, void * appState)
{
+ ChipLogProgress(Zcl, "Trigger Identify Complete");
sIdentifyEffect = EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_STOP_EFFECT;
+
+#if CHIP_DEVICE_CONFIG_ENABLE_SED == 1
+ AppTask::GetAppTask().StopStatusLEDTimer();
+#endif
}
} // namespace
@@ -83,6 +88,10 @@
sIdentifyEffect = static_cast<EmberAfIdentifyEffectIdentifier>(identify->mEffectVariant);
}
+#if CHIP_DEVICE_CONFIG_ENABLE_SED == 1
+ AppTask::GetAppTask().StartStatusLEDTimer();
+#endif
+
switch (sIdentifyEffect)
{
case EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BLINK:
@@ -107,8 +116,8 @@
Identify gIdentify = {
chip::EndpointId{ 1 },
- [](Identify *) { ChipLogProgress(Zcl, "onIdentifyStart"); },
- [](Identify *) { ChipLogProgress(Zcl, "onIdentifyStop"); },
+ AppTask::GetAppTask().OnIdentifyStart,
+ AppTask::GetAppTask().OnIdentifyStop,
EMBER_ZCL_IDENTIFY_IDENTIFY_TYPE_VISIBLE_LED,
OnTriggerIdentifyEffect,
};
@@ -163,6 +172,10 @@
appError(err);
}
+#if !(defined(CHIP_DEVICE_CONFIG_ENABLE_SED) && CHIP_DEVICE_CONFIG_ENABLE_SED)
+ sAppTask.StartStatusLEDTimer();
+#endif
+
EFR32_LOG("App Task started");
while (true)
@@ -176,6 +189,24 @@
}
}
+void AppTask::OnIdentifyStart(Identify * identify)
+{
+ ChipLogProgress(Zcl, "onIdentifyStart");
+
+#if CHIP_DEVICE_CONFIG_ENABLE_SED == 1
+ sAppTask.StartStatusLEDTimer();
+#endif
+}
+
+void AppTask::OnIdentifyStop(Identify * identify)
+{
+ ChipLogProgress(Zcl, "onIdentifyStop");
+
+#if CHIP_DEVICE_CONFIG_ENABLE_SED == 1
+ sAppTask.StopStatusLEDTimer();
+#endif
+}
+
void AppTask::LightActionEventHandler(AppEvent * aEvent)
{
bool initiated = false;
diff --git a/examples/lock-app/efr32/src/AppTask.cpp b/examples/lock-app/efr32/src/AppTask.cpp
index 04def4f..8b72c5a 100644
--- a/examples/lock-app/efr32/src/AppTask.cpp
+++ b/examples/lock-app/efr32/src/AppTask.cpp
@@ -78,7 +78,12 @@
namespace {
void OnTriggerIdentifyEffectCompleted(chip::System::Layer * systemLayer, void * appState)
{
+ ChipLogProgress(Zcl, "Trigger Identify Complete");
sIdentifyEffect = EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_STOP_EFFECT;
+
+#if CHIP_DEVICE_CONFIG_ENABLE_SED == 1
+ AppTask::GetAppTask().StopStatusLEDTimer();
+#endif
}
void OnTriggerIdentifyEffect(Identify * identify)
@@ -92,6 +97,10 @@
sIdentifyEffect = static_cast<EmberAfIdentifyEffectIdentifier>(identify->mEffectVariant);
}
+#if CHIP_DEVICE_CONFIG_ENABLE_SED == 1
+ AppTask::GetAppTask().StartStatusLEDTimer();
+#endif
+
switch (sIdentifyEffect)
{
case EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BLINK:
@@ -116,8 +125,8 @@
Identify gIdentify = {
chip::EndpointId{ 1 },
- [](Identify *) { ChipLogProgress(Zcl, "onIdentifyStart"); },
- [](Identify *) { ChipLogProgress(Zcl, "onIdentifyStop"); },
+ AppTask::GetAppTask().OnIdentifyStart,
+ AppTask::GetAppTask().OnIdentifyStop,
EMBER_ZCL_IDENTIFY_IDENTIFY_TYPE_VISIBLE_LED,
OnTriggerIdentifyEffect,
};
@@ -242,6 +251,10 @@
appError(err);
}
+#if !(defined(CHIP_DEVICE_CONFIG_ENABLE_SED) && CHIP_DEVICE_CONFIG_ENABLE_SED)
+ sAppTask.StartStatusLEDTimer();
+#endif
+
EFR32_LOG("App Task started");
// Users and credentials should be checked once from nvm flash on boot
@@ -258,6 +271,24 @@
}
}
+void AppTask::OnIdentifyStart(Identify * identify)
+{
+ ChipLogProgress(Zcl, "onIdentifyStart");
+
+#if CHIP_DEVICE_CONFIG_ENABLE_SED == 1
+ sAppTask.StartStatusLEDTimer();
+#endif
+}
+
+void AppTask::OnIdentifyStop(Identify * identify)
+{
+ ChipLogProgress(Zcl, "onIdentifyStop");
+
+#if CHIP_DEVICE_CONFIG_ENABLE_SED == 1
+ sAppTask.StopStatusLEDTimer();
+#endif
+}
+
void AppTask::LockActionEventHandler(AppEvent * aEvent)
{
bool initiated = false;
diff --git a/examples/thermostat/efr32/src/AppTask.cpp b/examples/thermostat/efr32/src/AppTask.cpp
index a74f81e..69a5975 100644
--- a/examples/thermostat/efr32/src/AppTask.cpp
+++ b/examples/thermostat/efr32/src/AppTask.cpp
@@ -189,7 +189,7 @@
#if CHIP_DEVICE_CONFIG_ENABLE_SED == 1
sAppTask.StartStatusLEDTimer();
-#endif // CHIP_DEVICE_CONFIG_ENABLE_SED
+#endif
}
void AppTask::OnIdentifyStop(Identify * identify)
@@ -198,7 +198,7 @@
#if CHIP_DEVICE_CONFIG_ENABLE_SED == 1
sAppTask.StopStatusLEDTimer();
-#endif // CHIP_DEVICE_CONFIG_ENABLE_SED
+#endif
}
void AppTask::ThermostatActionEventHandler(AppEvent * aEvent)
