Skip to content

Commit

Permalink
[Silabs][SiWx917] Base application modifications for SiWx917 SoC (#27009
Browse files Browse the repository at this point in the history 
)

* Base application modifications for SiWx917 SoC

* Restyled by clang-format

---------

Co-authored-by: Restyled.io <[email protected]>
  • Loading branch information
@chirag-silabs @restyled-commits @pull
2 people authored and pull[bot] committed Aug 8, 2023
1 parent e4c98ad commit a04d23e
Show file tree
Hide file tree
Showing 2 changed files with 188 additions and 55 deletions.
218 changes: 164 additions & 54 deletions examples/platform/silabs/SiWx917/BaseApplication.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,6 @@ bool sHaveBLEConnections = false;

#endif // CHIP_DEVICE_CONFIG_ENABLE_SED

Clusters::Identify::EffectIdentifierEnum sIdentifyEffect = Clusters::Identify::EffectIdentifierEnum::kStopEffect;

uint8_t sAppEventQueueBuffer[APP_EVENT_QUEUE_SIZE * sizeof(AppEvent)];
StaticQueue_t sAppEventQueueStruct;

Expand All @@ -114,12 +112,22 @@ StaticTask_t appTaskStruct;
BaseApplication::Function_t mFunction;
bool mFunctionTimerActive;

Identify * gIdentifyptr = nullptr;

#ifdef DISPLAY_ENABLED
SilabsLCD slLCD;
#endif

#ifdef EMBER_AF_PLUGIN_IDENTIFY_SERVER
Clusters::Identify::EffectIdentifierEnum sIdentifyEffect = Clusters::Identify::EffectIdentifierEnum::kStopEffect;

Identify gIdentify = {
chip::EndpointId{ 1 },
BaseApplication::OnIdentifyStart,
BaseApplication::OnIdentifyStop,
Clusters::Identify::IdentifyTypeEnum::kVisibleIndicator,
BaseApplication::OnTriggerIdentifyEffect,
};

#endif // EMBER_AF_PLUGIN_IDENTIFY_SERVER
} // namespace

/**********************************************************
Expand All @@ -146,18 +154,10 @@ CHIP_ERROR BaseApplication::StartAppTask(TaskFunction_t taskFunction)
return CHIP_NO_ERROR;
}

CHIP_ERROR BaseApplication::Init(Identify * identifyObj)
CHIP_ERROR BaseApplication::Init()
{
CHIP_ERROR err = CHIP_NO_ERROR;

if (identifyObj == nullptr)
{
SILABS_LOG("Invalid Identify Object!");
appError(CHIP_ERROR_INVALID_ARGUMENT);
}

gIdentifyptr = identifyObj;

#ifdef SL_WIFI
/*
* Wait for the WiFi to be initialized
Expand Down Expand Up @@ -264,6 +264,87 @@ void BaseApplication::FunctionFactoryReset(void)
chip::Server::GetInstance().ScheduleFactoryReset();
}

bool BaseApplication::ActivateStatusLedPatterns()
{
bool isPatternSet = false;
#if defined(ENABLE_WSTK_LEDS) && defined(SL_CATALOG_SIMPLE_LED_LED1_PRESENT)
#ifdef EMBER_AF_PLUGIN_IDENTIFY_SERVER
if (gIdentify.mActive)
{
// Identify in progress
// Do a steady blink on the status led
sStatusLED.Blink(250, 250);
isPatternSet = true;
}
else if (sIdentifyEffect != Clusters::Identify::EffectIdentifierEnum::kStopEffect)
{
// Identify trigger effect received. Do some on/off patterns on the status led
if (sIdentifyEffect == Clusters::Identify::EffectIdentifierEnum::kBlink)
{
// Fast blink
sStatusLED.Blink(50, 50);
}
else if (sIdentifyEffect == Clusters::Identify::EffectIdentifierEnum::kBreathe)
{
// Slow blink
sStatusLED.Blink(1000, 1000);
}
else if (sIdentifyEffect == Clusters::Identify::EffectIdentifierEnum::kOkay)
{
// Pulse effect
sStatusLED.Blink(300, 700);
}
else if (sIdentifyEffect == Clusters::Identify::EffectIdentifierEnum::kChannelChange)
{
// Alternate between Short and Long pulses effect
static uint64_t mLastChangeTimeMS = 0;
static bool alternatePattern = false;
uint32_t onTimeMS = alternatePattern ? 50 : 700;
uint32_t offTimeMS = alternatePattern ? 950 : 300;

uint64_t nowMS = chip::System::SystemClock().GetMonotonicMilliseconds64().count();
if (nowMS >= mLastChangeTimeMS + 1000) // each pattern is done over a 1 second period
{
mLastChangeTimeMS = nowMS;
alternatePattern = !alternatePattern;
sStatusLED.Blink(onTimeMS, offTimeMS);
}
}
isPatternSet = true;
}
#endif // EMBER_AF_PLUGIN_IDENTIFY_SERVER

#if !(defined(CHIP_DEVICE_CONFIG_ENABLE_SED) && CHIP_DEVICE_CONFIG_ENABLE_SED)
// Identify Patterns have priority over Status patterns
if (!isPatternSet)
{
// Apply different status feedbacks
if (sIsProvisioned && sIsEnabled)
{
if (sIsAttached)
{
sStatusLED.Set(true);
}
else
{
sStatusLED.Blink(950, 50);
}
}
else if (sHaveBLEConnections)
{
sStatusLED.Blink(100, 100);
}
else
{
sStatusLED.Blink(50, 950);
}
isPatternSet = true;
}
#endif // CHIP_DEVICE_CONFIG_ENABLE_SED
#endif // ENABLE_WSTK_LEDS) && SL_CATALOG_SIMPLE_LED_LED1_PRESENT
return isPatternSet;
}

void BaseApplication::LightEventHandler()
{
// Collect connectivity and configuration state from the CHIP stack. Because
Expand Down Expand Up @@ -303,48 +384,8 @@ void BaseApplication::LightEventHandler()
// Otherwise, blink the LED ON for a very short time.
if (mFunction != kFunction_FactoryReset)
{
if ((gIdentifyptr != nullptr) && (gIdentifyptr->mActive))
{
sStatusLED.Blink(250, 250);
}
else if (sIdentifyEffect != Clusters::Identify::EffectIdentifierEnum::kStopEffect)
{
if (sIdentifyEffect == Clusters::Identify::EffectIdentifierEnum::kBlink)
{
sStatusLED.Blink(50, 50);
}
if (sIdentifyEffect == Clusters::Identify::EffectIdentifierEnum::kBreathe)
{
sStatusLED.Blink(1000, 1000);
}
if (sIdentifyEffect == Clusters::Identify::EffectIdentifierEnum::kOkay)
{
sStatusLED.Blink(300, 700);
}
}
#if !(defined(CHIP_DEVICE_CONFIG_ENABLE_SED) && CHIP_DEVICE_CONFIG_ENABLE_SED)
else if (sIsProvisioned && sIsEnabled)
{
if (sIsAttached)
{
sStatusLED.Set(true);
}
else
{
sStatusLED.Blink(950, 50);
}
}
else if (sHaveBLEConnections)
{
sStatusLED.Blink(100, 100);
}
else
{
sStatusLED.Blink(50, 950);
}
#endif // CHIP_DEVICE_CONFIG_ENABLE_SED
ActivateStatusLedPatterns();
}

sStatusLED.Animate();
}

Expand Down Expand Up @@ -468,6 +509,75 @@ void BaseApplication::StopStatusLEDTimer()
}
}

#ifdef EMBER_AF_PLUGIN_IDENTIFY_SERVER
void BaseApplication::OnIdentifyStart(Identify * identify)
{
ChipLogProgress(Zcl, "onIdentifyStart");

#if CHIP_DEVICE_CONFIG_ENABLE_SED == 1
StartStatusLEDTimer();
#endif
}

void BaseApplication::OnIdentifyStop(Identify * identify)
{
ChipLogProgress(Zcl, "onIdentifyStop");

#if CHIP_DEVICE_CONFIG_ENABLE_SED == 1
StopStatusLEDTimer();
#endif
}

void BaseApplication::OnTriggerIdentifyEffectCompleted(chip::System::Layer * systemLayer, void * appState)
{
ChipLogProgress(Zcl, "Trigger Identify Complete");
sIdentifyEffect = Clusters::Identify::EffectIdentifierEnum::kStopEffect;

#if CHIP_DEVICE_CONFIG_ENABLE_SED == 1
StopStatusLEDTimer();
#endif
}

void BaseApplication::OnTriggerIdentifyEffect(Identify * identify)
{
sIdentifyEffect = identify->mCurrentEffectIdentifier;

if (identify->mEffectVariant != Clusters::Identify::EffectVariantEnum::kDefault)
{
ChipLogDetail(AppServer, "Identify Effect Variant unsupported. Using default");
}

#if CHIP_DEVICE_CONFIG_ENABLE_SED == 1
StartStatusLEDTimer();
#endif

switch (sIdentifyEffect)
{
case Clusters::Identify::EffectIdentifierEnum::kBlink:
case Clusters::Identify::EffectIdentifierEnum::kOkay:
(void) chip::DeviceLayer::SystemLayer().StartTimer(chip::System::Clock::Seconds16(5), OnTriggerIdentifyEffectCompleted,
identify);
break;
case Clusters::Identify::EffectIdentifierEnum::kBreathe:
case Clusters::Identify::EffectIdentifierEnum::kChannelChange:
(void) chip::DeviceLayer::SystemLayer().StartTimer(chip::System::Clock::Seconds16(10), OnTriggerIdentifyEffectCompleted,
identify);
break;
case Clusters::Identify::EffectIdentifierEnum::kFinishEffect:
(void) chip::DeviceLayer::SystemLayer().CancelTimer(OnTriggerIdentifyEffectCompleted, identify);
(void) chip::DeviceLayer::SystemLayer().StartTimer(chip::System::Clock::Seconds16(1), OnTriggerIdentifyEffectCompleted,
identify);
break;
case Clusters::Identify::EffectIdentifierEnum::kStopEffect:
(void) chip::DeviceLayer::SystemLayer().CancelTimer(OnTriggerIdentifyEffectCompleted, identify);
break;
default:
sIdentifyEffect = Clusters::Identify::EffectIdentifierEnum::kStopEffect;
ChipLogProgress(Zcl, "No identifier effect");
}
}
#endif // EMBER_AF_PLUGIN_IDENTIFY_SERVER

void BaseApplication::LightTimerEventHandler(TimerHandle_t xTimer)
{
LightEventHandler();
Expand Down
25 changes: 24 additions & 1 deletion examples/platform/silabs/SiWx917/BaseApplication.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,15 @@
#include "FreeRTOS.h"
#include "timers.h" // provides FreeRTOS timer support
#include <app/clusters/identify-server/identify-server.h>
#include <app/util/config.h>
#include <ble/BLEEndPoint.h>
#include <lib/core/CHIPError.h>
#include <platform/CHIPDeviceLayer.h>

#ifdef EMBER_AF_PLUGIN_IDENTIFY_SERVER
#include <app/clusters/identify-server/identify-server.h>
#endif

#ifdef DISPLAY_ENABLED
#include "demo-ui.h"
#include "lcd.h"
Expand Down Expand Up @@ -98,6 +103,14 @@ class BaseApplication
*/
static void StopStatusLEDTimer(void);

#ifdef EMBER_AF_PLUGIN_IDENTIFY_SERVER
// Idenfiy server command callbacks.
static void OnIdentifyStart(Identify * identify);
static void OnIdentifyStop(Identify * identify);
static void OnTriggerIdentifyEffectCompleted(chip::System::Layer * systemLayer, void * appState);
static void OnTriggerIdentifyEffect(Identify * identify);
#endif

enum Function_t
{
kFunction_NoneSelected = 0,
Expand All @@ -109,7 +122,7 @@ class BaseApplication
} Function;

protected:
CHIP_ERROR Init(Identify * identifyObj);
CHIP_ERROR Init();

/**
* @brief Function called to start the function timer
Expand Down Expand Up @@ -170,6 +183,16 @@ class BaseApplication
*/
static void LightTimerEventHandler(TimerHandle_t xTimer);

/**
* @brief Activate a set of Led patterns of the Status led
* Identify patterns and Trigger effects have priority
* If no identification patterns are in progress, we provide
* commissioning status feedback.
*
* @return True if a Led pattern was set, otherwise, returns false.
*/
static bool ActivateStatusLedPatterns();

/**
* @brief Updates device LEDs
*/
Expand Down

0 comments on commit a04d23e

Please sign in to comment.