Skip to content

Commit

Permalink
[EFR32] Light-Switch example AppTask clean up and refactor (#20513)
Browse files Browse the repository at this point in the history
* AppTask clean up and refactor

* fix identify effect logic

* Simplify light timer for SED
  • Loading branch information
mkardous-silabs authored Jul 11, 2022
1 parent 0ca7902 commit d271f7b
Show file tree
Hide file tree
Showing 6 changed files with 371 additions and 486 deletions.
1 change: 0 additions & 1 deletion examples/light-switch-app/efr32/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,6 @@ efr32_executable("light_switch_app") {
"${examples_plat_dir}/init_efrPlatform.cpp",
"${examples_plat_dir}/matter_config.cpp",
"src/AppTask.cpp",
"src/LightingManager.cpp",
"src/ZclCallbacks.cpp",
"src/binding-handler.cpp",
"src/main.cpp",
Expand Down
157 changes: 142 additions & 15 deletions examples/light-switch-app/efr32/include/AppTask.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,26 @@

#pragma once

/**********************************************************
* Includes
*********************************************************/

#include <stdbool.h>
#include <stdint.h>

#include "AppEvent.h"
#include "LightingManager.h"
#include "sl_simple_button_instances.h"

#include "FreeRTOS.h"
#include "sl_simple_button_instances.h"
#include "timers.h" // provides FreeRTOS timer support
#include <app/clusters/identify-server/identify-server.h>
#include <ble/BLEEndPoint.h>
#include <lib/core/CHIPError.h>
#include <platform/CHIPDeviceLayer.h>

/**********************************************************
* Defines
*********************************************************/

// Application-defined error codes in the CHIP_ERROR space.
#define APP_ERROR_EVENT_QUEUE_FAILED CHIP_APPLICATION_ERROR(0x01)
#define APP_ERROR_CREATE_TASK_FAILED CHIP_APPLICATION_ERROR(0x02)
Expand All @@ -39,38 +47,157 @@
#define APP_ERROR_START_TIMER_FAILED CHIP_APPLICATION_ERROR(0x05)
#define APP_ERROR_STOP_TIMER_FAILED CHIP_APPLICATION_ERROR(0x06)

/**********************************************************
* AppTask Declaration
*********************************************************/

class AppTask
{

public:
/**********************************************************
* Public Function Declaration
*********************************************************/

/**
* @brief Create AppTask task and Event Queue
* If an error occurs during creation, application will hang after printing out error code
*
* @return CHIP_ERROR CHIP_NO_ERROR if no errors
*/
CHIP_ERROR StartAppTask();

/**
* @brief AppTask task main loop function
*
* @param pvParameter FreeRTOS task parameter
*/
static void AppTaskMain(void * pvParameter);

void PostLightActionRequest(int32_t aActor, LightingManager::Action_t aAction);
/**
* @brief PostEvent function that add event to AppTask queue for processing
*
* @param event AppEvent to post
*/
void PostEvent(const AppEvent * event);

/**
* @brief Event handler when a button is pressed
* Function posts an event for button processing
*
* @param buttonHandle APP_LIGHT_SWITCH or APP_FUNCTION_BUTTON
* @param btnAction button action - SL_SIMPLE_BUTTON_PRESSED,
* SL_SIMPLE_BUTTON_RELEASED or SL_SIMPLE_BUTTON_DISABLED
*/
void ButtonEventHandler(const sl_button_t * buttonHandle, uint8_t btnAction);

/**
* @brief Callback called by the identify-server when an identify command is received
*
* @param identify identify structure the command applies on
*/
static void OnIdentifyStart(Identify * identify);

/**
* @brief Callback called by the identify-server when an identify command is stopped or finished
*
* @param identify identify structure the command applies on
*/
static void OnIdentifyStop(Identify * identify);

/**
* @brief Function called to start the LED light timer
*/
void StartLightTimer(void);

/**
* @brief Function to stop LED light timer
* Turns off Status LED before stopping timer
*/
void CancelLightTimer(void);

private:
/**********************************************************
* Private Function Declaration
*********************************************************/

friend AppTask & GetAppTask(void);

/**
* @brief AppTask initialisation function
*
* @return CHIP_ERROR
*/
CHIP_ERROR Init();

static void ActionInitiated(LightingManager::Action_t aAction, int32_t aActor);
static void ActionCompleted(LightingManager::Action_t aAction);

void CancelTimer(void);

/**
* @brief Function called to start the function timer
*
* @param aTimeoutMs timer duration in ms
*/
void StartFunctionTimer(uint32_t aTimeoutMs);

/**
* @brief Function to stop function timer
*/
void CancelFunctionTimer(void);

/**
* @brief Function call event callback function for processing
*
* @param event triggered event to be processed
*/
void DispatchEvent(AppEvent * event);

static void FunctionTimerEventHandler(AppEvent * aEvent);
static void FunctionHandler(AppEvent * aEvent);
/**
* @brief Function Timer finished callback function
* Post an FunctionEventHandler event
*
* @param xTimer timer that finished
*/
static void FunctionTimerEventHandler(TimerHandle_t xTimer);

/**
* @brief Timer Event processing function
* Trigger factory if Press and Hold duration is respected
*
* @param aEvent post event being processed
*/
static void FunctionEventHandler(AppEvent * aEvent);

/**
* @brief PB0 Button event processing function
* Press and hold will trigger a factory reset timer start
* Press and release will restart BLEAdvertising if not commisionned
*
* @param aEvent button event being processed
*/
static void ButtonHandler(AppEvent * aEvent);

/**
* @brief PB1 Button event processing function
* Function triggers a switch action sent to the CHIP task
*
* @param aEvent button event being processed
*/
static void SwitchActionEventHandler(AppEvent * aEvent);
static void TimerEventHandler(TimerHandle_t xTimer);

static void UpdateClusterState(void);

void StartTimer(uint32_t aTimeoutMs);
/**
* @brief Light Timer finished callback function
* Calls LED processing function
*
* @param xTimer timer that finished
*/
static void LightTimerEventHandler(TimerHandle_t xTimer);

/**
* @brief Updates device LEDs
*/
static void LightEventHandler();

/**********************************************************
* Private Attributes declaration
*********************************************************/

enum Function_t
{
Expand Down
85 changes: 0 additions & 85 deletions examples/light-switch-app/efr32/include/LightingManager.h

This file was deleted.

Loading

0 comments on commit d271f7b

Please sign in to comment.