From 222faed67839cdd4168de486041b9cf5c43eac63 Mon Sep 17 00:00:00 2001 From: MartB Date: Fri, 1 Apr 2022 19:14:59 +0200 Subject: [PATCH] Reformat files --- app_cfg.h | 97 ++++--- app_ui.c | 94 ++++--- app_ui.h | 11 +- board_glc002p.h | 176 +++++++----- sampleLight.c | 120 ++++---- sampleLight.h | 165 ++++++----- sampleLightCtrl.c | 252 ++++++++++------- sampleLightCtrl.h | 4 +- sampleLightEpCfg.c | 389 +++++++++++++------------ stack_cfg.h | 29 +- version_cfg.h | 36 +-- zb_afTestCb.c | 43 ++- zb_appCb.c | 176 +++++++----- zcl_colorCtrlCb.c | 672 ++++++++++++++++++++++++-------------------- zcl_levelCb.c | 163 ++++++----- zcl_onOffCb.c | 123 ++++---- zcl_sampleLightCb.c | 186 ++++++------ zcl_sceneCb.c | 48 ++-- 18 files changed, 1538 insertions(+), 1246 deletions(-) diff --git a/app_cfg.h b/app_cfg.h index 4273c98..addadc8 100644 --- a/app_cfg.h +++ b/app_cfg.h @@ -25,10 +25,10 @@ /* Enable C linkage for C++ Compilers: */ #if defined(__cplusplus) -extern "C" { +extern "C" +{ #endif - /********************************************************************** * Version configuration */ @@ -38,105 +38,102 @@ extern "C" { * Product Information */ /* Debug mode config */ -#define UART_PRINTF_MODE 0 -#define USB_PRINTF_MODE 0 +#define UART_PRINTF_MODE 0 +#define USB_PRINTF_MODE 0 /* HCI interface */ -#define ZBHCI_UART 0 +#define ZBHCI_UART 0 /* RGB + CCT always */ -#define COLOR_RGB_SUPPORT 1 +#define COLOR_RGB_SUPPORT 1 /* BDB */ -#define TOUCHLINK_SUPPORT 1 -#define FIND_AND_BIND_SUPPORT 0 +#define TOUCHLINK_SUPPORT 1 +#define FIND_AND_BIND_SUPPORT 0 /* Board ID */ -#define BOARD_GLC002P 0 +#define BOARD_GLC002P 0 /* Board define */ #if defined(MCU_CORE_826x) - #define BOARD BOARD_826x_DONGLE - #define CLOCK_SYS_CLOCK_HZ 32000000 +#define BOARD BOARD_826x_DONGLE +#define CLOCK_SYS_CLOCK_HZ 32000000 #elif defined(MCU_CORE_8258) #if (CHIP_TYPE == TLSR_8258_1M) - #define FLASH_CAP_SIZE_1M 1 +#define FLASH_CAP_SIZE_1M 1 #endif - #define BOARD BOARD_GLC002P - #define CLOCK_SYS_CLOCK_HZ 48000000 +#define BOARD BOARD_GLC002P +#define CLOCK_SYS_CLOCK_HZ 48000000 #elif defined(MCU_CORE_8278) - #define FLASH_CAP_SIZE_1M 1 - #define BOARD BOARD_8278_DONGLE//BOARD_8278_EVK - #define CLOCK_SYS_CLOCK_HZ 48000000 +#define FLASH_CAP_SIZE_1M 1 +#define BOARD BOARD_8278_DONGLE // BOARD_8278_EVK +#define CLOCK_SYS_CLOCK_HZ 48000000 #elif defined(MCU_CORE_B91) - #define FLASH_CAP_SIZE_1M 1 - #define BOARD BOARD_9518_DONGLE//BOARD_9518_EVK - #define CLOCK_SYS_CLOCK_HZ 48000000 +#define FLASH_CAP_SIZE_1M 1 +#define BOARD BOARD_9518_DONGLE // BOARD_9518_EVK +#define CLOCK_SYS_CLOCK_HZ 48000000 #else - #error "MCU is undefined!" +#error "MCU is undefined!" #endif /* Board include */ -#if(BOARD == BOARD_GLC002P) - #include "board_glc002p.h" +#if (BOARD == BOARD_GLC002P) +#include "board_glc002p.h" #endif - /* Voltage detect module */ /* If you want to define the VOLTAGE_DETECT_ENABLE to 1, * and the model of the development board is B91 evk or dongle, * be sure to connect GPIO_PB0 to VCC. */ -#define VOLTAGE_DETECT_ENABLE 0 +#define VOLTAGE_DETECT_ENABLE 0 /* Watch dog module */ -#define MODULE_WATCHDOG_ENABLE 0 +#define MODULE_WATCHDOG_ENABLE 0 /* UART module */ #if ZBHCI_UART -#define MODULE_UART_ENABLE 1 +#define MODULE_UART_ENABLE 1 #endif #if (ZBHCI_USB_PRINT || ZBHCI_USB_CDC || ZBHCI_USB_HID || ZBHCI_UART) - #define ZBHCI_EN 1 +#define ZBHCI_EN 1 #endif - /********************************************************************** * ZCL cluster support setting */ -#define ZCL_ON_OFF_SUPPORT 1 -#define ZCL_LEVEL_CTRL_SUPPORT 1 +#define ZCL_ON_OFF_SUPPORT 1 +#define ZCL_LEVEL_CTRL_SUPPORT 1 #if (COLOR_RGB_SUPPORT) -#define ZCL_LIGHT_COLOR_CONTROL_SUPPORT 1 +#define ZCL_LIGHT_COLOR_CONTROL_SUPPORT 1 #endif -#define ZCL_GROUP_SUPPORT 1 -#define ZCL_SCENE_SUPPORT 1 -#define ZCL_OTA_SUPPORT 1 -#define ZCL_GP_SUPPORT 1 -#define ZCL_WWAH_SUPPORT 0 +#define ZCL_GROUP_SUPPORT 1 +#define ZCL_SCENE_SUPPORT 1 +#define ZCL_OTA_SUPPORT 1 +#define ZCL_GP_SUPPORT 1 +#define ZCL_WWAH_SUPPORT 0 #if TOUCHLINK_SUPPORT -#define ZCL_ZLL_COMMISSIONING_SUPPORT 1 +#define ZCL_ZLL_COMMISSIONING_SUPPORT 1 #endif -#define AF_TEST_ENABLE 0 - +#define AF_TEST_ENABLE 0 /********************************************************************** * Stack configuration */ #include "stack_cfg.h" - -/********************************************************************** - * EV configuration - */ -typedef enum{ - EV_POLL_ED_DETECT, - EV_POLL_HCI, - EV_POLL_IDLE, - EV_POLL_MAX, -}ev_poll_e; + /********************************************************************** + * EV configuration + */ + typedef enum + { + EV_POLL_ED_DETECT, + EV_POLL_HCI, + EV_POLL_IDLE, + EV_POLL_MAX, + } ev_poll_e; /* Disable C linkage for C++ Compilers: */ #if defined(__cplusplus) diff --git a/app_ui.c b/app_ui.c index 04723e6..9245299 100644 --- a/app_ui.c +++ b/app_ui.c @@ -36,70 +36,86 @@ * LOCAL CONSTANTS */ - /********************************************************************** * TYPEDEFS */ - /********************************************************************** * GLOBAL VARIABLES */ - /********************************************************************** * LOCAL FUNCTIONS */ -void led_on(u32 pin){ +void led_on(u32 pin) +{ drv_gpio_write(pin, LED_ON); } -void led_off(u32 pin){ +void led_off(u32 pin) +{ drv_gpio_write(pin, LED_OFF); } -void led_init(void){ +void led_init(void) +{ led_off(LED_STATUS_R); led_off(LED_STATUS_G); led_off(LED_STATUS_B); } -void localPermitJoinState(void){ +void localPermitJoinState(void) +{ static bool assocPermit = 0; - if(assocPermit != zb_getMacAssocPermit()){ + if (assocPermit != zb_getMacAssocPermit()) + { assocPermit = zb_getMacAssocPermit(); - if(assocPermit){ + if (assocPermit) + { led_on(LED_STATUS_R); - }else{ + } + else + { led_off(LED_STATUS_R); } } } -void buttonKeepPressed(u8 btNum){ - if(btNum == VK_SW1){ +void buttonKeepPressed(u8 btNum) +{ + if (btNum == VK_SW1) + { gLightCtx.state = APP_FACTORY_NEW_DOING; led_on(LED_STATUS_R); led_on(LED_STATUS_G); led_on(LED_STATUS_B); zb_factoryReset(); - }else if(btNum == VK_SW2){ - + } + else if (btNum == VK_SW2) + { } } -void buttonShortPressed(u8 btNum){ - if(btNum == VK_SW1){ - if(zb_isDeviceJoinedNwk()){ +void buttonShortPressed(u8 btNum) +{ + if (btNum == VK_SW1) + { + if (zb_isDeviceJoinedNwk()) + { gLightCtx.sta = !gLightCtx.sta; - if(gLightCtx.sta){ + if (gLightCtx.sta) + { sampleLight_onoff(ZCL_ONOFF_STATUS_ON); - }else{ + } + else + { sampleLight_onoff(ZCL_ONOFF_STATUS_OFF); } } - }else if(btNum == VK_SW2){ + } + else if (btNum == VK_SW2) + { /* toggle local permit Joining */ static u8 duration = 0; duration = duration ? 0 : 0xff; @@ -107,46 +123,56 @@ void buttonShortPressed(u8 btNum){ } } -void keyScan_keyPressedCB(kb_data_t *kbEvt){ -// u8 toNormal = 0; +void keyScan_keyPressedCB(kb_data_t *kbEvt) +{ + // u8 toNormal = 0; u8 keyCode = kbEvt->keycode[0]; -// static u8 lastKeyCode = 0xff; + // static u8 lastKeyCode = 0xff; buttonShortPressed(keyCode); - if(keyCode == VK_SW1){ + if (keyCode == VK_SW1) + { gLightCtx.keyPressedTime = clock_time(); gLightCtx.state = APP_FACTORY_NEW_SET_CHECK; } } - -void keyScan_keyReleasedCB(u8 keyCode){ +void keyScan_keyReleasedCB(u8 keyCode) +{ gLightCtx.state = APP_STATE_NORMAL; } volatile u8 T_keyPressedNum = 0; -void app_key_handler(void){ +void app_key_handler(void) +{ static u8 valid_keyCode = 0xff; - if(gLightCtx.state == APP_FACTORY_NEW_SET_CHECK){ - if(clock_time_exceed(gLightCtx.keyPressedTime, 5*1000*1000)){ + if (gLightCtx.state == APP_FACTORY_NEW_SET_CHECK) + { + if (clock_time_exceed(gLightCtx.keyPressedTime, 5 * 1000 * 1000)) + { buttonKeepPressed(VK_SW1); } } - if(kb_scan_key(0 , 1)){ + if (kb_scan_key(0, 1)) + { T_keyPressedNum++; - if(kb_event.cnt){ + if (kb_event.cnt) + { keyScan_keyPressedCB(&kb_event); - if(kb_event.cnt == 1){ + if (kb_event.cnt == 1) + { valid_keyCode = kb_event.keycode[0]; } - }else{ + } + else + { keyScan_keyReleasedCB(valid_keyCode); valid_keyCode = 0xff; } } } -#endif /* __PROJECT_TL_DIMMABLE_LIGHT__ */ +#endif /* __PROJECT_TL_DIMMABLE_LIGHT__ */ diff --git a/app_ui.h b/app_ui.h index 9e9ccd8..242fe45 100644 --- a/app_ui.h +++ b/app_ui.h @@ -27,20 +27,19 @@ /********************************************************************** * CONSTANT */ -#define LED_ON 1 -#define LED_OFF 0 - +#define LED_ON 1 +#define LED_OFF 0 /********************************************************************** * TYPEDEFS */ -enum{ +enum +{ APP_STATE_NORMAL, APP_FACTORY_NEW_SET_CHECK, APP_FACTORY_NEW_DOING, }; - /********************************************************************** * FUNCTIONS */ @@ -50,4 +49,4 @@ void led_off(u32 pin); void localPermitJoinState(void); void app_key_handler(void); -#endif /* _APP_UI_H_ */ +#endif /* _APP_UI_H_ */ diff --git a/board_glc002p.h b/board_glc002p.h index 5deb217..ba774c9 100644 --- a/board_glc002p.h +++ b/board_glc002p.h @@ -25,116 +25,138 @@ /* Enable C linkage for C++ Compilers: */ #if defined(__cplusplus) -extern "C" { +extern "C" +{ #endif /******************************************************************************************************* *********************TLSR8258F512ET32 32 Pins: Start***************************************************** *******************************************************************************************************/ - // Option Button -#define BUTTON_OPT GPIO_PB7 -#define PB7_FUNC AS_GPIO -#define PB7_OUTPUT_ENABLE 0 -#define PB7_INPUT_ENABLE 1 -#define PULL_WAKEUP_SRC_PB7 PM_PIN_PULLUP_10K +// Option Button +#define BUTTON_OPT GPIO_PB7 +#define PB7_FUNC AS_GPIO +#define PB7_OUTPUT_ENABLE 0 +#define PB7_INPUT_ENABLE 1 +#define PULL_WAKEUP_SRC_PB7 PM_PIN_PULLUP_10K // Factory reset button -#define BUTTON_RESET GPIO_PC0 -#define PC0_FUNC AS_GPIO -#define PC0_OUTPUT_ENABLE 0 -#define PC0_INPUT_ENABLE 1 -#define PULL_WAKEUP_SRC_PC0 PM_PIN_PULLUP_10K +#define BUTTON_RESET GPIO_PC0 +#define PC0_FUNC AS_GPIO +#define PC0_OUTPUT_ENABLE 0 +#define PC0_INPUT_ENABLE 1 +#define PULL_WAKEUP_SRC_PC0 PM_PIN_PULLUP_10K // LED load Output Mapping -#define LED_B GPIO_PC2 // PWM0 -#define LED_G GPIO_PC3 // PWM1 -#define LED_R GPIO_PC4 // PWM2 -#define LED_C GPIO_PD2 // PWM3 -#define LED_W GPIO_PB4 // PWM4 +#define LED_B GPIO_PC2 // PWM0 +#define LED_G GPIO_PC3 // PWM1 +#define LED_R GPIO_PC4 // PWM2 +#define LED_C GPIO_PD2 // PWM3 +#define LED_W GPIO_PB4 // PWM4 -#define PWM_B_CHANNEL 0//PWM0 -#define PWM_B_CHANNEL_SET() do{ \ - gpio_set_func(LED_B, AS_PWM0); \ - }while(0) +#define PWM_B_CHANNEL 0 // PWM0 +#define PWM_B_CHANNEL_SET() \ + do \ + { \ + gpio_set_func(LED_B, AS_PWM0); \ + } while (0) -#define PWM_G_CHANNEL 1//PWM1 -#define PWM_G_CHANNEL_SET() do{ \ - gpio_set_func(LED_G, AS_PWM1); \ - }while(0) +#define PWM_G_CHANNEL 1 // PWM1 +#define PWM_G_CHANNEL_SET() \ + do \ + { \ + gpio_set_func(LED_G, AS_PWM1); \ + } while (0) -#define PWM_R_CHANNEL 2//PWM2 -#define PWM_R_CHANNEL_SET() do{ \ - gpio_set_func(LED_R, AS_PWM2); \ - }while(0) +#define PWM_R_CHANNEL 2 // PWM2 +#define PWM_R_CHANNEL_SET() \ + do \ + { \ + gpio_set_func(LED_R, AS_PWM2); \ + } while (0) +#define PWM_C_CHANNEL 3 // PWM3 +#define PWM_C_CHANNEL_SET() \ + do \ + { \ + gpio_set_func(LED_C, AS_PWM3); \ + } while (0) -#define PWM_C_CHANNEL 3//PWM3 -#define PWM_C_CHANNEL_SET() do{ \ - gpio_set_func(LED_C, AS_PWM3); \ - }while(0) +#define PWM_W_CHANNEL 4 // PWM4 +#define PWM_W_CHANNEL_SET() \ + do \ + { \ + gpio_set_func(LED_W, AS_PWM4); \ + } while (0) -#define PWM_W_CHANNEL 4//PWM4 -#define PWM_W_CHANNEL_SET() do{ \ - gpio_set_func(LED_W, AS_PWM4); \ - }while(0) +#define R_LIGHT_PWM_CHANNEL PWM_R_CHANNEL +#define G_LIGHT_PWM_CHANNEL PWM_G_CHANNEL +#define B_LIGHT_PWM_CHANNEL PWM_B_CHANNEL +#define COOL_LIGHT_PWM_CHANNEL PWM_C_CHANNEL +#define WARM_LIGHT_PWM_CHANNEL PWM_W_CHANNEL -#define R_LIGHT_PWM_CHANNEL PWM_R_CHANNEL -#define G_LIGHT_PWM_CHANNEL PWM_G_CHANNEL -#define B_LIGHT_PWM_CHANNEL PWM_B_CHANNEL -#define COOL_LIGHT_PWM_CHANNEL PWM_C_CHANNEL -#define WARM_LIGHT_PWM_CHANNEL PWM_W_CHANNEL - -#define R_LIGHT_PWM_SET() PWM_R_CHANNEL_SET() -#define G_LIGHT_PWM_SET() PWM_G_CHANNEL_SET() -#define B_LIGHT_PWM_SET() PWM_B_CHANNEL_SET() -#define COOL_LIGHT_PWM_SET() PWM_C_CHANNEL_SET() -#define WARM_LIGHT_PWM_SET() PWM_W_CHANNEL_SET() +#define R_LIGHT_PWM_SET() PWM_R_CHANNEL_SET() +#define G_LIGHT_PWM_SET() PWM_G_CHANNEL_SET() +#define B_LIGHT_PWM_SET() PWM_B_CHANNEL_SET() +#define COOL_LIGHT_PWM_SET() PWM_C_CHANNEL_SET() +#define WARM_LIGHT_PWM_SET() PWM_W_CHANNEL_SET() // On-Board LED Definitions for Mini 5in1 -#define OB_LED_R GPIO_PA0 -#define PA0_FUNC AS_GPIO -#define PA0_OUTPUT_ENABLE 1 -#define PA0_INPUT_ENABLE 0 +#define OB_LED_R GPIO_PA0 +#define PA0_FUNC AS_GPIO +#define PA0_OUTPUT_ENABLE 1 +#define PA0_INPUT_ENABLE 0 -#define OB_LED_G GPIO_PA1 -#define PA1_FUNC AS_GPIO -#define PA1_OUTPUT_ENABLE 1 -#define PA1_INPUT_ENABLE 0 +#define OB_LED_G GPIO_PA1 +#define PA1_FUNC AS_GPIO +#define PA1_OUTPUT_ENABLE 1 +#define PA1_INPUT_ENABLE 0 -#define OB_LED_B GPIO_PB1 -#define PB1_FUNC AS_GPIO -#define PB1_OUTPUT_ENABLE 1 -#define PB1_INPUT_ENABLE 0 +#define OB_LED_B GPIO_PB1 +#define PB1_FUNC AS_GPIO +#define PB1_OUTPUT_ENABLE 1 +#define PB1_INPUT_ENABLE 0 -#define LED_STATUS_R OB_LED_R -#define LED_STATUS_G OB_LED_G -#define LED_STATUS_B OB_LED_B +#define LED_STATUS_R OB_LED_R +#define LED_STATUS_G OB_LED_G +#define LED_STATUS_B OB_LED_B // UART #if ZBHCI_UART - #error please configure the uart PIN!!!!!! +#error please configure the uart PIN!!!!!! #endif // DEBUG #if UART_PRINTF_MODE - #define DEBUG_INFO_TX_PIN GPIO_PC4//print +#define DEBUG_INFO_TX_PIN GPIO_PC4 // print #endif -enum{ - VK_SW1 = 0x01, - VK_SW2 = 0x02 -}; + enum + { + VK_SW1 = 0x01, + VK_SW2 = 0x02 + }; -#define KB_MAP_NORMAL {\ - {VK_SW1,}, \ - {VK_SW2,}, } +#define KB_MAP_NORMAL \ + { \ + { \ + VK_SW1, \ + }, \ + { \ + VK_SW2, \ + }, \ + } -#define KB_MAP_NUM KB_MAP_NORMAL -#define KB_MAP_FN KB_MAP_NORMAL - -#define KB_DRIVE_PINS {NULL } -#define KB_SCAN_PINS {BUTTON_OPT, BUTTON_RESET} +#define KB_MAP_NUM KB_MAP_NORMAL +#define KB_MAP_FN KB_MAP_NORMAL +#define KB_DRIVE_PINS \ + { \ + NULL \ + } +#define KB_SCAN_PINS \ + { \ + BUTTON_OPT, BUTTON_RESET \ + } /* Disable C linkage for C++ Compilers: */ #if defined(__cplusplus) diff --git a/sampleLight.c b/sampleLight.c index 5aadc43..dfabe89 100644 --- a/sampleLight.c +++ b/sampleLight.c @@ -47,65 +47,60 @@ * LOCAL CONSTANTS */ - /********************************************************************** * TYPEDEFS */ - /********************************************************************** * GLOBAL VARIABLES */ app_ctx_t gLightCtx; - #ifdef ZCL_OTA extern ota_callBack_t sampleLight_otaCb; -//running code firmware information +// running code firmware information ota_preamble_t sampleLight_otaInfo = { - .fileVer = FILE_VERSION, - .imageType = IMAGE_TYPE, - .manufacturerCode = MANUFACTURER_CODE_TELINK, + .fileVer = FILE_VERSION, + .imageType = IMAGE_TYPE, + .manufacturerCode = MANUFACTURER_CODE_TELINK, }; #endif - -//Must declare the application call back function which used by ZDO layer +// Must declare the application call back function which used by ZDO layer const zdo_appIndCb_t appCbLst = { - bdb_zdoStartDevCnf,//start device cnf cb - NULL,//reset cnf cb - NULL,//device announce indication cb - sampleLight_leaveIndHandler,//leave ind cb - sampleLight_leaveCnfHandler,//leave cnf cb - sampleLight_nwkUpdateIndicateHandler,//nwk update ind cb - NULL,//permit join ind cb - NULL,//nlme sync cnf cb - NULL,//tc join ind cb - NULL,//tc detects that the frame counter is near limit + bdb_zdoStartDevCnf, // start device cnf cb + NULL, // reset cnf cb + NULL, // device announce indication cb + sampleLight_leaveIndHandler, // leave ind cb + sampleLight_leaveCnfHandler, // leave cnf cb + sampleLight_nwkUpdateIndicateHandler, // nwk update ind cb + NULL, // permit join ind cb + NULL, // nlme sync cnf cb + NULL, // tc join ind cb + NULL, // tc detects that the frame counter is near limit }; - /** * @brief Definition for bdb commissioning setting */ bdb_commissionSetting_t g_bdbCommissionSetting = { .linkKey.tcLinkKey.keyType = SS_GLOBAL_LINK_KEY, - .linkKey.tcLinkKey.key = (u8 *)tcLinkKeyCentralDefault, //can use unique link key stored in NV + .linkKey.tcLinkKey.key = (u8 *)tcLinkKeyCentralDefault, // can use unique link key stored in NV .linkKey.distributeLinkKey.keyType = MASTER_KEY, - .linkKey.distributeLinkKey.key = (u8 *)linkKeyDistributedMaster, //use linkKeyDistributedCertification before testing + .linkKey.distributeLinkKey.key = (u8 *)linkKeyDistributedMaster, // use linkKeyDistributedCertification before testing .linkKey.touchLinkKey.keyType = MASTER_KEY, - .linkKey.touchLinkKey.key = (u8 *)touchLinkKeyMaster, //use touchLinkKeyCertification before testing + .linkKey.touchLinkKey.key = (u8 *)touchLinkKeyMaster, // use touchLinkKeyCertification before testing #if TOUCHLINK_SUPPORT - .touchlinkEnable = 1, /* enable touch-link */ + .touchlinkEnable = 1, /* enable touch-link */ #else - .touchlinkEnable = 0, /* disable touch-link */ + .touchlinkEnable = 0, /* disable touch-link */ #endif - .touchlinkChannel = DEFAULT_CHANNEL, /* touch-link default operation channel for target */ - .touchlinkLqiThreshold = 0xA0, /* threshold for touch-link scan req/resp command */ + .touchlinkChannel = DEFAULT_CHANNEL, /* touch-link default operation channel for target */ + .touchlinkLqiThreshold = 0xA0, /* threshold for touch-link scan req/resp command */ }; /********************************************************************** @@ -113,7 +108,6 @@ bdb_commissionSetting_t g_bdbCommissionSetting = { */ ev_timer_event_t *sampleLightAttrsStoreTimerEvt = NULL; - /********************************************************************** * FUNCTIONS */ @@ -134,7 +128,7 @@ void stack_init(void) zb_init(); /* Register stack CB */ - zb_zdoCbRegister((zdo_appIndCb_t *)&appCbLst); + zb_zdoCbRegister((zdo_appIndCb_t *)&appCbLst); } /********************************************************************* @@ -150,9 +144,9 @@ void user_app_init(void) { af_nodeDescManuCodeUpdate(MANUFACTURER_CODE_TELINK); - /* Initialize ZCL layer */ + /* Initialize ZCL layer */ /* Register Incoming ZCL Foundation command/response messages */ - zcl_init(sampleLight_zclProcessIncomingMsg); + zcl_init(sampleLight_zclProcessIncomingMsg); /* Register endPoint */ af_endpointRegister(SAMPLE_LIGHT_ENDPOINT, (af_simple_descriptor_t *)&sampleLight_simpleDesc, zcl_rx_handler, NULL); @@ -175,17 +169,15 @@ void user_app_init(void) #if ZCL_OTA_SUPPORT /* Initialize OTA */ - ota_init(OTA_TYPE_CLIENT, (af_simple_descriptor_t *)&sampleLight_simpleDesc, &sampleLight_otaInfo, &sampleLight_otaCb); + ota_init(OTA_TYPE_CLIENT, (af_simple_descriptor_t *)&sampleLight_simpleDesc, &sampleLight_otaInfo, &sampleLight_otaCb); #endif #if ZCL_WWAH_SUPPORT - /* Initialize WWAH server */ - wwah_init(WWAH_TYPE_SERVER, (af_simple_descriptor_t *)&sampleLight_simpleDesc); + /* Initialize WWAH server */ + wwah_init(WWAH_TYPE_SERVER, (af_simple_descriptor_t *)&sampleLight_simpleDesc); #endif } - - s32 sampleLightAttrsStoreTimerCb(void *arg) { zcl_onOffAttr_save(); @@ -198,7 +190,8 @@ s32 sampleLightAttrsStoreTimerCb(void *arg) void sampleLightAttrsStoreTimerStart(void) { - if(sampleLightAttrsStoreTimerEvt){ + if (sampleLightAttrsStoreTimerEvt) + { TL_ZB_TIMER_CANCEL(&sampleLightAttrsStoreTimerEvt); } sampleLightAttrsStoreTimerEvt = TL_ZB_TIMER_SCHEDULE(sampleLightAttrsStoreTimerCb, NULL, 200); @@ -206,9 +199,11 @@ void sampleLightAttrsStoreTimerStart(void) void sampleLightAttrsChk(void) { - if(gLightCtx.lightAttrsChanged){ + if (gLightCtx.lightAttrsChanged) + { gLightCtx.lightAttrsChanged = FALSE; - if(zb_isDeviceJoinedNwk()){ + if (zb_isDeviceJoinedNwk()) + { sampleLightAttrsStoreTimerStart(); } } @@ -216,16 +211,20 @@ void sampleLightAttrsChk(void) void report_handler(void) { - if(zb_isDeviceJoinedNwk()){ - if(zcl_reportingEntryActiveNumGet()){ - u16 second = 1;//TODO: fix me + if (zb_isDeviceJoinedNwk()) + { + if (zcl_reportingEntryActiveNumGet()) + { + u16 second = 1; // TODO: fix me reportNoMinLimit(); - //start report timer + // start report timer reportAttrTimerStart(second); - }else{ - //stop report timer + } + else + { + // stop report timer reportAttrTimerStop(); } } @@ -235,12 +234,13 @@ void app_task(void) { app_key_handler(); localPermitJoinState(); - if(BDB_STATE_GET() == BDB_STATE_IDLE){ - //factroyRst_handler(); + if (BDB_STATE_GET() == BDB_STATE_IDLE) + { + // factroyRst_handler(); report_handler(); -#if 0/* NOTE: If set to '1', the latest status of lighting will be stored. */ +#if 0 /* NOTE: If set to '1', the latest status of lighting will be stored. */ sampleLightAttrsChk(); #endif } @@ -253,8 +253,8 @@ static void sampleLightSysException(void) zcl_colorCtrlAttr_save(); SYSTEM_RESET(); - //led_on(LED_POWER); - //while(1); + // led_on(LED_POWER); + // while(1); } /********************************************************************* @@ -274,7 +274,7 @@ void user_init(bool isRetention) led_init(); hwLight_init(); - //factroyRst_init(); + // factroyRst_init(); /* Initialize Stack */ stack_init(); @@ -295,20 +295,20 @@ void user_init(bool isRetention) #endif ev_on_poll(EV_POLL_IDLE, app_task); - /* Read the pre-install code from NV */ - if(bdb_preInstallCodeLoad(&gLightCtx.tcLinkKey.keyType, gLightCtx.tcLinkKey.key) == RET_OK){ + /* Read the pre-install code from NV */ + if (bdb_preInstallCodeLoad(&gLightCtx.tcLinkKey.keyType, gLightCtx.tcLinkKey.key) == RET_OK) + { g_bdbCommissionSetting.linkKey.tcLinkKey.keyType = gLightCtx.tcLinkKey.keyType; g_bdbCommissionSetting.linkKey.tcLinkKey.key = gLightCtx.tcLinkKey.key; } - /* Set default reporting configuration */ - u8 reportableChange = 0x00; - bdb_defaultReportingCfg(SAMPLE_LIGHT_ENDPOINT, HA_PROFILE_ID, ZCL_CLUSTER_GEN_ON_OFF, ZCL_ATTRID_ONOFF, - 0x0000, 0x003c, (u8 *)&reportableChange); + /* Set default reporting configuration */ + u8 reportableChange = 0x00; + bdb_defaultReportingCfg(SAMPLE_LIGHT_ENDPOINT, HA_PROFILE_ID, ZCL_CLUSTER_GEN_ON_OFF, ZCL_ATTRID_ONOFF, + 0x0000, 0x003c, (u8 *)&reportableChange); - /* Initialize BDB */ + /* Initialize BDB */ bdb_init((af_simple_descriptor_t *)&sampleLight_simpleDesc, &g_bdbCommissionSetting, &g_zbDemoBdbCb, 1); } -#endif /* __PROJECT_TL_DIMMABLE_LIGHT__ */ - +#endif /* __PROJECT_TL_DIMMABLE_LIGHT__ */ diff --git a/sampleLight.h b/sampleLight.h index 11d799f..c08c4de 100644 --- a/sampleLight.h +++ b/sampleLight.h @@ -24,150 +24,160 @@ #ifndef _SAMPLE_LIGHT_H_ #define _SAMPLE_LIGHT_H_ - - /********************************************************************** * CONSTANT */ -#define SAMPLE_LIGHT_ENDPOINT 0x01 -#define SAMPLE_TEST_ENDPOINT 0x02 +#define SAMPLE_LIGHT_ENDPOINT 0x01 +#define SAMPLE_TEST_ENDPOINT 0x02 /********************************************************************** * TYPEDEFS */ -typedef struct{ +typedef struct +{ u8 keyType; /* ERTIFICATION_KEY or MASTER_KEY key for touch-link or distribute network - SS_UNIQUE_LINK_KEY or SS_GLOBAL_LINK_KEY for distribute network */ - u8 key[16]; /* the key used */ -}app_linkKey_info_t; + SS_UNIQUE_LINK_KEY or SS_GLOBAL_LINK_KEY for distribute network */ + u8 key[16]; /* the key used */ +} app_linkKey_info_t; -typedef struct{ +typedef struct +{ ev_timer_event_t *timerLedEvt; u32 keyPressedTime; u16 ledOnTime; u16 ledOffTime; - u8 oriSta; //original state before blink - u8 sta; //current state in blink - u8 times; //blink times - u8 state; + u8 oriSta; // original state before blink + u8 sta; // current state in blink + u8 times; // blink times + u8 state; bool bdbFindBindFlg; bool lightAttrsChanged; app_linkKey_info_t tcLinkKey; -}app_ctx_t; +} app_ctx_t; /** * @brief Defined for basic cluster attributes */ -typedef struct{ - u8 zclVersion; - u8 appVersion; - u8 stackVersion; - u8 hwVersion; - u8 manuName[ZCL_BASIC_MAX_LENGTH]; - u8 modelId[ZCL_BASIC_MAX_LENGTH]; - u8 swBuildId[ZCL_BASIC_MAX_LENGTH]; - u8 powerSource; - u8 deviceEnable; -}zcl_basicAttr_t; +typedef struct +{ + u8 zclVersion; + u8 appVersion; + u8 stackVersion; + u8 hwVersion; + u8 manuName[ZCL_BASIC_MAX_LENGTH]; + u8 modelId[ZCL_BASIC_MAX_LENGTH]; + u8 swBuildId[ZCL_BASIC_MAX_LENGTH]; + u8 powerSource; + u8 deviceEnable; +} zcl_basicAttr_t; /** * @brief Defined for identify cluster attributes */ -typedef struct{ - u16 identifyTime; -}zcl_identifyAttr_t; +typedef struct +{ + u16 identifyTime; +} zcl_identifyAttr_t; /** * @brief Defined for group cluster attributes */ -typedef struct{ - u8 nameSupport; -}zcl_groupAttr_t; +typedef struct +{ + u8 nameSupport; +} zcl_groupAttr_t; /** * @brief Defined for scene cluster attributes */ -typedef struct{ - u8 sceneCount; - u8 currentScene; - u8 nameSupport; +typedef struct +{ + u8 sceneCount; + u8 currentScene; + u8 nameSupport; bool sceneValid; - u16 currentGroup; -}zcl_sceneAttr_t; + u16 currentGroup; +} zcl_sceneAttr_t; /** * @brief Defined for on/off cluster attributes */ -typedef struct{ - u16 onTime; - u16 offWaitTime; - u8 startUpOnOff; +typedef struct +{ + u16 onTime; + u16 offWaitTime; + u8 startUpOnOff; bool onOff; bool globalSceneControl; -}zcl_onOffAttr_t; +} zcl_onOffAttr_t; /** * @brief Defined for level cluster attributes */ -typedef struct{ - u16 remainingTime; - u8 curLevel; - u8 startUpCurrentLevel; -}zcl_levelAttr_t; +typedef struct +{ + u16 remainingTime; + u8 curLevel; + u8 startUpCurrentLevel; +} zcl_levelAttr_t; /** * @brief Defined for color control cluster attributes */ -typedef struct{ - u8 colorMode; - u8 options; - u8 enhancedColorMode; - u8 numOfPrimaries; +typedef struct +{ + u8 colorMode; + u8 options; + u8 enhancedColorMode; + u8 numOfPrimaries; u16 colorCapabilities; - u8 currentHue; - u8 currentSaturation; + u8 currentHue; + u8 currentSaturation; u16 currentX; u16 currentY; - u16 enhancedCurrentHue; - u8 colorLoopActive; - u8 colorLoopDirection; - u16 colorLoopTime; + u16 enhancedCurrentHue; + u8 colorLoopActive; + u8 colorLoopDirection; + u16 colorLoopTime; u16 colorLoopStartEnhancedHue; u16 colorLoopStoredEnhancedHue; u16 colorTemperatureMireds; u16 colorTempPhysicalMinMireds; u16 colorTempPhysicalMaxMireds; u16 startUpColorTemperatureMireds; -}zcl_lightColorCtrlAttr_t; +} zcl_lightColorCtrlAttr_t; /** * @brief Defined for saving on/off attributes */ -typedef struct { - u8 onOff; - u8 startUpOnOff; -}zcl_nv_onOff_t; +typedef struct +{ + u8 onOff; + u8 startUpOnOff; +} zcl_nv_onOff_t; /** * @brief Defined for saving level attributes */ -typedef struct { - u8 curLevel; - u8 startUpCurLevel; -}zcl_nv_level_t; +typedef struct +{ + u8 curLevel; + u8 startUpCurLevel; +} zcl_nv_level_t; /** * @brief Defined for saving color control attributes */ -typedef struct { - u8 currentHue; - u8 currentSaturation; - u16 colorTemperatureMireds; - u16 startUpColorTemperatureMireds; -}zcl_nv_colorCtrl_t; +typedef struct +{ + u8 currentHue; + u8 currentSaturation; + u16 colorTemperatureMireds; + u16 startUpColorTemperatureMireds; +} zcl_nv_colorCtrl_t; /********************************************************************** * GLOBAL VARIABLES @@ -176,7 +186,6 @@ extern app_ctx_t gLightCtx; extern bdb_commissionSetting_t g_bdbCommissionSetting; extern bdb_appCb_t g_zbDemoBdbCb; - extern u8 SAMPLELIGHT_CB_CLUSTER_NUM; extern const zcl_specClusterInfo_t g_sampleLightClusterList[]; extern const af_simple_descriptor_t sampleLight_simpleDesc; @@ -193,10 +202,10 @@ extern zcl_onOffAttr_t g_zcl_onOffAttrs; extern zcl_levelAttr_t g_zcl_levelAttrs; extern zcl_lightColorCtrlAttr_t g_zcl_colorCtrlAttrs; -#define zcl_sceneAttrGet() &g_zcl_sceneAttrs -#define zcl_onoffAttrGet() &g_zcl_onOffAttrs -#define zcl_levelAttrGet() &g_zcl_levelAttrs -#define zcl_colorAttrGet() &g_zcl_colorCtrlAttrs +#define zcl_sceneAttrGet() &g_zcl_sceneAttrs +#define zcl_onoffAttrGet() &g_zcl_onOffAttrs +#define zcl_levelAttrGet() &g_zcl_levelAttrs +#define zcl_colorAttrGet() &g_zcl_colorCtrlAttrs /********************************************************************** * FUNCTIONS diff --git a/sampleLightCtrl.c b/sampleLightCtrl.c index ed82b05..6dee98b 100644 --- a/sampleLightCtrl.c +++ b/sampleLightCtrl.c @@ -30,26 +30,23 @@ #include "zcl_include.h" #include "sampleLight.h" #include "sampleLightCtrl.h" -#include +#include /********************************************************************** * LOCAL CONSTANTS */ -#define PWM_FREQUENCY 1000 //1KHz -#define PWM_FULL_DUTYCYCLE 100 -#define PMW_MAX_TICK (PWM_CLOCK_SOURCE / PWM_FREQUENCY) - +#define PWM_FREQUENCY 1000 // 1KHz +#define PWM_FULL_DUTYCYCLE 100 +#define PMW_MAX_TICK (PWM_CLOCK_SOURCE / PWM_FREQUENCY) /********************************************************************** * TYPEDEFS */ - /********************************************************************** * GLOBAL VARIABLES */ - /********************************************************************** * FUNCTIONS */ @@ -132,13 +129,16 @@ void hwLight_init(void) */ void hwLight_onOffUpdate(u8 onOff) { - if(onOff){ + if (onOff) + { drv_pwm_start(R_LIGHT_PWM_CHANNEL); drv_pwm_start(G_LIGHT_PWM_CHANNEL); drv_pwm_start(B_LIGHT_PWM_CHANNEL); drv_pwm_start(COOL_LIGHT_PWM_CHANNEL); drv_pwm_start(WARM_LIGHT_PWM_CHANNEL); - }else{ + } + else + { drv_pwm_stop(R_LIGHT_PWM_CHANNEL); drv_pwm_stop(G_LIGHT_PWM_CHANNEL); drv_pwm_stop(B_LIGHT_PWM_CHANNEL); @@ -147,7 +147,6 @@ void hwLight_onOffUpdate(u8 onOff) } } - /********************************************************************* * @fn hwLight_levelUpdate * @@ -234,58 +233,73 @@ void hwLight_colorUpdate_colorTemperature(u16 colorTemperatureMireds, u8 level) */ void hsvToRGB(u8 hue, u8 saturation, u8 level, u8 *R, u8 *G, u8 *B) { - u8 region; - u8 remainder; - u8 p, q, t; + u8 region; + u8 remainder; + u8 p, q, t; u16 rHue = (u16)hue * 360 / ZCL_COLOR_ATTR_HUE_MAX; u8 rS = saturation; u8 rV = level; - if(saturation == 0){ + if (saturation == 0) + { *R = rV; *G = rV; *B = rV; return; } - if(rHue < 360){ + if (rHue < 360) + { region = rHue / 60; - }else{ + } + else + { region = 0; } remainder = (rHue - (region * 60)) * 4; - p = (rV * (255 - rS)) >> 8; - q = (rV * (255 - ((rS * remainder) >> 8))) >> 8; - t = (rV * (255 - ((rS * (255 - remainder)) >> 8))) >> 8; + p = (rV * (255 - rS)) >> 8; + q = (rV * (255 - ((rS * remainder) >> 8))) >> 8; + t = (rV * (255 - ((rS * (255 - remainder)) >> 8))) >> 8; - if (region == 0) { - *R = rV; - *G = t; - *B = p; - } else if (region == 1) { - *R = q; - *G = rV; - *B = p; - } else if (region == 2) { - *R = p; - *G = rV; - *B = t; - } else if (region == 3) { - *R = p; - *G = q; - *B = rV; - } else if (region == 4) { - *R = t; - *G = p; - *B = rV; - } else { - *R = rV; - *G = p; - *B = q; - } + if (region == 0) + { + *R = rV; + *G = t; + *B = p; + } + else if (region == 1) + { + *R = q; + *G = rV; + *B = p; + } + else if (region == 2) + { + *R = p; + *G = rV; + *B = t; + } + else if (region == 3) + { + *R = p; + *G = q; + *B = rV; + } + else if (region == 4) + { + *R = t; + *G = p; + *B = rV; + } + else + { + *R = rV; + *G = p; + *B = q; + } } /********************************************************************* @@ -309,10 +323,11 @@ void hwLight_colorUpdate_HSV2RGB(u8 hue, u8 saturation, u8 level) hsvToRGB(hue, saturation, level, &R, &G, &B); - hwLight_colorUpdate_RGB(R,G,B); + hwLight_colorUpdate_RGB(R, G, B); } -void hwLight_colorUpdate_RGB(u8 R, u8 G, u8 B) { +void hwLight_colorUpdate_RGB(u8 R, u8 G, u8 B) +{ u16 gammaCorrectR = ((u16)R * R) / ZCL_LEVEL_ATTR_MAX_LEVEL; u16 gammaCorrectG = ((u16)G * G) / ZCL_LEVEL_ATTR_MAX_LEVEL; u16 gammaCorrectB = ((u16)B * B) / ZCL_LEVEL_ATTR_MAX_LEVEL; @@ -324,36 +339,40 @@ void hwLight_colorUpdate_RGB(u8 R, u8 G, u8 B) { pwmSetDuty(WARM_LIGHT_PWM_CHANNEL, 0); } -static float ENFORCE_BOUNDS_FLOAT(float lowerBound, float num, float upperBound) { - return num < lowerBound ? lowerBound : num > upperBound ? upperBound : num; +static float ENFORCE_BOUNDS_FLOAT(float lowerBound, float num, float upperBound) +{ + return num < lowerBound ? lowerBound : num > upperBound ? upperBound + : num; } -float LINEAR_TO_SRGB_GAMMA_CORRECTION(const float part) { - return part <= 0.0031308 ? 12.92 * part : 1.055 * pow(part, 1.0 / 2.4) - 0.055; +float LINEAR_TO_SRGB_GAMMA_CORRECTION(const float part) +{ + return part <= 0.0031308 ? 12.92 * part : 1.055 * pow(part, 1.0 / 2.4) - 0.055; } -void hwLight_colorUpdate_XY2RGB(u16 xI, u16 yI, u8 level) { - float x = xI / 65536.f; - float y = yI / 65536.f; +void hwLight_colorUpdate_XY2RGB(u16 xI, u16 yI, u8 level) +{ + float x = xI / 65536.f; + float y = yI / 65536.f; - // This does not locate the closest point in the gamma spectrum of the lamps. possible #todo - const float z = 1 - x - y; + // This does not locate the closest point in the gamma spectrum of the lamps. possible #todo + const float z = 1 - x - y; - const float Y = level / ZCL_LEVEL_ATTR_MAX_LEVEL; // This is luminance, but used as brightness - const float X = ((Y) / y) * x; - const float Z = ((Y) / y) * z; + const float Y = level / ZCL_LEVEL_ATTR_MAX_LEVEL; // This is luminance, but used as brightness + const float X = ((Y) / y) * x; + const float Z = ((Y) / y) * z; - // D65 BT.709 conversion https://en.wikipedia.org/wiki/SRGB - float r = X * 1.656492 - Y * 0.354851 - Z * 0.255038; - float g = -X * 0.707196 + Y * 1.655397 + Z * 0.036152; - float b = X * 0.051713 - Y * 0.121364 + Z * 1.011530; + // D65 BT.709 conversion https://en.wikipedia.org/wiki/SRGB + float r = X * 1.656492 - Y * 0.354851 - Z * 0.255038; + float g = -X * 0.707196 + Y * 1.655397 + Z * 0.036152; + float b = X * 0.051713 - Y * 0.121364 + Z * 1.011530; - // Enforce the lower and upper bounds - r = ENFORCE_BOUNDS_FLOAT(0.0, r * 255, 255.0); - g = ENFORCE_BOUNDS_FLOAT(0.0, g * 255, 255.0); - b = ENFORCE_BOUNDS_FLOAT(0.0, b * 255, 255.0); + // Enforce the lower and upper bounds + r = ENFORCE_BOUNDS_FLOAT(0.0, r * 255, 255.0); + g = ENFORCE_BOUNDS_FLOAT(0.0, g * 255, 255.0); + b = ENFORCE_BOUNDS_FLOAT(0.0, b * 255, 255.0); - hwLight_colorUpdate_RGB((u8)r,(u8)g,(u8)b); + hwLight_colorUpdate_RGB((u8)r, (u8)g, (u8)b); } /********************************************************************* @@ -413,27 +432,38 @@ void light_fresh(void) */ void light_applyUpdate(u8 *curLevel, u16 *curLevel256, s32 *stepLevel256, u16 *remainingTime, u8 minLevel, u8 maxLevel, bool wrap) { - if((*stepLevel256 > 0) && ((((s32)*curLevel256 + *stepLevel256) / 256) > maxLevel)){ + if ((*stepLevel256 > 0) && ((((s32)*curLevel256 + *stepLevel256) / 256) > maxLevel)) + { *curLevel256 = (wrap) ? ((u16)minLevel * 256 + ((*curLevel256 + *stepLevel256) - (u16)maxLevel * 256) - 256) : ((u16)maxLevel * 256); - }else if((*stepLevel256 < 0) && ((((s32)*curLevel256 + *stepLevel256) / 256) < minLevel)){ + } + else if ((*stepLevel256 < 0) && ((((s32)*curLevel256 + *stepLevel256) / 256) < minLevel)) + { *curLevel256 = (wrap) ? ((u16)maxLevel * 256 - ((u16)minLevel * 256 - ((s32)*curLevel256 + *stepLevel256)) + 256) : ((u16)minLevel * 256); - }else{ + } + else + { *curLevel256 += *stepLevel256; } - if(*stepLevel256 > 0){ + if (*stepLevel256 > 0) + { *curLevel = (*curLevel256 + 127) / 256; - }else{ + } + else + { *curLevel = *curLevel256 / 256; } - if(*remainingTime == 0){ + if (*remainingTime == 0) + { *curLevel256 = ((u16)*curLevel) * 256; *stepLevel256 = 0; - }else if(*remainingTime != 0xFFFF){ - *remainingTime = *remainingTime -1; + } + else if (*remainingTime != 0xFFFF) + { + *remainingTime = *remainingTime - 1; } light_fresh(); @@ -450,27 +480,38 @@ void light_applyUpdate(u8 *curLevel, u16 *curLevel256, s32 *stepLevel256, u16 *r */ void light_applyUpdate_16(u16 *curLevel, u32 *curLevel256, s32 *stepLevel256, u16 *remainingTime, u16 minLevel, u16 maxLevel, bool wrap) { - if((*stepLevel256 > 0) && ((((s32)*curLevel256 + *stepLevel256) / 256) > maxLevel)){ + if ((*stepLevel256 > 0) && ((((s32)*curLevel256 + *stepLevel256) / 256) > maxLevel)) + { *curLevel256 = (wrap) ? ((u32)minLevel * 256 + ((*curLevel256 + *stepLevel256) - (u32)maxLevel * 256) - 256) : ((u32)maxLevel * 256); - }else if((*stepLevel256 < 0) && ((((s32)*curLevel256 + *stepLevel256) / 256) < minLevel)){ + } + else if ((*stepLevel256 < 0) && ((((s32)*curLevel256 + *stepLevel256) / 256) < minLevel)) + { *curLevel256 = (wrap) ? ((u32)maxLevel * 256 - ((u32)minLevel * 256 - ((s32)*curLevel256 + *stepLevel256)) + 256) : ((u32)minLevel * 256); - }else{ + } + else + { *curLevel256 += *stepLevel256; } - if(*stepLevel256 > 0){ + if (*stepLevel256 > 0) + { *curLevel = (*curLevel256 + 127) / 256; - }else{ + } + else + { *curLevel = *curLevel256 / 256; } - if(*remainingTime == 0){ + if (*remainingTime == 0) + { *curLevel256 = ((u32)*curLevel) * 256; *stepLevel256 = 0; - }else if(*remainingTime != 0xFFFF){ - *remainingTime = *remainingTime -1; + } + else if (*remainingTime != 0xFFFF) + { + *remainingTime = *remainingTime - 1; } light_fresh(); @@ -489,13 +530,19 @@ s32 light_blink_TimerEvtCb(void *arg) { u32 interval = 0; - if(gLightCtx.sta == gLightCtx.oriSta){ - if(gLightCtx.times){ + if (gLightCtx.sta == gLightCtx.oriSta) + { + if (gLightCtx.times) + { gLightCtx.times--; - if(gLightCtx.times <= 0){ - if(gLightCtx.oriSta){ + if (gLightCtx.times <= 0) + { + if (gLightCtx.oriSta) + { hwLight_onOffUpdate(ZCL_CMD_ONOFF_ON); - }else{ + } + else + { hwLight_onOffUpdate(ZCL_CMD_ONOFF_OFF); } @@ -506,10 +553,13 @@ s32 light_blink_TimerEvtCb(void *arg) } gLightCtx.sta = !gLightCtx.sta; - if(gLightCtx.sta){ + if (gLightCtx.sta) + { hwLight_onOffUpdate(ZCL_CMD_ONOFF_ON); interval = gLightCtx.ledOnTime; - }else{ + } + else + { hwLight_onOffUpdate(ZCL_CMD_ONOFF_OFF); interval = gLightCtx.ledOffTime; } @@ -536,12 +586,16 @@ void light_blink_start(u8 times, u16 ledOnTime, u16 ledOffTime) gLightCtx.oriSta = pOnoff->onOff; gLightCtx.times = times; - if(!gLightCtx.timerLedEvt){ - if(gLightCtx.oriSta){ + if (!gLightCtx.timerLedEvt) + { + if (gLightCtx.oriSta) + { hwLight_onOffUpdate(ZCL_CMD_ONOFF_OFF); gLightCtx.sta = 0; interval = ledOffTime; - }else{ + } + else + { hwLight_onOffUpdate(ZCL_CMD_ONOFF_ON); gLightCtx.sta = 1; interval = ledOnTime; @@ -564,16 +618,20 @@ void light_blink_start(u8 times, u16 ledOnTime, u16 ledOffTime) */ void light_blink_stop(void) { - if(gLightCtx.timerLedEvt){ + if (gLightCtx.timerLedEvt) + { TL_ZB_TIMER_CANCEL(&gLightCtx.timerLedEvt); gLightCtx.times = 0; - if(gLightCtx.oriSta){ + if (gLightCtx.oriSta) + { hwLight_onOffUpdate(ZCL_CMD_ONOFF_ON); - }else{ + } + else + { hwLight_onOffUpdate(ZCL_CMD_ONOFF_OFF); } } } -#endif /* __PROJECT_TL_DIMMABLE_LIGHT__ */ +#endif /* __PROJECT_TL_DIMMABLE_LIGHT__ */ diff --git a/sampleLightCtrl.h b/sampleLightCtrl.h index 9c2a2e7..be4c56c 100644 --- a/sampleLightCtrl.h +++ b/sampleLightCtrl.h @@ -24,12 +24,10 @@ #ifndef _SAMPLE_LIGHT_CTRL_H_ #define _SAMPLE_LIGHT_CTRL_H_ - /********************************************************************** * CONSTANT */ - /********************************************************************** * FUNCTIONS */ @@ -49,4 +47,4 @@ void light_applyUpdate_16(u16 *curLevel, u32 *curLevel256, s32 *stepLevel256, u1 void light_blink_start(u8 times, u16 ledOnTime, u16 ledOffTime); void light_blink_stop(void); -#endif /* _SAMPLE_LIGHT_CTRL_H_ */ +#endif /* _SAMPLE_LIGHT_CTRL_H_ */ diff --git a/sampleLightEpCfg.c b/sampleLightEpCfg.c index 5444930..4d00d48 100644 --- a/sampleLightEpCfg.c +++ b/sampleLightEpCfg.c @@ -30,29 +30,36 @@ #include "zcl_include.h" #include "sampleLight.h" - /********************************************************************** * LOCAL CONSTANTS */ #ifndef ZCL_BASIC_MFG_NAME -#define ZCL_BASIC_MFG_NAME {8,'G','L','E','D','O','P','T','O'} +#define ZCL_BASIC_MFG_NAME \ + { \ + 8, 'G', 'L', 'E', 'D', 'O', 'P', 'T', 'O' \ + } #endif #ifndef ZCL_BASIC_MODEL_ID -#define ZCL_BASIC_MODEL_ID {9,'G','L','-','C','-','0','0','8','P'} +#define ZCL_BASIC_MODEL_ID \ + { \ + 9, 'G', 'L', '-', 'C', '-', '0', '0', '8', 'P' \ + } #endif #ifndef ZCL_BASIC_SW_BUILD_ID -#define ZCL_BASIC_SW_BUILD_ID {8,'2','0','2','2','0','4','0','1'} +#define ZCL_BASIC_SW_BUILD_ID \ + { \ + 8, '2', '0', '2', '2', '0', '4', '0', '1' \ + } #endif -#define COLOR_TEMPERATURE_PHYSICAL_MIN 0x009A//6500K -#define COLOR_TEMPERATURE_PHYSICAL_MAX 0x01C6//2200K -#define COLOR_TEMPERATURE_DEFAULT 0x00FA//4000K +#define COLOR_TEMPERATURE_PHYSICAL_MIN 0x009A // 6500K +#define COLOR_TEMPERATURE_PHYSICAL_MAX 0x01C6 // 2200K +#define COLOR_TEMPERATURE_DEFAULT 0x00FA // 4000K /********************************************************************** * TYPEDEFS */ - /********************************************************************** * GLOBAL VARIABLES */ @@ -60,29 +67,29 @@ * @brief Definition for Incoming cluster / Sever Cluster */ const u16 sampleLight_inClusterList[] = -{ - ZCL_CLUSTER_GEN_BASIC, - ZCL_CLUSTER_GEN_IDENTIFY, + { + ZCL_CLUSTER_GEN_BASIC, + ZCL_CLUSTER_GEN_IDENTIFY, #ifdef ZCL_GROUP - ZCL_CLUSTER_GEN_GROUPS, + ZCL_CLUSTER_GEN_GROUPS, #endif #ifdef ZCL_SCENE - ZCL_CLUSTER_GEN_SCENES, + ZCL_CLUSTER_GEN_SCENES, #endif #ifdef ZCL_ON_OFF - ZCL_CLUSTER_GEN_ON_OFF, + ZCL_CLUSTER_GEN_ON_OFF, #endif #ifdef ZCL_LEVEL_CTRL - ZCL_CLUSTER_GEN_LEVEL_CONTROL, + ZCL_CLUSTER_GEN_LEVEL_CONTROL, #endif #ifdef ZCL_LIGHT_COLOR_CONTROL - ZCL_CLUSTER_LIGHTING_COLOR_CONTROL, + ZCL_CLUSTER_LIGHTING_COLOR_CONTROL, #endif #ifdef ZCL_ZLL_COMMISSIONING - ZCL_CLUSTER_TOUCHLINK_COMMISSIONING, + ZCL_CLUSTER_TOUCHLINK_COMMISSIONING, #endif #ifdef ZCL_WWAH - ZCL_CLUSTER_WWAH, + ZCL_CLUSTER_WWAH, #endif }; @@ -90,242 +97,239 @@ const u16 sampleLight_inClusterList[] = * @brief Definition for Outgoing cluster / Client Cluster */ const u16 sampleLight_outClusterList[] = -{ + { #ifdef ZCL_OTA - ZCL_CLUSTER_OTA, + ZCL_CLUSTER_OTA, #endif }; /** * @brief Definition for Server cluster number and Client cluster number */ -#define SAMPLELIGHT_IN_CLUSTER_NUM (sizeof(sampleLight_inClusterList)/sizeof(sampleLight_inClusterList[0])) -#define SAMPLELIGHT_OUT_CLUSTER_NUM (sizeof(sampleLight_outClusterList)/sizeof(sampleLight_outClusterList[0])) +#define SAMPLELIGHT_IN_CLUSTER_NUM (sizeof(sampleLight_inClusterList) / sizeof(sampleLight_inClusterList[0])) +#define SAMPLELIGHT_OUT_CLUSTER_NUM (sizeof(sampleLight_outClusterList) / sizeof(sampleLight_outClusterList[0])) /** * @brief Definition for simple description for HA profile */ const af_simple_descriptor_t sampleLight_simpleDesc = -{ - HA_PROFILE_ID, /* Application profile identifier */ - HA_DEV_COLOR_DIMMABLE_LIGHT, - SAMPLE_LIGHT_ENDPOINT, /* Endpoint */ - 1, /* Application device version */ - 0, /* Reserved */ - SAMPLELIGHT_IN_CLUSTER_NUM, /* Application input cluster count */ - SAMPLELIGHT_OUT_CLUSTER_NUM, /* Application output cluster count */ - (u16 *)sampleLight_inClusterList, /* Application input cluster list */ - (u16 *)sampleLight_outClusterList, /* Application output cluster list */ + { + HA_PROFILE_ID, /* Application profile identifier */ + HA_DEV_COLOR_DIMMABLE_LIGHT, + SAMPLE_LIGHT_ENDPOINT, /* Endpoint */ + 1, /* Application device version */ + 0, /* Reserved */ + SAMPLELIGHT_IN_CLUSTER_NUM, /* Application input cluster count */ + SAMPLELIGHT_OUT_CLUSTER_NUM, /* Application output cluster count */ + (u16 *)sampleLight_inClusterList, /* Application input cluster list */ + (u16 *)sampleLight_outClusterList, /* Application output cluster list */ }; /* Basic */ zcl_basicAttr_t g_zcl_basicAttrs = -{ - .zclVersion = 0x03, - .appVersion = 0x00, - .stackVersion = 0x00, - .hwVersion = 0x02, - .manuName = ZCL_BASIC_MFG_NAME, - .modelId = ZCL_BASIC_MODEL_ID, - .powerSource = POWER_SOURCE_MAINS_1_PHASE, - .swBuildId = ZCL_BASIC_SW_BUILD_ID, - .deviceEnable = TRUE, + { + .zclVersion = 0x03, + .appVersion = 0x00, + .stackVersion = 0x00, + .hwVersion = 0x02, + .manuName = ZCL_BASIC_MFG_NAME, + .modelId = ZCL_BASIC_MODEL_ID, + .powerSource = POWER_SOURCE_MAINS_1_PHASE, + .swBuildId = ZCL_BASIC_SW_BUILD_ID, + .deviceEnable = TRUE, }; const zclAttrInfo_t basic_attrTbl[] = -{ - { ZCL_ATTRID_BASIC_ZCL_VER, ZCL_DATA_TYPE_UINT8, ACCESS_CONTROL_READ, (u8*)&g_zcl_basicAttrs.zclVersion}, - { ZCL_ATTRID_BASIC_APP_VER, ZCL_DATA_TYPE_UINT8, ACCESS_CONTROL_READ, (u8*)&g_zcl_basicAttrs.appVersion}, - { ZCL_ATTRID_BASIC_STACK_VER, ZCL_DATA_TYPE_UINT8, ACCESS_CONTROL_READ, (u8*)&g_zcl_basicAttrs.stackVersion}, - { ZCL_ATTRID_BASIC_HW_VER, ZCL_DATA_TYPE_UINT8, ACCESS_CONTROL_READ, (u8*)&g_zcl_basicAttrs.hwVersion}, - { ZCL_ATTRID_BASIC_MFR_NAME, ZCL_DATA_TYPE_CHAR_STR, ACCESS_CONTROL_READ, (u8*)g_zcl_basicAttrs.manuName}, - { ZCL_ATTRID_BASIC_MODEL_ID, ZCL_DATA_TYPE_CHAR_STR, ACCESS_CONTROL_READ, (u8*)g_zcl_basicAttrs.modelId}, - { ZCL_ATTRID_BASIC_POWER_SOURCE, ZCL_DATA_TYPE_ENUM8, ACCESS_CONTROL_READ, (u8*)&g_zcl_basicAttrs.powerSource}, - { ZCL_ATTRID_BASIC_DEV_ENABLED, ZCL_DATA_TYPE_BOOLEAN, ACCESS_CONTROL_READ | ACCESS_CONTROL_WRITE, (u8*)&g_zcl_basicAttrs.deviceEnable}, - { ZCL_ATTRID_BASIC_SW_BUILD_ID, ZCL_DATA_TYPE_CHAR_STR, ACCESS_CONTROL_READ, (u8*)&g_zcl_basicAttrs.swBuildId}, + { + {ZCL_ATTRID_BASIC_ZCL_VER, ZCL_DATA_TYPE_UINT8, ACCESS_CONTROL_READ, (u8 *)&g_zcl_basicAttrs.zclVersion}, + {ZCL_ATTRID_BASIC_APP_VER, ZCL_DATA_TYPE_UINT8, ACCESS_CONTROL_READ, (u8 *)&g_zcl_basicAttrs.appVersion}, + {ZCL_ATTRID_BASIC_STACK_VER, ZCL_DATA_TYPE_UINT8, ACCESS_CONTROL_READ, (u8 *)&g_zcl_basicAttrs.stackVersion}, + {ZCL_ATTRID_BASIC_HW_VER, ZCL_DATA_TYPE_UINT8, ACCESS_CONTROL_READ, (u8 *)&g_zcl_basicAttrs.hwVersion}, + {ZCL_ATTRID_BASIC_MFR_NAME, ZCL_DATA_TYPE_CHAR_STR, ACCESS_CONTROL_READ, (u8 *)g_zcl_basicAttrs.manuName}, + {ZCL_ATTRID_BASIC_MODEL_ID, ZCL_DATA_TYPE_CHAR_STR, ACCESS_CONTROL_READ, (u8 *)g_zcl_basicAttrs.modelId}, + {ZCL_ATTRID_BASIC_POWER_SOURCE, ZCL_DATA_TYPE_ENUM8, ACCESS_CONTROL_READ, (u8 *)&g_zcl_basicAttrs.powerSource}, + {ZCL_ATTRID_BASIC_DEV_ENABLED, ZCL_DATA_TYPE_BOOLEAN, ACCESS_CONTROL_READ | ACCESS_CONTROL_WRITE, (u8 *)&g_zcl_basicAttrs.deviceEnable}, + {ZCL_ATTRID_BASIC_SW_BUILD_ID, ZCL_DATA_TYPE_CHAR_STR, ACCESS_CONTROL_READ, (u8 *)&g_zcl_basicAttrs.swBuildId}, - { ZCL_ATTRID_GLOBAL_CLUSTER_REVISION, ZCL_DATA_TYPE_UINT16, ACCESS_CONTROL_READ, (u8*)&zcl_attr_global_clusterRevision}, + {ZCL_ATTRID_GLOBAL_CLUSTER_REVISION, ZCL_DATA_TYPE_UINT16, ACCESS_CONTROL_READ, (u8 *)&zcl_attr_global_clusterRevision}, }; -#define ZCL_BASIC_ATTR_NUM sizeof(basic_attrTbl) / sizeof(zclAttrInfo_t) - +#define ZCL_BASIC_ATTR_NUM sizeof(basic_attrTbl) / sizeof(zclAttrInfo_t) /* Identify */ zcl_identifyAttr_t g_zcl_identifyAttrs = -{ - .identifyTime = 0x0000, + { + .identifyTime = 0x0000, }; const zclAttrInfo_t identify_attrTbl[] = -{ - { ZCL_ATTRID_IDENTIFY_TIME, ZCL_DATA_TYPE_UINT16, ACCESS_CONTROL_READ | ACCESS_CONTROL_WRITE, (u8*)&g_zcl_identifyAttrs.identifyTime }, + { + {ZCL_ATTRID_IDENTIFY_TIME, ZCL_DATA_TYPE_UINT16, ACCESS_CONTROL_READ | ACCESS_CONTROL_WRITE, (u8 *)&g_zcl_identifyAttrs.identifyTime}, - { ZCL_ATTRID_GLOBAL_CLUSTER_REVISION, ZCL_DATA_TYPE_UINT16, ACCESS_CONTROL_READ, (u8*)&zcl_attr_global_clusterRevision}, + {ZCL_ATTRID_GLOBAL_CLUSTER_REVISION, ZCL_DATA_TYPE_UINT16, ACCESS_CONTROL_READ, (u8 *)&zcl_attr_global_clusterRevision}, }; -#define ZCL_IDENTIFY_ATTR_NUM sizeof(identify_attrTbl) / sizeof(zclAttrInfo_t) +#define ZCL_IDENTIFY_ATTR_NUM sizeof(identify_attrTbl) / sizeof(zclAttrInfo_t) #ifdef ZCL_GROUP /* Group */ zcl_groupAttr_t g_zcl_groupAttrs = -{ - .nameSupport = 0, + { + .nameSupport = 0, }; const zclAttrInfo_t group_attrTbl[] = -{ - { ZCL_ATTRID_GROUP_NAME_SUPPORT, ZCL_DATA_TYPE_BITMAP8, ACCESS_CONTROL_READ, (u8*)&g_zcl_groupAttrs.nameSupport }, + { + {ZCL_ATTRID_GROUP_NAME_SUPPORT, ZCL_DATA_TYPE_BITMAP8, ACCESS_CONTROL_READ, (u8 *)&g_zcl_groupAttrs.nameSupport}, - { ZCL_ATTRID_GLOBAL_CLUSTER_REVISION, ZCL_DATA_TYPE_UINT16, ACCESS_CONTROL_READ, (u8*)&zcl_attr_global_clusterRevision}, + {ZCL_ATTRID_GLOBAL_CLUSTER_REVISION, ZCL_DATA_TYPE_UINT16, ACCESS_CONTROL_READ, (u8 *)&zcl_attr_global_clusterRevision}, }; -#define ZCL_GROUP_ATTR_NUM sizeof(group_attrTbl) / sizeof(zclAttrInfo_t) +#define ZCL_GROUP_ATTR_NUM sizeof(group_attrTbl) / sizeof(zclAttrInfo_t) #endif #ifdef ZCL_SCENE /* Scene */ zcl_sceneAttr_t g_zcl_sceneAttrs = -{ - .sceneCount = 0, - .currentScene = 0, - .currentGroup = 0x0000, - .sceneValid = FALSE, - .nameSupport = 0, + { + .sceneCount = 0, + .currentScene = 0, + .currentGroup = 0x0000, + .sceneValid = FALSE, + .nameSupport = 0, }; const zclAttrInfo_t scene_attrTbl[] = -{ - { ZCL_ATTRID_SCENE_SCENE_COUNT, ZCL_DATA_TYPE_UINT8, ACCESS_CONTROL_READ, (u8*)&g_zcl_sceneAttrs.sceneCount }, - { ZCL_ATTRID_SCENE_CURRENT_SCENE, ZCL_DATA_TYPE_UINT8, ACCESS_CONTROL_READ, (u8*)&g_zcl_sceneAttrs.currentScene }, - { ZCL_ATTRID_SCENE_CURRENT_GROUP, ZCL_DATA_TYPE_UINT16, ACCESS_CONTROL_READ, (u8*)&g_zcl_sceneAttrs.currentGroup }, - { ZCL_ATTRID_SCENE_SCENE_VALID, ZCL_DATA_TYPE_BOOLEAN, ACCESS_CONTROL_READ, (u8*)&g_zcl_sceneAttrs.sceneValid }, - { ZCL_ATTRID_SCENE_NAME_SUPPORT, ZCL_DATA_TYPE_BITMAP8, ACCESS_CONTROL_READ, (u8*)&g_zcl_sceneAttrs.nameSupport }, + { + {ZCL_ATTRID_SCENE_SCENE_COUNT, ZCL_DATA_TYPE_UINT8, ACCESS_CONTROL_READ, (u8 *)&g_zcl_sceneAttrs.sceneCount}, + {ZCL_ATTRID_SCENE_CURRENT_SCENE, ZCL_DATA_TYPE_UINT8, ACCESS_CONTROL_READ, (u8 *)&g_zcl_sceneAttrs.currentScene}, + {ZCL_ATTRID_SCENE_CURRENT_GROUP, ZCL_DATA_TYPE_UINT16, ACCESS_CONTROL_READ, (u8 *)&g_zcl_sceneAttrs.currentGroup}, + {ZCL_ATTRID_SCENE_SCENE_VALID, ZCL_DATA_TYPE_BOOLEAN, ACCESS_CONTROL_READ, (u8 *)&g_zcl_sceneAttrs.sceneValid}, + {ZCL_ATTRID_SCENE_NAME_SUPPORT, ZCL_DATA_TYPE_BITMAP8, ACCESS_CONTROL_READ, (u8 *)&g_zcl_sceneAttrs.nameSupport}, - { ZCL_ATTRID_GLOBAL_CLUSTER_REVISION, ZCL_DATA_TYPE_UINT16, ACCESS_CONTROL_READ, (u8*)&zcl_attr_global_clusterRevision}, + {ZCL_ATTRID_GLOBAL_CLUSTER_REVISION, ZCL_DATA_TYPE_UINT16, ACCESS_CONTROL_READ, (u8 *)&zcl_attr_global_clusterRevision}, }; -#define ZCL_SCENE_ATTR_NUM sizeof(scene_attrTbl) / sizeof(zclAttrInfo_t) +#define ZCL_SCENE_ATTR_NUM sizeof(scene_attrTbl) / sizeof(zclAttrInfo_t) #endif #ifdef ZCL_ON_OFF /* On/Off */ zcl_onOffAttr_t g_zcl_onOffAttrs = -{ - .onOff = 0x00, - .globalSceneControl = 1, - .onTime = 0x0000, - .offWaitTime = 0x0000, - .startUpOnOff = ZCL_START_UP_ONOFF_SET_ONOFF_TO_ON, + { + .onOff = 0x00, + .globalSceneControl = 1, + .onTime = 0x0000, + .offWaitTime = 0x0000, + .startUpOnOff = ZCL_START_UP_ONOFF_SET_ONOFF_TO_ON, }; const zclAttrInfo_t onOff_attrTbl[] = -{ - { ZCL_ATTRID_ONOFF, ZCL_DATA_TYPE_BOOLEAN, ACCESS_CONTROL_READ | ACCESS_CONTROL_REPORTABLE, (u8*)&g_zcl_onOffAttrs.onOff}, - { ZCL_ATTRID_GLOBAL_SCENE_CONTROL, ZCL_DATA_TYPE_BOOLEAN, ACCESS_CONTROL_READ, (u8*)&g_zcl_onOffAttrs.globalSceneControl}, - { ZCL_ATTRID_ON_TIME, ZCL_DATA_TYPE_UINT16, ACCESS_CONTROL_READ | ACCESS_CONTROL_WRITE, (u8*)&g_zcl_onOffAttrs.onTime}, - { ZCL_ATTRID_OFF_WAIT_TIME, ZCL_DATA_TYPE_UINT16, ACCESS_CONTROL_READ | ACCESS_CONTROL_WRITE, (u8*)&g_zcl_onOffAttrs.offWaitTime}, - { ZCL_ATTRID_START_UP_ONOFF, ZCL_DATA_TYPE_ENUM8, ACCESS_CONTROL_READ | ACCESS_CONTROL_WRITE, (u8*)&g_zcl_onOffAttrs.startUpOnOff}, + { + {ZCL_ATTRID_ONOFF, ZCL_DATA_TYPE_BOOLEAN, ACCESS_CONTROL_READ | ACCESS_CONTROL_REPORTABLE, (u8 *)&g_zcl_onOffAttrs.onOff}, + {ZCL_ATTRID_GLOBAL_SCENE_CONTROL, ZCL_DATA_TYPE_BOOLEAN, ACCESS_CONTROL_READ, (u8 *)&g_zcl_onOffAttrs.globalSceneControl}, + {ZCL_ATTRID_ON_TIME, ZCL_DATA_TYPE_UINT16, ACCESS_CONTROL_READ | ACCESS_CONTROL_WRITE, (u8 *)&g_zcl_onOffAttrs.onTime}, + {ZCL_ATTRID_OFF_WAIT_TIME, ZCL_DATA_TYPE_UINT16, ACCESS_CONTROL_READ | ACCESS_CONTROL_WRITE, (u8 *)&g_zcl_onOffAttrs.offWaitTime}, + {ZCL_ATTRID_START_UP_ONOFF, ZCL_DATA_TYPE_ENUM8, ACCESS_CONTROL_READ | ACCESS_CONTROL_WRITE, (u8 *)&g_zcl_onOffAttrs.startUpOnOff}, - { ZCL_ATTRID_GLOBAL_CLUSTER_REVISION, ZCL_DATA_TYPE_UINT16, ACCESS_CONTROL_READ, (u8*)&zcl_attr_global_clusterRevision}, + {ZCL_ATTRID_GLOBAL_CLUSTER_REVISION, ZCL_DATA_TYPE_UINT16, ACCESS_CONTROL_READ, (u8 *)&zcl_attr_global_clusterRevision}, }; -#define ZCL_ONOFF_ATTR_NUM sizeof(onOff_attrTbl) / sizeof(zclAttrInfo_t) +#define ZCL_ONOFF_ATTR_NUM sizeof(onOff_attrTbl) / sizeof(zclAttrInfo_t) #endif #ifdef ZCL_LEVEL_CTRL /* Level */ zcl_levelAttr_t g_zcl_levelAttrs = -{ - .curLevel = 0xFE, - .remainingTime = 0, - .startUpCurrentLevel = ZCL_START_UP_CURRENT_LEVEL_TO_PREVIOUS, + { + .curLevel = 0xFE, + .remainingTime = 0, + .startUpCurrentLevel = ZCL_START_UP_CURRENT_LEVEL_TO_PREVIOUS, }; const zclAttrInfo_t level_attrTbl[] = -{ - { ZCL_ATTRID_LEVEL_CURRENT_LEVEL, ZCL_DATA_TYPE_UINT8, ACCESS_CONTROL_READ | ACCESS_CONTROL_REPORTABLE, (u8*)&g_zcl_levelAttrs.curLevel }, - { ZCL_ATTRID_LEVEL_REMAINING_TIME, ZCL_DATA_TYPE_UINT16, ACCESS_CONTROL_READ, (u8*)&g_zcl_levelAttrs.remainingTime }, - { ZCL_ATTRID_LEVEL_START_UP_CURRENT_LEVEL, ZCL_DATA_TYPE_UINT8, ACCESS_CONTROL_READ | ACCESS_CONTROL_WRITE, (u8*)&g_zcl_levelAttrs.startUpCurrentLevel }, + { + {ZCL_ATTRID_LEVEL_CURRENT_LEVEL, ZCL_DATA_TYPE_UINT8, ACCESS_CONTROL_READ | ACCESS_CONTROL_REPORTABLE, (u8 *)&g_zcl_levelAttrs.curLevel}, + {ZCL_ATTRID_LEVEL_REMAINING_TIME, ZCL_DATA_TYPE_UINT16, ACCESS_CONTROL_READ, (u8 *)&g_zcl_levelAttrs.remainingTime}, + {ZCL_ATTRID_LEVEL_START_UP_CURRENT_LEVEL, ZCL_DATA_TYPE_UINT8, ACCESS_CONTROL_READ | ACCESS_CONTROL_WRITE, (u8 *)&g_zcl_levelAttrs.startUpCurrentLevel}, - { ZCL_ATTRID_GLOBAL_CLUSTER_REVISION, ZCL_DATA_TYPE_UINT16, ACCESS_CONTROL_READ, (u8*)&zcl_attr_global_clusterRevision}, + {ZCL_ATTRID_GLOBAL_CLUSTER_REVISION, ZCL_DATA_TYPE_UINT16, ACCESS_CONTROL_READ, (u8 *)&zcl_attr_global_clusterRevision}, }; -#define ZCL_LEVEL_ATTR_NUM sizeof(level_attrTbl) / sizeof(zclAttrInfo_t) +#define ZCL_LEVEL_ATTR_NUM sizeof(level_attrTbl) / sizeof(zclAttrInfo_t) #endif /* Color Control */ zcl_lightColorCtrlAttr_t g_zcl_colorCtrlAttrs = -{ - .colorMode = ZCL_COLOR_MODE_COLOR_TEMPERATURE_MIREDS, - .options = 0, - .enhancedColorMode = ZCL_COLOR_MODE_COLOR_TEMPERATURE_MIREDS, - .colorCapabilities = ZCL_COLOR_CAPABILITIES_BIT_COLOR_TEMPERATURE | ZCL_COLOR_CAPABILITIES_BIT_X_Y_ATTRIBUTES | ZCL_COLOR_CAPABILITIES_BIT_HUE_SATURATION, - .numOfPrimaries = 0, - .currentHue = 0x00, - .currentSaturation = 0x00, - .currentX = 0x616b, - .currentY = 0x607d, - .enhancedCurrentHue = 0x0000, - .colorLoopActive = 0x00, - .colorLoopDirection = 0x00, - .colorLoopTime = 0x0019, - .colorLoopStartEnhancedHue = 0x2300, - .colorLoopStoredEnhancedHue = 0x0000, - .colorTemperatureMireds = COLOR_TEMPERATURE_DEFAULT, - .colorTempPhysicalMinMireds = COLOR_TEMPERATURE_PHYSICAL_MIN, - .colorTempPhysicalMaxMireds = COLOR_TEMPERATURE_PHYSICAL_MAX, - .startUpColorTemperatureMireds = ZCL_START_UP_COLOR_TEMPERATURE_MIREDS_TO_PREVIOUS, + { + .colorMode = ZCL_COLOR_MODE_COLOR_TEMPERATURE_MIREDS, + .options = 0, + .enhancedColorMode = ZCL_COLOR_MODE_COLOR_TEMPERATURE_MIREDS, + .colorCapabilities = ZCL_COLOR_CAPABILITIES_BIT_COLOR_TEMPERATURE | ZCL_COLOR_CAPABILITIES_BIT_X_Y_ATTRIBUTES | ZCL_COLOR_CAPABILITIES_BIT_HUE_SATURATION, + .numOfPrimaries = 0, + .currentHue = 0x00, + .currentSaturation = 0x00, + .currentX = 0x616b, + .currentY = 0x607d, + .enhancedCurrentHue = 0x0000, + .colorLoopActive = 0x00, + .colorLoopDirection = 0x00, + .colorLoopTime = 0x0019, + .colorLoopStartEnhancedHue = 0x2300, + .colorLoopStoredEnhancedHue = 0x0000, + .colorTemperatureMireds = COLOR_TEMPERATURE_DEFAULT, + .colorTempPhysicalMinMireds = COLOR_TEMPERATURE_PHYSICAL_MIN, + .colorTempPhysicalMaxMireds = COLOR_TEMPERATURE_PHYSICAL_MAX, + .startUpColorTemperatureMireds = ZCL_START_UP_COLOR_TEMPERATURE_MIREDS_TO_PREVIOUS, }; const zclAttrInfo_t lightColorCtrl_attrTbl[] = -{ - { ZCL_ATTRID_COLOR_MODE, ZCL_DATA_TYPE_ENUM8, ACCESS_CONTROL_READ, (u8*)&g_zcl_colorCtrlAttrs.colorMode }, - { ZCL_ATTRID_COLOR_OPTIONS, ZCL_DATA_TYPE_BITMAP8, ACCESS_CONTROL_READ | ACCESS_CONTROL_WRITE, (u8*)&g_zcl_colorCtrlAttrs.options }, - { ZCL_ATTRID_ENHANCED_COLOR_MODE, ZCL_DATA_TYPE_ENUM8, ACCESS_CONTROL_READ, (u8*)&g_zcl_colorCtrlAttrs.enhancedColorMode }, - { ZCL_ATTRID_COLOR_CAPABILITIES, ZCL_DATA_TYPE_BITMAP16, ACCESS_CONTROL_READ, (u8*)&g_zcl_colorCtrlAttrs.colorCapabilities }, - { ZCL_ATTRID_NUMBER_OF_PRIMARIES, ZCL_DATA_TYPE_UINT8, ACCESS_CONTROL_READ, (u8*)&g_zcl_colorCtrlAttrs.numOfPrimaries }, - { ZCL_ATTRID_CURRENT_X, ZCL_DATA_TYPE_UINT16, ACCESS_CONTROL_READ, (u8*)&g_zcl_colorCtrlAttrs.currentX }, - { ZCL_ATTRID_CURRENT_Y, ZCL_DATA_TYPE_UINT16, ACCESS_CONTROL_READ, (u8*)&g_zcl_colorCtrlAttrs.currentY }, - { ZCL_ATTRID_CURRENT_HUE, ZCL_DATA_TYPE_UINT8, ACCESS_CONTROL_READ | ACCESS_CONTROL_REPORTABLE, (u8*)&g_zcl_colorCtrlAttrs.currentHue }, - { ZCL_ATTRID_ENHANCED_CURRENT_HUE, ZCL_DATA_TYPE_UINT16, ACCESS_CONTROL_READ, (u8*)&g_zcl_colorCtrlAttrs.currentHue }, - { ZCL_ATTRID_CURRENT_SATURATION, ZCL_DATA_TYPE_UINT8, ACCESS_CONTROL_READ | ACCESS_CONTROL_REPORTABLE, (u8*)&g_zcl_colorCtrlAttrs.currentSaturation }, - { ZCL_ATTRID_COLOR_LOOP_ACTIVE, ZCL_DATA_TYPE_UINT8, ACCESS_CONTROL_READ | ACCESS_CONTROL_REPORTABLE, (u8*)&g_zcl_colorCtrlAttrs.colorLoopActive }, - { ZCL_ATTRID_COLOR_LOOP_DIRECTION, ZCL_DATA_TYPE_UINT8, ACCESS_CONTROL_READ | ACCESS_CONTROL_REPORTABLE, (u8*)&g_zcl_colorCtrlAttrs.colorLoopDirection }, - { ZCL_ATTRID_COLOR_LOOP_TIME, ZCL_DATA_TYPE_UINT16, ACCESS_CONTROL_READ | ACCESS_CONTROL_REPORTABLE, (u8*)&g_zcl_colorCtrlAttrs.colorLoopTime }, - { ZCL_ATTRID_COLOR_LOOP_START_ENHANCED_HUE, ZCL_DATA_TYPE_UINT16, ACCESS_CONTROL_READ, (u8*)&g_zcl_colorCtrlAttrs.colorLoopStartEnhancedHue }, - { ZCL_ATTRID_COLOR_LOOP_STORED_ENHANCED_HUE, ZCL_DATA_TYPE_UINT16, ACCESS_CONTROL_READ, (u8*)&g_zcl_colorCtrlAttrs.colorLoopStoredEnhancedHue }, - { ZCL_ATTRID_COLOR_TEMPERATURE_MIREDS, ZCL_DATA_TYPE_UINT16, ACCESS_CONTROL_READ | ACCESS_CONTROL_REPORTABLE, (u8*)&g_zcl_colorCtrlAttrs.colorTemperatureMireds }, - { ZCL_ATTRID_COLOR_TEMP_PHYSICAL_MIN_MIREDS, ZCL_DATA_TYPE_UINT16, ACCESS_CONTROL_READ, (u8*)&g_zcl_colorCtrlAttrs.colorTempPhysicalMinMireds }, - { ZCL_ATTRID_COLOR_TEMP_PHYSICAL_MAX_MIREDS, ZCL_DATA_TYPE_UINT16, ACCESS_CONTROL_READ, (u8*)&g_zcl_colorCtrlAttrs.colorTempPhysicalMaxMireds }, - { ZCL_ATTRID_START_UP_COLOR_TEMPERATURE_MIREDS, ZCL_DATA_TYPE_UINT16, ACCESS_CONTROL_READ | ACCESS_CONTROL_WRITE, (u8*)&g_zcl_colorCtrlAttrs.startUpColorTemperatureMireds }, + { + {ZCL_ATTRID_COLOR_MODE, ZCL_DATA_TYPE_ENUM8, ACCESS_CONTROL_READ, (u8 *)&g_zcl_colorCtrlAttrs.colorMode}, + {ZCL_ATTRID_COLOR_OPTIONS, ZCL_DATA_TYPE_BITMAP8, ACCESS_CONTROL_READ | ACCESS_CONTROL_WRITE, (u8 *)&g_zcl_colorCtrlAttrs.options}, + {ZCL_ATTRID_ENHANCED_COLOR_MODE, ZCL_DATA_TYPE_ENUM8, ACCESS_CONTROL_READ, (u8 *)&g_zcl_colorCtrlAttrs.enhancedColorMode}, + {ZCL_ATTRID_COLOR_CAPABILITIES, ZCL_DATA_TYPE_BITMAP16, ACCESS_CONTROL_READ, (u8 *)&g_zcl_colorCtrlAttrs.colorCapabilities}, + {ZCL_ATTRID_NUMBER_OF_PRIMARIES, ZCL_DATA_TYPE_UINT8, ACCESS_CONTROL_READ, (u8 *)&g_zcl_colorCtrlAttrs.numOfPrimaries}, + {ZCL_ATTRID_CURRENT_X, ZCL_DATA_TYPE_UINT16, ACCESS_CONTROL_READ, (u8 *)&g_zcl_colorCtrlAttrs.currentX}, + {ZCL_ATTRID_CURRENT_Y, ZCL_DATA_TYPE_UINT16, ACCESS_CONTROL_READ, (u8 *)&g_zcl_colorCtrlAttrs.currentY}, + {ZCL_ATTRID_CURRENT_HUE, ZCL_DATA_TYPE_UINT8, ACCESS_CONTROL_READ | ACCESS_CONTROL_REPORTABLE, (u8 *)&g_zcl_colorCtrlAttrs.currentHue}, + {ZCL_ATTRID_ENHANCED_CURRENT_HUE, ZCL_DATA_TYPE_UINT16, ACCESS_CONTROL_READ, (u8 *)&g_zcl_colorCtrlAttrs.currentHue}, + {ZCL_ATTRID_CURRENT_SATURATION, ZCL_DATA_TYPE_UINT8, ACCESS_CONTROL_READ | ACCESS_CONTROL_REPORTABLE, (u8 *)&g_zcl_colorCtrlAttrs.currentSaturation}, + {ZCL_ATTRID_COLOR_LOOP_ACTIVE, ZCL_DATA_TYPE_UINT8, ACCESS_CONTROL_READ | ACCESS_CONTROL_REPORTABLE, (u8 *)&g_zcl_colorCtrlAttrs.colorLoopActive}, + {ZCL_ATTRID_COLOR_LOOP_DIRECTION, ZCL_DATA_TYPE_UINT8, ACCESS_CONTROL_READ | ACCESS_CONTROL_REPORTABLE, (u8 *)&g_zcl_colorCtrlAttrs.colorLoopDirection}, + {ZCL_ATTRID_COLOR_LOOP_TIME, ZCL_DATA_TYPE_UINT16, ACCESS_CONTROL_READ | ACCESS_CONTROL_REPORTABLE, (u8 *)&g_zcl_colorCtrlAttrs.colorLoopTime}, + {ZCL_ATTRID_COLOR_LOOP_START_ENHANCED_HUE, ZCL_DATA_TYPE_UINT16, ACCESS_CONTROL_READ, (u8 *)&g_zcl_colorCtrlAttrs.colorLoopStartEnhancedHue}, + {ZCL_ATTRID_COLOR_LOOP_STORED_ENHANCED_HUE, ZCL_DATA_TYPE_UINT16, ACCESS_CONTROL_READ, (u8 *)&g_zcl_colorCtrlAttrs.colorLoopStoredEnhancedHue}, + {ZCL_ATTRID_COLOR_TEMPERATURE_MIREDS, ZCL_DATA_TYPE_UINT16, ACCESS_CONTROL_READ | ACCESS_CONTROL_REPORTABLE, (u8 *)&g_zcl_colorCtrlAttrs.colorTemperatureMireds}, + {ZCL_ATTRID_COLOR_TEMP_PHYSICAL_MIN_MIREDS, ZCL_DATA_TYPE_UINT16, ACCESS_CONTROL_READ, (u8 *)&g_zcl_colorCtrlAttrs.colorTempPhysicalMinMireds}, + {ZCL_ATTRID_COLOR_TEMP_PHYSICAL_MAX_MIREDS, ZCL_DATA_TYPE_UINT16, ACCESS_CONTROL_READ, (u8 *)&g_zcl_colorCtrlAttrs.colorTempPhysicalMaxMireds}, + {ZCL_ATTRID_START_UP_COLOR_TEMPERATURE_MIREDS, ZCL_DATA_TYPE_UINT16, ACCESS_CONTROL_READ | ACCESS_CONTROL_WRITE, (u8 *)&g_zcl_colorCtrlAttrs.startUpColorTemperatureMireds}, - { ZCL_ATTRID_GLOBAL_CLUSTER_REVISION, ZCL_DATA_TYPE_UINT16, ACCESS_CONTROL_READ, (u8*)&zcl_attr_global_clusterRevision}, + {ZCL_ATTRID_GLOBAL_CLUSTER_REVISION, ZCL_DATA_TYPE_UINT16, ACCESS_CONTROL_READ, (u8 *)&zcl_attr_global_clusterRevision}, }; -#define ZCL_COLOR_ATTR_NUM sizeof(lightColorCtrl_attrTbl) / sizeof(zclAttrInfo_t) +#define ZCL_COLOR_ATTR_NUM sizeof(lightColorCtrl_attrTbl) / sizeof(zclAttrInfo_t) /** * @brief Definition for simple light ZCL specific cluster */ const zcl_specClusterInfo_t g_sampleLightClusterList[] = -{ - {ZCL_CLUSTER_GEN_BASIC, MANUFACTURER_CODE_NONE, ZCL_BASIC_ATTR_NUM, basic_attrTbl, zcl_basic_register, sampleLight_basicCb}, - {ZCL_CLUSTER_GEN_IDENTIFY, MANUFACTURER_CODE_NONE, ZCL_IDENTIFY_ATTR_NUM, identify_attrTbl, zcl_identify_register, sampleLight_identifyCb}, - {ZCL_CLUSTER_GEN_GROUPS, MANUFACTURER_CODE_NONE, ZCL_GROUP_ATTR_NUM, group_attrTbl, zcl_group_register, NULL}, - {ZCL_CLUSTER_GEN_SCENES, MANUFACTURER_CODE_NONE, ZCL_SCENE_ATTR_NUM, scene_attrTbl, zcl_scene_register, sampleLight_sceneCb}, - {ZCL_CLUSTER_GEN_ON_OFF, MANUFACTURER_CODE_NONE, ZCL_ONOFF_ATTR_NUM, onOff_attrTbl, zcl_onOff_register, sampleLight_onOffCb}, - {ZCL_CLUSTER_GEN_LEVEL_CONTROL, MANUFACTURER_CODE_NONE, ZCL_LEVEL_ATTR_NUM, level_attrTbl, zcl_level_register, sampleLight_levelCb}, - {ZCL_CLUSTER_LIGHTING_COLOR_CONTROL, MANUFACTURER_CODE_NONE, ZCL_COLOR_ATTR_NUM, lightColorCtrl_attrTbl, zcl_lightColorCtrl_register, sampleLight_colorCtrlCb}, + { + {ZCL_CLUSTER_GEN_BASIC, MANUFACTURER_CODE_NONE, ZCL_BASIC_ATTR_NUM, basic_attrTbl, zcl_basic_register, sampleLight_basicCb}, + {ZCL_CLUSTER_GEN_IDENTIFY, MANUFACTURER_CODE_NONE, ZCL_IDENTIFY_ATTR_NUM, identify_attrTbl, zcl_identify_register, sampleLight_identifyCb}, + {ZCL_CLUSTER_GEN_GROUPS, MANUFACTURER_CODE_NONE, ZCL_GROUP_ATTR_NUM, group_attrTbl, zcl_group_register, NULL}, + {ZCL_CLUSTER_GEN_SCENES, MANUFACTURER_CODE_NONE, ZCL_SCENE_ATTR_NUM, scene_attrTbl, zcl_scene_register, sampleLight_sceneCb}, + {ZCL_CLUSTER_GEN_ON_OFF, MANUFACTURER_CODE_NONE, ZCL_ONOFF_ATTR_NUM, onOff_attrTbl, zcl_onOff_register, sampleLight_onOffCb}, + {ZCL_CLUSTER_GEN_LEVEL_CONTROL, MANUFACTURER_CODE_NONE, ZCL_LEVEL_ATTR_NUM, level_attrTbl, zcl_level_register, sampleLight_levelCb}, + {ZCL_CLUSTER_LIGHTING_COLOR_CONTROL, MANUFACTURER_CODE_NONE, ZCL_COLOR_ATTR_NUM, lightColorCtrl_attrTbl, zcl_lightColorCtrl_register, sampleLight_colorCtrlCb}, }; -u8 SAMPLELIGHT_CB_CLUSTER_NUM = (sizeof(g_sampleLightClusterList)/sizeof(g_sampleLightClusterList[0])); - +u8 SAMPLELIGHT_CB_CLUSTER_NUM = (sizeof(g_sampleLightClusterList) / sizeof(g_sampleLightClusterList[0])); /********************************************************************** * FUNCTIONS */ - /********************************************************************* * @fn zcl_onOffAttr_save * @@ -342,20 +346,24 @@ nv_sts_t zcl_onOffAttr_save(void) #if NV_ENABLE zcl_nv_onOff_t zcl_nv_onOff; - st = nv_flashReadNew(1, NV_MODULE_ZCL, NV_ITEM_ZCL_ON_OFF, sizeof(zcl_nv_onOff_t), (u8*)&zcl_nv_onOff); + st = nv_flashReadNew(1, NV_MODULE_ZCL, NV_ITEM_ZCL_ON_OFF, sizeof(zcl_nv_onOff_t), (u8 *)&zcl_nv_onOff); - if(st == NV_SUCC){ - if((zcl_nv_onOff.onOff != g_zcl_onOffAttrs.onOff) || (zcl_nv_onOff.startUpOnOff != g_zcl_onOffAttrs.startUpOnOff)){ + if (st == NV_SUCC) + { + if ((zcl_nv_onOff.onOff != g_zcl_onOffAttrs.onOff) || (zcl_nv_onOff.startUpOnOff != g_zcl_onOffAttrs.startUpOnOff)) + { zcl_nv_onOff.onOff = g_zcl_onOffAttrs.onOff; zcl_nv_onOff.startUpOnOff = g_zcl_onOffAttrs.startUpOnOff; - st = nv_flashWriteNew(1, NV_MODULE_ZCL, NV_ITEM_ZCL_ON_OFF, sizeof(zcl_nv_onOff_t), (u8*)&zcl_nv_onOff); + st = nv_flashWriteNew(1, NV_MODULE_ZCL, NV_ITEM_ZCL_ON_OFF, sizeof(zcl_nv_onOff_t), (u8 *)&zcl_nv_onOff); } - }else if(st == NV_ITEM_NOT_FOUND){ + } + else if (st == NV_ITEM_NOT_FOUND) + { zcl_nv_onOff.onOff = g_zcl_onOffAttrs.onOff; zcl_nv_onOff.startUpOnOff = g_zcl_onOffAttrs.startUpOnOff; - st = nv_flashWriteNew(1, NV_MODULE_ZCL, NV_ITEM_ZCL_ON_OFF, sizeof(zcl_nv_onOff_t), (u8*)&zcl_nv_onOff); + st = nv_flashWriteNew(1, NV_MODULE_ZCL, NV_ITEM_ZCL_ON_OFF, sizeof(zcl_nv_onOff_t), (u8 *)&zcl_nv_onOff); } #else st = NV_ENABLE_PROTECT_ERROR; @@ -380,9 +388,10 @@ nv_sts_t zcl_onOffAttr_restore(void) #if NV_ENABLE zcl_nv_onOff_t zcl_nv_onOff; - st = nv_flashReadNew(1, NV_MODULE_ZCL, NV_ITEM_ZCL_ON_OFF, sizeof(zcl_nv_onOff_t), (u8*)&zcl_nv_onOff); + st = nv_flashReadNew(1, NV_MODULE_ZCL, NV_ITEM_ZCL_ON_OFF, sizeof(zcl_nv_onOff_t), (u8 *)&zcl_nv_onOff); - if(st == NV_SUCC){ + if (st == NV_SUCC) + { g_zcl_onOffAttrs.onOff = zcl_nv_onOff.onOff; g_zcl_onOffAttrs.startUpOnOff = zcl_nv_onOff.startUpOnOff; } @@ -409,20 +418,24 @@ nv_sts_t zcl_levelAttr_save(void) #if NV_ENABLE zcl_nv_level_t zcl_nv_level; - st = nv_flashReadNew(1, NV_MODULE_ZCL, NV_ITEM_ZCL_LEVEL, sizeof(zcl_nv_level_t), (u8*)&zcl_nv_level); + st = nv_flashReadNew(1, NV_MODULE_ZCL, NV_ITEM_ZCL_LEVEL, sizeof(zcl_nv_level_t), (u8 *)&zcl_nv_level); - if(st == NV_SUCC){ - if((zcl_nv_level.curLevel != g_zcl_levelAttrs.curLevel) || (zcl_nv_level.startUpCurLevel != g_zcl_levelAttrs.startUpCurrentLevel)){ + if (st == NV_SUCC) + { + if ((zcl_nv_level.curLevel != g_zcl_levelAttrs.curLevel) || (zcl_nv_level.startUpCurLevel != g_zcl_levelAttrs.startUpCurrentLevel)) + { zcl_nv_level.curLevel = g_zcl_levelAttrs.curLevel; zcl_nv_level.startUpCurLevel = g_zcl_levelAttrs.startUpCurrentLevel; - st = nv_flashWriteNew(1, NV_MODULE_ZCL, NV_ITEM_ZCL_LEVEL, sizeof(zcl_nv_level_t), (u8*)&zcl_nv_level); + st = nv_flashWriteNew(1, NV_MODULE_ZCL, NV_ITEM_ZCL_LEVEL, sizeof(zcl_nv_level_t), (u8 *)&zcl_nv_level); } - }else if(st == NV_ITEM_NOT_FOUND){ + } + else if (st == NV_ITEM_NOT_FOUND) + { zcl_nv_level.curLevel = g_zcl_levelAttrs.curLevel; zcl_nv_level.startUpCurLevel = g_zcl_levelAttrs.startUpCurrentLevel; - st = nv_flashWriteNew(1, NV_MODULE_ZCL, NV_ITEM_ZCL_LEVEL, sizeof(zcl_nv_level_t), (u8*)&zcl_nv_level); + st = nv_flashWriteNew(1, NV_MODULE_ZCL, NV_ITEM_ZCL_LEVEL, sizeof(zcl_nv_level_t), (u8 *)&zcl_nv_level); } #else st = NV_ENABLE_PROTECT_ERROR; @@ -447,9 +460,10 @@ nv_sts_t zcl_levelAttr_restore(void) #if NV_ENABLE zcl_nv_level_t zcl_nv_level; - st = nv_flashReadNew(1, NV_MODULE_ZCL, NV_ITEM_ZCL_LEVEL, sizeof(zcl_nv_level_t), (u8*)&zcl_nv_level); + st = nv_flashReadNew(1, NV_MODULE_ZCL, NV_ITEM_ZCL_LEVEL, sizeof(zcl_nv_level_t), (u8 *)&zcl_nv_level); - if(st == NV_SUCC){ + if (st == NV_SUCC) + { g_zcl_levelAttrs.curLevel = zcl_nv_level.curLevel; g_zcl_levelAttrs.startUpCurrentLevel = zcl_nv_level.startUpCurLevel; } @@ -477,12 +491,12 @@ nv_sts_t zcl_colorCtrlAttr_save(void) bool needSave = FALSE; zcl_nv_colorCtrl_t zcl_nv_colorCtrl; - st = nv_flashReadNew(1, NV_MODULE_ZCL, NV_ITEM_ZCL_COLOR_CTRL, sizeof(zcl_nv_colorCtrl_t), (u8*)&zcl_nv_colorCtrl); + st = nv_flashReadNew(1, NV_MODULE_ZCL, NV_ITEM_ZCL_COLOR_CTRL, sizeof(zcl_nv_colorCtrl_t), (u8 *)&zcl_nv_colorCtrl); - if(st == NV_SUCC){ - if((zcl_nv_colorCtrl.currentHue != g_zcl_colorCtrlAttrs.currentHue) || (zcl_nv_colorCtrl.currentSaturation != g_zcl_colorCtrlAttrs.currentSaturation) - || (zcl_nv_colorCtrl.colorTemperatureMireds != g_zcl_colorCtrlAttrs.colorTemperatureMireds) - || (zcl_nv_colorCtrl.startUpColorTemperatureMireds != g_zcl_colorCtrlAttrs.startUpColorTemperatureMireds)){ + if (st == NV_SUCC) + { + if ((zcl_nv_colorCtrl.currentHue != g_zcl_colorCtrlAttrs.currentHue) || (zcl_nv_colorCtrl.currentSaturation != g_zcl_colorCtrlAttrs.currentSaturation) || (zcl_nv_colorCtrl.colorTemperatureMireds != g_zcl_colorCtrlAttrs.colorTemperatureMireds) || (zcl_nv_colorCtrl.startUpColorTemperatureMireds != g_zcl_colorCtrlAttrs.startUpColorTemperatureMireds)) + { zcl_nv_colorCtrl.currentHue = g_zcl_colorCtrlAttrs.currentHue; zcl_nv_colorCtrl.currentSaturation = g_zcl_colorCtrlAttrs.currentSaturation; zcl_nv_colorCtrl.colorTemperatureMireds = g_zcl_colorCtrlAttrs.colorTemperatureMireds; @@ -490,7 +504,9 @@ nv_sts_t zcl_colorCtrlAttr_save(void) needSave = TRUE; } - }else if(st == NV_ITEM_NOT_FOUND){ + } + else if (st == NV_ITEM_NOT_FOUND) + { zcl_nv_colorCtrl.currentHue = g_zcl_colorCtrlAttrs.currentHue; zcl_nv_colorCtrl.currentSaturation = g_zcl_colorCtrlAttrs.currentSaturation; zcl_nv_colorCtrl.colorTemperatureMireds = g_zcl_colorCtrlAttrs.colorTemperatureMireds; @@ -499,9 +515,9 @@ nv_sts_t zcl_colorCtrlAttr_save(void) needSave = TRUE; } - - if(needSave){ - st = nv_flashWriteNew(1, NV_MODULE_ZCL, NV_ITEM_ZCL_COLOR_CTRL, sizeof(zcl_nv_colorCtrl_t), (u8*)&zcl_nv_colorCtrl); + if (needSave) + { + st = nv_flashWriteNew(1, NV_MODULE_ZCL, NV_ITEM_ZCL_COLOR_CTRL, sizeof(zcl_nv_colorCtrl_t), (u8 *)&zcl_nv_colorCtrl); } #endif @@ -525,9 +541,10 @@ nv_sts_t zcl_colorCtrlAttr_restore(void) #if NV_ENABLE zcl_nv_colorCtrl_t zcl_nv_colorCtrl; - st = nv_flashReadNew(1, NV_MODULE_ZCL, NV_ITEM_ZCL_COLOR_CTRL, sizeof(zcl_nv_colorCtrl_t), (u8*)&zcl_nv_colorCtrl); + st = nv_flashReadNew(1, NV_MODULE_ZCL, NV_ITEM_ZCL_COLOR_CTRL, sizeof(zcl_nv_colorCtrl_t), (u8 *)&zcl_nv_colorCtrl); - if(st == NV_SUCC){ + if (st == NV_SUCC) + { g_zcl_colorCtrlAttrs.currentHue = zcl_nv_colorCtrl.currentHue; g_zcl_colorCtrlAttrs.currentSaturation = zcl_nv_colorCtrl.currentSaturation; g_zcl_colorCtrlAttrs.colorTemperatureMireds = zcl_nv_colorCtrl.colorTemperatureMireds; @@ -556,4 +573,4 @@ void zcl_sampleLightAttrsInit(void) zcl_colorCtrlAttr_restore(); } -#endif /* __PROJECT_TL_DIMMABLE_LIGHT__ */ +#endif /* __PROJECT_TL_DIMMABLE_LIGHT__ */ diff --git a/stack_cfg.h b/stack_cfg.h index 67fd2d6..a9ac027 100644 --- a/stack_cfg.h +++ b/stack_cfg.h @@ -23,23 +23,21 @@ #pragma once - /** * @brief Working channel * Valid value: 11 ~ 26 */ -#define DEFAULT_CHANNEL 20 +#define DEFAULT_CHANNEL 20 /** * @brief NVRAM */ -#define NV_ENABLE 1 +#define NV_ENABLE 1 /** * @brief Security */ -#define SECURITY_ENABLE 1 - +#define SECURITY_ENABLE 1 /********************************************************************** * Following parameter need user to adjust according the app requirement @@ -48,32 +46,30 @@ * @brief ZCL: MAX number of cluster list, in cluster number add + out cluster number * */ -#define ZCL_CLUSTER_NUM_MAX 11 +#define ZCL_CLUSTER_NUM_MAX 11 /** * @brief ZCL: maximum number for zcl reporting table * */ -#define ZCL_REPORTING_TABLE_NUM 4 +#define ZCL_REPORTING_TABLE_NUM 4 /** * @brief ZCL: maximum number for zcl scene table * */ -#define ZCL_SCENE_TABLE_NUM 8 - +#define ZCL_SCENE_TABLE_NUM 8 /** * @brief APS: MAX number of groups size in the group table * In each group entry, there is 8 endpoints existed. */ -#define APS_GROUP_TABLE_NUM 8 +#define APS_GROUP_TABLE_NUM 8 /** * @brief APS: MAX number of binding table size */ -#define APS_BINDING_TABLE_NUM 8 - +#define APS_BINDING_TABLE_NUM 8 /********************************************************************** * Following configuration will calculated automatically @@ -83,11 +79,10 @@ Auto definition for the role */ #if (COORDINATOR) - #define ZB_ROUTER_ROLE 1 - #define ZB_COORDINATOR_ROLE 1 +#define ZB_ROUTER_ROLE 1 +#define ZB_COORDINATOR_ROLE 1 #elif (ROUTER) - #define ZB_ROUTER_ROLE 1 +#define ZB_ROUTER_ROLE 1 #elif (END_DEVICE) - #define ZB_ED_ROLE 1 +#define ZB_ED_ROLE 1 #endif - diff --git a/version_cfg.h b/version_cfg.h index fe8f636..d08bcfc 100644 --- a/version_cfg.h +++ b/version_cfg.h @@ -26,33 +26,33 @@ #include "../common/comm_cfg.h" #if defined(MCU_CORE_826x) - #if (CHIP_8269) - #define CHIP_TYPE TLSR_8269 - #else - #define CHIP_TYPE TLSR_8267 - #endif +#if (CHIP_8269) +#define CHIP_TYPE TLSR_8269 +#else +#define CHIP_TYPE TLSR_8267 +#endif #elif defined(MCU_CORE_8258) - #define CHIP_TYPE TLSR_8258_512K//TLSR_8258_1M +#define CHIP_TYPE TLSR_8258_512K // TLSR_8258_1M #elif defined(MCU_CORE_8278) - #define CHIP_TYPE TLSR_8278 +#define CHIP_TYPE TLSR_8278 #elif defined(MCU_CORE_B91) - #define CHIP_TYPE TLSR_9518 +#define CHIP_TYPE TLSR_9518 #endif -#define APP_RELEASE 0x10//app release 1.0 -#define APP_BUILD 0x01//app build 01 -#define STACK_RELEASE 0x30//stack release 3.0 -#define STACK_BUILD 0x01//stack build 01 +#define APP_RELEASE 0x10 // app release 1.0 +#define APP_BUILD 0x01 // app build 01 +#define STACK_RELEASE 0x30 // stack release 3.0 +#define STACK_BUILD 0x01 // stack build 01 /********************************************************************************************* * During OTA upgrade, the upgraded device will check the rules of the following three fields. * Refer to ZCL OTA specification for details. */ -#define MANUFACTURER_CODE_TELINK 0x124f //Gledopto ID -#define IMAGE_TYPE ((CHIP_TYPE << 8) | IMAGE_TYPE_LIGHT) -#define FILE_VERSION ((APP_RELEASE << 24) | (APP_BUILD << 16) | (STACK_RELEASE << 8) | STACK_BUILD) +#define MANUFACTURER_CODE_TELINK 0x124f // Gledopto ID +#define IMAGE_TYPE ((CHIP_TYPE << 8) | IMAGE_TYPE_LIGHT) +#define FILE_VERSION ((APP_RELEASE << 24) | (APP_BUILD << 16) | (STACK_RELEASE << 8) | STACK_BUILD) /* Pre-compiled link configuration. */ -#define IS_BOOT_LOADER_IMAGE 0 -#define RESV_FOR_APP_RAM_CODE_SIZE 0 -#define IMAGE_OFFSET APP_IMAGE_ADDR +#define IS_BOOT_LOADER_IMAGE 0 +#define RESV_FOR_APP_RAM_CODE_SIZE 0 +#define IMAGE_OFFSET APP_IMAGE_ADDR diff --git a/zb_afTestCb.c b/zb_afTestCb.c index e02c24e..9d7193b 100644 --- a/zb_afTestCb.c +++ b/zb_afTestCb.c @@ -39,12 +39,10 @@ * LOCAL CONSTANTS */ - /********************************************************************** * TYPEDEFS */ - /********************************************************************** * LOCAL FUNCTIONS */ @@ -53,7 +51,6 @@ * GLOBAL VARIABLES */ - /********************************************************************** * LOCAL VARIABLES */ @@ -74,13 +71,15 @@ static void afTest_testReqPrc(apsdeDataInd_t *pApsdeInd) u8 dataLen = 50; u8 *pBuf = (u8 *)ev_buf_allocate(dataLen); - if(pBuf){ + if (pBuf) + { u8 *pData = pBuf; *pData++ = LO_UINT16(g_afTest_rcvReqCnt); *pData++ = HI_UINT16(g_afTest_rcvReqCnt); - for(u8 i = 0; i < dataLen - 2; i++){ + for (u8 i = 0; i < dataLen - 2; i++) + { *pData++ = i; } @@ -115,20 +114,21 @@ void afTest_rx_handler(void *arg) { apsdeDataInd_t *pApsdeInd = (apsdeDataInd_t *)arg; - switch(pApsdeInd->indInfo.cluster_id){ - case ZCL_CLUSTER_TELINK_SDK_TEST_CLEAR_REQ: - g_afTest_rcvReqCnt = 0; - afTest_testClearReqPrc(pApsdeInd); - break; - case ZCL_CLUSTER_TELINK_SDK_TEST_REQ: - g_afTest_rcvReqCnt++; - afTest_testReqPrc(pApsdeInd); - break; - case ZCL_CLUSTER_TELINK_SDK_TEST_RSP: + switch (pApsdeInd->indInfo.cluster_id) + { + case ZCL_CLUSTER_TELINK_SDK_TEST_CLEAR_REQ: + g_afTest_rcvReqCnt = 0; + afTest_testClearReqPrc(pApsdeInd); + break; + case ZCL_CLUSTER_TELINK_SDK_TEST_REQ: + g_afTest_rcvReqCnt++; + afTest_testReqPrc(pApsdeInd); + break; + case ZCL_CLUSTER_TELINK_SDK_TEST_RSP: - break; - default: - break; + break; + default: + break; } /* Must be free here. */ @@ -137,9 +137,8 @@ void afTest_rx_handler(void *arg) void afTest_dataSendConfirm(void *arg) { -// apsdeDataConf_t *pApsDataCnf = (apsdeDataConf_t *)arg; - + // apsdeDataConf_t *pApsDataCnf = (apsdeDataConf_t *)arg; } -#endif /* AF_TEST_ENABLE */ -#endif /* __PROJECT_TL_DIMMABLE_LIGHT__ */ +#endif /* AF_TEST_ENABLE */ +#endif /* __PROJECT_TL_DIMMABLE_LIGHT__ */ diff --git a/zb_appCb.c b/zb_appCb.c index 48782bb..26081d6 100644 --- a/zb_appCb.c +++ b/zb_appCb.c @@ -37,13 +37,12 @@ /********************************************************************** * LOCAL CONSTANTS */ -#define DEBUG_HEART 0 +#define DEBUG_HEART 0 /********************************************************************** * TYPEDEFS */ - /********************************************************************** * LOCAL FUNCTIONS */ @@ -51,7 +50,6 @@ void zbdemo_bdbInitCb(u8 status, u8 joinedNetwork); void zbdemo_bdbCommissioningCb(u8 status, void *arg); void zbdemo_bdbIdentifyCb(u8 endpoint, u16 srcAddr, u16 identifyTime); - /********************************************************************** * GLOBAL VARIABLES */ @@ -59,8 +57,8 @@ bdb_appCb_t g_zbDemoBdbCb = {zbdemo_bdbInitCb, zbdemo_bdbCommissioningCb, zbdemo #ifdef ZCL_OTA ota_callBack_t sampleLight_otaCb = -{ - sampleLight_otaProcessMsgHandler, + { + sampleLight_otaProcessMsgHandler, }; #endif @@ -77,8 +75,10 @@ ev_timer_event_t *heartTimerEvt = NULL; * FUNCTIONS */ #if DEBUG_HEART -static s32 heartTimerCb(void *arg){ - if(heartInterval == 0){ +static s32 heartTimerCb(void *arg) +{ + if (heartInterval == 0) + { heartTimerEvt = NULL; return -1; } @@ -89,14 +89,16 @@ static s32 heartTimerCb(void *arg){ } #endif -s32 sampleLight_bdbNetworkSteerStart(void *arg){ +s32 sampleLight_bdbNetworkSteerStart(void *arg) +{ bdb_networkSteerStart(); return -1; } #if FIND_AND_BIND_SUPPORT -s32 sampleLight_bdbFindAndBindStart(void *arg){ +s32 sampleLight_bdbFindAndBindStart(void *arg) +{ bdb_findAndBindStart(BDB_COMMISSIONING_ROLE_TARGET); return -1; @@ -114,34 +116,43 @@ s32 sampleLight_bdbFindAndBindStart(void *arg){ * * @return None */ -void zbdemo_bdbInitCb(u8 status, u8 joinedNetwork){ - if(status == BDB_INIT_STATUS_SUCCESS){ +void zbdemo_bdbInitCb(u8 status, u8 joinedNetwork) +{ + if (status == BDB_INIT_STATUS_SUCCESS) + { /* * start bdb commissioning * */ - if(joinedNetwork){ + if (joinedNetwork) + { heartInterval = 1000; #ifdef ZCL_OTA ota_queryStart(OTA_PERIODIC_QUERY_INTERVAL); #endif - }else{ + } + else + { heartInterval = 500; -#if (!ZBHCI_EN) +#if (!ZBHCI_EN) u16 jitter = 0; - do{ + do + { jitter = zb_random() % 0x0fff; - }while(jitter == 0); + } while (jitter == 0); TL_ZB_TIMER_SCHEDULE(sampleLight_bdbNetworkSteerStart, NULL, jitter); #endif } - }else{ + } + else + { heartInterval = 200; } #if DEBUG_HEART - if(heartTimerEvt){ + if (heartTimerEvt) + { TL_ZB_TIMER_CANCEL(&heartTimerEvt); } heartTimerEvt = TL_ZB_TIMER_SCHEDULE(heartTimerCb, NULL, heartInterval); @@ -159,89 +170,113 @@ void zbdemo_bdbInitCb(u8 status, u8 joinedNetwork){ * * @return None */ -void zbdemo_bdbCommissioningCb(u8 status, void *arg){ - if(status == BDB_COMMISSION_STA_SUCCESS){ +void zbdemo_bdbCommissioningCb(u8 status, void *arg) +{ + if (status == BDB_COMMISSION_STA_SUCCESS) + { heartInterval = 1000; #if FIND_AND_BIND_SUPPORT - if(!gLightCtx.bdbFindBindFlg){ - gLightCtx.bdbFindBindFlg = TRUE; + if (!gLightCtx.bdbFindBindFlg) + { + gLightCtx.bdbFindBindFlg = TRUE; #endif - light_blink_start(2, 200, 200); + light_blink_start(2, 200, 200); #ifdef ZCL_OTA - ota_queryStart(OTA_PERIODIC_QUERY_INTERVAL); + ota_queryStart(OTA_PERIODIC_QUERY_INTERVAL); #endif #if FIND_AND_BIND_SUPPORT - //start Finding & Binding - TL_ZB_TIMER_SCHEDULE(sampleLight_bdbFindAndBindStart, NULL, 1000); - } + // start Finding & Binding + TL_ZB_TIMER_SCHEDULE(sampleLight_bdbFindAndBindStart, NULL, 1000); + } #endif - }else if(status == BDB_COMMISSION_STA_IN_PROGRESS){ - - }else if(status == BDB_COMMISSION_STA_NOT_AA_CAPABLE){ - - }else if((status == BDB_COMMISSION_STA_NO_NETWORK)||(status == BDB_COMMISSION_STA_TCLK_EX_FAILURE)){ + } + else if (status == BDB_COMMISSION_STA_IN_PROGRESS) + { + } + else if (status == BDB_COMMISSION_STA_NOT_AA_CAPABLE) + { + } + else if ((status == BDB_COMMISSION_STA_NO_NETWORK) || (status == BDB_COMMISSION_STA_TCLK_EX_FAILURE)) + { u16 jitter = 0; - do{ + do + { jitter = zb_random() % 0x0fff; - }while(jitter == 0); + } while (jitter == 0); TL_ZB_TIMER_SCHEDULE(sampleLight_bdbNetworkSteerStart, NULL, jitter); - }else if(status == BDB_COMMISSION_STA_TARGET_FAILURE){ - - }else if(status == BDB_COMMISSION_STA_FORMATION_FAILURE){ - - }else if(status == BDB_COMMISSION_STA_NO_IDENTIFY_QUERY_RESPONSE){ - - }else if(status == BDB_COMMISSION_STA_BINDING_TABLE_FULL){ - - }else if(status == BDB_COMMISSION_STA_NO_SCAN_RESPONSE){ - - }else if(status == BDB_COMMISSION_STA_NOT_PERMITTED){ - - }else if(status == BDB_COMMISSION_STA_REJOIN_FAILURE){ + } + else if (status == BDB_COMMISSION_STA_TARGET_FAILURE) + { + } + else if (status == BDB_COMMISSION_STA_FORMATION_FAILURE) + { + } + else if (status == BDB_COMMISSION_STA_NO_IDENTIFY_QUERY_RESPONSE) + { + } + else if (status == BDB_COMMISSION_STA_BINDING_TABLE_FULL) + { + } + else if (status == BDB_COMMISSION_STA_NO_SCAN_RESPONSE) + { + } + else if (status == BDB_COMMISSION_STA_NOT_PERMITTED) + { + } + else if (status == BDB_COMMISSION_STA_REJOIN_FAILURE) + { zb_rejoinReq(NLME_REJOIN_METHOD_REJOIN, zb_apsChannelMaskGet()); - }else if(status == BDB_COMMISSION_STA_FORMATION_DONE){ + } + else if (status == BDB_COMMISSION_STA_FORMATION_DONE) + { #if ZBHCI_EN #else - tl_zbMacChannelSet(DEFAULT_CHANNEL); //set default channel + tl_zbMacChannelSet(DEFAULT_CHANNEL); // set default channel #endif } } - extern void sampleLight_zclIdentifyCmdHandler(u8 endpoint, u16 srcAddr, u16 identifyTime); -void zbdemo_bdbIdentifyCb(u8 endpoint, u16 srcAddr, u16 identifyTime){ +void zbdemo_bdbIdentifyCb(u8 endpoint, u16 srcAddr, u16 identifyTime) +{ #if FIND_AND_BIND_SUPPORT sampleLight_zclIdentifyCmdHandler(endpoint, srcAddr, identifyTime); #endif } - - #ifdef ZCL_OTA void sampleLight_otaProcessMsgHandler(u8 evt, u8 status) { - if(evt == OTA_EVT_START){ - if(status == ZCL_STA_SUCCESS){ - - }else{ - + if (evt == OTA_EVT_START) + { + if (status == ZCL_STA_SUCCESS) + { } - }else if(evt == OTA_EVT_COMPLETE){ - if(status == ZCL_STA_SUCCESS){ + else + { + } + } + else if (evt == OTA_EVT_COMPLETE) + { + if (status == ZCL_STA_SUCCESS) + { ota_mcuReboot(); - }else{ + } + else + { ota_queryStart(OTA_PERIODIC_QUERY_INTERVAL); } } } #endif -s32 sampleLight_softReset(void *arg){ +s32 sampleLight_softReset(void *arg) +{ SYSTEM_RESET(); return -1; @@ -258,12 +293,13 @@ s32 sampleLight_softReset(void *arg){ */ void sampleLight_leaveCnfHandler(nlme_leave_cnf_t *pLeaveCnf) { - if(pLeaveCnf->status == SUCCESS){ - light_blink_start(3, 200, 200); + if (pLeaveCnf->status == SUCCESS) + { + light_blink_start(3, 200, 200); - //waiting blink over - TL_ZB_TIMER_SCHEDULE(sampleLight_softReset, NULL, 2 * 1000); - } + // waiting blink over + TL_ZB_TIMER_SCHEDULE(sampleLight_softReset, NULL, 2 * 1000); + } } /********************************************************************* @@ -277,11 +313,11 @@ void sampleLight_leaveCnfHandler(nlme_leave_cnf_t *pLeaveCnf) */ void sampleLight_leaveIndHandler(nlme_leave_ind_t *pLeaveInd) { - } -u8 sampleLight_nwkUpdateIndicateHandler(nwkCmd_nwkUpdate_t *pNwkUpdate){ +u8 sampleLight_nwkUpdateIndicateHandler(nwkCmd_nwkUpdate_t *pNwkUpdate) +{ return FAILURE; } -#endif /* __PROJECT_TL_DIMMABLE_LIGHT__ */ +#endif /* __PROJECT_TL_DIMMABLE_LIGHT__ */ diff --git a/zcl_colorCtrlCb.c b/zcl_colorCtrlCb.c index 3725cc4..fbdc6a4 100644 --- a/zcl_colorCtrlCb.c +++ b/zcl_colorCtrlCb.c @@ -36,58 +36,55 @@ /********************************************************************** * LOCAL CONSTANTS */ -#define ZCL_COLOR_CHANGE_INTERVAL 100 - - +#define ZCL_COLOR_CHANGE_INTERVAL 100 /********************************************************************** * TYPEDEFS */ -typedef struct{ +typedef struct +{ s32 stepHue256; - u16 currentHue256; - u16 hueRemainingTime; + u16 currentHue256; + u16 hueRemainingTime; s32 stepSaturation256; u16 currentSaturation256; u16 saturationRemainingTime; - + s32 stepColorTemp256; - u32 currentColorTemp256; - u16 colorTempRemainingTime; - u16 colorTempMinMireds; - u16 colorTempMaxMireds; -}zcl_colorInfo_t; + u32 currentColorTemp256; + u16 colorTempRemainingTime; + u16 colorTempMinMireds; + u16 colorTempMaxMireds; +} zcl_colorInfo_t; /********************************************************************** * LOCAL VARIABLES */ static zcl_colorInfo_t colorInfo = { - .stepHue256 = 0, - .currentHue256 = 0, - .hueRemainingTime = 0, + .stepHue256 = 0, + .currentHue256 = 0, + .hueRemainingTime = 0, - .stepSaturation256 = 0, - .currentSaturation256 = 0, - .saturationRemainingTime = 0, - - .stepColorTemp256 = 0, - .currentColorTemp256 = 0, - .colorTempRemainingTime = 0, - .colorTempMinMireds = 0, - .colorTempMaxMireds = 0, + .stepSaturation256 = 0, + .currentSaturation256 = 0, + .saturationRemainingTime = 0, + + .stepColorTemp256 = 0, + .currentColorTemp256 = 0, + .colorTempRemainingTime = 0, + .colorTempMinMireds = 0, + .colorTempMaxMireds = 0, }; static ev_timer_event_t *colorTimerEvt = NULL; static ev_timer_event_t *colorLoopTimerEvt = NULL; - /********************************************************************** * FUNCTIONS */ void sampleLight_updateColorMode(u8 colorMode); - /********************************************************************* * @fn sampleLight_colorInit * @@ -116,8 +113,7 @@ void sampleLight_colorInit(void) pColor->enhancedColorMode = ZCL_COLOR_MODE_COLOR_TEMPERATURE_MIREDS; light_applyUpdate_16(&pColor->colorTemperatureMireds, &colorInfo.currentColorTemp256, &colorInfo.stepColorTemp256, &colorInfo.colorTempRemainingTime, - pColor->colorTempPhysicalMinMireds, pColor->colorTempPhysicalMaxMireds, FALSE); - + pColor->colorTempPhysicalMinMireds, pColor->colorTempPhysicalMaxMireds, FALSE); } /********************************************************************* @@ -136,13 +132,16 @@ void sampleLight_updateColorMode(u8 colorMode) { zcl_lightColorCtrlAttr_t *pColor = zcl_colorAttrGet(); - if(colorMode != pColor->colorMode){ - if(colorMode == ZCL_COLOR_MODE_CURRENT_X_Y){ - - }else if(colorMode == ZCL_COLOR_MODE_CURRENT_HUE_SATURATION){ - - }else if(colorMode == ZCL_COLOR_MODE_COLOR_TEMPERATURE_MIREDS){ - + if (colorMode != pColor->colorMode) + { + if (colorMode == ZCL_COLOR_MODE_CURRENT_X_Y) + { + } + else if (colorMode == ZCL_COLOR_MODE_CURRENT_HUE_SATURATION) + { + } + else if (colorMode == ZCL_COLOR_MODE_COLOR_TEMPERATURE_MIREDS) + { } } } @@ -161,11 +160,16 @@ void sampleLight_updateColor(void) zcl_lightColorCtrlAttr_t *pColor = zcl_colorAttrGet(); zcl_levelAttr_t *pLevel = zcl_levelAttrGet(); - if(pColor->colorMode == ZCL_COLOR_MODE_CURRENT_X_Y) { + if (pColor->colorMode == ZCL_COLOR_MODE_CURRENT_X_Y) + { hwLight_colorUpdate_XY2RGB(pColor->currentX, pColor->currentY, pLevel->curLevel); - } else if(pColor->colorMode == ZCL_COLOR_MODE_CURRENT_HUE_SATURATION || pColor->enhancedColorMode == ZCL_ENHANCED_COLOR_MODE_CURRENT_HUE_SATURATION){ + } + else if (pColor->colorMode == ZCL_COLOR_MODE_CURRENT_HUE_SATURATION || pColor->enhancedColorMode == ZCL_ENHANCED_COLOR_MODE_CURRENT_HUE_SATURATION) + { hwLight_colorUpdate_HSV2RGB(pColor->currentHue, pColor->currentSaturation, pLevel->curLevel); - } else if(pColor->colorMode == ZCL_COLOR_MODE_COLOR_TEMPERATURE_MIREDS){ + } + else if (pColor->colorMode == ZCL_COLOR_MODE_COLOR_TEMPERATURE_MIREDS) + { hwLight_colorUpdate_colorTemperature(pColor->colorTemperatureMireds, pLevel->curLevel); } } @@ -183,28 +187,36 @@ static s32 sampleLight_colorTimerEvtCb(void *arg) { zcl_lightColorCtrlAttr_t *pColor = zcl_colorAttrGet(); - if( (pColor->enhancedColorMode == ZCL_COLOR_MODE_CURRENT_HUE_SATURATION) || - (pColor->enhancedColorMode == ZCL_ENHANCED_COLOR_MODE_CURRENT_HUE_SATURATION) ){ - if(colorInfo.saturationRemainingTime){ + if ((pColor->enhancedColorMode == ZCL_COLOR_MODE_CURRENT_HUE_SATURATION) || + (pColor->enhancedColorMode == ZCL_ENHANCED_COLOR_MODE_CURRENT_HUE_SATURATION)) + { + if (colorInfo.saturationRemainingTime) + { light_applyUpdate(&pColor->currentSaturation, &colorInfo.currentSaturation256, &colorInfo.stepSaturation256, &colorInfo.saturationRemainingTime, - ZCL_COLOR_ATTR_SATURATION_MIN, ZCL_COLOR_ATTR_SATURATION_MAX, FALSE); + ZCL_COLOR_ATTR_SATURATION_MIN, ZCL_COLOR_ATTR_SATURATION_MAX, FALSE); } - if(colorInfo.hueRemainingTime){ + if (colorInfo.hueRemainingTime) + { light_applyUpdate(&pColor->currentHue, &colorInfo.currentHue256, &colorInfo.stepHue256, &colorInfo.hueRemainingTime, - ZCL_COLOR_ATTR_HUE_MIN, ZCL_COLOR_ATTR_HUE_MAX, TRUE); + ZCL_COLOR_ATTR_HUE_MIN, ZCL_COLOR_ATTR_HUE_MAX, TRUE); } } - else if(pColor->enhancedColorMode == ZCL_COLOR_MODE_COLOR_TEMPERATURE_MIREDS){ - if(colorInfo.colorTempRemainingTime){ + else if (pColor->enhancedColorMode == ZCL_COLOR_MODE_COLOR_TEMPERATURE_MIREDS) + { + if (colorInfo.colorTempRemainingTime) + { light_applyUpdate_16(&pColor->colorTemperatureMireds, &colorInfo.currentColorTemp256, &colorInfo.stepColorTemp256, &colorInfo.colorTempRemainingTime, - colorInfo.colorTempMinMireds, colorInfo.colorTempMaxMireds, FALSE); + colorInfo.colorTempMinMireds, colorInfo.colorTempMaxMireds, FALSE); } } - if(colorInfo.saturationRemainingTime || colorInfo.hueRemainingTime || colorInfo.colorTempRemainingTime){ + if (colorInfo.saturationRemainingTime || colorInfo.hueRemainingTime || colorInfo.colorTempRemainingTime) + { return 0; - }else{ + } + else + { colorTimerEvt = NULL; return -1; } @@ -221,7 +233,8 @@ static s32 sampleLight_colorTimerEvtCb(void *arg) */ static void sampleLight_colorTimerStop(void) { - if(colorTimerEvt){ + if (colorTimerEvt) + { TL_ZB_TIMER_CANCEL(&colorTimerEvt); } } @@ -239,9 +252,11 @@ static s32 sampleLight_colorLoopTimerEvtCb(void *arg) { zcl_lightColorCtrlAttr_t *pColor = zcl_colorAttrGet(); - if(pColor->colorLoopActive){ - - }else{ + if (pColor->colorLoopActive) + { + } + else + { colorLoopTimerEvt = NULL; return -1; } @@ -260,12 +275,12 @@ static s32 sampleLight_colorLoopTimerEvtCb(void *arg) */ static void sampleLight_colorLoopTimerStop(void) { - if(colorLoopTimerEvt){ + if (colorLoopTimerEvt) + { TL_ZB_TIMER_CANCEL(&colorLoopTimerEvt); } } - /********************************************************************* * @fn sampleLight_moveToHueProcess * @@ -288,33 +303,42 @@ static void sampleLight_moveToHueProcess(zcl_colorCtrlMoveToHueCmd_t *cmd) s16 hueDiff = (s16)cmd->hue - pColor->currentHue; - switch(cmd->direction){ - case COLOR_CTRL_DIRECTION_SHORTEST_DISTANCE: - if(hueDiff > (ZCL_COLOR_ATTR_HUE_MAX / 2)){ - hueDiff -= (ZCL_COLOR_ATTR_HUE_MAX + 1); - }else if(hueDiff < -ZCL_COLOR_ATTR_HUE_MAX / 2){ - hueDiff += (ZCL_COLOR_ATTR_HUE_MAX + 1); - } - break; - case COLOR_CTRL_DIRECTION_LONGEST_DISTANCE: - if((hueDiff > 0) && (hueDiff < (ZCL_COLOR_ATTR_HUE_MAX / 2))){ - hueDiff -= (ZCL_COLOR_ATTR_HUE_MAX + 1); - }else if((hueDiff < 0) && (hueDiff > -ZCL_COLOR_ATTR_HUE_MAX / 2)){ - hueDiff += (ZCL_COLOR_ATTR_HUE_MAX + 1); - } - break; - case COLOR_CTRL_DIRECTION_UP: - if(hueDiff < 0){ - hueDiff += ZCL_COLOR_ATTR_HUE_MAX; - } - break; - case COLOR_CTRL_DIRECTION_DOWN: - if(hueDiff > 0){ - hueDiff -= ZCL_COLOR_ATTR_HUE_MAX; - } - break; - default: - break; + switch (cmd->direction) + { + case COLOR_CTRL_DIRECTION_SHORTEST_DISTANCE: + if (hueDiff > (ZCL_COLOR_ATTR_HUE_MAX / 2)) + { + hueDiff -= (ZCL_COLOR_ATTR_HUE_MAX + 1); + } + else if (hueDiff < -ZCL_COLOR_ATTR_HUE_MAX / 2) + { + hueDiff += (ZCL_COLOR_ATTR_HUE_MAX + 1); + } + break; + case COLOR_CTRL_DIRECTION_LONGEST_DISTANCE: + if ((hueDiff > 0) && (hueDiff < (ZCL_COLOR_ATTR_HUE_MAX / 2))) + { + hueDiff -= (ZCL_COLOR_ATTR_HUE_MAX + 1); + } + else if ((hueDiff < 0) && (hueDiff > -ZCL_COLOR_ATTR_HUE_MAX / 2)) + { + hueDiff += (ZCL_COLOR_ATTR_HUE_MAX + 1); + } + break; + case COLOR_CTRL_DIRECTION_UP: + if (hueDiff < 0) + { + hueDiff += ZCL_COLOR_ATTR_HUE_MAX; + } + break; + case COLOR_CTRL_DIRECTION_DOWN: + if (hueDiff > 0) + { + hueDiff -= ZCL_COLOR_ATTR_HUE_MAX; + } + break; + default: + break; } colorInfo.hueRemainingTime = (cmd->transitionTime == 0) ? 1 : cmd->transitionTime; @@ -322,12 +346,15 @@ static void sampleLight_moveToHueProcess(zcl_colorCtrlMoveToHueCmd_t *cmd) colorInfo.stepHue256 /= (s32)colorInfo.hueRemainingTime; light_applyUpdate(&pColor->currentHue, &colorInfo.currentHue256, &colorInfo.stepHue256, &colorInfo.hueRemainingTime, - ZCL_COLOR_ATTR_HUE_MIN, ZCL_COLOR_ATTR_HUE_MAX, TRUE); + ZCL_COLOR_ATTR_HUE_MIN, ZCL_COLOR_ATTR_HUE_MAX, TRUE); - if(colorInfo.hueRemainingTime){ + if (colorInfo.hueRemainingTime) + { sampleLight_colorTimerStop(); colorTimerEvt = TL_ZB_TIMER_SCHEDULE(sampleLight_colorTimerEvtCb, NULL, ZCL_COLOR_CHANGE_INTERVAL); - }else{ + } + else + { sampleLight_colorTimerStop(); } } @@ -352,30 +379,34 @@ static void sampleLight_moveHueProcess(zcl_colorCtrlMoveHueCmd_t *cmd) colorInfo.currentHue256 = (u16)(pColor->currentHue) << 8; - switch(cmd->moveMode){ - case COLOR_CTRL_MOVE_STOP: - colorInfo.stepHue256 = 0; - colorInfo.hueRemainingTime = 0; - break; - case COLOR_CTRL_MOVE_UP: - colorInfo.stepHue256 = (((s32)cmd->rate) << 8) / 10; - colorInfo.hueRemainingTime = 0xFFFF; - break; - case COLOR_CTRL_MOVE_DOWN: - colorInfo.stepHue256 = ((-(s32)cmd->rate) << 8) / 10; - colorInfo.hueRemainingTime = 0xFFFF; - break; - default: - break; + switch (cmd->moveMode) + { + case COLOR_CTRL_MOVE_STOP: + colorInfo.stepHue256 = 0; + colorInfo.hueRemainingTime = 0; + break; + case COLOR_CTRL_MOVE_UP: + colorInfo.stepHue256 = (((s32)cmd->rate) << 8) / 10; + colorInfo.hueRemainingTime = 0xFFFF; + break; + case COLOR_CTRL_MOVE_DOWN: + colorInfo.stepHue256 = ((-(s32)cmd->rate) << 8) / 10; + colorInfo.hueRemainingTime = 0xFFFF; + break; + default: + break; } light_applyUpdate(&pColor->currentHue, &colorInfo.currentHue256, &colorInfo.stepHue256, &colorInfo.hueRemainingTime, - ZCL_COLOR_ATTR_HUE_MIN, ZCL_COLOR_ATTR_HUE_MAX, TRUE); + ZCL_COLOR_ATTR_HUE_MIN, ZCL_COLOR_ATTR_HUE_MAX, TRUE); - if(colorInfo.hueRemainingTime){ + if (colorInfo.hueRemainingTime) + { sampleLight_colorTimerStop(); colorTimerEvt = TL_ZB_TIMER_SCHEDULE(sampleLight_colorTimerEvtCb, NULL, ZCL_COLOR_CHANGE_INTERVAL); - }else{ + } + else + { sampleLight_colorTimerStop(); } } @@ -404,23 +435,27 @@ static void sampleLight_stepHueProcess(zcl_colorCtrlStepHueCmd_t *cmd) colorInfo.stepHue256 = (((s32)cmd->stepSize) << 8) / colorInfo.hueRemainingTime; - switch(cmd->stepMode){ - case COLOR_CTRL_STEP_MODE_UP: - break; - case COLOR_CTRL_STEP_MODE_DOWN: - colorInfo.stepHue256 = -colorInfo.stepHue256; - break; - default: - break; + switch (cmd->stepMode) + { + case COLOR_CTRL_STEP_MODE_UP: + break; + case COLOR_CTRL_STEP_MODE_DOWN: + colorInfo.stepHue256 = -colorInfo.stepHue256; + break; + default: + break; } light_applyUpdate(&pColor->currentHue, &colorInfo.currentHue256, &colorInfo.stepHue256, &colorInfo.hueRemainingTime, - ZCL_COLOR_ATTR_HUE_MIN, ZCL_COLOR_ATTR_HUE_MAX, TRUE); + ZCL_COLOR_ATTR_HUE_MIN, ZCL_COLOR_ATTR_HUE_MAX, TRUE); - if(colorInfo.hueRemainingTime){ + if (colorInfo.hueRemainingTime) + { sampleLight_colorTimerStop(); colorTimerEvt = TL_ZB_TIMER_SCHEDULE(sampleLight_colorTimerEvtCb, NULL, ZCL_COLOR_CHANGE_INTERVAL); - }else{ + } + else + { sampleLight_colorTimerStop(); } } @@ -451,12 +486,15 @@ static void sampleLight_moveToSaturationProcess(zcl_colorCtrlMoveToSaturationCmd colorInfo.stepSaturation256 /= (s32)colorInfo.saturationRemainingTime; light_applyUpdate(&pColor->currentSaturation, &colorInfo.currentSaturation256, &colorInfo.stepSaturation256, &colorInfo.saturationRemainingTime, - ZCL_COLOR_ATTR_SATURATION_MIN, ZCL_COLOR_ATTR_SATURATION_MAX, FALSE); + ZCL_COLOR_ATTR_SATURATION_MIN, ZCL_COLOR_ATTR_SATURATION_MAX, FALSE); - if(colorInfo.saturationRemainingTime){ + if (colorInfo.saturationRemainingTime) + { sampleLight_colorTimerStop(); colorTimerEvt = TL_ZB_TIMER_SCHEDULE(sampleLight_colorTimerEvtCb, NULL, ZCL_COLOR_CHANGE_INTERVAL); - }else{ + } + else + { sampleLight_colorTimerStop(); } } @@ -481,30 +519,34 @@ static void sampleLight_moveSaturationProcess(zcl_colorCtrlMoveSaturationCmd_t * colorInfo.currentSaturation256 = (u16)(pColor->currentSaturation) << 8; - switch(cmd->moveMode){ - case COLOR_CTRL_MOVE_STOP: - colorInfo.stepSaturation256 = 0; - colorInfo.saturationRemainingTime = 0; - break; - case COLOR_CTRL_MOVE_UP: - colorInfo.stepSaturation256 = (((s32)cmd->rate) << 8) / 10; - colorInfo.saturationRemainingTime = 0xFFFF; - break; - case COLOR_CTRL_MOVE_DOWN: - colorInfo.stepSaturation256 = ((-(s32)cmd->rate) << 8) / 10; - colorInfo.saturationRemainingTime = 0xFFFF; - break; - default: - break; + switch (cmd->moveMode) + { + case COLOR_CTRL_MOVE_STOP: + colorInfo.stepSaturation256 = 0; + colorInfo.saturationRemainingTime = 0; + break; + case COLOR_CTRL_MOVE_UP: + colorInfo.stepSaturation256 = (((s32)cmd->rate) << 8) / 10; + colorInfo.saturationRemainingTime = 0xFFFF; + break; + case COLOR_CTRL_MOVE_DOWN: + colorInfo.stepSaturation256 = ((-(s32)cmd->rate) << 8) / 10; + colorInfo.saturationRemainingTime = 0xFFFF; + break; + default: + break; } light_applyUpdate(&pColor->currentSaturation, &colorInfo.currentSaturation256, &colorInfo.stepSaturation256, &colorInfo.saturationRemainingTime, - ZCL_COLOR_ATTR_SATURATION_MIN, ZCL_COLOR_ATTR_SATURATION_MAX, FALSE); + ZCL_COLOR_ATTR_SATURATION_MIN, ZCL_COLOR_ATTR_SATURATION_MAX, FALSE); - if(colorInfo.saturationRemainingTime){ + if (colorInfo.saturationRemainingTime) + { sampleLight_colorTimerStop(); colorTimerEvt = TL_ZB_TIMER_SCHEDULE(sampleLight_colorTimerEvtCb, NULL, ZCL_COLOR_CHANGE_INTERVAL); - }else{ + } + else + { sampleLight_colorTimerStop(); } } @@ -533,23 +575,27 @@ static void sampleLight_stepSaturationProcess(zcl_colorCtrlStepSaturationCmd_t * colorInfo.stepSaturation256 = (((s32)cmd->stepSize) << 8) / colorInfo.saturationRemainingTime; - switch(cmd->stepMode){ - case COLOR_CTRL_STEP_MODE_UP: - break; - case COLOR_CTRL_STEP_MODE_DOWN: - colorInfo.stepSaturation256 = -colorInfo.stepSaturation256; - break; - default: - break; + switch (cmd->stepMode) + { + case COLOR_CTRL_STEP_MODE_UP: + break; + case COLOR_CTRL_STEP_MODE_DOWN: + colorInfo.stepSaturation256 = -colorInfo.stepSaturation256; + break; + default: + break; } light_applyUpdate(&pColor->currentSaturation, &colorInfo.currentSaturation256, &colorInfo.stepSaturation256, &colorInfo.saturationRemainingTime, - ZCL_COLOR_ATTR_SATURATION_MIN, ZCL_COLOR_ATTR_SATURATION_MAX, FALSE); + ZCL_COLOR_ATTR_SATURATION_MIN, ZCL_COLOR_ATTR_SATURATION_MAX, FALSE); - if(colorInfo.saturationRemainingTime){ + if (colorInfo.saturationRemainingTime) + { sampleLight_colorTimerStop(); colorTimerEvt = TL_ZB_TIMER_SCHEDULE(sampleLight_colorTimerEvtCb, NULL, ZCL_COLOR_CHANGE_INTERVAL); - }else{ + } + else + { sampleLight_colorTimerStop(); } } @@ -596,8 +642,6 @@ static void sampleLight_moveToColorProcess(zcl_colorCtrlMoveToColorCmd_t *cmd) pColor->colorMode = ZCL_COLOR_MODE_CURRENT_X_Y; pColor->enhancedColorMode = ZCL_COLOR_MODE_CURRENT_X_Y; - - } /********************************************************************* @@ -617,8 +661,6 @@ static void sampleLight_moveColorProcess(zcl_colorCtrlMoveColorCmd_t *cmd) pColor->colorMode = ZCL_COLOR_MODE_CURRENT_X_Y; pColor->enhancedColorMode = ZCL_COLOR_MODE_CURRENT_X_Y; - - } /********************************************************************* @@ -638,8 +680,6 @@ static void sampleLight_stepColorProcess(zcl_colorCtrlStepColorCmd_t *cmd) pColor->colorMode = ZCL_COLOR_MODE_CURRENT_X_Y; pColor->enhancedColorMode = ZCL_COLOR_MODE_CURRENT_X_Y; - - } /********************************************************************* @@ -660,20 +700,19 @@ static void sampleLight_enhancedMoveToHueProcess(zcl_colorCtrlEnhancedMoveToHueC pColor->colorMode = ZCL_COLOR_MODE_CURRENT_HUE_SATURATION; pColor->enhancedColorMode = ZCL_ENHANCED_COLOR_MODE_CURRENT_HUE_SATURATION; - switch(cmd->direction){ - case COLOR_CTRL_DIRECTION_SHORTEST_DISTANCE: - break; - case COLOR_CTRL_DIRECTION_LONGEST_DISTANCE: - break; - case COLOR_CTRL_DIRECTION_UP: - break; - case COLOR_CTRL_DIRECTION_DOWN: - break; - default: - break; + switch (cmd->direction) + { + case COLOR_CTRL_DIRECTION_SHORTEST_DISTANCE: + break; + case COLOR_CTRL_DIRECTION_LONGEST_DISTANCE: + break; + case COLOR_CTRL_DIRECTION_UP: + break; + case COLOR_CTRL_DIRECTION_DOWN: + break; + default: + break; } - - } /********************************************************************* @@ -694,18 +733,17 @@ static void sampleLight_enhancedMoveHueProcess(zcl_colorCtrlEnhancedMoveHueCmd_t pColor->colorMode = ZCL_COLOR_MODE_CURRENT_HUE_SATURATION; pColor->enhancedColorMode = ZCL_ENHANCED_COLOR_MODE_CURRENT_HUE_SATURATION; - switch(cmd->moveMode){ - case COLOR_CTRL_MOVE_STOP: - break; - case COLOR_CTRL_MOVE_UP: - break; - case COLOR_CTRL_MOVE_DOWN: - break; - default: - break; + switch (cmd->moveMode) + { + case COLOR_CTRL_MOVE_STOP: + break; + case COLOR_CTRL_MOVE_UP: + break; + case COLOR_CTRL_MOVE_DOWN: + break; + default: + break; } - - } /********************************************************************* @@ -726,16 +764,15 @@ static void sampleLight_enhancedStepHueProcess(zcl_colorCtrlEnhancedStepHueCmd_t pColor->colorMode = ZCL_COLOR_MODE_CURRENT_HUE_SATURATION; pColor->enhancedColorMode = ZCL_ENHANCED_COLOR_MODE_CURRENT_HUE_SATURATION; - switch(cmd->stepMode){ - case COLOR_CTRL_STEP_MODE_UP: - break; - case COLOR_CTRL_STEP_MODE_DOWN: - break; - default: - break; + switch (cmd->stepMode) + { + case COLOR_CTRL_STEP_MODE_UP: + break; + case COLOR_CTRL_STEP_MODE_DOWN: + break; + default: + break; } - - } /********************************************************************* @@ -776,28 +813,33 @@ static void sampleLight_colorLoopSetProcess(zcl_colorCtrlColorLoopSetCmd_t *cmd) { zcl_lightColorCtrlAttr_t *pColor = zcl_colorAttrGet(); - if(cmd->updateFlags.bits.direction){ + if (cmd->updateFlags.bits.direction) + { pColor->colorLoopDirection = cmd->direction; } - if(cmd->updateFlags.bits.time){ + if (cmd->updateFlags.bits.time) + { pColor->colorLoopTime = cmd->time; } - if(cmd->updateFlags.bits.startHue){ + if (cmd->updateFlags.bits.startHue) + { pColor->colorLoopStartEnhancedHue = cmd->startHue; } - if(cmd->updateFlags.bits.action){ - switch(cmd->action){ - case COLOR_LOOP_SET_DEACTION: - break; - case COLOR_LOOP_SET_ACTION_FROM_COLOR_LOOP_START_ENHANCED_HUE: - break; - case COLOR_LOOP_SET_ACTION_FROM_ENHANCED_CURRENT_HUE: - break; - default: - break; + if (cmd->updateFlags.bits.action) + { + switch (cmd->action) + { + case COLOR_LOOP_SET_DEACTION: + break; + case COLOR_LOOP_SET_ACTION_FROM_COLOR_LOOP_START_ENHANCED_HUE: + break; + case COLOR_LOOP_SET_ACTION_FROM_ENHANCED_CURRENT_HUE: + break; + default: + break; } } } @@ -831,12 +873,15 @@ static void sampleLight_moveToColorTemperatureProcess(zcl_colorCtrlMoveToColorTe colorInfo.stepColorTemp256 /= (s32)colorInfo.colorTempRemainingTime; light_applyUpdate_16(&pColor->colorTemperatureMireds, &colorInfo.currentColorTemp256, &colorInfo.stepColorTemp256, &colorInfo.colorTempRemainingTime, - colorInfo.colorTempMinMireds, colorInfo.colorTempMaxMireds, FALSE); + colorInfo.colorTempMinMireds, colorInfo.colorTempMaxMireds, FALSE); - if(colorInfo.colorTempRemainingTime){ + if (colorInfo.colorTempRemainingTime) + { sampleLight_colorTimerStop(); colorTimerEvt = TL_ZB_TIMER_SCHEDULE(sampleLight_colorTimerEvtCb, NULL, ZCL_COLOR_CHANGE_INTERVAL); - }else{ + } + else + { sampleLight_colorTimerStop(); } } @@ -859,46 +904,56 @@ static void sampleLight_moveColorTemperatureProcess(zcl_colorCtrlMoveColorTemper pColor->colorMode = ZCL_COLOR_MODE_COLOR_TEMPERATURE_MIREDS; pColor->enhancedColorMode = ZCL_COLOR_MODE_COLOR_TEMPERATURE_MIREDS; - if(cmd->colorTempMinMireds){ + if (cmd->colorTempMinMireds) + { colorInfo.colorTempMinMireds = (cmd->colorTempMinMireds < pColor->colorTempPhysicalMinMireds) ? pColor->colorTempPhysicalMinMireds : cmd->colorTempMinMireds; - }else{ + } + else + { colorInfo.colorTempMinMireds = pColor->colorTempPhysicalMinMireds; } - if(cmd->colorTempMaxMireds){ + if (cmd->colorTempMaxMireds) + { colorInfo.colorTempMaxMireds = (cmd->colorTempMaxMireds > pColor->colorTempPhysicalMaxMireds) ? pColor->colorTempPhysicalMaxMireds : cmd->colorTempMaxMireds; - }else{ + } + else + { colorInfo.colorTempMaxMireds = pColor->colorTempPhysicalMaxMireds; } colorInfo.currentColorTemp256 = (u32)(pColor->colorTemperatureMireds) << 8; - switch(cmd->moveMode){ - case COLOR_CTRL_MOVE_STOP: - colorInfo.stepColorTemp256 = 0; - colorInfo.colorTempRemainingTime = 0; - break; - case COLOR_CTRL_MOVE_UP: - colorInfo.stepColorTemp256 = (((s32)cmd->rate) << 8) / 10; - colorInfo.colorTempRemainingTime = 0xFFFF; - break; - case COLOR_CTRL_MOVE_DOWN: - colorInfo.stepColorTemp256 = ((-(s32)cmd->rate) << 8) / 10; - colorInfo.colorTempRemainingTime = 0xFFFF; - break; - default: - break; + switch (cmd->moveMode) + { + case COLOR_CTRL_MOVE_STOP: + colorInfo.stepColorTemp256 = 0; + colorInfo.colorTempRemainingTime = 0; + break; + case COLOR_CTRL_MOVE_UP: + colorInfo.stepColorTemp256 = (((s32)cmd->rate) << 8) / 10; + colorInfo.colorTempRemainingTime = 0xFFFF; + break; + case COLOR_CTRL_MOVE_DOWN: + colorInfo.stepColorTemp256 = ((-(s32)cmd->rate) << 8) / 10; + colorInfo.colorTempRemainingTime = 0xFFFF; + break; + default: + break; } light_applyUpdate_16(&pColor->colorTemperatureMireds, &colorInfo.currentColorTemp256, &colorInfo.stepColorTemp256, &colorInfo.colorTempRemainingTime, - colorInfo.colorTempMinMireds, colorInfo.colorTempMaxMireds, FALSE); + colorInfo.colorTempMinMireds, colorInfo.colorTempMaxMireds, FALSE); - if(colorInfo.colorTempRemainingTime){ + if (colorInfo.colorTempRemainingTime) + { sampleLight_colorTimerStop(); colorTimerEvt = TL_ZB_TIMER_SCHEDULE(sampleLight_colorTimerEvtCb, NULL, ZCL_COLOR_CHANGE_INTERVAL); - }else{ + } + else + { sampleLight_colorTimerStop(); } } @@ -921,17 +976,23 @@ static void sampleLight_stepColorTemperatureProcess(zcl_colorCtrlStepColorTemper pColor->colorMode = ZCL_COLOR_MODE_COLOR_TEMPERATURE_MIREDS; pColor->enhancedColorMode = ZCL_COLOR_MODE_COLOR_TEMPERATURE_MIREDS; - if(cmd->colorTempMinMireds){ + if (cmd->colorTempMinMireds) + { colorInfo.colorTempMinMireds = (cmd->colorTempMinMireds < pColor->colorTempPhysicalMinMireds) ? pColor->colorTempPhysicalMinMireds : cmd->colorTempMinMireds; - }else{ + } + else + { colorInfo.colorTempMinMireds = pColor->colorTempPhysicalMinMireds; } - if(cmd->colorTempMaxMireds){ + if (cmd->colorTempMaxMireds) + { colorInfo.colorTempMaxMireds = (cmd->colorTempMaxMireds > pColor->colorTempPhysicalMaxMireds) ? pColor->colorTempPhysicalMaxMireds : cmd->colorTempMaxMireds; - }else{ + } + else + { colorInfo.colorTempMaxMireds = pColor->colorTempPhysicalMaxMireds; } @@ -941,28 +1002,31 @@ static void sampleLight_stepColorTemperatureProcess(zcl_colorCtrlStepColorTemper colorInfo.stepColorTemp256 = (((s32)cmd->stepSize) << 8) / colorInfo.colorTempRemainingTime; - switch(cmd->stepMode){ - case COLOR_CTRL_STEP_MODE_UP: - break; - case COLOR_CTRL_STEP_MODE_DOWN: - colorInfo.stepColorTemp256 = -colorInfo.stepColorTemp256; - break; - default: - break; + switch (cmd->stepMode) + { + case COLOR_CTRL_STEP_MODE_UP: + break; + case COLOR_CTRL_STEP_MODE_DOWN: + colorInfo.stepColorTemp256 = -colorInfo.stepColorTemp256; + break; + default: + break; } light_applyUpdate_16(&pColor->colorTemperatureMireds, &colorInfo.currentColorTemp256, &colorInfo.stepColorTemp256, &colorInfo.colorTempRemainingTime, - colorInfo.colorTempMinMireds, colorInfo.colorTempMaxMireds, FALSE); + colorInfo.colorTempMinMireds, colorInfo.colorTempMaxMireds, FALSE); - if(colorInfo.colorTempRemainingTime){ + if (colorInfo.colorTempRemainingTime) + { sampleLight_colorTimerStop(); colorTimerEvt = TL_ZB_TIMER_SCHEDULE(sampleLight_colorTimerEvtCb, NULL, ZCL_COLOR_CHANGE_INTERVAL); - }else{ + } + else + { sampleLight_colorTimerStop(); } } - /********************************************************************* * @fn sampleLight_stopMoveStepProcess * @@ -974,7 +1038,7 @@ static void sampleLight_stepColorTemperatureProcess(zcl_colorCtrlStepColorTemper */ static void sampleLight_stopMoveStepProcess(void) { - //zcl_lightColorCtrlAttr_t *pColor = zcl_colorAttrGet(); + // zcl_lightColorCtrlAttr_t *pColor = zcl_colorAttrGet(); colorInfo.hueRemainingTime = 0; colorInfo.saturationRemainingTime = 0; @@ -996,73 +1060,75 @@ static void sampleLight_stopMoveStepProcess(void) */ status_t sampleLight_colorCtrlCb(zclIncomingAddrInfo_t *pAddrInfo, u8 cmdId, void *cmdPayload) { - if(pAddrInfo->dstEp == SAMPLE_LIGHT_ENDPOINT){ - switch(cmdId){ - case ZCL_CMD_LIGHT_COLOR_CONTROL_MOVE_TO_HUE: - sampleLight_moveToHueProcess((zcl_colorCtrlMoveToHueCmd_t *)cmdPayload); - break; - case ZCL_CMD_LIGHT_COLOR_CONTROL_MOVE_HUE: - sampleLight_moveHueProcess((zcl_colorCtrlMoveHueCmd_t *)cmdPayload); - break; - case ZCL_CMD_LIGHT_COLOR_CONTROL_STEP_HUE: - sampleLight_stepHueProcess((zcl_colorCtrlStepHueCmd_t *)cmdPayload); - break; - case ZCL_CMD_LIGHT_COLOR_CONTROL_MOVE_TO_SATURATION: - sampleLight_moveToSaturationProcess((zcl_colorCtrlMoveToSaturationCmd_t *)cmdPayload); - break; - case ZCL_CMD_LIGHT_COLOR_CONTROL_MOVE_SATURATION: - sampleLight_moveSaturationProcess((zcl_colorCtrlMoveSaturationCmd_t *)cmdPayload); - break; - case ZCL_CMD_LIGHT_COLOR_CONTROL_STEP_SATURATION: - sampleLight_stepSaturationProcess((zcl_colorCtrlStepSaturationCmd_t *)cmdPayload); - break; - case ZCL_CMD_LIGHT_COLOR_CONTROL_MOVE_TO_HUE_AND_SATURATION: - sampleLight_moveToHueAndSaturationProcess((zcl_colorCtrlMoveToHueAndSaturationCmd_t *)cmdPayload); - break; - case ZCL_CMD_LIGHT_COLOR_CONTROL_MOVE_TO_COLOR: - sampleLight_moveToColorProcess((zcl_colorCtrlMoveToColorCmd_t *)cmdPayload); - break; - case ZCL_CMD_LIGHT_COLOR_CONTROL_MOVE_COLOR: - sampleLight_moveColorProcess((zcl_colorCtrlMoveColorCmd_t *)cmdPayload); - break; - case ZCL_CMD_LIGHT_COLOR_CONTROL_STEP_COLOR: - sampleLight_stepColorProcess((zcl_colorCtrlStepColorCmd_t *)cmdPayload); - break; - case ZCL_CMD_LIGHT_COLOR_CONTROL_ENHANCED_MOVE_TO_HUE: - sampleLight_enhancedMoveToHueProcess((zcl_colorCtrlEnhancedMoveToHueCmd_t *)cmdPayload); - break; - case ZCL_CMD_LIGHT_COLOR_CONTROL_ENHANCED_MOVE_HUE: - sampleLight_enhancedMoveHueProcess((zcl_colorCtrlEnhancedMoveHueCmd_t *)cmdPayload); - break; - case ZCL_CMD_LIGHT_COLOR_CONTROL_ENHANCED_STEP_HUE: - sampleLight_enhancedStepHueProcess((zcl_colorCtrlEnhancedStepHueCmd_t *)cmdPayload); - break; - case ZCL_CMD_LIGHT_COLOR_CONTROL_ENHANCED_MOVE_TO_HUE_AND_SATURATION: - sampleLight_enhancedMoveToHueAndSaturationProcess((zcl_colorCtrlEnhancedMoveToHueAndSaturationCmd_t *)cmdPayload); - break; - case ZCL_CMD_LIGHT_COLOR_CONTROL_COLOR_LOOP_SET: - sampleLight_colorLoopSetProcess((zcl_colorCtrlColorLoopSetCmd_t *)cmdPayload); - break; - case ZCL_CMD_LIGHT_COLOR_CONTROL_MOVE_TO_COLOR_TEMPERATURE: - sampleLight_moveToColorTemperatureProcess((zcl_colorCtrlMoveToColorTemperatureCmd_t *)cmdPayload); - break; - case ZCL_CMD_LIGHT_COLOR_CONTROL_MOVE_COLOR_TEMPERATURE: - sampleLight_moveColorTemperatureProcess((zcl_colorCtrlMoveColorTemperatureCmd_t *)cmdPayload); - break; - case ZCL_CMD_LIGHT_COLOR_CONTROL_STEP_COLOR_TEMPERATURE: - sampleLight_stepColorTemperatureProcess((zcl_colorCtrlStepColorTemperatureCmd_t *)cmdPayload); - break; - case ZCL_CMD_LIGHT_COLOR_CONTROL_STOP_MOVE_STEP: - sampleLight_stopMoveStepProcess(); - break; - default: - break; + if (pAddrInfo->dstEp == SAMPLE_LIGHT_ENDPOINT) + { + switch (cmdId) + { + case ZCL_CMD_LIGHT_COLOR_CONTROL_MOVE_TO_HUE: + sampleLight_moveToHueProcess((zcl_colorCtrlMoveToHueCmd_t *)cmdPayload); + break; + case ZCL_CMD_LIGHT_COLOR_CONTROL_MOVE_HUE: + sampleLight_moveHueProcess((zcl_colorCtrlMoveHueCmd_t *)cmdPayload); + break; + case ZCL_CMD_LIGHT_COLOR_CONTROL_STEP_HUE: + sampleLight_stepHueProcess((zcl_colorCtrlStepHueCmd_t *)cmdPayload); + break; + case ZCL_CMD_LIGHT_COLOR_CONTROL_MOVE_TO_SATURATION: + sampleLight_moveToSaturationProcess((zcl_colorCtrlMoveToSaturationCmd_t *)cmdPayload); + break; + case ZCL_CMD_LIGHT_COLOR_CONTROL_MOVE_SATURATION: + sampleLight_moveSaturationProcess((zcl_colorCtrlMoveSaturationCmd_t *)cmdPayload); + break; + case ZCL_CMD_LIGHT_COLOR_CONTROL_STEP_SATURATION: + sampleLight_stepSaturationProcess((zcl_colorCtrlStepSaturationCmd_t *)cmdPayload); + break; + case ZCL_CMD_LIGHT_COLOR_CONTROL_MOVE_TO_HUE_AND_SATURATION: + sampleLight_moveToHueAndSaturationProcess((zcl_colorCtrlMoveToHueAndSaturationCmd_t *)cmdPayload); + break; + case ZCL_CMD_LIGHT_COLOR_CONTROL_MOVE_TO_COLOR: + sampleLight_moveToColorProcess((zcl_colorCtrlMoveToColorCmd_t *)cmdPayload); + break; + case ZCL_CMD_LIGHT_COLOR_CONTROL_MOVE_COLOR: + sampleLight_moveColorProcess((zcl_colorCtrlMoveColorCmd_t *)cmdPayload); + break; + case ZCL_CMD_LIGHT_COLOR_CONTROL_STEP_COLOR: + sampleLight_stepColorProcess((zcl_colorCtrlStepColorCmd_t *)cmdPayload); + break; + case ZCL_CMD_LIGHT_COLOR_CONTROL_ENHANCED_MOVE_TO_HUE: + sampleLight_enhancedMoveToHueProcess((zcl_colorCtrlEnhancedMoveToHueCmd_t *)cmdPayload); + break; + case ZCL_CMD_LIGHT_COLOR_CONTROL_ENHANCED_MOVE_HUE: + sampleLight_enhancedMoveHueProcess((zcl_colorCtrlEnhancedMoveHueCmd_t *)cmdPayload); + break; + case ZCL_CMD_LIGHT_COLOR_CONTROL_ENHANCED_STEP_HUE: + sampleLight_enhancedStepHueProcess((zcl_colorCtrlEnhancedStepHueCmd_t *)cmdPayload); + break; + case ZCL_CMD_LIGHT_COLOR_CONTROL_ENHANCED_MOVE_TO_HUE_AND_SATURATION: + sampleLight_enhancedMoveToHueAndSaturationProcess((zcl_colorCtrlEnhancedMoveToHueAndSaturationCmd_t *)cmdPayload); + break; + case ZCL_CMD_LIGHT_COLOR_CONTROL_COLOR_LOOP_SET: + sampleLight_colorLoopSetProcess((zcl_colorCtrlColorLoopSetCmd_t *)cmdPayload); + break; + case ZCL_CMD_LIGHT_COLOR_CONTROL_MOVE_TO_COLOR_TEMPERATURE: + sampleLight_moveToColorTemperatureProcess((zcl_colorCtrlMoveToColorTemperatureCmd_t *)cmdPayload); + break; + case ZCL_CMD_LIGHT_COLOR_CONTROL_MOVE_COLOR_TEMPERATURE: + sampleLight_moveColorTemperatureProcess((zcl_colorCtrlMoveColorTemperatureCmd_t *)cmdPayload); + break; + case ZCL_CMD_LIGHT_COLOR_CONTROL_STEP_COLOR_TEMPERATURE: + sampleLight_stepColorTemperatureProcess((zcl_colorCtrlStepColorTemperatureCmd_t *)cmdPayload); + break; + case ZCL_CMD_LIGHT_COLOR_CONTROL_STOP_MOVE_STEP: + sampleLight_stopMoveStepProcess(); + break; + default: + break; } } return ZCL_STA_SUCCESS; } -#endif /* ZCL_LIGHT_COLOR_CONTROL */ +#endif /* ZCL_LIGHT_COLOR_CONTROL */ -#endif /* __PROJECT_TL_DIMMABLE_LIGHT__ */ +#endif /* __PROJECT_TL_DIMMABLE_LIGHT__ */ diff --git a/zcl_levelCb.c b/zcl_levelCb.c index 6321a34..6008ec2 100644 --- a/zcl_levelCb.c +++ b/zcl_levelCb.c @@ -36,24 +36,25 @@ /********************************************************************** * LOCAL CONSTANTS */ -#define ZCL_LEVEL_CHANGE_INTERVAL 100 +#define ZCL_LEVEL_CHANGE_INTERVAL 100 /********************************************************************** * TYPEDEFS */ -typedef struct{ +typedef struct +{ s32 stepLevel256; - u16 currentLevel256; - u8 withOnOff; -}zcl_levelInfo_t; + u16 currentLevel256; + u8 withOnOff; +} zcl_levelInfo_t; /********************************************************************** * LOCAL VARIABLES */ static zcl_levelInfo_t levelInfo = { - .stepLevel256 = 0, - .currentLevel256 = 0, - .withOnOff = 0, + .stepLevel256 = 0, + .currentLevel256 = 0, + .withOnOff = 0, }; static ev_timer_event_t *levelTimerEvt = NULL; @@ -80,7 +81,7 @@ void sampleLight_levelInit(void) levelInfo.currentLevel256 = (u16)(pLevel->curLevel) << 8; light_applyUpdate(&pLevel->curLevel, &levelInfo.currentLevel256, &levelInfo.stepLevel256, &pLevel->remainingTime, - ZCL_LEVEL_ATTR_MIN_LEVEL, ZCL_LEVEL_ATTR_MAX_LEVEL, FALSE); + ZCL_LEVEL_ATTR_MIN_LEVEL, ZCL_LEVEL_ATTR_MAX_LEVEL, FALSE); } /********************************************************************* @@ -108,24 +109,30 @@ void sampleLight_updateLevel(void) * * @return 0: timer continue on; -1: timer will be canceled */ -static s32 sampleLight_levelTimerEvtCb(void * arg) +static s32 sampleLight_levelTimerEvtCb(void *arg) { zcl_levelAttr_t *pLevel = zcl_levelAttrGet(); - if(pLevel->remainingTime){ + if (pLevel->remainingTime) + { light_applyUpdate(&pLevel->curLevel, &levelInfo.currentLevel256, &levelInfo.stepLevel256, &pLevel->remainingTime, - ZCL_LEVEL_ATTR_MIN_LEVEL, ZCL_LEVEL_ATTR_MAX_LEVEL, FALSE); + ZCL_LEVEL_ATTR_MIN_LEVEL, ZCL_LEVEL_ATTR_MAX_LEVEL, FALSE); } - if(levelInfo.withOnOff){ - if(pLevel->curLevel == ZCL_LEVEL_ATTR_MIN_LEVEL){ + if (levelInfo.withOnOff) + { + if (pLevel->curLevel == ZCL_LEVEL_ATTR_MIN_LEVEL) + { sampleLight_onoff(ZCL_CMD_ONOFF_OFF); } } - if(pLevel->remainingTime){ + if (pLevel->remainingTime) + { return 0; - }else{ + } + else + { levelTimerEvt = NULL; return -1; } @@ -142,7 +149,8 @@ static s32 sampleLight_levelTimerEvtCb(void * arg) */ static void sampleLight_LevelTimerStop(void) { - if(levelTimerEvt){ + if (levelTimerEvt) + { TL_ZB_TIMER_CANCEL(&levelTimerEvt); } } @@ -169,20 +177,27 @@ static void sampleLight_moveToLevelProcess(u8 cmdId, moveToLvl_t *cmd) levelInfo.stepLevel256 /= (s32)pLevel->remainingTime; light_applyUpdate(&pLevel->curLevel, &levelInfo.currentLevel256, &levelInfo.stepLevel256, &pLevel->remainingTime, - ZCL_LEVEL_ATTR_MIN_LEVEL, ZCL_LEVEL_ATTR_MAX_LEVEL, FALSE); + ZCL_LEVEL_ATTR_MIN_LEVEL, ZCL_LEVEL_ATTR_MAX_LEVEL, FALSE); - if(levelInfo.withOnOff){ - if(levelInfo.stepLevel256 > 0){ + if (levelInfo.withOnOff) + { + if (levelInfo.stepLevel256 > 0) + { sampleLight_onoff(ZCL_CMD_ONOFF_ON); - }else if(pLevel->curLevel == ZCL_LEVEL_ATTR_MIN_LEVEL){ + } + else if (pLevel->curLevel == ZCL_LEVEL_ATTR_MIN_LEVEL) + { sampleLight_onoff(ZCL_CMD_ONOFF_OFF); } } - if(pLevel->remainingTime){ + if (pLevel->remainingTime) + { sampleLight_LevelTimerStop(); levelTimerEvt = TL_ZB_TIMER_SCHEDULE(sampleLight_levelTimerEvtCb, NULL, ZCL_LEVEL_CHANGE_INTERVAL); - }else{ + } + else + { sampleLight_LevelTimerStop(); } } @@ -207,40 +222,51 @@ static void sampleLight_moveProcess(u8 cmdId, move_t *cmd) u32 rate = (u32)cmd->rate * 100; u8 newLevel; u8 deltaLevel; - if(cmd->moveMode == LEVEL_MOVE_UP){ + if (cmd->moveMode == LEVEL_MOVE_UP) + { newLevel = ZCL_LEVEL_ATTR_MAX_LEVEL; deltaLevel = ZCL_LEVEL_ATTR_MAX_LEVEL - pLevel->curLevel; - }else{ + } + else + { newLevel = ZCL_LEVEL_ATTR_MIN_LEVEL; deltaLevel = pLevel->curLevel - ZCL_LEVEL_ATTR_MIN_LEVEL; } pLevel->remainingTime = ((u32)deltaLevel * 1000) / rate; - if(pLevel->remainingTime == 0){ + if (pLevel->remainingTime == 0) + { pLevel->remainingTime = 1; } levelInfo.stepLevel256 = ((s32)(newLevel - pLevel->curLevel)) << 8; levelInfo.stepLevel256 /= (s32)pLevel->remainingTime; - if(cmd->moveMode == LEVEL_MOVE_UP){ - if(levelInfo.withOnOff){ + if (cmd->moveMode == LEVEL_MOVE_UP) + { + if (levelInfo.withOnOff) + { sampleLight_onoff(ZCL_CMD_ONOFF_ON); } } light_applyUpdate(&pLevel->curLevel, &levelInfo.currentLevel256, &levelInfo.stepLevel256, &pLevel->remainingTime, - ZCL_LEVEL_ATTR_MIN_LEVEL, ZCL_LEVEL_ATTR_MAX_LEVEL, FALSE); + ZCL_LEVEL_ATTR_MIN_LEVEL, ZCL_LEVEL_ATTR_MAX_LEVEL, FALSE); - if(levelInfo.withOnOff){ - if(pLevel->curLevel == ZCL_LEVEL_ATTR_MIN_LEVEL){ + if (levelInfo.withOnOff) + { + if (pLevel->curLevel == ZCL_LEVEL_ATTR_MIN_LEVEL) + { sampleLight_onoff(ZCL_CMD_ONOFF_OFF); } } - if(pLevel->remainingTime){ + if (pLevel->remainingTime) + { sampleLight_LevelTimerStop(); levelTimerEvt = TL_ZB_TIMER_SCHEDULE(sampleLight_levelTimerEvtCb, NULL, ZCL_LEVEL_CHANGE_INTERVAL); - }else{ + } + else + { sampleLight_LevelTimerStop(); } } @@ -265,27 +291,36 @@ static void sampleLight_stepProcess(u8 cmdId, step_t *cmd) levelInfo.currentLevel256 = (u16)(pLevel->curLevel) << 8; levelInfo.stepLevel256 = (((s32)cmd->stepSize) << 8) / pLevel->remainingTime; - if(cmd->stepMode == LEVEL_STEP_UP){ - if(levelInfo.withOnOff){ + if (cmd->stepMode == LEVEL_STEP_UP) + { + if (levelInfo.withOnOff) + { sampleLight_onoff(ZCL_CMD_ONOFF_ON); } - }else{ + } + else + { levelInfo.stepLevel256 = -levelInfo.stepLevel256; } light_applyUpdate(&pLevel->curLevel, &levelInfo.currentLevel256, &levelInfo.stepLevel256, &pLevel->remainingTime, - ZCL_LEVEL_ATTR_MIN_LEVEL, ZCL_LEVEL_ATTR_MAX_LEVEL, FALSE); + ZCL_LEVEL_ATTR_MIN_LEVEL, ZCL_LEVEL_ATTR_MAX_LEVEL, FALSE); - if(levelInfo.withOnOff){ - if(pLevel->curLevel == ZCL_LEVEL_ATTR_MIN_LEVEL){ + if (levelInfo.withOnOff) + { + if (pLevel->curLevel == ZCL_LEVEL_ATTR_MIN_LEVEL) + { sampleLight_onoff(ZCL_CMD_ONOFF_OFF); } } - if(pLevel->remainingTime){ + if (pLevel->remainingTime) + { sampleLight_LevelTimerStop(); levelTimerEvt = TL_ZB_TIMER_SCHEDULE(sampleLight_levelTimerEvtCb, NULL, ZCL_LEVEL_CHANGE_INTERVAL); - }else{ + } + else + { sampleLight_LevelTimerStop(); } } @@ -323,32 +358,34 @@ static void sampleLight_stopProcess(u8 cmdId, stop_t *cmd) */ status_t sampleLight_levelCb(zclIncomingAddrInfo_t *pAddrInfo, u8 cmdId, void *cmdPayload) { - if(pAddrInfo->dstEp == SAMPLE_LIGHT_ENDPOINT){ - switch(cmdId){ - case ZCL_CMD_LEVEL_MOVE_TO_LEVEL: - case ZCL_CMD_LEVEL_MOVE_TO_LEVEL_WITH_ON_OFF: - sampleLight_moveToLevelProcess(cmdId, (moveToLvl_t *)cmdPayload); - break; - case ZCL_CMD_LEVEL_MOVE: - case ZCL_CMD_LEVEL_MOVE_WITH_ON_OFF: - sampleLight_moveProcess(cmdId, (move_t *)cmdPayload); - break; - case ZCL_CMD_LEVEL_STEP: - case ZCL_CMD_LEVEL_STEP_WITH_ON_OFF: - sampleLight_stepProcess(cmdId, (step_t *)cmdPayload); - break; - case ZCL_CMD_LEVEL_STOP: - case ZCL_CMD_LEVEL_STOP_WITH_ON_OFF: - sampleLight_stopProcess(cmdId, (stop_t *)cmdPayload); - break; - default: - break; + if (pAddrInfo->dstEp == SAMPLE_LIGHT_ENDPOINT) + { + switch (cmdId) + { + case ZCL_CMD_LEVEL_MOVE_TO_LEVEL: + case ZCL_CMD_LEVEL_MOVE_TO_LEVEL_WITH_ON_OFF: + sampleLight_moveToLevelProcess(cmdId, (moveToLvl_t *)cmdPayload); + break; + case ZCL_CMD_LEVEL_MOVE: + case ZCL_CMD_LEVEL_MOVE_WITH_ON_OFF: + sampleLight_moveProcess(cmdId, (move_t *)cmdPayload); + break; + case ZCL_CMD_LEVEL_STEP: + case ZCL_CMD_LEVEL_STEP_WITH_ON_OFF: + sampleLight_stepProcess(cmdId, (step_t *)cmdPayload); + break; + case ZCL_CMD_LEVEL_STOP: + case ZCL_CMD_LEVEL_STOP_WITH_ON_OFF: + sampleLight_stopProcess(cmdId, (stop_t *)cmdPayload); + break; + default: + break; } } return ZCL_STA_SUCCESS; } -#endif /* ZCL_LEVEL_CTRL */ +#endif /* ZCL_LEVEL_CTRL */ -#endif /* __PROJECT_TL_DIMMABLE_LIGHT__ */ +#endif /* __PROJECT_TL_DIMMABLE_LIGHT__ */ diff --git a/zcl_onOffCb.c b/zcl_onOffCb.c index 6203556..157f12d 100644 --- a/zcl_onOffCb.c +++ b/zcl_onOffCb.c @@ -35,7 +35,7 @@ /********************************************************************** * LOCAL CONSTANTS */ -#define ZCL_ONOFF_TIMER_INTERVAL 100 //the timer interval to change the offWaitTime/onTime attribute of the ONOFF cluster +#define ZCL_ONOFF_TIMER_INTERVAL 100 // the timer interval to change the offWaitTime/onTime attribute of the ONOFF cluster /********************************************************************** * LOCAL VARIABLES @@ -91,25 +91,35 @@ void sampleLight_onoff(u8 cmd) { zcl_onOffAttr_t *pOnOff = zcl_onoffAttrGet(); - if(cmd == ZCL_CMD_ONOFF_ON){ + if (cmd == ZCL_CMD_ONOFF_ON) + { pOnOff->globalSceneControl = TRUE; pOnOff->onOff = ZCL_ONOFF_STATUS_ON; - if(pOnOff->onTime == 0){ + if (pOnOff->onTime == 0) + { pOnOff->offWaitTime = 0; } - }else if(cmd == ZCL_CMD_ONOFF_OFF){ + } + else if (cmd == ZCL_CMD_ONOFF_OFF) + { pOnOff->onOff = ZCL_ONOFF_STATUS_OFF; pOnOff->onTime = 0; - }else{ - if(pOnOff->onOff == ZCL_ONOFF_STATUS_OFF){ + } + else + { + if (pOnOff->onOff == ZCL_ONOFF_STATUS_OFF) + { pOnOff->globalSceneControl = TRUE; pOnOff->onOff = ZCL_ONOFF_STATUS_ON; - if(pOnOff->onTime == 0){ + if (pOnOff->onTime == 0) + { pOnOff->offWaitTime = 0; } - }else{ + } + else + { pOnOff->onOff = ZCL_ONOFF_STATUS_OFF; pOnOff->onTime = 0; } @@ -136,25 +146,32 @@ static s32 sampleLight_OnWithTimedOffTimerCb(void *arg) { zcl_onOffAttr_t *pOnOff = zcl_onoffAttrGet(); - if((pOnOff->onOff == ZCL_ONOFF_STATUS_ON) && pOnOff->onTime){ + if ((pOnOff->onOff == ZCL_ONOFF_STATUS_ON) && pOnOff->onTime) + { pOnOff->onTime--; - if(pOnOff->onTime <= 0){ + if (pOnOff->onTime <= 0) + { pOnOff->offWaitTime = 0; sampleLight_onoff(ZCL_CMD_ONOFF_OFF); } } - if((pOnOff->onOff == ZCL_ONOFF_STATUS_OFF) && pOnOff->offWaitTime){ + if ((pOnOff->onOff == ZCL_ONOFF_STATUS_OFF) && pOnOff->offWaitTime) + { pOnOff->offWaitTime--; - if(pOnOff->offWaitTime <= 0){ + if (pOnOff->offWaitTime <= 0) + { onWithTimedOffTimerEvt = NULL; return -1; } } - if(pOnOff->onTime || pOnOff->offWaitTime){ + if (pOnOff->onTime || pOnOff->offWaitTime) + { return 0; - }else{ + } + else + { onWithTimedOffTimerEvt = NULL; return -1; } @@ -171,7 +188,8 @@ static s32 sampleLight_OnWithTimedOffTimerCb(void *arg) */ static void sampleLight_OnWithTimedOffTimerStop(void) { - if(onWithTimedOffTimerEvt){ + if (onWithTimedOffTimerEvt) + { TL_ZB_TIMER_CANCEL(&onWithTimedOffTimerEvt); } } @@ -189,20 +207,26 @@ static void sampleLight_onoff_onWithTimedOffProcess(zcl_onoff_onWithTimeOffCmd_t { zcl_onOffAttr_t *pOnOff = zcl_onoffAttrGet(); - if(cmd->onOffCtrl.bits.acceptOnlyWhenOn && (pOnOff->onOff == ZCL_ONOFF_STATUS_OFF)){ + if (cmd->onOffCtrl.bits.acceptOnlyWhenOn && (pOnOff->onOff == ZCL_ONOFF_STATUS_OFF)) + { return; } - if(pOnOff->offWaitTime && (pOnOff->onOff == ZCL_ONOFF_STATUS_OFF)){ + if (pOnOff->offWaitTime && (pOnOff->onOff == ZCL_ONOFF_STATUS_OFF)) + { pOnOff->offWaitTime = min2(pOnOff->offWaitTime, cmd->offWaitTime); - }else{ + } + else + { pOnOff->onTime = max2(pOnOff->onTime, cmd->onTime); pOnOff->offWaitTime = cmd->offWaitTime; sampleLight_onoff(ZCL_CMD_ONOFF_ON); } - if((pOnOff->onTime < 0xFFFF) && (pOnOff->offWaitTime < 0xFFFF)){ - if(pOnOff->onTime || pOnOff->offWaitTime){ + if ((pOnOff->onTime < 0xFFFF) && (pOnOff->offWaitTime < 0xFFFF)) + { + if (pOnOff->onTime || pOnOff->offWaitTime) + { sampleLight_OnWithTimedOffTimerStop(); onWithTimedOffTimerEvt = TL_ZB_TIMER_SCHEDULE(sampleLight_OnWithTimedOffTimerCb, NULL, ZCL_ONOFF_TIMER_INTERVAL); } @@ -220,7 +244,7 @@ static void sampleLight_onoff_onWithTimedOffProcess(zcl_onoff_onWithTimeOffCmd_t */ static void sampleLight_onoff_offWithEffectProcess(zcl_onoff_offWithEffectCmd_t *cmd) { - //TODO: FIXED ME + // TODO: FIXED ME sampleLight_onoff(ZCL_CMD_ONOFF_OFF); } @@ -236,7 +260,6 @@ static void sampleLight_onoff_offWithEffectProcess(zcl_onoff_offWithEffectCmd_t */ static void sampleLight_onoff_onWithRecallGlobalSceneProcess(void) { - } /********************************************************************* @@ -254,36 +277,40 @@ status_t sampleLight_onOffCb(zclIncomingAddrInfo_t *pAddrInfo, u8 cmdId, void *c { zcl_onOffAttr_t *pOnOff = zcl_onoffAttrGet(); - if(pAddrInfo->dstEp == SAMPLE_LIGHT_ENDPOINT){ - switch(cmdId){ - case ZCL_CMD_ONOFF_ON: - case ZCL_CMD_ONOFF_OFF: - case ZCL_CMD_ONOFF_TOGGLE: - sampleLight_onoff(cmdId); - break; - case ZCL_CMD_OFF_WITH_EFFECT: - if(pOnOff->globalSceneControl == TRUE){ - /* TODO: store its settings in its global scene */ + if (pAddrInfo->dstEp == SAMPLE_LIGHT_ENDPOINT) + { + switch (cmdId) + { + case ZCL_CMD_ONOFF_ON: + case ZCL_CMD_ONOFF_OFF: + case ZCL_CMD_ONOFF_TOGGLE: + sampleLight_onoff(cmdId); + break; + case ZCL_CMD_OFF_WITH_EFFECT: + if (pOnOff->globalSceneControl == TRUE) + { + /* TODO: store its settings in its global scene */ - pOnOff->globalSceneControl = FALSE; - } - sampleLight_onoff_offWithEffectProcess((zcl_onoff_offWithEffectCmd_t *)cmdPayload); - break; - case ZCL_CMD_ON_WITH_RECALL_GLOBAL_SCENE: - if(pOnOff->globalSceneControl == FALSE){ - sampleLight_onoff_onWithRecallGlobalSceneProcess(); - pOnOff->globalSceneControl = TRUE; - } - break; - case ZCL_CMD_ON_WITH_TIMED_OFF: - sampleLight_onoff_onWithTimedOffProcess((zcl_onoff_onWithTimeOffCmd_t *)cmdPayload); - break; - default: - break; + pOnOff->globalSceneControl = FALSE; + } + sampleLight_onoff_offWithEffectProcess((zcl_onoff_offWithEffectCmd_t *)cmdPayload); + break; + case ZCL_CMD_ON_WITH_RECALL_GLOBAL_SCENE: + if (pOnOff->globalSceneControl == FALSE) + { + sampleLight_onoff_onWithRecallGlobalSceneProcess(); + pOnOff->globalSceneControl = TRUE; + } + break; + case ZCL_CMD_ON_WITH_TIMED_OFF: + sampleLight_onoff_onWithTimedOffProcess((zcl_onoff_onWithTimeOffCmd_t *)cmdPayload); + break; + default: + break; } } return ZCL_STA_SUCCESS; } -#endif /* __PROJECT_TL_DIMMABLE_LIGHT__ */ +#endif /* __PROJECT_TL_DIMMABLE_LIGHT__ */ diff --git a/zcl_sampleLightCb.c b/zcl_sampleLightCb.c index d045af4..26b80fc 100644 --- a/zcl_sampleLightCb.c +++ b/zcl_sampleLightCb.c @@ -37,13 +37,10 @@ * LOCAL CONSTANTS */ - - /********************************************************************** * TYPEDEFS */ - /********************************************************************** * LOCAL FUNCTIONS */ @@ -61,12 +58,10 @@ static void sampleLight_zclReportCmd(zclReportCmd_t *pReportCmd); #endif static void sampleLight_zclDfltRspCmd(zclDefaultRspCmd_t *pDftRspCmd); - /********************************************************************** * GLOBAL VARIABLES */ - /********************************************************************** * LOCAL VARIABLES */ @@ -74,7 +69,6 @@ static void sampleLight_zclDfltRspCmd(zclDefaultRspCmd_t *pDftRspCmd); static ev_timer_event_t *identifyTimerEvt = NULL; #endif - /********************************************************************** * FUNCTIONS */ @@ -90,39 +84,39 @@ static ev_timer_event_t *identifyTimerEvt = NULL; */ void sampleLight_zclProcessIncomingMsg(zclIncoming_t *pInHdlrMsg) { -// printf("sampleLight_zclProcessIncomingMsg\n"); + // printf("sampleLight_zclProcessIncomingMsg\n"); - switch(pInHdlrMsg->hdr.cmd) + switch (pInHdlrMsg->hdr.cmd) { #ifdef ZCL_READ - case ZCL_CMD_READ_RSP: - sampleLight_zclReadRspCmd(pInHdlrMsg->attrCmd); - break; + case ZCL_CMD_READ_RSP: + sampleLight_zclReadRspCmd(pInHdlrMsg->attrCmd); + break; #endif #ifdef ZCL_WRITE - case ZCL_CMD_WRITE: - sampleLight_zclWriteReqCmd(pInHdlrMsg->msg->indInfo.cluster_id, pInHdlrMsg->attrCmd); - break; - case ZCL_CMD_WRITE_RSP: - sampleLight_zclWriteRspCmd(pInHdlrMsg->attrCmd); - break; + case ZCL_CMD_WRITE: + sampleLight_zclWriteReqCmd(pInHdlrMsg->msg->indInfo.cluster_id, pInHdlrMsg->attrCmd); + break; + case ZCL_CMD_WRITE_RSP: + sampleLight_zclWriteRspCmd(pInHdlrMsg->attrCmd); + break; #endif #ifdef ZCL_REPORT - case ZCL_CMD_CONFIG_REPORT: - sampleLight_zclCfgReportCmd(pInHdlrMsg->attrCmd); - break; - case ZCL_CMD_CONFIG_REPORT_RSP: - sampleLight_zclCfgReportRspCmd(pInHdlrMsg->attrCmd); - break; - case ZCL_CMD_REPORT: - sampleLight_zclReportCmd(pInHdlrMsg->attrCmd); - break; + case ZCL_CMD_CONFIG_REPORT: + sampleLight_zclCfgReportCmd(pInHdlrMsg->attrCmd); + break; + case ZCL_CMD_CONFIG_REPORT_RSP: + sampleLight_zclCfgReportRspCmd(pInHdlrMsg->attrCmd); + break; + case ZCL_CMD_REPORT: + sampleLight_zclReportCmd(pInHdlrMsg->attrCmd); + break; #endif - case ZCL_CMD_DEFAULT_RSP: - sampleLight_zclDfltRspCmd(pInHdlrMsg->attrCmd); - break; - default: - break; + case ZCL_CMD_DEFAULT_RSP: + sampleLight_zclDfltRspCmd(pInHdlrMsg->attrCmd); + break; + default: + break; } } @@ -138,8 +132,7 @@ void sampleLight_zclProcessIncomingMsg(zclIncoming_t *pInHdlrMsg) */ static void sampleLight_zclReadRspCmd(zclReadRspCmd_t *pReadRspCmd) { -// printf("sampleLight_zclReadRspCmd\n"); - + // printf("sampleLight_zclReadRspCmd\n"); } #endif @@ -158,9 +151,12 @@ static void sampleLight_zclWriteReqCmd(u16 clusterId, zclWriteCmd_t *pWriteReqCm u8 numAttr = pWriteReqCmd->numAttr; zclWriteRec_t *attr = pWriteReqCmd->attrList; - if(clusterId == ZCL_CLUSTER_GEN_ON_OFF){ - for(u8 i = 0; i < numAttr; i++){ - if(attr[i].attrID == ZCL_ATTRID_START_UP_ONOFF){ + if (clusterId == ZCL_CLUSTER_GEN_ON_OFF) + { + for (u8 i = 0; i < numAttr; i++) + { + if (attr[i].attrID == ZCL_ATTRID_START_UP_ONOFF) + { zcl_onOffAttr_save(); } } @@ -178,12 +174,10 @@ static void sampleLight_zclWriteReqCmd(u16 clusterId, zclWriteCmd_t *pWriteReqCm */ static void sampleLight_zclWriteRspCmd(zclWriteRspCmd_t *pWriteRspCmd) { -// printf("sampleLight_zclWriteRspCmd\n"); - + // printf("sampleLight_zclWriteRspCmd\n"); } #endif - /********************************************************************* * @fn sampleLight_zclDfltRspCmd * @@ -197,9 +191,11 @@ static void sampleLight_zclDfltRspCmd(zclDefaultRspCmd_t *pDftRspCmd) { // printf("sampleLight_zclDfltRspCmd\n"); #ifdef ZCL_OTA - if( (pDftRspCmd->commandID == ZCL_CMD_OTA_UPGRADE_END_REQ) && - (pDftRspCmd->statusCode == ZCL_STA_ABORT) ){ - if(zcl_attr_imageUpgradeStatus == IMAGE_UPGRADE_STATUS_DOWNLOAD_COMPLETE){ + if ((pDftRspCmd->commandID == ZCL_CMD_OTA_UPGRADE_END_REQ) && + (pDftRspCmd->statusCode == ZCL_STA_ABORT)) + { + if (zcl_attr_imageUpgradeStatus == IMAGE_UPGRADE_STATUS_DOWNLOAD_COMPLETE) + { ota_upgradeAbort(); } } @@ -218,8 +214,7 @@ static void sampleLight_zclDfltRspCmd(zclDefaultRspCmd_t *pDftRspCmd) */ static void sampleLight_zclCfgReportCmd(zclCfgReportCmd_t *pCfgReportCmd) { -// printf("sampleLight_zclCfgReportCmd\n"); - + // printf("sampleLight_zclCfgReportCmd\n"); } /********************************************************************* @@ -233,8 +228,7 @@ static void sampleLight_zclCfgReportCmd(zclCfgReportCmd_t *pCfgReportCmd) */ static void sampleLight_zclCfgReportRspCmd(zclCfgReportRspCmd_t *pCfgReportRspCmd) { -// printf("sampleLight_zclCfgReportRspCmd\n"); - + // printf("sampleLight_zclCfgReportRspCmd\n"); } /********************************************************************* @@ -248,8 +242,7 @@ static void sampleLight_zclCfgReportRspCmd(zclCfgReportRspCmd_t *pCfgReportRspCm */ static void sampleLight_zclReportCmd(zclReportCmd_t *pReportCmd) { -// printf("sampleLight_zclReportCmd\n"); - + // printf("sampleLight_zclReportCmd\n"); } #endif @@ -267,9 +260,10 @@ static void sampleLight_zclReportCmd(zclReportCmd_t *pReportCmd) */ status_t sampleLight_basicCb(zclIncomingAddrInfo_t *pAddrInfo, u8 cmdId, void *cmdPayload) { - if(cmdId == ZCL_CMD_BASIC_RESET_FAC_DEFAULT){ - //Reset all the attributes of all its clusters to factory defaults - //zcl_nv_attr_reset(); + if (cmdId == ZCL_CMD_BASIC_RESET_FAC_DEFAULT) + { + // Reset all the attributes of all its clusters to factory defaults + // zcl_nv_attr_reset(); } return ZCL_STA_SUCCESS; @@ -279,7 +273,8 @@ status_t sampleLight_basicCb(zclIncomingAddrInfo_t *pAddrInfo, u8 cmdId, void *c #ifdef ZCL_IDENTIFY s32 sampleLight_zclIdentifyTimerCb(void *arg) { - if(g_zcl_identifyAttrs.identifyTime <= 0){ + if (g_zcl_identifyAttrs.identifyTime <= 0) + { light_blink_stop(); identifyTimerEvt = NULL; @@ -291,7 +286,8 @@ s32 sampleLight_zclIdentifyTimerCb(void *arg) void sampleLight_zclIdentifyTimerStop(void) { - if(identifyTimerEvt){ + if (identifyTimerEvt) + { TL_ZB_TIMER_CANCEL(&identifyTimerEvt); } } @@ -311,11 +307,15 @@ void sampleLight_zclIdentifyCmdHandler(u8 endpoint, u16 srcAddr, u16 identifyTim { g_zcl_identifyAttrs.identifyTime = identifyTime; - if(identifyTime == 0){ + if (identifyTime == 0) + { sampleLight_zclIdentifyTimerStop(); light_blink_stop(); - }else{ - if(!identifyTimerEvt){ + } + else + { + if (!identifyTimerEvt) + { light_blink_start(identifyTime, 500, 500); identifyTimerEvt = TL_ZB_TIMER_SCHEDULE(sampleLight_zclIdentifyTimerCb, NULL, 1000); } @@ -334,29 +334,30 @@ void sampleLight_zclIdentifyCmdHandler(u8 endpoint, u16 srcAddr, u16 identifyTim static void sampleLight_zcltriggerCmdHandler(zcl_triggerEffect_t *pTriggerEffect) { u8 effectId = pTriggerEffect->effectId; -// u8 effectVariant = pTriggerEffect->effectVariant; + // u8 effectVariant = pTriggerEffect->effectVariant; - switch(effectId){ - case IDENTIFY_EFFECT_BLINK: - light_blink_start(1, 500, 500); - break; - case IDENTIFY_EFFECT_BREATHE: - light_blink_start(15, 300, 700); - break; - case IDENTIFY_EFFECT_OKAY: - light_blink_start(2, 250, 250); - break; - case IDENTIFY_EFFECT_CHANNEL_CHANGE: - light_blink_start(1, 500, 7500); - break; - case IDENTIFY_EFFECT_FINISH_EFFECT: - light_blink_start(1, 300, 700); - break; - case IDENTIFY_EFFECT_STOP_EFFECT: - light_blink_stop(); - break; - default: - break; + switch (effectId) + { + case IDENTIFY_EFFECT_BLINK: + light_blink_start(1, 500, 500); + break; + case IDENTIFY_EFFECT_BREATHE: + light_blink_start(15, 300, 700); + break; + case IDENTIFY_EFFECT_OKAY: + light_blink_start(2, 250, 250); + break; + case IDENTIFY_EFFECT_CHANNEL_CHANGE: + light_blink_start(1, 500, 7500); + break; + case IDENTIFY_EFFECT_FINISH_EFFECT: + light_blink_start(1, 300, 700); + break; + case IDENTIFY_EFFECT_STOP_EFFECT: + light_blink_stop(); + break; + default: + break; } } @@ -373,17 +374,20 @@ static void sampleLight_zcltriggerCmdHandler(zcl_triggerEffect_t *pTriggerEffect */ status_t sampleLight_identifyCb(zclIncomingAddrInfo_t *pAddrInfo, u8 cmdId, void *cmdPayload) { - if(pAddrInfo->dstEp == SAMPLE_LIGHT_ENDPOINT){ - if(pAddrInfo->dirCluster == ZCL_FRAME_CLIENT_SERVER_DIR){ - switch(cmdId){ - case ZCL_CMD_IDENTIFY: - sampleLight_zclIdentifyCmdHandler(pAddrInfo->dstEp, pAddrInfo->srcAddr, ((zcl_identifyCmd_t *)cmdPayload)->identifyTime); - break; - case ZCL_CMD_TRIGGER_EFFECT: - sampleLight_zcltriggerCmdHandler((zcl_triggerEffect_t *)cmdPayload); - break; - default: - break; + if (pAddrInfo->dstEp == SAMPLE_LIGHT_ENDPOINT) + { + if (pAddrInfo->dirCluster == ZCL_FRAME_CLIENT_SERVER_DIR) + { + switch (cmdId) + { + case ZCL_CMD_IDENTIFY: + sampleLight_zclIdentifyCmdHandler(pAddrInfo->dstEp, pAddrInfo->srcAddr, ((zcl_identifyCmd_t *)cmdPayload)->identifyTime); + break; + case ZCL_CMD_TRIGGER_EFFECT: + sampleLight_zcltriggerCmdHandler((zcl_triggerEffect_t *)cmdPayload); + break; + default: + break; } } } @@ -392,6 +396,4 @@ status_t sampleLight_identifyCb(zclIncomingAddrInfo_t *pAddrInfo, u8 cmdId, void } #endif -#endif /* __PROJECT_TL_DIMMABLE_LIGHT__ */ - - +#endif /* __PROJECT_TL_DIMMABLE_LIGHT__ */ diff --git a/zcl_sceneCb.c b/zcl_sceneCb.c index 8045f10..e5ed84f 100644 --- a/zcl_sceneCb.c +++ b/zcl_sceneCb.c @@ -23,7 +23,6 @@ #if (__PROJECT_TL_DIMMABLE_LIGHT__) - /********************************************************************** * INCLUDES */ @@ -32,7 +31,6 @@ #include "zcl_include.h" #include "sampleLight.h" - /********************************************************************* * @fn sampleLight_sceneRecallReqHandler * @@ -50,20 +48,20 @@ static void sampleLight_sceneRecallReqHandler(zclIncomingAddrInfo_t *pAddrInfo, #ifdef ZCL_ON_OFF zcl_onOffAttr_t *pOnOff = zcl_onoffAttrGet(); - pOnOff->onOff = pScene->extField[extLen+3]; + pOnOff->onOff = pScene->extField[extLen + 3]; extLen += 4; #endif #ifdef ZCL_LEVEL_CTRL - u8 level = pScene->extField[extLen+3]; + u8 level = pScene->extField[extLen + 3]; extLen += 4; #endif #ifdef ZCL_LIGHT_COLOR_CONTROL - u8 colorMode = pScene->extField[extLen+3]; - u8 hue = pScene->extField[extLen+4]; - u8 saturation = pScene->extField[extLen+5]; - u16 colorTemperatureMireds = BUILD_U16(pScene->extField[extLen+6], pScene->extField[extLen+7]); + u8 colorMode = pScene->extField[extLen + 3]; + u8 hue = pScene->extField[extLen + 4]; + u8 saturation = pScene->extField[extLen + 5]; + u16 colorTemperatureMireds = BUILD_U16(pScene->extField[extLen + 6], pScene->extField[extLen + 7]); extLen += 8; #endif @@ -77,14 +75,17 @@ static void sampleLight_sceneRecallReqHandler(zclIncomingAddrInfo_t *pAddrInfo, #endif #ifdef ZCL_LIGHT_COLOR_CONTROL - if (colorMode == ZCL_COLOR_MODE_CURRENT_HUE_SATURATION) { + if (colorMode == ZCL_COLOR_MODE_CURRENT_HUE_SATURATION) + { zcl_colorCtrlMoveToColorTemperatureCmd_t move2ColorTemp; move2ColorTemp.colorTemperature = colorTemperatureMireds; move2ColorTemp.transitionTime = pScene->transTime; move2ColorTemp.optPresent = 0; sampleLight_colorCtrlCb(pAddrInfo, ZCL_CMD_LIGHT_COLOR_CONTROL_MOVE_TO_COLOR_TEMPERATURE, &move2ColorTemp); - } else { + } + else + { zcl_colorCtrlMoveToHueAndSaturationCmd_t move2HueAndSat; move2HueAndSat.hue = hue; move2HueAndSat.saturation = saturation; @@ -156,17 +157,20 @@ static void sampleLight_sceneStoreReqHandler(zcl_sceneEntry_t *pScene) */ status_t sampleLight_sceneCb(zclIncomingAddrInfo_t *pAddrInfo, u8 cmdId, void *cmdPayload) { - if(pAddrInfo->dstEp == SAMPLE_LIGHT_ENDPOINT){ - if(pAddrInfo->dirCluster == ZCL_FRAME_CLIENT_SERVER_DIR){ - switch(cmdId){ - case ZCL_CMD_SCENE_STORE_SCENE: - sampleLight_sceneStoreReqHandler((zcl_sceneEntry_t *)cmdPayload); - break; - case ZCL_CMD_SCENE_RECALL_SCENE: - sampleLight_sceneRecallReqHandler(pAddrInfo, (zcl_sceneEntry_t *)cmdPayload); - break; - default: - break; + if (pAddrInfo->dstEp == SAMPLE_LIGHT_ENDPOINT) + { + if (pAddrInfo->dirCluster == ZCL_FRAME_CLIENT_SERVER_DIR) + { + switch (cmdId) + { + case ZCL_CMD_SCENE_STORE_SCENE: + sampleLight_sceneStoreReqHandler((zcl_sceneEntry_t *)cmdPayload); + break; + case ZCL_CMD_SCENE_RECALL_SCENE: + sampleLight_sceneRecallReqHandler(pAddrInfo, (zcl_sceneEntry_t *)cmdPayload); + break; + default: + break; } } } @@ -174,4 +178,4 @@ status_t sampleLight_sceneCb(zclIncomingAddrInfo_t *pAddrInfo, u8 cmdId, void *c return ZCL_STA_SUCCESS; } -#endif /* __PROJECT_TL_DIMMABLE_LIGHT__ */ +#endif /* __PROJECT_TL_DIMMABLE_LIGHT__ */