diff --git a/examples/lock-app/efr32/include/BoltLockManager.h b/examples/lock-app/efr32/include/BoltLockManager.h index 325613e3507004..3a455e9676cecd 100644 --- a/examples/lock-app/efr32/include/BoltLockManager.h +++ b/examples/lock-app/efr32/include/BoltLockManager.h @@ -46,7 +46,7 @@ class BoltLockManager kState_UnlockingCompleted, } State; - int Init(); + int Init(); bool IsUnlocked(); void EnableAutoRelock(bool aOn); void SetAutoLockDuration(uint32_t aDurationInSecs); @@ -58,27 +58,27 @@ class BoltLockManager void SetCallbacks(Callback_fn_initiated aActionInitiated_CB, Callback_fn_completed aActionCompleted_CB); private: - friend BoltLockManager &BoltLockMgr(void); - State_t mState; + friend BoltLockManager & BoltLockMgr(void); + State_t mState; Callback_fn_initiated mActionInitiated_CB; Callback_fn_completed mActionCompleted_CB; - bool mAutoRelock; + bool mAutoRelock; uint32_t mAutoLockDuration; - bool mAutoLockTimerArmed; + bool mAutoLockTimerArmed; void CancelTimer(void); void StartTimer(uint32_t aTimeoutMs); static void TimerEventHandler(TimerHandle_t xTimer); - static void AutoReLockTimerEventHandler(AppEvent *aEvent); - static void ActuatorMovementTimerEventHandler(AppEvent *aEvent); + static void AutoReLockTimerEventHandler(AppEvent * aEvent); + static void ActuatorMovementTimerEventHandler(AppEvent * aEvent); static BoltLockManager sLock; }; -inline BoltLockManager &BoltLockMgr(void) +inline BoltLockManager & BoltLockMgr(void) { return BoltLockManager::sLock; } diff --git a/examples/lock-app/efr32/include/LEDWidget.h b/examples/lock-app/efr32/include/LEDWidget.h index 8d4eb51199b7dc..22ad72b0532aa5 100644 --- a/examples/lock-app/efr32/include/LEDWidget.h +++ b/examples/lock-app/efr32/include/LEDWidget.h @@ -23,19 +23,19 @@ class LEDWidget { public: static void InitGpio(void); - void Init(int ledNum); - void Set(bool state); - void Invert(void); - void Blink(uint32_t changeRateMS); - void Blink(uint32_t onTimeMS, uint32_t offTimeMS); - void Animate(); + void Init(int ledNum); + void Set(bool state); + void Invert(void); + void Blink(uint32_t changeRateMS); + void Blink(uint32_t onTimeMS, uint32_t offTimeMS); + void Animate(); private: - int64_t mLastChangeTimeUS; + int64_t mLastChangeTimeUS; uint32_t mBlinkOnTimeMS; uint32_t mBlinkOffTimeMS; - int mLedNum; - bool mState; + int mLedNum; + bool mState; void DoSet(bool state); }; diff --git a/examples/lock-app/efr32/include/ble-configuration.h b/examples/lock-app/efr32/include/ble-configuration.h index 2000262a8b7122..106b5e41ae0ca7 100644 --- a/examples/lock-app/efr32/include/ble-configuration.h +++ b/examples/lock-app/efr32/include/ble-configuration.h @@ -21,21 +21,17 @@ #ifndef __BLE_CONFIG__ #define __BLE_CONFIG__ - // Top level macros #define SILABS_AF_DEVICE_NAME "lock-example" - // Generated plugin macros - // Custom macros -#define BRD4161A 1 +#define BRD4161A 1 #ifdef EMBER_AF_BOARD_TYPE #undef EMBER_AF_BOARD_TYPE #endif #define EMBER_AF_BOARD_TYPE BRD4161A - -#endif // __BLE_CONFIG__ \ No newline at end of file +#endif // __BLE_CONFIG__ diff --git a/examples/lock-app/efr32/include/board_features.h b/examples/lock-app/efr32/include/board_features.h index b72a650c58a1dc..4934be0d812e85 100644 --- a/examples/lock-app/efr32/include/board_features.h +++ b/examples/lock-app/efr32/include/board_features.h @@ -1,19 +1,22 @@ -/***************************************************************************//** - * @file - * @brief board_features.h - ******************************************************************************* - * # License - * Copyright 2018 Silicon Laboratories Inc. www.silabs.com - ******************************************************************************* - * - * The licensor of this software is Silicon Laboratories Inc. Your use of this - * software is governed by the terms of Silicon Labs Master Software License - * Agreement (MSLA) available at - * www.silabs.com/about-us/legal/master-software-license-agreement. This - * software is distributed to you in Source Code format and is governed by the - * sections of the MSLA applicable to Source Code. - * - ******************************************************************************/ +/***************************************************************************/ /** + * @file + * @brief board_features.h + ******************************************************************************* + * # License + * Copyright 2018 Silicon Laboratories Inc. + *www.silabs.com + ******************************************************************************* + * + * The licensor of this software is Silicon + *Laboratories Inc. Your use of this software is + *governed by the terms of Silicon Labs Master + *Software License Agreement (MSLA) available at + * www.silabs.com/about-us/legal/master-software-license-agreement. + *This software is distributed to you in Source Code + *format and is governed by the sections of the MSLA + *applicable to Source Code. + * + ******************************************************************************/ #ifndef BOARD_FEATURES_H #define BOARD_FEATURES_H @@ -21,124 +24,51 @@ #include "ble-configuration.h" /* Indicate if LCD is supported */ -#if (EMBER_AF_BOARD_TYPE == BRD4100A)\ - || (EMBER_AF_BOARD_TYPE == BRD4101B)\ - || (EMBER_AF_BOARD_TYPE == BRD4103A)\ - || (EMBER_AF_BOARD_TYPE == BRD4104A)\ - || (EMBER_AF_BOARD_TYPE == BRD4105A)\ - || (EMBER_AF_BOARD_TYPE == BRD4150A)\ - || (EMBER_AF_BOARD_TYPE == BRD4150B)\ - || (EMBER_AF_BOARD_TYPE == BRD4150C)\ - || (EMBER_AF_BOARD_TYPE == BRD4151A)\ - || (EMBER_AF_BOARD_TYPE == BRD4153A)\ - || (EMBER_AF_BOARD_TYPE == BRD4158A)\ - || (EMBER_AF_BOARD_TYPE == BRD4159A)\ - || (EMBER_AF_BOARD_TYPE == BRD4161A)\ - || (EMBER_AF_BOARD_TYPE == BRD4162A)\ - || (EMBER_AF_BOARD_TYPE == BRD4163A)\ - || (EMBER_AF_BOARD_TYPE == BRD4164A)\ - || (EMBER_AF_BOARD_TYPE == BRD4165B)\ - || (EMBER_AF_BOARD_TYPE == BRD4167A)\ - || (EMBER_AF_BOARD_TYPE == BRD4168A)\ - || (EMBER_AF_BOARD_TYPE == BRD4169A)\ - || (EMBER_AF_BOARD_TYPE == BRD4169B)\ - || (EMBER_AF_BOARD_TYPE == BRD4170A)\ - || (EMBER_AF_BOARD_TYPE == BRD4171A)\ - || (EMBER_AF_BOARD_TYPE == BRD4172A)\ - || (EMBER_AF_BOARD_TYPE == BRD4172B)\ - || (EMBER_AF_BOARD_TYPE == BRD4173A)\ - || (EMBER_AF_BOARD_TYPE == BRD4174A)\ - || (EMBER_AF_BOARD_TYPE == BRD4174B)\ - || (EMBER_AF_BOARD_TYPE == BRD4175A)\ - || (EMBER_AF_BOARD_TYPE == BRD4180A)\ - || (EMBER_AF_BOARD_TYPE == BRD4180B)\ - || (EMBER_AF_BOARD_TYPE == BRD4181A)\ - || (EMBER_AF_BOARD_TYPE == BRD4181B)\ - || (EMBER_AF_BOARD_TYPE == BRD4182A)\ - || (EMBER_AF_BOARD_TYPE == BRD4300A)\ - || (EMBER_AF_BOARD_TYPE == BRD4302A)\ - || (EMBER_AF_BOARD_TYPE == BRD4303A)\ - || (EMBER_AF_BOARD_TYPE == BRD4304A)\ - || (EMBER_AF_BOARD_TYPE == BRD4305A)\ - || (EMBER_AF_BOARD_TYPE == BRD4305C)\ - || (EMBER_AF_BOARD_TYPE == BRD4305D)\ - || (EMBER_AF_BOARD_TYPE == BRD4305E)\ - || (EMBER_AF_BOARD_TYPE == BRD4306A)\ - || (EMBER_AF_BOARD_TYPE == BRD4306B)\ - || (EMBER_AF_BOARD_TYPE == BRD4306C)\ - || (EMBER_AF_BOARD_TYPE == BRD4306D)\ - || (EMBER_AF_BOARD_TYPE == BRD4308A)\ - || (EMBER_AF_BOARD_TYPE == BRD4308B)\ - || (EMBER_AF_BOARD_TYPE == BRD4310A)\ - || (EMBER_AF_BOARD_TYPE == BRD4311A) +#if (EMBER_AF_BOARD_TYPE == BRD4100A) || (EMBER_AF_BOARD_TYPE == BRD4101B) || (EMBER_AF_BOARD_TYPE == BRD4103A) || \ + (EMBER_AF_BOARD_TYPE == BRD4104A) || (EMBER_AF_BOARD_TYPE == BRD4105A) || (EMBER_AF_BOARD_TYPE == BRD4150A) || \ + (EMBER_AF_BOARD_TYPE == BRD4150B) || (EMBER_AF_BOARD_TYPE == BRD4150C) || (EMBER_AF_BOARD_TYPE == BRD4151A) || \ + (EMBER_AF_BOARD_TYPE == BRD4153A) || (EMBER_AF_BOARD_TYPE == BRD4158A) || (EMBER_AF_BOARD_TYPE == BRD4159A) || \ + (EMBER_AF_BOARD_TYPE == BRD4161A) || (EMBER_AF_BOARD_TYPE == BRD4162A) || (EMBER_AF_BOARD_TYPE == BRD4163A) || \ + (EMBER_AF_BOARD_TYPE == BRD4164A) || (EMBER_AF_BOARD_TYPE == BRD4165B) || (EMBER_AF_BOARD_TYPE == BRD4167A) || \ + (EMBER_AF_BOARD_TYPE == BRD4168A) || (EMBER_AF_BOARD_TYPE == BRD4169A) || (EMBER_AF_BOARD_TYPE == BRD4169B) || \ + (EMBER_AF_BOARD_TYPE == BRD4170A) || (EMBER_AF_BOARD_TYPE == BRD4171A) || (EMBER_AF_BOARD_TYPE == BRD4172A) || \ + (EMBER_AF_BOARD_TYPE == BRD4172B) || (EMBER_AF_BOARD_TYPE == BRD4173A) || (EMBER_AF_BOARD_TYPE == BRD4174A) || \ + (EMBER_AF_BOARD_TYPE == BRD4174B) || (EMBER_AF_BOARD_TYPE == BRD4175A) || (EMBER_AF_BOARD_TYPE == BRD4180A) || \ + (EMBER_AF_BOARD_TYPE == BRD4180B) || (EMBER_AF_BOARD_TYPE == BRD4181A) || (EMBER_AF_BOARD_TYPE == BRD4181B) || \ + (EMBER_AF_BOARD_TYPE == BRD4182A) || (EMBER_AF_BOARD_TYPE == BRD4300A) || (EMBER_AF_BOARD_TYPE == BRD4302A) || \ + (EMBER_AF_BOARD_TYPE == BRD4303A) || (EMBER_AF_BOARD_TYPE == BRD4304A) || (EMBER_AF_BOARD_TYPE == BRD4305A) || \ + (EMBER_AF_BOARD_TYPE == BRD4305C) || (EMBER_AF_BOARD_TYPE == BRD4305D) || (EMBER_AF_BOARD_TYPE == BRD4305E) || \ + (EMBER_AF_BOARD_TYPE == BRD4306A) || (EMBER_AF_BOARD_TYPE == BRD4306B) || (EMBER_AF_BOARD_TYPE == BRD4306C) || \ + (EMBER_AF_BOARD_TYPE == BRD4306D) || (EMBER_AF_BOARD_TYPE == BRD4308A) || (EMBER_AF_BOARD_TYPE == BRD4308B) || \ + (EMBER_AF_BOARD_TYPE == BRD4310A) || (EMBER_AF_BOARD_TYPE == BRD4311A) #define FEATURE_LCD_SUPPORT #endif /* Indicate if the same pins are used for LEDs and Buttons on the WSTK */ -#if (EMBER_AF_BOARD_TYPE == BRD4101B)\ - || (EMBER_AF_BOARD_TYPE == BRD4300A)\ - || (EMBER_AF_BOARD_TYPE == BRD4301A)\ - || (EMBER_AF_BOARD_TYPE == BRD4304A)\ - || (EMBER_AF_BOARD_TYPE == BRD4306A)\ - || (EMBER_AF_BOARD_TYPE == BRD4306B)\ - || (EMBER_AF_BOARD_TYPE == BRD4306C)\ - || (EMBER_AF_BOARD_TYPE == BRD4306D)\ - || (EMBER_AF_BOARD_TYPE == BRD4308A)\ - || (EMBER_AF_BOARD_TYPE == BRD4308B)\ - || (EMBER_AF_BOARD_TYPE == BRD4309A)\ - || (EMBER_AF_BOARD_TYPE == BRD4310A)\ - || (EMBER_AF_BOARD_TYPE == BRD4311A) +#if (EMBER_AF_BOARD_TYPE == BRD4101B) || (EMBER_AF_BOARD_TYPE == BRD4300A) || (EMBER_AF_BOARD_TYPE == BRD4301A) || \ + (EMBER_AF_BOARD_TYPE == BRD4304A) || (EMBER_AF_BOARD_TYPE == BRD4306A) || (EMBER_AF_BOARD_TYPE == BRD4306B) || \ + (EMBER_AF_BOARD_TYPE == BRD4306C) || (EMBER_AF_BOARD_TYPE == BRD4306D) || (EMBER_AF_BOARD_TYPE == BRD4308A) || \ + (EMBER_AF_BOARD_TYPE == BRD4308B) || (EMBER_AF_BOARD_TYPE == BRD4309A) || (EMBER_AF_BOARD_TYPE == BRD4310A) || \ + (EMBER_AF_BOARD_TYPE == BRD4311A) #define FEATURE_LED_BUTTON_ON_SAME_PIN #endif -#if (EMBER_AF_BOARD_TYPE == BRD4100A)\ - || (EMBER_AF_BOARD_TYPE == BRD4101B)\ - || (EMBER_AF_BOARD_TYPE == BRD4103A)\ - || (EMBER_AF_BOARD_TYPE == BRD4104A)\ - || (EMBER_AF_BOARD_TYPE == BRD4105A)\ - || (EMBER_AF_BOARD_TYPE == BRD4150A)\ - || (EMBER_AF_BOARD_TYPE == BRD4150B)\ - || (EMBER_AF_BOARD_TYPE == BRD4150C)\ - || (EMBER_AF_BOARD_TYPE == BRD4151A)\ - || (EMBER_AF_BOARD_TYPE == BRD4153A)\ - || (EMBER_AF_BOARD_TYPE == BRD4158A)\ - || (EMBER_AF_BOARD_TYPE == BRD4159A)\ - || (EMBER_AF_BOARD_TYPE == BRD4160A)\ - || (EMBER_AF_BOARD_TYPE == BRD4161A)\ - || (EMBER_AF_BOARD_TYPE == BRD4162A)\ - || (EMBER_AF_BOARD_TYPE == BRD4163A)\ - || (EMBER_AF_BOARD_TYPE == BRD4164A)\ - || (EMBER_AF_BOARD_TYPE == BRD4165B)\ - || (EMBER_AF_BOARD_TYPE == BRD4166A)\ - || (EMBER_AF_BOARD_TYPE == BRD4167A)\ - || (EMBER_AF_BOARD_TYPE == BRD4168A)\ - || (EMBER_AF_BOARD_TYPE == BRD4169A)\ - || (EMBER_AF_BOARD_TYPE == BRD4169B)\ - || (EMBER_AF_BOARD_TYPE == BRD4170A)\ - || (EMBER_AF_BOARD_TYPE == BRD4171A)\ - || (EMBER_AF_BOARD_TYPE == BRD4172A)\ - || (EMBER_AF_BOARD_TYPE == BRD4172B)\ - || (EMBER_AF_BOARD_TYPE == BRD4173A)\ - || (EMBER_AF_BOARD_TYPE == BRD4174A)\ - || (EMBER_AF_BOARD_TYPE == BRD4174B)\ - || (EMBER_AF_BOARD_TYPE == BRD4175A)\ - || (EMBER_AF_BOARD_TYPE == BRD4182A)\ - || (EMBER_AF_BOARD_TYPE == BRD4183A)\ - || (EMBER_AF_BOARD_TYPE == BRD4184A)\ - || (EMBER_AF_BOARD_TYPE == BRD4301A)\ - || (EMBER_AF_BOARD_TYPE == BRD4302A)\ - || (EMBER_AF_BOARD_TYPE == BRD4303A)\ - || (EMBER_AF_BOARD_TYPE == BRD4304A)\ - || (EMBER_AF_BOARD_TYPE == BRD4305A)\ - || (EMBER_AF_BOARD_TYPE == BRD4305C)\ - || (EMBER_AF_BOARD_TYPE == BRD4305D)\ - || (EMBER_AF_BOARD_TYPE == BRD4305E)\ - || (EMBER_AF_BOARD_TYPE == BRD4306A)\ - || (EMBER_AF_BOARD_TYPE == BRD4306B)\ - || (EMBER_AF_BOARD_TYPE == BRD4306C)\ - || (EMBER_AF_BOARD_TYPE == BRD4306D)\ - || (EMBER_AF_BOARD_TYPE == BRD4310A)\ - || (EMBER_AF_BOARD_TYPE == BRD4311A) +#if (EMBER_AF_BOARD_TYPE == BRD4100A) || (EMBER_AF_BOARD_TYPE == BRD4101B) || (EMBER_AF_BOARD_TYPE == BRD4103A) || \ + (EMBER_AF_BOARD_TYPE == BRD4104A) || (EMBER_AF_BOARD_TYPE == BRD4105A) || (EMBER_AF_BOARD_TYPE == BRD4150A) || \ + (EMBER_AF_BOARD_TYPE == BRD4150B) || (EMBER_AF_BOARD_TYPE == BRD4150C) || (EMBER_AF_BOARD_TYPE == BRD4151A) || \ + (EMBER_AF_BOARD_TYPE == BRD4153A) || (EMBER_AF_BOARD_TYPE == BRD4158A) || (EMBER_AF_BOARD_TYPE == BRD4159A) || \ + (EMBER_AF_BOARD_TYPE == BRD4160A) || (EMBER_AF_BOARD_TYPE == BRD4161A) || (EMBER_AF_BOARD_TYPE == BRD4162A) || \ + (EMBER_AF_BOARD_TYPE == BRD4163A) || (EMBER_AF_BOARD_TYPE == BRD4164A) || (EMBER_AF_BOARD_TYPE == BRD4165B) || \ + (EMBER_AF_BOARD_TYPE == BRD4166A) || (EMBER_AF_BOARD_TYPE == BRD4167A) || (EMBER_AF_BOARD_TYPE == BRD4168A) || \ + (EMBER_AF_BOARD_TYPE == BRD4169A) || (EMBER_AF_BOARD_TYPE == BRD4169B) || (EMBER_AF_BOARD_TYPE == BRD4170A) || \ + (EMBER_AF_BOARD_TYPE == BRD4171A) || (EMBER_AF_BOARD_TYPE == BRD4172A) || (EMBER_AF_BOARD_TYPE == BRD4172B) || \ + (EMBER_AF_BOARD_TYPE == BRD4173A) || (EMBER_AF_BOARD_TYPE == BRD4174A) || (EMBER_AF_BOARD_TYPE == BRD4174B) || \ + (EMBER_AF_BOARD_TYPE == BRD4175A) || (EMBER_AF_BOARD_TYPE == BRD4182A) || (EMBER_AF_BOARD_TYPE == BRD4183A) || \ + (EMBER_AF_BOARD_TYPE == BRD4184A) || (EMBER_AF_BOARD_TYPE == BRD4301A) || (EMBER_AF_BOARD_TYPE == BRD4302A) || \ + (EMBER_AF_BOARD_TYPE == BRD4303A) || (EMBER_AF_BOARD_TYPE == BRD4304A) || (EMBER_AF_BOARD_TYPE == BRD4305A) || \ + (EMBER_AF_BOARD_TYPE == BRD4305C) || (EMBER_AF_BOARD_TYPE == BRD4305D) || (EMBER_AF_BOARD_TYPE == BRD4305E) || \ + (EMBER_AF_BOARD_TYPE == BRD4306A) || (EMBER_AF_BOARD_TYPE == BRD4306B) || (EMBER_AF_BOARD_TYPE == BRD4306C) || \ + (EMBER_AF_BOARD_TYPE == BRD4306D) || (EMBER_AF_BOARD_TYPE == BRD4310A) || (EMBER_AF_BOARD_TYPE == BRD4311A) #define FEATURE_SPI_FLASH #endif @@ -146,273 +76,108 @@ #define FEATURE_IOEXPANDER #endif -#if (EMBER_AF_BOARD_TYPE == BRD4150B)\ - || (EMBER_AF_BOARD_TYPE == BRD4151A)\ - || (EMBER_AF_BOARD_TYPE == BRD4158A)\ - || (EMBER_AF_BOARD_TYPE == BRD4161A)\ - || (EMBER_AF_BOARD_TYPE == BRD4164A)\ - || (EMBER_AF_BOARD_TYPE == BRD4165B)\ - || (EMBER_AF_BOARD_TYPE == BRD4168A)\ - || (EMBER_AF_BOARD_TYPE == BRD4169B)\ - || (EMBER_AF_BOARD_TYPE == BRD4170A)\ - || (EMBER_AF_BOARD_TYPE == BRD4171A)\ - || (EMBER_AF_BOARD_TYPE == BRD4172A)\ - || (EMBER_AF_BOARD_TYPE == BRD4172B)\ - || (EMBER_AF_BOARD_TYPE == BRD4174A)\ - || (EMBER_AF_BOARD_TYPE == BRD4174B)\ - || (EMBER_AF_BOARD_TYPE == BRD4180A)\ - || (EMBER_AF_BOARD_TYPE == BRD4180B)\ - || (EMBER_AF_BOARD_TYPE == BRD4181A)\ - || (EMBER_AF_BOARD_TYPE == BRD4181B)\ - || (EMBER_AF_BOARD_TYPE == BRD4304A)\ - || (EMBER_AF_BOARD_TYPE == BRD4305A)\ - || (EMBER_AF_BOARD_TYPE == BRD4305E)\ - || (EMBER_AF_BOARD_TYPE == BRD4306B)\ - || (EMBER_AF_BOARD_TYPE == BRD4306D)\ - || (EMBER_AF_BOARD_TYPE == BRD4308A)\ - || (EMBER_AF_BOARD_TYPE == BRD4308B)\ - || (EMBER_AF_BOARD_TYPE == BRD4309A) +#if (EMBER_AF_BOARD_TYPE == BRD4150B) || (EMBER_AF_BOARD_TYPE == BRD4151A) || (EMBER_AF_BOARD_TYPE == BRD4158A) || \ + (EMBER_AF_BOARD_TYPE == BRD4161A) || (EMBER_AF_BOARD_TYPE == BRD4164A) || (EMBER_AF_BOARD_TYPE == BRD4165B) || \ + (EMBER_AF_BOARD_TYPE == BRD4168A) || (EMBER_AF_BOARD_TYPE == BRD4169B) || (EMBER_AF_BOARD_TYPE == BRD4170A) || \ + (EMBER_AF_BOARD_TYPE == BRD4171A) || (EMBER_AF_BOARD_TYPE == BRD4172A) || (EMBER_AF_BOARD_TYPE == BRD4172B) || \ + (EMBER_AF_BOARD_TYPE == BRD4174A) || (EMBER_AF_BOARD_TYPE == BRD4174B) || (EMBER_AF_BOARD_TYPE == BRD4180A) || \ + (EMBER_AF_BOARD_TYPE == BRD4180B) || (EMBER_AF_BOARD_TYPE == BRD4181A) || (EMBER_AF_BOARD_TYPE == BRD4181B) || \ + (EMBER_AF_BOARD_TYPE == BRD4304A) || (EMBER_AF_BOARD_TYPE == BRD4305A) || (EMBER_AF_BOARD_TYPE == BRD4305E) || \ + (EMBER_AF_BOARD_TYPE == BRD4306B) || (EMBER_AF_BOARD_TYPE == BRD4306D) || (EMBER_AF_BOARD_TYPE == BRD4308A) || \ + (EMBER_AF_BOARD_TYPE == BRD4308B) || (EMBER_AF_BOARD_TYPE == BRD4309A) #define FEATURE_PA_INPUT_FROM_VBAT #endif -#if (EMBER_AF_BOARD_TYPE == BRD4182A)\ - || (EMBER_AF_BOARD_TYPE == BRD4183A)\ - || (EMBER_AF_BOARD_TYPE == BRD4184A)\ - || (EMBER_AF_BOARD_TYPE == BRD4310A)\ - || (EMBER_AF_BOARD_TYPE == BRD4311A) +#if (EMBER_AF_BOARD_TYPE == BRD4182A) || (EMBER_AF_BOARD_TYPE == BRD4183A) || (EMBER_AF_BOARD_TYPE == BRD4184A) || \ + (EMBER_AF_BOARD_TYPE == BRD4310A) || (EMBER_AF_BOARD_TYPE == BRD4311A) #define FEATURE_EXP_HEADER_USART1 #endif -#if (EMBER_AF_BOARD_TYPE == BRD4103A)\ - || (EMBER_AF_BOARD_TYPE == BRD4161A)\ - || (EMBER_AF_BOARD_TYPE == BRD4162A)\ - || (EMBER_AF_BOARD_TYPE == BRD4163A)\ - || (EMBER_AF_BOARD_TYPE == BRD4164A)\ - || (EMBER_AF_BOARD_TYPE == BRD4170A) +#if (EMBER_AF_BOARD_TYPE == BRD4103A) || (EMBER_AF_BOARD_TYPE == BRD4161A) || (EMBER_AF_BOARD_TYPE == BRD4162A) || \ + (EMBER_AF_BOARD_TYPE == BRD4163A) || (EMBER_AF_BOARD_TYPE == BRD4164A) || (EMBER_AF_BOARD_TYPE == BRD4170A) #define FEATURE_EXP_HEADER_USART3 #endif -#if (EMBER_AF_BOARD_TYPE == BRD4100A)\ - || (EMBER_AF_BOARD_TYPE == BRD4101B)\ - || (EMBER_AF_BOARD_TYPE == BRD4103A)\ - || (EMBER_AF_BOARD_TYPE == BRD4104A)\ - || (EMBER_AF_BOARD_TYPE == BRD4105A)\ - || (EMBER_AF_BOARD_TYPE == BRD4150A)\ - || (EMBER_AF_BOARD_TYPE == BRD4150B)\ - || (EMBER_AF_BOARD_TYPE == BRD4150C)\ - || (EMBER_AF_BOARD_TYPE == BRD4151A)\ - || (EMBER_AF_BOARD_TYPE == BRD4153A)\ - || (EMBER_AF_BOARD_TYPE == BRD4158A)\ - || (EMBER_AF_BOARD_TYPE == BRD4159A)\ - || (EMBER_AF_BOARD_TYPE == BRD4160A)\ - || (EMBER_AF_BOARD_TYPE == BRD4161A)\ - || (EMBER_AF_BOARD_TYPE == BRD4162A)\ - || (EMBER_AF_BOARD_TYPE == BRD4163A)\ - || (EMBER_AF_BOARD_TYPE == BRD4164A)\ - || (EMBER_AF_BOARD_TYPE == BRD4165B)\ - || (EMBER_AF_BOARD_TYPE == BRD4166A)\ - || (EMBER_AF_BOARD_TYPE == BRD4167A)\ - || (EMBER_AF_BOARD_TYPE == BRD4168A)\ - || (EMBER_AF_BOARD_TYPE == BRD4169A)\ - || (EMBER_AF_BOARD_TYPE == BRD4169B)\ - || (EMBER_AF_BOARD_TYPE == BRD4170A)\ - || (EMBER_AF_BOARD_TYPE == BRD4171A)\ - || (EMBER_AF_BOARD_TYPE == BRD4172A)\ - || (EMBER_AF_BOARD_TYPE == BRD4172B)\ - || (EMBER_AF_BOARD_TYPE == BRD4173A)\ - || (EMBER_AF_BOARD_TYPE == BRD4174A)\ - || (EMBER_AF_BOARD_TYPE == BRD4174B)\ - || (EMBER_AF_BOARD_TYPE == BRD4175A)\ - || (EMBER_AF_BOARD_TYPE == BRD4179B)\ - || (EMBER_AF_BOARD_TYPE == BRD4180A)\ - || (EMBER_AF_BOARD_TYPE == BRD4180B)\ - || (EMBER_AF_BOARD_TYPE == BRD4181A)\ - || (EMBER_AF_BOARD_TYPE == BRD4181B)\ - || (EMBER_AF_BOARD_TYPE == BRD4182A)\ - || (EMBER_AF_BOARD_TYPE == BRD4183A)\ - || (EMBER_AF_BOARD_TYPE == BRD4184A)\ - || (EMBER_AF_BOARD_TYPE == BRD4300A)\ - || (EMBER_AF_BOARD_TYPE == BRD4301A)\ - || (EMBER_AF_BOARD_TYPE == BRD4302A)\ - || (EMBER_AF_BOARD_TYPE == BRD4303A)\ - || (EMBER_AF_BOARD_TYPE == BRD4304A)\ - || (EMBER_AF_BOARD_TYPE == BRD4305A)\ - || (EMBER_AF_BOARD_TYPE == BRD4305C)\ - || (EMBER_AF_BOARD_TYPE == BRD4305D)\ - || (EMBER_AF_BOARD_TYPE == BRD4305E)\ - || (EMBER_AF_BOARD_TYPE == BRD4306A)\ - || (EMBER_AF_BOARD_TYPE == BRD4306B)\ - || (EMBER_AF_BOARD_TYPE == BRD4306C)\ - || (EMBER_AF_BOARD_TYPE == BRD4306D)\ - || (EMBER_AF_BOARD_TYPE == BRD4308A)\ - || (EMBER_AF_BOARD_TYPE == BRD4308B)\ - || (EMBER_AF_BOARD_TYPE == BRD4309A)\ - || (EMBER_AF_BOARD_TYPE == BRD4310A)\ - || (EMBER_AF_BOARD_TYPE == BRD4311A) +#if (EMBER_AF_BOARD_TYPE == BRD4100A) || (EMBER_AF_BOARD_TYPE == BRD4101B) || (EMBER_AF_BOARD_TYPE == BRD4103A) || \ + (EMBER_AF_BOARD_TYPE == BRD4104A) || (EMBER_AF_BOARD_TYPE == BRD4105A) || (EMBER_AF_BOARD_TYPE == BRD4150A) || \ + (EMBER_AF_BOARD_TYPE == BRD4150B) || (EMBER_AF_BOARD_TYPE == BRD4150C) || (EMBER_AF_BOARD_TYPE == BRD4151A) || \ + (EMBER_AF_BOARD_TYPE == BRD4153A) || (EMBER_AF_BOARD_TYPE == BRD4158A) || (EMBER_AF_BOARD_TYPE == BRD4159A) || \ + (EMBER_AF_BOARD_TYPE == BRD4160A) || (EMBER_AF_BOARD_TYPE == BRD4161A) || (EMBER_AF_BOARD_TYPE == BRD4162A) || \ + (EMBER_AF_BOARD_TYPE == BRD4163A) || (EMBER_AF_BOARD_TYPE == BRD4164A) || (EMBER_AF_BOARD_TYPE == BRD4165B) || \ + (EMBER_AF_BOARD_TYPE == BRD4166A) || (EMBER_AF_BOARD_TYPE == BRD4167A) || (EMBER_AF_BOARD_TYPE == BRD4168A) || \ + (EMBER_AF_BOARD_TYPE == BRD4169A) || (EMBER_AF_BOARD_TYPE == BRD4169B) || (EMBER_AF_BOARD_TYPE == BRD4170A) || \ + (EMBER_AF_BOARD_TYPE == BRD4171A) || (EMBER_AF_BOARD_TYPE == BRD4172A) || (EMBER_AF_BOARD_TYPE == BRD4172B) || \ + (EMBER_AF_BOARD_TYPE == BRD4173A) || (EMBER_AF_BOARD_TYPE == BRD4174A) || (EMBER_AF_BOARD_TYPE == BRD4174B) || \ + (EMBER_AF_BOARD_TYPE == BRD4175A) || (EMBER_AF_BOARD_TYPE == BRD4179B) || (EMBER_AF_BOARD_TYPE == BRD4180A) || \ + (EMBER_AF_BOARD_TYPE == BRD4180B) || (EMBER_AF_BOARD_TYPE == BRD4181A) || (EMBER_AF_BOARD_TYPE == BRD4181B) || \ + (EMBER_AF_BOARD_TYPE == BRD4182A) || (EMBER_AF_BOARD_TYPE == BRD4183A) || (EMBER_AF_BOARD_TYPE == BRD4184A) || \ + (EMBER_AF_BOARD_TYPE == BRD4300A) || (EMBER_AF_BOARD_TYPE == BRD4301A) || (EMBER_AF_BOARD_TYPE == BRD4302A) || \ + (EMBER_AF_BOARD_TYPE == BRD4303A) || (EMBER_AF_BOARD_TYPE == BRD4304A) || (EMBER_AF_BOARD_TYPE == BRD4305A) || \ + (EMBER_AF_BOARD_TYPE == BRD4305C) || (EMBER_AF_BOARD_TYPE == BRD4305D) || (EMBER_AF_BOARD_TYPE == BRD4305E) || \ + (EMBER_AF_BOARD_TYPE == BRD4306A) || (EMBER_AF_BOARD_TYPE == BRD4306B) || (EMBER_AF_BOARD_TYPE == BRD4306C) || \ + (EMBER_AF_BOARD_TYPE == BRD4306D) || (EMBER_AF_BOARD_TYPE == BRD4308A) || (EMBER_AF_BOARD_TYPE == BRD4308B) || \ + (EMBER_AF_BOARD_TYPE == BRD4309A) || (EMBER_AF_BOARD_TYPE == BRD4310A) || (EMBER_AF_BOARD_TYPE == BRD4311A) #define FEATURE_PTI_SUPPORT #endif -#if (EMBER_AF_BOARD_TYPE == BRD4100A)\ - || (EMBER_AF_BOARD_TYPE == BRD4101B)\ - || (EMBER_AF_BOARD_TYPE == BRD4103A)\ - || (EMBER_AF_BOARD_TYPE == BRD4104A)\ - || (EMBER_AF_BOARD_TYPE == BRD4105A)\ - || (EMBER_AF_BOARD_TYPE == BRD4150A)\ - || (EMBER_AF_BOARD_TYPE == BRD4150B)\ - || (EMBER_AF_BOARD_TYPE == BRD4150C)\ - || (EMBER_AF_BOARD_TYPE == BRD4151A)\ - || (EMBER_AF_BOARD_TYPE == BRD4153A)\ - || (EMBER_AF_BOARD_TYPE == BRD4158A)\ - || (EMBER_AF_BOARD_TYPE == BRD4159A)\ - || (EMBER_AF_BOARD_TYPE == BRD4161A)\ - || (EMBER_AF_BOARD_TYPE == BRD4162A)\ - || (EMBER_AF_BOARD_TYPE == BRD4163A)\ - || (EMBER_AF_BOARD_TYPE == BRD4164A)\ - || (EMBER_AF_BOARD_TYPE == BRD4165B)\ - || (EMBER_AF_BOARD_TYPE == BRD4167A)\ - || (EMBER_AF_BOARD_TYPE == BRD4168A)\ - || (EMBER_AF_BOARD_TYPE == BRD4169A)\ - || (EMBER_AF_BOARD_TYPE == BRD4169B)\ - || (EMBER_AF_BOARD_TYPE == BRD4170A)\ - || (EMBER_AF_BOARD_TYPE == BRD4172A)\ - || (EMBER_AF_BOARD_TYPE == BRD4172B)\ - || (EMBER_AF_BOARD_TYPE == BRD4173A)\ - || (EMBER_AF_BOARD_TYPE == BRD4174A)\ - || (EMBER_AF_BOARD_TYPE == BRD4174B)\ - || (EMBER_AF_BOARD_TYPE == BRD4175A)\ - || (EMBER_AF_BOARD_TYPE == BRD4179B)\ - || (EMBER_AF_BOARD_TYPE == BRD4180A)\ - || (EMBER_AF_BOARD_TYPE == BRD4180B)\ - || (EMBER_AF_BOARD_TYPE == BRD4181A)\ - || (EMBER_AF_BOARD_TYPE == BRD4181B)\ - || (EMBER_AF_BOARD_TYPE == BRD4182A)\ - || (EMBER_AF_BOARD_TYPE == BRD4183A)\ - || (EMBER_AF_BOARD_TYPE == BRD4300A)\ - || (EMBER_AF_BOARD_TYPE == BRD4301A)\ - || (EMBER_AF_BOARD_TYPE == BRD4302A)\ - || (EMBER_AF_BOARD_TYPE == BRD4303A)\ - || (EMBER_AF_BOARD_TYPE == BRD4304A)\ - || (EMBER_AF_BOARD_TYPE == BRD4305A)\ - || (EMBER_AF_BOARD_TYPE == BRD4305C)\ - || (EMBER_AF_BOARD_TYPE == BRD4305D)\ - || (EMBER_AF_BOARD_TYPE == BRD4305E)\ - || (EMBER_AF_BOARD_TYPE == BRD4306A)\ - || (EMBER_AF_BOARD_TYPE == BRD4306B)\ - || (EMBER_AF_BOARD_TYPE == BRD4306C)\ - || (EMBER_AF_BOARD_TYPE == BRD4306D)\ - || (EMBER_AF_BOARD_TYPE == BRD4308A)\ - || (EMBER_AF_BOARD_TYPE == BRD4308B)\ - || (EMBER_AF_BOARD_TYPE == BRD4309A)\ - || (EMBER_AF_BOARD_TYPE == BRD4310A)\ - || (EMBER_AF_BOARD_TYPE == BRD4311A) +#if (EMBER_AF_BOARD_TYPE == BRD4100A) || (EMBER_AF_BOARD_TYPE == BRD4101B) || (EMBER_AF_BOARD_TYPE == BRD4103A) || \ + (EMBER_AF_BOARD_TYPE == BRD4104A) || (EMBER_AF_BOARD_TYPE == BRD4105A) || (EMBER_AF_BOARD_TYPE == BRD4150A) || \ + (EMBER_AF_BOARD_TYPE == BRD4150B) || (EMBER_AF_BOARD_TYPE == BRD4150C) || (EMBER_AF_BOARD_TYPE == BRD4151A) || \ + (EMBER_AF_BOARD_TYPE == BRD4153A) || (EMBER_AF_BOARD_TYPE == BRD4158A) || (EMBER_AF_BOARD_TYPE == BRD4159A) || \ + (EMBER_AF_BOARD_TYPE == BRD4161A) || (EMBER_AF_BOARD_TYPE == BRD4162A) || (EMBER_AF_BOARD_TYPE == BRD4163A) || \ + (EMBER_AF_BOARD_TYPE == BRD4164A) || (EMBER_AF_BOARD_TYPE == BRD4165B) || (EMBER_AF_BOARD_TYPE == BRD4167A) || \ + (EMBER_AF_BOARD_TYPE == BRD4168A) || (EMBER_AF_BOARD_TYPE == BRD4169A) || (EMBER_AF_BOARD_TYPE == BRD4169B) || \ + (EMBER_AF_BOARD_TYPE == BRD4170A) || (EMBER_AF_BOARD_TYPE == BRD4172A) || (EMBER_AF_BOARD_TYPE == BRD4172B) || \ + (EMBER_AF_BOARD_TYPE == BRD4173A) || (EMBER_AF_BOARD_TYPE == BRD4174A) || (EMBER_AF_BOARD_TYPE == BRD4174B) || \ + (EMBER_AF_BOARD_TYPE == BRD4175A) || (EMBER_AF_BOARD_TYPE == BRD4179B) || (EMBER_AF_BOARD_TYPE == BRD4180A) || \ + (EMBER_AF_BOARD_TYPE == BRD4180B) || (EMBER_AF_BOARD_TYPE == BRD4181A) || (EMBER_AF_BOARD_TYPE == BRD4181B) || \ + (EMBER_AF_BOARD_TYPE == BRD4182A) || (EMBER_AF_BOARD_TYPE == BRD4183A) || (EMBER_AF_BOARD_TYPE == BRD4300A) || \ + (EMBER_AF_BOARD_TYPE == BRD4301A) || (EMBER_AF_BOARD_TYPE == BRD4302A) || (EMBER_AF_BOARD_TYPE == BRD4303A) || \ + (EMBER_AF_BOARD_TYPE == BRD4304A) || (EMBER_AF_BOARD_TYPE == BRD4305A) || (EMBER_AF_BOARD_TYPE == BRD4305C) || \ + (EMBER_AF_BOARD_TYPE == BRD4305D) || (EMBER_AF_BOARD_TYPE == BRD4305E) || (EMBER_AF_BOARD_TYPE == BRD4306A) || \ + (EMBER_AF_BOARD_TYPE == BRD4306B) || (EMBER_AF_BOARD_TYPE == BRD4306C) || (EMBER_AF_BOARD_TYPE == BRD4306D) || \ + (EMBER_AF_BOARD_TYPE == BRD4308A) || (EMBER_AF_BOARD_TYPE == BRD4308B) || (EMBER_AF_BOARD_TYPE == BRD4309A) || \ + (EMBER_AF_BOARD_TYPE == BRD4310A) || (EMBER_AF_BOARD_TYPE == BRD4311A) #define FEATURE_HW_FLOW_CONTROL #endif -#if (EMBER_AF_BOARD_TYPE == BRD4100A)\ - || (EMBER_AF_BOARD_TYPE == BRD4101B)\ - || (EMBER_AF_BOARD_TYPE == BRD4103A)\ - || (EMBER_AF_BOARD_TYPE == BRD4104A)\ - || (EMBER_AF_BOARD_TYPE == BRD4105A)\ - || (EMBER_AF_BOARD_TYPE == BRD4150A)\ - || (EMBER_AF_BOARD_TYPE == BRD4150B)\ - || (EMBER_AF_BOARD_TYPE == BRD4150C)\ - || (EMBER_AF_BOARD_TYPE == BRD4151A)\ - || (EMBER_AF_BOARD_TYPE == BRD4153A)\ - || (EMBER_AF_BOARD_TYPE == BRD4158A)\ - || (EMBER_AF_BOARD_TYPE == BRD4159A)\ - || (EMBER_AF_BOARD_TYPE == BRD4160A)\ - || (EMBER_AF_BOARD_TYPE == BRD4161A)\ - || (EMBER_AF_BOARD_TYPE == BRD4162A)\ - || (EMBER_AF_BOARD_TYPE == BRD4163A)\ - || (EMBER_AF_BOARD_TYPE == BRD4164A)\ - || (EMBER_AF_BOARD_TYPE == BRD4165B)\ - || (EMBER_AF_BOARD_TYPE == BRD4166A)\ - || (EMBER_AF_BOARD_TYPE == BRD4167A)\ - || (EMBER_AF_BOARD_TYPE == BRD4168A)\ - || (EMBER_AF_BOARD_TYPE == BRD4169A)\ - || (EMBER_AF_BOARD_TYPE == BRD4169B)\ - || (EMBER_AF_BOARD_TYPE == BRD4170A)\ - || (EMBER_AF_BOARD_TYPE == BRD4171A)\ - || (EMBER_AF_BOARD_TYPE == BRD4172A)\ - || (EMBER_AF_BOARD_TYPE == BRD4172B)\ - || (EMBER_AF_BOARD_TYPE == BRD4173A)\ - || (EMBER_AF_BOARD_TYPE == BRD4174A)\ - || (EMBER_AF_BOARD_TYPE == BRD4174B)\ - || (EMBER_AF_BOARD_TYPE == BRD4175A)\ - || (EMBER_AF_BOARD_TYPE == BRD4182A)\ - || (EMBER_AF_BOARD_TYPE == BRD4184A)\ - || (EMBER_AF_BOARD_TYPE == BRD4300A)\ - || (EMBER_AF_BOARD_TYPE == BRD4301A)\ - || (EMBER_AF_BOARD_TYPE == BRD4302A)\ - || (EMBER_AF_BOARD_TYPE == BRD4303A)\ - || (EMBER_AF_BOARD_TYPE == BRD4304A)\ - || (EMBER_AF_BOARD_TYPE == BRD4305A)\ - || (EMBER_AF_BOARD_TYPE == BRD4305C)\ - || (EMBER_AF_BOARD_TYPE == BRD4305D)\ - || (EMBER_AF_BOARD_TYPE == BRD4305E)\ - || (EMBER_AF_BOARD_TYPE == BRD4306A)\ - || (EMBER_AF_BOARD_TYPE == BRD4306B)\ - || (EMBER_AF_BOARD_TYPE == BRD4306C)\ - || (EMBER_AF_BOARD_TYPE == BRD4306D)\ - || (EMBER_AF_BOARD_TYPE == BRD4310A)\ - || (EMBER_AF_BOARD_TYPE == BRD4311A) +#if (EMBER_AF_BOARD_TYPE == BRD4100A) || (EMBER_AF_BOARD_TYPE == BRD4101B) || (EMBER_AF_BOARD_TYPE == BRD4103A) || \ + (EMBER_AF_BOARD_TYPE == BRD4104A) || (EMBER_AF_BOARD_TYPE == BRD4105A) || (EMBER_AF_BOARD_TYPE == BRD4150A) || \ + (EMBER_AF_BOARD_TYPE == BRD4150B) || (EMBER_AF_BOARD_TYPE == BRD4150C) || (EMBER_AF_BOARD_TYPE == BRD4151A) || \ + (EMBER_AF_BOARD_TYPE == BRD4153A) || (EMBER_AF_BOARD_TYPE == BRD4158A) || (EMBER_AF_BOARD_TYPE == BRD4159A) || \ + (EMBER_AF_BOARD_TYPE == BRD4160A) || (EMBER_AF_BOARD_TYPE == BRD4161A) || (EMBER_AF_BOARD_TYPE == BRD4162A) || \ + (EMBER_AF_BOARD_TYPE == BRD4163A) || (EMBER_AF_BOARD_TYPE == BRD4164A) || (EMBER_AF_BOARD_TYPE == BRD4165B) || \ + (EMBER_AF_BOARD_TYPE == BRD4166A) || (EMBER_AF_BOARD_TYPE == BRD4167A) || (EMBER_AF_BOARD_TYPE == BRD4168A) || \ + (EMBER_AF_BOARD_TYPE == BRD4169A) || (EMBER_AF_BOARD_TYPE == BRD4169B) || (EMBER_AF_BOARD_TYPE == BRD4170A) || \ + (EMBER_AF_BOARD_TYPE == BRD4171A) || (EMBER_AF_BOARD_TYPE == BRD4172A) || (EMBER_AF_BOARD_TYPE == BRD4172B) || \ + (EMBER_AF_BOARD_TYPE == BRD4173A) || (EMBER_AF_BOARD_TYPE == BRD4174A) || (EMBER_AF_BOARD_TYPE == BRD4174B) || \ + (EMBER_AF_BOARD_TYPE == BRD4175A) || (EMBER_AF_BOARD_TYPE == BRD4182A) || (EMBER_AF_BOARD_TYPE == BRD4184A) || \ + (EMBER_AF_BOARD_TYPE == BRD4300A) || (EMBER_AF_BOARD_TYPE == BRD4301A) || (EMBER_AF_BOARD_TYPE == BRD4302A) || \ + (EMBER_AF_BOARD_TYPE == BRD4303A) || (EMBER_AF_BOARD_TYPE == BRD4304A) || (EMBER_AF_BOARD_TYPE == BRD4305A) || \ + (EMBER_AF_BOARD_TYPE == BRD4305C) || (EMBER_AF_BOARD_TYPE == BRD4305D) || (EMBER_AF_BOARD_TYPE == BRD4305E) || \ + (EMBER_AF_BOARD_TYPE == BRD4306A) || (EMBER_AF_BOARD_TYPE == BRD4306B) || (EMBER_AF_BOARD_TYPE == BRD4306C) || \ + (EMBER_AF_BOARD_TYPE == BRD4306D) || (EMBER_AF_BOARD_TYPE == BRD4310A) || (EMBER_AF_BOARD_TYPE == BRD4311A) #define FEATURE_I2C_SENSOR #endif -#if (EMBER_AF_BOARD_TYPE == BRD4100A)\ - || (EMBER_AF_BOARD_TYPE == BRD4101B)\ - || (EMBER_AF_BOARD_TYPE == BRD4103A)\ - || (EMBER_AF_BOARD_TYPE == BRD4104A)\ - || (EMBER_AF_BOARD_TYPE == BRD4105A)\ - || (EMBER_AF_BOARD_TYPE == BRD4150A)\ - || (EMBER_AF_BOARD_TYPE == BRD4150B)\ - || (EMBER_AF_BOARD_TYPE == BRD4150C)\ - || (EMBER_AF_BOARD_TYPE == BRD4151A)\ - || (EMBER_AF_BOARD_TYPE == BRD4153A)\ - || (EMBER_AF_BOARD_TYPE == BRD4158A)\ - || (EMBER_AF_BOARD_TYPE == BRD4159A)\ - || (EMBER_AF_BOARD_TYPE == BRD4160A)\ - || (EMBER_AF_BOARD_TYPE == BRD4161A)\ - || (EMBER_AF_BOARD_TYPE == BRD4162A)\ - || (EMBER_AF_BOARD_TYPE == BRD4163A)\ - || (EMBER_AF_BOARD_TYPE == BRD4164A)\ - || (EMBER_AF_BOARD_TYPE == BRD4165B)\ - || (EMBER_AF_BOARD_TYPE == BRD4166A)\ - || (EMBER_AF_BOARD_TYPE == BRD4167A)\ - || (EMBER_AF_BOARD_TYPE == BRD4168A)\ - || (EMBER_AF_BOARD_TYPE == BRD4169A)\ - || (EMBER_AF_BOARD_TYPE == BRD4169B)\ - || (EMBER_AF_BOARD_TYPE == BRD4170A)\ - || (EMBER_AF_BOARD_TYPE == BRD4172A)\ - || (EMBER_AF_BOARD_TYPE == BRD4172B)\ - || (EMBER_AF_BOARD_TYPE == BRD4173A)\ - || (EMBER_AF_BOARD_TYPE == BRD4174A)\ - || (EMBER_AF_BOARD_TYPE == BRD4174B)\ - || (EMBER_AF_BOARD_TYPE == BRD4175A)\ - || (EMBER_AF_BOARD_TYPE == BRD4179B)\ - || (EMBER_AF_BOARD_TYPE == BRD4180A)\ - || (EMBER_AF_BOARD_TYPE == BRD4180B)\ - || (EMBER_AF_BOARD_TYPE == BRD4181A)\ - || (EMBER_AF_BOARD_TYPE == BRD4181B)\ - || (EMBER_AF_BOARD_TYPE == BRD4182A)\ - || (EMBER_AF_BOARD_TYPE == BRD4183A)\ - || (EMBER_AF_BOARD_TYPE == BRD4184A)\ - || (EMBER_AF_BOARD_TYPE == BRD4300A)\ - || (EMBER_AF_BOARD_TYPE == BRD4301A)\ - || (EMBER_AF_BOARD_TYPE == BRD4302A)\ - || (EMBER_AF_BOARD_TYPE == BRD4303A)\ - || (EMBER_AF_BOARD_TYPE == BRD4304A)\ - || (EMBER_AF_BOARD_TYPE == BRD4305A)\ - || (EMBER_AF_BOARD_TYPE == BRD4305C)\ - || (EMBER_AF_BOARD_TYPE == BRD4305D)\ - || (EMBER_AF_BOARD_TYPE == BRD4305E)\ - || (EMBER_AF_BOARD_TYPE == BRD4306A)\ - || (EMBER_AF_BOARD_TYPE == BRD4306B)\ - || (EMBER_AF_BOARD_TYPE == BRD4306C)\ - || (EMBER_AF_BOARD_TYPE == BRD4306D)\ - || (EMBER_AF_BOARD_TYPE == BRD4308A)\ - || (EMBER_AF_BOARD_TYPE == BRD4308B)\ - || (EMBER_AF_BOARD_TYPE == BRD4310A) +#if (EMBER_AF_BOARD_TYPE == BRD4100A) || (EMBER_AF_BOARD_TYPE == BRD4101B) || (EMBER_AF_BOARD_TYPE == BRD4103A) || \ + (EMBER_AF_BOARD_TYPE == BRD4104A) || (EMBER_AF_BOARD_TYPE == BRD4105A) || (EMBER_AF_BOARD_TYPE == BRD4150A) || \ + (EMBER_AF_BOARD_TYPE == BRD4150B) || (EMBER_AF_BOARD_TYPE == BRD4150C) || (EMBER_AF_BOARD_TYPE == BRD4151A) || \ + (EMBER_AF_BOARD_TYPE == BRD4153A) || (EMBER_AF_BOARD_TYPE == BRD4158A) || (EMBER_AF_BOARD_TYPE == BRD4159A) || \ + (EMBER_AF_BOARD_TYPE == BRD4160A) || (EMBER_AF_BOARD_TYPE == BRD4161A) || (EMBER_AF_BOARD_TYPE == BRD4162A) || \ + (EMBER_AF_BOARD_TYPE == BRD4163A) || (EMBER_AF_BOARD_TYPE == BRD4164A) || (EMBER_AF_BOARD_TYPE == BRD4165B) || \ + (EMBER_AF_BOARD_TYPE == BRD4166A) || (EMBER_AF_BOARD_TYPE == BRD4167A) || (EMBER_AF_BOARD_TYPE == BRD4168A) || \ + (EMBER_AF_BOARD_TYPE == BRD4169A) || (EMBER_AF_BOARD_TYPE == BRD4169B) || (EMBER_AF_BOARD_TYPE == BRD4170A) || \ + (EMBER_AF_BOARD_TYPE == BRD4172A) || (EMBER_AF_BOARD_TYPE == BRD4172B) || (EMBER_AF_BOARD_TYPE == BRD4173A) || \ + (EMBER_AF_BOARD_TYPE == BRD4174A) || (EMBER_AF_BOARD_TYPE == BRD4174B) || (EMBER_AF_BOARD_TYPE == BRD4175A) || \ + (EMBER_AF_BOARD_TYPE == BRD4179B) || (EMBER_AF_BOARD_TYPE == BRD4180A) || (EMBER_AF_BOARD_TYPE == BRD4180B) || \ + (EMBER_AF_BOARD_TYPE == BRD4181A) || (EMBER_AF_BOARD_TYPE == BRD4181B) || (EMBER_AF_BOARD_TYPE == BRD4182A) || \ + (EMBER_AF_BOARD_TYPE == BRD4183A) || (EMBER_AF_BOARD_TYPE == BRD4184A) || (EMBER_AF_BOARD_TYPE == BRD4300A) || \ + (EMBER_AF_BOARD_TYPE == BRD4301A) || (EMBER_AF_BOARD_TYPE == BRD4302A) || (EMBER_AF_BOARD_TYPE == BRD4303A) || \ + (EMBER_AF_BOARD_TYPE == BRD4304A) || (EMBER_AF_BOARD_TYPE == BRD4305A) || (EMBER_AF_BOARD_TYPE == BRD4305C) || \ + (EMBER_AF_BOARD_TYPE == BRD4305D) || (EMBER_AF_BOARD_TYPE == BRD4305E) || (EMBER_AF_BOARD_TYPE == BRD4306A) || \ + (EMBER_AF_BOARD_TYPE == BRD4306B) || (EMBER_AF_BOARD_TYPE == BRD4306C) || (EMBER_AF_BOARD_TYPE == BRD4306D) || \ + (EMBER_AF_BOARD_TYPE == BRD4308A) || (EMBER_AF_BOARD_TYPE == BRD4308B) || (EMBER_AF_BOARD_TYPE == BRD4310A) #define FEATURE_LFXO #endif @@ -420,64 +185,26 @@ #define FEATURE_EFP #endif -#if (EMBER_AF_BOARD_TYPE == BRD4100A)\ - || (EMBER_AF_BOARD_TYPE == BRD4101B)\ - || (EMBER_AF_BOARD_TYPE == BRD4103A)\ - || (EMBER_AF_BOARD_TYPE == BRD4104A)\ - || (EMBER_AF_BOARD_TYPE == BRD4105A)\ - || (EMBER_AF_BOARD_TYPE == BRD4150A)\ - || (EMBER_AF_BOARD_TYPE == BRD4150B)\ - || (EMBER_AF_BOARD_TYPE == BRD4150C)\ - || (EMBER_AF_BOARD_TYPE == BRD4151A)\ - || (EMBER_AF_BOARD_TYPE == BRD4153A)\ - || (EMBER_AF_BOARD_TYPE == BRD4158A)\ - || (EMBER_AF_BOARD_TYPE == BRD4159A)\ - || (EMBER_AF_BOARD_TYPE == BRD4160A)\ - || (EMBER_AF_BOARD_TYPE == BRD4161A)\ - || (EMBER_AF_BOARD_TYPE == BRD4162A)\ - || (EMBER_AF_BOARD_TYPE == BRD4163A)\ - || (EMBER_AF_BOARD_TYPE == BRD4164A)\ - || (EMBER_AF_BOARD_TYPE == BRD4165B)\ - || (EMBER_AF_BOARD_TYPE == BRD4166A)\ - || (EMBER_AF_BOARD_TYPE == BRD4167A)\ - || (EMBER_AF_BOARD_TYPE == BRD4168A)\ - || (EMBER_AF_BOARD_TYPE == BRD4169A)\ - || (EMBER_AF_BOARD_TYPE == BRD4169B)\ - || (EMBER_AF_BOARD_TYPE == BRD4170A)\ - || (EMBER_AF_BOARD_TYPE == BRD4171A)\ - || (EMBER_AF_BOARD_TYPE == BRD4172A)\ - || (EMBER_AF_BOARD_TYPE == BRD4172B)\ - || (EMBER_AF_BOARD_TYPE == BRD4173A)\ - || (EMBER_AF_BOARD_TYPE == BRD4174A)\ - || (EMBER_AF_BOARD_TYPE == BRD4174B)\ - || (EMBER_AF_BOARD_TYPE == BRD4175A)\ - || (EMBER_AF_BOARD_TYPE == BRD4179B)\ - || (EMBER_AF_BOARD_TYPE == BRD4180A)\ - || (EMBER_AF_BOARD_TYPE == BRD4180B)\ - || (EMBER_AF_BOARD_TYPE == BRD4181A)\ - || (EMBER_AF_BOARD_TYPE == BRD4181B)\ - || (EMBER_AF_BOARD_TYPE == BRD4182A)\ - || (EMBER_AF_BOARD_TYPE == BRD4183A)\ - || (EMBER_AF_BOARD_TYPE == BRD4184A)\ - || (EMBER_AF_BOARD_TYPE == BRD4300A)\ - || (EMBER_AF_BOARD_TYPE == BRD4301A)\ - || (EMBER_AF_BOARD_TYPE == BRD4302A)\ - || (EMBER_AF_BOARD_TYPE == BRD4303A)\ - || (EMBER_AF_BOARD_TYPE == BRD4304A)\ - || (EMBER_AF_BOARD_TYPE == BRD4305A)\ - || (EMBER_AF_BOARD_TYPE == BRD4305C)\ - || (EMBER_AF_BOARD_TYPE == BRD4305D)\ - || (EMBER_AF_BOARD_TYPE == BRD4305E)\ - || (EMBER_AF_BOARD_TYPE == BRD4306A)\ - || (EMBER_AF_BOARD_TYPE == BRD4306B)\ - || (EMBER_AF_BOARD_TYPE == BRD4306C)\ - || (EMBER_AF_BOARD_TYPE == BRD4306D)\ - || (EMBER_AF_BOARD_TYPE == BRD4308A)\ - || (EMBER_AF_BOARD_TYPE == BRD4308B)\ - || (EMBER_AF_BOARD_TYPE == BRD4309A)\ - || (EMBER_AF_BOARD_TYPE == BRD4310A)\ - || (EMBER_AF_BOARD_TYPE == BRD4311A)\ - || (EMBER_AF_BOARD_TYPE == RD_0057_0101) +#if (EMBER_AF_BOARD_TYPE == BRD4100A) || (EMBER_AF_BOARD_TYPE == BRD4101B) || (EMBER_AF_BOARD_TYPE == BRD4103A) || \ + (EMBER_AF_BOARD_TYPE == BRD4104A) || (EMBER_AF_BOARD_TYPE == BRD4105A) || (EMBER_AF_BOARD_TYPE == BRD4150A) || \ + (EMBER_AF_BOARD_TYPE == BRD4150B) || (EMBER_AF_BOARD_TYPE == BRD4150C) || (EMBER_AF_BOARD_TYPE == BRD4151A) || \ + (EMBER_AF_BOARD_TYPE == BRD4153A) || (EMBER_AF_BOARD_TYPE == BRD4158A) || (EMBER_AF_BOARD_TYPE == BRD4159A) || \ + (EMBER_AF_BOARD_TYPE == BRD4160A) || (EMBER_AF_BOARD_TYPE == BRD4161A) || (EMBER_AF_BOARD_TYPE == BRD4162A) || \ + (EMBER_AF_BOARD_TYPE == BRD4163A) || (EMBER_AF_BOARD_TYPE == BRD4164A) || (EMBER_AF_BOARD_TYPE == BRD4165B) || \ + (EMBER_AF_BOARD_TYPE == BRD4166A) || (EMBER_AF_BOARD_TYPE == BRD4167A) || (EMBER_AF_BOARD_TYPE == BRD4168A) || \ + (EMBER_AF_BOARD_TYPE == BRD4169A) || (EMBER_AF_BOARD_TYPE == BRD4169B) || (EMBER_AF_BOARD_TYPE == BRD4170A) || \ + (EMBER_AF_BOARD_TYPE == BRD4171A) || (EMBER_AF_BOARD_TYPE == BRD4172A) || (EMBER_AF_BOARD_TYPE == BRD4172B) || \ + (EMBER_AF_BOARD_TYPE == BRD4173A) || (EMBER_AF_BOARD_TYPE == BRD4174A) || (EMBER_AF_BOARD_TYPE == BRD4174B) || \ + (EMBER_AF_BOARD_TYPE == BRD4175A) || (EMBER_AF_BOARD_TYPE == BRD4179B) || (EMBER_AF_BOARD_TYPE == BRD4180A) || \ + (EMBER_AF_BOARD_TYPE == BRD4180B) || (EMBER_AF_BOARD_TYPE == BRD4181A) || (EMBER_AF_BOARD_TYPE == BRD4181B) || \ + (EMBER_AF_BOARD_TYPE == BRD4182A) || (EMBER_AF_BOARD_TYPE == BRD4183A) || (EMBER_AF_BOARD_TYPE == BRD4184A) || \ + (EMBER_AF_BOARD_TYPE == BRD4300A) || (EMBER_AF_BOARD_TYPE == BRD4301A) || (EMBER_AF_BOARD_TYPE == BRD4302A) || \ + (EMBER_AF_BOARD_TYPE == BRD4303A) || (EMBER_AF_BOARD_TYPE == BRD4304A) || (EMBER_AF_BOARD_TYPE == BRD4305A) || \ + (EMBER_AF_BOARD_TYPE == BRD4305C) || (EMBER_AF_BOARD_TYPE == BRD4305D) || (EMBER_AF_BOARD_TYPE == BRD4305E) || \ + (EMBER_AF_BOARD_TYPE == BRD4306A) || (EMBER_AF_BOARD_TYPE == BRD4306B) || (EMBER_AF_BOARD_TYPE == BRD4306C) || \ + (EMBER_AF_BOARD_TYPE == BRD4306D) || (EMBER_AF_BOARD_TYPE == BRD4308A) || (EMBER_AF_BOARD_TYPE == BRD4308B) || \ + (EMBER_AF_BOARD_TYPE == BRD4309A) || (EMBER_AF_BOARD_TYPE == BRD4310A) || (EMBER_AF_BOARD_TYPE == BRD4311A) || \ + (EMBER_AF_BOARD_TYPE == RD_0057_0101) #define FEATURE_BOARD_DETECTED #endif @@ -500,4 +227,4 @@ // #define FEATURE_BOARD_DETECTED #endif -#endif /* BOARD_FEATURES_H */ \ No newline at end of file +#endif /* BOARD_FEATURES_H */ diff --git a/examples/lock-app/efr32/include/hal-config-app-common.h b/examples/lock-app/efr32/include/hal-config-app-common.h index 14a46e89fbdad5..694ba60d090d06 100644 --- a/examples/lock-app/efr32/include/hal-config-app-common.h +++ b/examples/lock-app/efr32/include/hal-config-app-common.h @@ -1,19 +1,22 @@ -/***************************************************************************//** - * @file - * @brief hal-config-app-common.h - ******************************************************************************* - * # License - * Copyright 2018 Silicon Laboratories Inc. www.silabs.com - ******************************************************************************* - * - * The licensor of this software is Silicon Laboratories Inc. Your use of this - * software is governed by the terms of Silicon Labs Master Software License - * Agreement (MSLA) available at - * www.silabs.com/about-us/legal/master-software-license-agreement. This - * software is distributed to you in Source Code format and is governed by the - * sections of the MSLA applicable to Source Code. - * - ******************************************************************************/ +/***************************************************************************/ /** + * @file + * @brief hal-config-app-common.h + ******************************************************************************* + * # License + * Copyright 2018 Silicon Laboratories Inc. + *www.silabs.com + ******************************************************************************* + * + * The licensor of this software is Silicon + *Laboratories Inc. Your use of this software is + *governed by the terms of Silicon Labs Master + *Software License Agreement (MSLA) available at + * www.silabs.com/about-us/legal/master-software-license-agreement. + *This software is distributed to you in Source Code + *format and is governed by the sections of the MSLA + *applicable to Source Code. + * + ******************************************************************************/ #ifndef HAL_CONFIG_APP_COMMON_H #define HAL_CONFIG_APP_COMMON_H @@ -25,90 +28,88 @@ #include "hal-config-ioexp.h" #endif +#define HAL_EXTFLASH_FREQUENCY (1000000) -#define HAL_EXTFLASH_FREQUENCY (1000000) - -#define HAL_PTI_ENABLE (1) -#define HAL_PTI_MODE (HAL_PTI_MODE_UART) -#define HAL_PTI_BAUD_RATE (1600000) +#define HAL_PTI_ENABLE (1) +#define HAL_PTI_MODE (HAL_PTI_MODE_UART) +#define HAL_PTI_BAUD_RATE (1600000) #ifdef BSP_CLK_LFXO_CTUNE #undef BSP_CLK_LFXO_CTUNE #endif -#define BSP_CLK_LFXO_CTUNE (32) - -#define HAL_PA_RAMP (10) -#define HAL_PA_2P4_LOWPOWER (0) -#define HAL_PA_POWER (252) -#define HAL_PA_CURVE_HEADER "pa_curves_efr32.h" +#define BSP_CLK_LFXO_CTUNE (32) +#define HAL_PA_RAMP (10) +#define HAL_PA_2P4_LOWPOWER (0) +#define HAL_PA_POWER (252) +#define HAL_PA_CURVE_HEADER "pa_curves_efr32.h" -#define HAL_PA_VOLTAGE BSP_PA_VOLTAGE +#define HAL_PA_VOLTAGE BSP_PA_VOLTAGE // Select antenna path on EFR32xG2x devices: // - RF2G2_IO1: 0 // - RF2G2_IO2: 1 -#define GECKO_RF_ANTENNA 1 +#define GECKO_RF_ANTENNA 1 #if defined(FEATURE_EXP_HEADER_USART3) -#define BSP_EXP_USART USART3 +#define BSP_EXP_USART USART3 -#define BSP_EXP_USART_CTS_PIN BSP_USART3_CTS_PIN -#define BSP_EXP_USART_CTS_PORT BSP_USART3_CTS_PORT -#define BSP_EXP_USART_CTS_LOC BSP_USART3_CTS_LOC +#define BSP_EXP_USART_CTS_PIN BSP_USART3_CTS_PIN +#define BSP_EXP_USART_CTS_PORT BSP_USART3_CTS_PORT +#define BSP_EXP_USART_CTS_LOC BSP_USART3_CTS_LOC -#define BSP_EXP_USART_RTS_PIN BSP_USART3_RTS_PIN -#define BSP_EXP_USART_RTS_PORT BSP_USART3_RTS_PORT -#define BSP_EXP_USART_RTS_LOC BSP_USART3_RTS_LOC +#define BSP_EXP_USART_RTS_PIN BSP_USART3_RTS_PIN +#define BSP_EXP_USART_RTS_PORT BSP_USART3_RTS_PORT +#define BSP_EXP_USART_RTS_LOC BSP_USART3_RTS_LOC -#define BSP_EXP_USART_RX_PIN BSP_USART3_RX_PIN -#define BSP_EXP_USART_RX_PORT BSP_USART3_RX_PORT -#define BSP_EXP_USART_RX_LOC BSP_USART3_RX_LOC +#define BSP_EXP_USART_RX_PIN BSP_USART3_RX_PIN +#define BSP_EXP_USART_RX_PORT BSP_USART3_RX_PORT +#define BSP_EXP_USART_RX_LOC BSP_USART3_RX_LOC -#define BSP_EXP_USART_TX_PIN BSP_USART3_TX_PIN -#define BSP_EXP_USART_TX_PORT BSP_USART3_TX_PORT -#define BSP_EXP_USART_TX_LOC BSP_USART3_TX_LOC +#define BSP_EXP_USART_TX_PIN BSP_USART3_TX_PIN +#define BSP_EXP_USART_TX_PORT BSP_USART3_TX_PORT +#define BSP_EXP_USART_TX_LOC BSP_USART3_TX_LOC #elif defined(FEATURE_EXP_HEADER_USART1) -#define BSP_EXP_USART USART1 +#define BSP_EXP_USART USART1 -#define BSP_EXP_USART_CTS_PIN BSP_USART1_CTS_PIN -#define BSP_EXP_USART_CTS_PORT BSP_USART1_CTS_PORT -#define BSP_EXP_USART_CTS_LOC BSP_USART1_CTS_LOC +#define BSP_EXP_USART_CTS_PIN BSP_USART1_CTS_PIN +#define BSP_EXP_USART_CTS_PORT BSP_USART1_CTS_PORT +#define BSP_EXP_USART_CTS_LOC BSP_USART1_CTS_LOC -#define BSP_EXP_USART_RTS_PIN BSP_USART1_RTS_PIN -#define BSP_EXP_USART_RTS_PORT BSP_USART1_RTS_PORT -#define BSP_EXP_USART_RTS_LOC BSP_USART1_RTS_LOC +#define BSP_EXP_USART_RTS_PIN BSP_USART1_RTS_PIN +#define BSP_EXP_USART_RTS_PORT BSP_USART1_RTS_PORT +#define BSP_EXP_USART_RTS_LOC BSP_USART1_RTS_LOC -#define BSP_EXP_USART_RX_PIN BSP_USART1_RX_PIN -#define BSP_EXP_USART_RX_PORT BSP_USART1_RX_PORT -#define BSP_EXP_USART_RX_LOC BSP_USART1_RX_LOC +#define BSP_EXP_USART_RX_PIN BSP_USART1_RX_PIN +#define BSP_EXP_USART_RX_PORT BSP_USART1_RX_PORT +#define BSP_EXP_USART_RX_LOC BSP_USART1_RX_LOC -#define BSP_EXP_USART_TX_PIN BSP_USART1_TX_PIN -#define BSP_EXP_USART_TX_PORT BSP_USART1_TX_PORT -#define BSP_EXP_USART_TX_LOC BSP_USART1_TX_LOC +#define BSP_EXP_USART_TX_PIN BSP_USART1_TX_PIN +#define BSP_EXP_USART_TX_PORT BSP_USART1_TX_PORT +#define BSP_EXP_USART_TX_LOC BSP_USART1_TX_LOC #else -#define BSP_EXP_USART USART0 +#define BSP_EXP_USART USART0 -#define BSP_EXP_USART_CTS_PIN BSP_USART0_CTS_PIN -#define BSP_EXP_USART_CTS_PORT BSP_USART0_CTS_PORT -#define BSP_EXP_USART_CTS_LOC BSP_USART0_CTS_LOC +#define BSP_EXP_USART_CTS_PIN BSP_USART0_CTS_PIN +#define BSP_EXP_USART_CTS_PORT BSP_USART0_CTS_PORT +#define BSP_EXP_USART_CTS_LOC BSP_USART0_CTS_LOC -#define BSP_EXP_USART_RTS_PIN BSP_USART0_RTS_PIN -#define BSP_EXP_USART_RTS_PORT BSP_USART0_RTS_PORT -#define BSP_EXP_USART_RTS_LOC BSP_USART0_RTS_LOC +#define BSP_EXP_USART_RTS_PIN BSP_USART0_RTS_PIN +#define BSP_EXP_USART_RTS_PORT BSP_USART0_RTS_PORT +#define BSP_EXP_USART_RTS_LOC BSP_USART0_RTS_LOC -#define BSP_EXP_USART_RX_PIN BSP_USART0_RX_PIN -#define BSP_EXP_USART_RX_PORT BSP_USART0_RX_PORT -#define BSP_EXP_USART_RX_LOC BSP_USART0_RX_LOC +#define BSP_EXP_USART_RX_PIN BSP_USART0_RX_PIN +#define BSP_EXP_USART_RX_PORT BSP_USART0_RX_PORT +#define BSP_EXP_USART_RX_LOC BSP_USART0_RX_LOC -#define BSP_EXP_USART_TX_PIN BSP_USART0_TX_PIN -#define BSP_EXP_USART_TX_PORT BSP_USART0_TX_PORT -#define BSP_EXP_USART_TX_LOC BSP_USART0_TX_LOC +#define BSP_EXP_USART_TX_PIN BSP_USART0_TX_PIN +#define BSP_EXP_USART_TX_PORT BSP_USART0_TX_PORT +#define BSP_EXP_USART_TX_LOC BSP_USART0_TX_LOC #endif // FEATURE_EXP_HEADER_USART3 - -#endif /* HAL_CONFIG_APP_COMMON_H */ \ No newline at end of file + +#endif /* HAL_CONFIG_APP_COMMON_H */ diff --git a/examples/lock-app/efr32/include/hal-config.h b/examples/lock-app/efr32/include/hal-config.h index 0d26486bac5b1a..c152d11e29cc11 100644 --- a/examples/lock-app/efr32/include/hal-config.h +++ b/examples/lock-app/efr32/include/hal-config.h @@ -33,38 +33,41 @@ // [BULBPWM_COLOR]$ // $[DISPLAY] -#define HAL_SPIDISPLAY_FREQUENCY (1000000) +#define HAL_SPIDISPLAY_FREQUENCY (1000000) // $[BUTTON] -#define BSP_BUTTON_PRESENT (1) +#define BSP_BUTTON_PRESENT (1) -#define BSP_BUTTON0_PIN (6U) -#define BSP_BUTTON0_PORT (gpioPortF) +#define BSP_BUTTON0_PIN (6U) +#define BSP_BUTTON0_PORT (gpioPortF) -#define BSP_BUTTON1_PIN (7U) -#define BSP_BUTTON1_PORT (gpioPortF) +#define BSP_BUTTON1_PIN (7U) +#define BSP_BUTTON1_PORT (gpioPortF) -#define BSP_BUTTON_COUNT (2U) -#define BSP_BUTTON_INIT { { BSP_BUTTON0_PORT, BSP_BUTTON0_PIN }, { BSP_BUTTON1_PORT, BSP_BUTTON1_PIN } } -#define BSP_BUTTON_GPIO_DOUT (HAL_GPIO_DOUT_LOW) -#define BSP_BUTTON_GPIO_MODE (HAL_GPIO_MODE_INPUT) +#define BSP_BUTTON_COUNT (2U) +#define BSP_BUTTON_INIT \ + { \ + { BSP_BUTTON0_PORT, BSP_BUTTON0_PIN }, { BSP_BUTTON1_PORT, BSP_BUTTON1_PIN } \ + } +#define BSP_BUTTON_GPIO_DOUT (HAL_GPIO_DOUT_LOW) +#define BSP_BUTTON_GPIO_MODE (HAL_GPIO_MODE_INPUT) // [BUTTON]$ // $[CMU] -#define HAL_CLK_HFCLK_SOURCE (HAL_CLK_HFCLK_SOURCE_HFXO) -#define HAL_CLK_LFECLK_SOURCE (HAL_CLK_LFCLK_SOURCE_LFRCO) -#define HAL_CLK_LFBCLK_SOURCE (HAL_CLK_LFCLK_SOURCE_LFRCO) -#define BSP_CLK_LFXO_PRESENT (1) -#define BSP_CLK_HFXO_PRESENT (1) -#define BSP_CLK_LFXO_INIT CMU_LFXOINIT_DEFAULT -#define BSP_CLK_LFXO_CTUNE (0) -#define BSP_CLK_LFXO_FREQ (32768) -#define HAL_CLK_LFACLK_SOURCE (HAL_CLK_LFCLK_SOURCE_LFRCO) -#define BSP_CLK_HFXO_FREQ (38400000) -#define BSP_CLK_HFXO_CTUNE (338) -#define BSP_CLK_HFXO_INIT CMU_HFXOINIT_DEFAULT -#define BSP_CLK_HFXO_CTUNE_TOKEN (0) -#define HAL_CLK_HFXO_AUTOSTART (HAL_CLK_HFXO_AUTOSTART_NONE) +#define HAL_CLK_HFCLK_SOURCE (HAL_CLK_HFCLK_SOURCE_HFXO) +#define HAL_CLK_LFECLK_SOURCE (HAL_CLK_LFCLK_SOURCE_LFRCO) +#define HAL_CLK_LFBCLK_SOURCE (HAL_CLK_LFCLK_SOURCE_LFRCO) +#define BSP_CLK_LFXO_PRESENT (1) +#define BSP_CLK_HFXO_PRESENT (1) +#define BSP_CLK_LFXO_INIT CMU_LFXOINIT_DEFAULT +#define BSP_CLK_LFXO_CTUNE (0) +#define BSP_CLK_LFXO_FREQ (32768) +#define HAL_CLK_LFACLK_SOURCE (HAL_CLK_LFCLK_SOURCE_LFRCO) +#define BSP_CLK_HFXO_FREQ (38400000) +#define BSP_CLK_HFXO_CTUNE (338) +#define BSP_CLK_HFXO_INIT CMU_HFXOINIT_DEFAULT +#define BSP_CLK_HFXO_CTUNE_TOKEN (0) +#define HAL_CLK_HFXO_AUTOSTART (HAL_CLK_HFXO_AUTOSTART_NONE) // [CMU]$ // $[COEX] @@ -77,10 +80,10 @@ // [CSEN0]$ // $[DCDC] -#define BSP_DCDC_PRESENT (1) +#define BSP_DCDC_PRESENT (1) -#define HAL_DCDC_BYPASS (0) -#define BSP_DCDC_INIT EMU_DCDCINIT_DEFAULT +#define HAL_DCDC_BYPASS (0) +#define BSP_DCDC_INIT EMU_DCDCINIT_DEFAULT // [DCDC]$ // $[EMU] @@ -93,47 +96,47 @@ // [EZRADIOPRO]$ // $[GPIO] -#define PORTIO_GPIO_SWCLKTCK_PIN (0) -#define PORTIO_GPIO_SWCLKTCK_PORT (gpioPortF) -#define PORTIO_GPIO_DBGROUTE_LOC (0) +#define PORTIO_GPIO_SWCLKTCK_PIN (0) +#define PORTIO_GPIO_SWCLKTCK_PORT (gpioPortF) +#define PORTIO_GPIO_DBGROUTE_LOC (0) -#define PORTIO_GPIO_SWDIOTMS_PIN (1) -#define PORTIO_GPIO_SWDIOTMS_PORT (gpioPortF) +#define PORTIO_GPIO_SWDIOTMS_PIN (1) +#define PORTIO_GPIO_SWDIOTMS_PORT (gpioPortF) -#define PORTIO_GPIO_SWV_PIN (2) -#define PORTIO_GPIO_SWV_PORT (gpioPortF) -#define PORTIO_GPIO_SWV_LOC (0) +#define PORTIO_GPIO_SWV_PIN (2) +#define PORTIO_GPIO_SWV_PORT (gpioPortF) +#define PORTIO_GPIO_SWV_LOC (0) -#define PORTIO_GPIO_TCLK_PIN (8) -#define PORTIO_GPIO_TCLK_PORT (gpioPortF) -#define PORTIO_GPIO_TCLK_LOC (0) +#define PORTIO_GPIO_TCLK_PIN (8) +#define PORTIO_GPIO_TCLK_PORT (gpioPortF) +#define PORTIO_GPIO_TCLK_LOC (0) -#define PORTIO_GPIO_TD0_PIN (9) -#define PORTIO_GPIO_TD0_PORT (gpioPortF) -#define PORTIO_GPIO_TD0_LOC (0) +#define PORTIO_GPIO_TD0_PIN (9) +#define PORTIO_GPIO_TD0_PORT (gpioPortF) +#define PORTIO_GPIO_TD0_LOC (0) -#define PORTIO_GPIO_TD1_PIN (10) -#define PORTIO_GPIO_TD1_PORT (gpioPortF) -#define PORTIO_GPIO_TD1_LOC (0) +#define PORTIO_GPIO_TD1_PIN (10) +#define PORTIO_GPIO_TD1_PORT (gpioPortF) +#define PORTIO_GPIO_TD1_LOC (0) -#define PORTIO_GPIO_TD2_PIN (11) -#define PORTIO_GPIO_TD2_PORT (gpioPortF) -#define PORTIO_GPIO_TD2_LOC (0) +#define PORTIO_GPIO_TD2_PIN (11) +#define PORTIO_GPIO_TD2_PORT (gpioPortF) +#define PORTIO_GPIO_TD2_LOC (0) -#define PORTIO_GPIO_TD3_PIN (12) -#define PORTIO_GPIO_TD3_PORT (gpioPortF) -#define PORTIO_GPIO_TD3_LOC (0) +#define PORTIO_GPIO_TD3_PIN (12) +#define PORTIO_GPIO_TD3_PORT (gpioPortF) +#define PORTIO_GPIO_TD3_LOC (0) // [GPIO]$ // $[I2C0] -#define PORTIO_I2C0_SCL_PIN (10) -#define PORTIO_I2C0_SCL_PORT (gpioPortC) -#define PORTIO_I2C0_SCL_LOC (14) +#define PORTIO_I2C0_SCL_PIN (10) +#define PORTIO_I2C0_SCL_PORT (gpioPortC) +#define PORTIO_I2C0_SCL_LOC (14) -#define PORTIO_I2C0_SDA_PIN (11) -#define PORTIO_I2C0_SDA_PORT (gpioPortC) -#define PORTIO_I2C0_SDA_LOC (16) +#define PORTIO_I2C0_SDA_PIN (11) +#define PORTIO_I2C0_SDA_PORT (gpioPortC) +#define PORTIO_I2C0_SDA_LOC (16) // [I2C0]$ @@ -150,18 +153,24 @@ // [IOEXP]$ // $[LED] -#define BSP_LED_PRESENT (1) - -#define BSP_LED0_PIN (4) -#define BSP_LED0_PORT (gpioPortF) - -#define BSP_LED1_PIN (5) -#define BSP_LED1_PORT (gpioPortF) - -#define HAL_LED_ENABLE { 0, 1 } -#define HAL_LED_COUNT (2) -#define BSP_LED_COUNT (2) -#define BSP_LED_INIT { { BSP_LED0_PORT, BSP_LED0_PIN }, { BSP_LED1_PORT, BSP_LED1_PIN } } +#define BSP_LED_PRESENT (1) + +#define BSP_LED0_PIN (4) +#define BSP_LED0_PORT (gpioPortF) + +#define BSP_LED1_PIN (5) +#define BSP_LED1_PORT (gpioPortF) + +#define HAL_LED_ENABLE \ + { \ + 0, 1 \ + } +#define HAL_LED_COUNT (2) +#define BSP_LED_COUNT (2) +#define BSP_LED_INIT \ + { \ + { BSP_LED0_PORT, BSP_LED0_PIN }, { BSP_LED1_PORT, BSP_LED1_PIN } \ + } // [LED]$ // $[LESENSE] @@ -180,13 +189,13 @@ // [LNA]$ // $[PA] -#define HAL_PA_ENABLE (1) +#define HAL_PA_ENABLE (1) -#define HAL_PA_RAMP (10) -#define HAL_PA_2P4_LOWPOWER (0) -#define HAL_PA_POWER (252) -#define HAL_PA_VOLTAGE (3300) -#define HAL_PA_CURVE_HEADER "pa_curves_efr32.h" +#define HAL_PA_RAMP (10) +#define HAL_PA_2P4_LOWPOWER (0) +#define HAL_PA_POWER (252) +#define HAL_PA_VOLTAGE (3300) +#define HAL_PA_CURVE_HEADER "pa_curves_efr32.h" // [PA]$ // $[PCNT0] @@ -202,67 +211,67 @@ // [PORTIO]$ // $[PRS] -#define PORTIO_PRS_CH4_PIN (13) -#define PORTIO_PRS_CH4_PORT (gpioPortD) -#define PORTIO_PRS_CH4_LOC (4) +#define PORTIO_PRS_CH4_PIN (13) +#define PORTIO_PRS_CH4_PORT (gpioPortD) +#define PORTIO_PRS_CH4_LOC (4) // [PRS]$ // $[PTI] -#define PORTIO_PTI_DFRAME_PIN (13) -#define PORTIO_PTI_DFRAME_PORT (gpioPortB) -#define PORTIO_PTI_DFRAME_LOC (6) +#define PORTIO_PTI_DFRAME_PIN (13) +#define PORTIO_PTI_DFRAME_PORT (gpioPortB) +#define PORTIO_PTI_DFRAME_LOC (6) -#define PORTIO_PTI_DOUT_PIN (12) -#define PORTIO_PTI_DOUT_PORT (gpioPortB) -#define PORTIO_PTI_DOUT_LOC (6) +#define PORTIO_PTI_DOUT_PIN (12) +#define PORTIO_PTI_DOUT_PORT (gpioPortB) +#define PORTIO_PTI_DOUT_LOC (6) -#define HAL_PTI_ENABLE (1) +#define HAL_PTI_ENABLE (1) -#define BSP_PTI_DFRAME_PIN (13) -#define BSP_PTI_DFRAME_PORT (gpioPortB) -#define BSP_PTI_DFRAME_LOC (6) +#define BSP_PTI_DFRAME_PIN (13) +#define BSP_PTI_DFRAME_PORT (gpioPortB) +#define BSP_PTI_DFRAME_LOC (6) -#define BSP_PTI_DOUT_PIN (12) -#define BSP_PTI_DOUT_PORT (gpioPortB) -#define BSP_PTI_DOUT_LOC (6) +#define BSP_PTI_DOUT_PIN (12) +#define BSP_PTI_DOUT_PORT (gpioPortB) +#define BSP_PTI_DOUT_LOC (6) -#define HAL_PTI_MODE (HAL_PTI_MODE_UART) -#define HAL_PTI_BAUD_RATE (1600000) +#define HAL_PTI_MODE (HAL_PTI_MODE_UART) +#define HAL_PTI_BAUD_RATE (1600000) // [PTI]$ // $[PYD1698] // [PYD1698]$ // $[SERIAL] -#define HAL_SERIAL_USART0_ENABLE (0) -#define HAL_SERIAL_LEUART0_ENABLE (0) -#define HAL_SERIAL_USART1_ENABLE (0) -#define HAL_SERIAL_USART2_ENABLE (0) -#define HAL_SERIAL_USART3_ENABLE (0) -#define HAL_SERIAL_RXWAKE_ENABLE (0) -#define BSP_SERIAL_APP_CTS_PIN (2) -#define BSP_SERIAL_APP_CTS_PORT (gpioPortA) -#define BSP_SERIAL_APP_CTS_LOC (30) - -#define BSP_SERIAL_APP_RX_PIN (1) -#define BSP_SERIAL_APP_RX_PORT (gpioPortA) -#define BSP_SERIAL_APP_RX_LOC (0) - -#define BSP_SERIAL_APP_TX_PIN (0) -#define BSP_SERIAL_APP_TX_PORT (gpioPortA) -#define BSP_SERIAL_APP_TX_LOC (0) - -#define BSP_SERIAL_APP_RTS_PIN (3) -#define BSP_SERIAL_APP_RTS_PORT (gpioPortA) -#define BSP_SERIAL_APP_RTS_LOC (30) - -#define HAL_SERIAL_APP_RX_QUEUE_SIZE (128) -#define HAL_SERIAL_APP_BAUD_RATE (115200) -#define HAL_SERIAL_APP_RXSTOP (16) -#define HAL_SERIAL_APP_RXSTART (16) -#define HAL_SERIAL_APP_TX_QUEUE_SIZE (128) -#define HAL_SERIAL_APP_FLOW_CONTROL (HAL_USART_FLOW_CONTROL_HWUART) +#define HAL_SERIAL_USART0_ENABLE (0) +#define HAL_SERIAL_LEUART0_ENABLE (0) +#define HAL_SERIAL_USART1_ENABLE (0) +#define HAL_SERIAL_USART2_ENABLE (0) +#define HAL_SERIAL_USART3_ENABLE (0) +#define HAL_SERIAL_RXWAKE_ENABLE (0) +#define BSP_SERIAL_APP_CTS_PIN (2) +#define BSP_SERIAL_APP_CTS_PORT (gpioPortA) +#define BSP_SERIAL_APP_CTS_LOC (30) + +#define BSP_SERIAL_APP_RX_PIN (1) +#define BSP_SERIAL_APP_RX_PORT (gpioPortA) +#define BSP_SERIAL_APP_RX_LOC (0) + +#define BSP_SERIAL_APP_TX_PIN (0) +#define BSP_SERIAL_APP_TX_PORT (gpioPortA) +#define BSP_SERIAL_APP_TX_LOC (0) + +#define BSP_SERIAL_APP_RTS_PIN (3) +#define BSP_SERIAL_APP_RTS_PORT (gpioPortA) +#define BSP_SERIAL_APP_RTS_LOC (30) + +#define HAL_SERIAL_APP_RX_QUEUE_SIZE (128) +#define HAL_SERIAL_APP_BAUD_RATE (115200) +#define HAL_SERIAL_APP_RXSTOP (16) +#define HAL_SERIAL_APP_RXSTART (16) +#define HAL_SERIAL_APP_TX_QUEUE_SIZE (128) +#define HAL_SERIAL_APP_FLOW_CONTROL (HAL_USART_FLOW_CONTROL_HWUART) // [SERIAL]$ // $[SPIDISPLAY] @@ -281,102 +290,102 @@ // [UARTNCP]$ // $[USART0] -#define PORTIO_USART0_CTS_PIN (2) -#define PORTIO_USART0_CTS_PORT (gpioPortA) -#define PORTIO_USART0_CTS_LOC (30) - -#define PORTIO_USART0_RTS_PIN (3) -#define PORTIO_USART0_RTS_PORT (gpioPortA) -#define PORTIO_USART0_RTS_LOC (30) - -#define PORTIO_USART0_RX_PIN (1) -#define PORTIO_USART0_RX_PORT (gpioPortA) -#define PORTIO_USART0_RX_LOC (0) - -#define PORTIO_USART0_TX_PIN (0) -#define PORTIO_USART0_TX_PORT (gpioPortA) -#define PORTIO_USART0_TX_LOC (0) - -#define HAL_USART0_ENABLE (1) - -#define BSP_USART0_CTS_PIN (2) -#define BSP_USART0_CTS_PORT (gpioPortA) -#define BSP_USART0_CTS_LOC (30) - -#define BSP_USART0_RX_PIN (1) -#define BSP_USART0_RX_PORT (gpioPortA) -#define BSP_USART0_RX_LOC (0) - -#define BSP_USART0_TX_PIN (0) -#define BSP_USART0_TX_PORT (gpioPortA) -#define BSP_USART0_TX_LOC (0) - -#define BSP_USART0_RTS_PIN (3) -#define BSP_USART0_RTS_PORT (gpioPortA) -#define BSP_USART0_RTS_LOC (30) - -#define HAL_USART0_RX_QUEUE_SIZE (128) -#define HAL_USART0_BAUD_RATE (115200) -#define HAL_USART0_RXSTOP (16) -#define HAL_USART0_RXSTART (16) -#define HAL_USART0_TX_QUEUE_SIZE (128) -#define HAL_USART0_FLOW_CONTROL (HAL_USART_FLOW_CONTROL_NONE) +#define PORTIO_USART0_CTS_PIN (2) +#define PORTIO_USART0_CTS_PORT (gpioPortA) +#define PORTIO_USART0_CTS_LOC (30) + +#define PORTIO_USART0_RTS_PIN (3) +#define PORTIO_USART0_RTS_PORT (gpioPortA) +#define PORTIO_USART0_RTS_LOC (30) + +#define PORTIO_USART0_RX_PIN (1) +#define PORTIO_USART0_RX_PORT (gpioPortA) +#define PORTIO_USART0_RX_LOC (0) + +#define PORTIO_USART0_TX_PIN (0) +#define PORTIO_USART0_TX_PORT (gpioPortA) +#define PORTIO_USART0_TX_LOC (0) + +#define HAL_USART0_ENABLE (1) + +#define BSP_USART0_CTS_PIN (2) +#define BSP_USART0_CTS_PORT (gpioPortA) +#define BSP_USART0_CTS_LOC (30) + +#define BSP_USART0_RX_PIN (1) +#define BSP_USART0_RX_PORT (gpioPortA) +#define BSP_USART0_RX_LOC (0) + +#define BSP_USART0_TX_PIN (0) +#define BSP_USART0_TX_PORT (gpioPortA) +#define BSP_USART0_TX_LOC (0) + +#define BSP_USART0_RTS_PIN (3) +#define BSP_USART0_RTS_PORT (gpioPortA) +#define BSP_USART0_RTS_LOC (30) + +#define HAL_USART0_RX_QUEUE_SIZE (128) +#define HAL_USART0_BAUD_RATE (115200) +#define HAL_USART0_RXSTOP (16) +#define HAL_USART0_RXSTART (16) +#define HAL_USART0_TX_QUEUE_SIZE (128) +#define HAL_USART0_FLOW_CONTROL (HAL_USART_FLOW_CONTROL_NONE) // [USART0]$ // $[USART1] -#define PORTIO_USART1_CLK_PIN (8) -#define PORTIO_USART1_CLK_PORT (gpioPortC) -#define PORTIO_USART1_CLK_LOC (11) +#define PORTIO_USART1_CLK_PIN (8) +#define PORTIO_USART1_CLK_PORT (gpioPortC) +#define PORTIO_USART1_CLK_LOC (11) -#define PORTIO_USART1_CS_PIN (9) -#define PORTIO_USART1_CS_PORT (gpioPortC) -#define PORTIO_USART1_CS_LOC (11) +#define PORTIO_USART1_CS_PIN (9) +#define PORTIO_USART1_CS_PORT (gpioPortC) +#define PORTIO_USART1_CS_LOC (11) -#define PORTIO_USART1_RX_PIN (7) -#define PORTIO_USART1_RX_PORT (gpioPortC) -#define PORTIO_USART1_RX_LOC (11) +#define PORTIO_USART1_RX_PIN (7) +#define PORTIO_USART1_RX_PORT (gpioPortC) +#define PORTIO_USART1_RX_LOC (11) -#define PORTIO_USART1_TX_PIN (6) -#define PORTIO_USART1_TX_PORT (gpioPortC) -#define PORTIO_USART1_TX_LOC (11) +#define PORTIO_USART1_TX_PIN (6) +#define PORTIO_USART1_TX_PORT (gpioPortC) +#define PORTIO_USART1_TX_LOC (11) // [USART1]$ // $[USART2] -#define PORTIO_USART2_CLK_PIN (8) -#define PORTIO_USART2_CLK_PORT (gpioPortA) -#define PORTIO_USART2_CLK_LOC (1) +#define PORTIO_USART2_CLK_PIN (8) +#define PORTIO_USART2_CLK_PORT (gpioPortA) +#define PORTIO_USART2_CLK_LOC (1) -#define PORTIO_USART2_CS_PIN (9) -#define PORTIO_USART2_CS_PORT (gpioPortA) -#define PORTIO_USART2_CS_LOC (1) +#define PORTIO_USART2_CS_PIN (9) +#define PORTIO_USART2_CS_PORT (gpioPortA) +#define PORTIO_USART2_CS_LOC (1) -#define PORTIO_USART2_RX_PIN (7) -#define PORTIO_USART2_RX_PORT (gpioPortA) -#define PORTIO_USART2_RX_LOC (1) +#define PORTIO_USART2_RX_PIN (7) +#define PORTIO_USART2_RX_PORT (gpioPortA) +#define PORTIO_USART2_RX_LOC (1) -#define PORTIO_USART2_TX_PIN (6) -#define PORTIO_USART2_TX_PORT (gpioPortA) -#define PORTIO_USART2_TX_LOC (1) +#define PORTIO_USART2_TX_PIN (6) +#define PORTIO_USART2_TX_PORT (gpioPortA) +#define PORTIO_USART2_TX_LOC (1) // [USART2]$ // $[USART3] -#define PORTIO_USART3_CTS_PIN (8) -#define PORTIO_USART3_CTS_PORT (gpioPortD) -#define PORTIO_USART3_CTS_LOC (28) +#define PORTIO_USART3_CTS_PIN (8) +#define PORTIO_USART3_CTS_PORT (gpioPortD) +#define PORTIO_USART3_CTS_LOC (28) -#define PORTIO_USART3_RTS_PIN (9) -#define PORTIO_USART3_RTS_PORT (gpioPortD) -#define PORTIO_USART3_RTS_LOC (28) +#define PORTIO_USART3_RTS_PIN (9) +#define PORTIO_USART3_RTS_PORT (gpioPortD) +#define PORTIO_USART3_RTS_LOC (28) -#define PORTIO_USART3_RX_PIN (7) -#define PORTIO_USART3_RX_PORT (gpioPortB) -#define PORTIO_USART3_RX_LOC (10) +#define PORTIO_USART3_RX_PIN (7) +#define PORTIO_USART3_RX_PORT (gpioPortB) +#define PORTIO_USART3_RX_LOC (10) -#define PORTIO_USART3_TX_PIN (6) -#define PORTIO_USART3_TX_PORT (gpioPortB) -#define PORTIO_USART3_TX_LOC (10) +#define PORTIO_USART3_TX_PIN (6) +#define PORTIO_USART3_TX_PORT (gpioPortB) +#define PORTIO_USART3_TX_LOC (10) // [USART3]$ @@ -399,4 +408,3 @@ // [WTIMER1]$ #endif /* HAL_CONFIG_H */ - diff --git a/examples/lock-app/efr32/include/init_board.h b/examples/lock-app/efr32/include/init_board.h index 5d8f45d82a099e..17bbd633cecd9f 100644 --- a/examples/lock-app/efr32/include/init_board.h +++ b/examples/lock-app/efr32/include/init_board.h @@ -1,19 +1,22 @@ -/***************************************************************************//** - * @file - * @brief init_board.h - ******************************************************************************* - * # License - * Copyright 2018 Silicon Laboratories Inc. www.silabs.com - ******************************************************************************* - * - * The licensor of this software is Silicon Laboratories Inc. Your use of this - * software is governed by the terms of Silicon Labs Master Software License - * Agreement (MSLA) available at - * www.silabs.com/about-us/legal/master-software-license-agreement. This - * software is distributed to you in Source Code format and is governed by the - * sections of the MSLA applicable to Source Code. - * - ******************************************************************************/ +/***************************************************************************/ /** + * @file + * @brief init_board.h + ******************************************************************************* + * # License + * Copyright 2018 Silicon Laboratories Inc. + *www.silabs.com + ******************************************************************************* + * + * The licensor of this software is Silicon + *Laboratories Inc. Your use of this software is + *governed by the terms of Silicon Labs Master + *Software License Agreement (MSLA) available at + * www.silabs.com/about-us/legal/master-software-license-agreement. + *This software is distributed to you in Source Code + *format and is governed by the sections of the MSLA + *applicable to Source Code. + * + ******************************************************************************/ #ifndef INIT_BOARD_H #define INIT_BOARD_H diff --git a/examples/lock-app/efr32/include/init_mcu.h b/examples/lock-app/efr32/include/init_mcu.h index c7a1bc049483b6..76e3703cd6b2c4 100644 --- a/examples/lock-app/efr32/include/init_mcu.h +++ b/examples/lock-app/efr32/include/init_mcu.h @@ -1,19 +1,22 @@ -/***************************************************************************//** - * @file - * @brief init_mcu.h - ******************************************************************************* - * # License - * Copyright 2018 Silicon Laboratories Inc. www.silabs.com - ******************************************************************************* - * - * The licensor of this software is Silicon Laboratories Inc. Your use of this - * software is governed by the terms of Silicon Labs Master Software License - * Agreement (MSLA) available at - * www.silabs.com/about-us/legal/master-software-license-agreement. This - * software is distributed to you in Source Code format and is governed by the - * sections of the MSLA applicable to Source Code. - * - ******************************************************************************/ +/***************************************************************************/ /** + * @file + * @brief init_mcu.h + ******************************************************************************* + * # License + * Copyright 2018 Silicon Laboratories Inc. + *www.silabs.com + ******************************************************************************* + * + * The licensor of this software is Silicon + *Laboratories Inc. Your use of this software is + *governed by the terms of Silicon Labs Master + *Software License Agreement (MSLA) available at + * www.silabs.com/about-us/legal/master-software-license-agreement. + *This software is distributed to you in Source Code + *format and is governed by the sections of the MSLA + *applicable to Source Code. + * + ******************************************************************************/ #ifndef INIT_MCU_H #define INIT_MCU_H @@ -37,14 +40,13 @@ extern "C" { * for self use on custom boards. */ -//This is a Silicon Labs radio board, the CTUNE value can be read out from EEPROM -#define MFG_CTUNE_EN 1 +// This is a Silicon Labs radio board, the CTUNE value can be read out from EEPROM +#define MFG_CTUNE_EN 1 - -//Address for CTUNE in User page +// Address for CTUNE in User page #define MFG_CTUNE_ADDR 0x0FE00100UL -//Value of the CTUNE in User page -#define MFG_CTUNE_VAL (*((uint16_t *) (MFG_CTUNE_ADDR))) +// Value of the CTUNE in User page +#define MFG_CTUNE_VAL (*((uint16_t *) (MFG_CTUNE_ADDR))) void initMcu(void); diff --git a/examples/lock-app/efr32/include/mbedtls-config.h b/examples/lock-app/efr32/include/mbedtls-config.h index e63861aa983a65..1583f084c459b8 100644 --- a/examples/lock-app/efr32/include/mbedtls-config.h +++ b/examples/lock-app/efr32/include/mbedtls-config.h @@ -32,7 +32,6 @@ #include #include - #define MBEDTLS_PLATFORM_SNPRINTF_MACRO snprintf #define MBEDTLS_AES_C @@ -71,8 +70,7 @@ #define MBEDTLS_SSL_PROTO_DTLS #define MBEDTLS_SSL_TLS_C -#if OPENTHREAD_CONFIG_BORDER_AGENT_ENABLE || OPENTHREAD_CONFIG_COMMISSIONER_ENABLE || \ - OPENTHREAD_CONFIG_COAP_SECURE_API_ENABLE +#if OPENTHREAD_CONFIG_BORDER_AGENT_ENABLE || OPENTHREAD_CONFIG_COMMISSIONER_ENABLE || OPENTHREAD_CONFIG_COAP_SECURE_API_ENABLE #define MBEDTLS_SSL_COOKIE_C #define MBEDTLS_SSL_SRV_C #endif @@ -102,27 +100,27 @@ #define MBEDTLS_PEM_PARSE_C #endif -#define MBEDTLS_MPI_WINDOW_SIZE 1 /**< Maximum windows size used. */ -#define MBEDTLS_MPI_MAX_SIZE 32 /**< Maximum number of bytes for usable MPIs. */ -#define MBEDTLS_ECP_MAX_BITS 256 /**< Maximum bit size of groups */ -#define MBEDTLS_ECP_WINDOW_SIZE 2 /**< Maximum window size used */ -#define MBEDTLS_ECP_FIXED_POINT_OPTIM 0 /**< Enable fixed-point speed-up */ -#define MBEDTLS_ENTROPY_MAX_SOURCES 1 /**< Maximum number of sources supported */ +#define MBEDTLS_MPI_WINDOW_SIZE 1 /**< Maximum windows size used. */ +#define MBEDTLS_MPI_MAX_SIZE 32 /**< Maximum number of bytes for usable MPIs. */ +#define MBEDTLS_ECP_MAX_BITS 256 /**< Maximum bit size of groups */ +#define MBEDTLS_ECP_WINDOW_SIZE 2 /**< Maximum window size used */ +#define MBEDTLS_ECP_FIXED_POINT_OPTIM 0 /**< Enable fixed-point speed-up */ +#define MBEDTLS_ENTROPY_MAX_SOURCES 1 /**< Maximum number of sources supported */ // #if OPENTHREAD_CONFIG_MULTIPLE_INSTANCE_ENABLE -#define MBEDTLS_PLATFORM_STD_CALLOC calloc /**< Default allocator to use, can be undefined */ -#define MBEDTLS_PLATFORM_STD_FREE free /**< Default free to use, can be undefined */ +#define MBEDTLS_PLATFORM_STD_CALLOC calloc /**< Default allocator to use, can be undefined */ +#define MBEDTLS_PLATFORM_STD_FREE free /**< Default free to use, can be undefined */ // #else // #define MBEDTLS_MEMORY_BUFFER_ALLOC_C // #endif #if OPENTHREAD_CONFIG_COAP_SECURE_API_ENABLE -#define MBEDTLS_SSL_MAX_CONTENT_LEN 900 /**< Maxium fragment length in bytes */ +#define MBEDTLS_SSL_MAX_CONTENT_LEN 900 /**< Maxium fragment length in bytes */ #else -#define MBEDTLS_SSL_MAX_CONTENT_LEN 768 /**< Maxium fragment length in bytes */ +#define MBEDTLS_SSL_MAX_CONTENT_LEN 768 /**< Maxium fragment length in bytes */ #endif -#define MBEDTLS_SSL_CIPHERSUITES MBEDTLS_TLS_ECJPAKE_WITH_AES_128_CCM_8 +#define MBEDTLS_SSL_CIPHERSUITES MBEDTLS_TLS_ECJPAKE_WITH_AES_128_CCM_8 #if defined(MBEDTLS_USER_CONFIG_FILE) #include MBEDTLS_USER_CONFIG_FILE diff --git a/examples/lock-app/efr32/src/ButtonHandler.cpp b/examples/lock-app/efr32/src/ButtonHandler.cpp index a970ed3fb371b5..99a9a3d5b2725b 100644 --- a/examples/lock-app/efr32/src/ButtonHandler.cpp +++ b/examples/lock-app/efr32/src/ButtonHandler.cpp @@ -28,12 +28,12 @@ typedef struct ButtonArray { GPIO_Port_TypeDef port; - unsigned int pin; + unsigned int pin; } ButtonArray_t; static const ButtonArray_t sButtonArray[BSP_BUTTON_COUNT] = BSP_BUTTON_INIT; // GPIO info for the 2 WDTK buttons. TimerHandle_t buttonTimers[BSP_BUTTON_COUNT]; // FreeRTOS timers used for debouncing buttons. Array to hold handles to - // the created timers. +// the created timers. void ButtonHandler::Init(void) { @@ -42,13 +42,12 @@ void ButtonHandler::Init(void) // Create FreeRTOS sw timers for debouncing buttons. for (uint8_t i = 0; i < BSP_BUTTON_COUNT; i++) { - buttonTimers[i] = - xTimerCreate("BtnTmr", // Just a text name, not used by the RTOS kernel - APP_BUTTON_DEBOUNCE_PERIOD_MS, // timer period - false, // no timer reload (==one-shot) - (void *)(int)i, // init timer id = button index - TimerCallback // timer callback handler (all buttons use the same timer cn function) - ); + buttonTimers[i] = xTimerCreate("BtnTmr", // Just a text name, not used by the RTOS kernel + APP_BUTTON_DEBOUNCE_PERIOD_MS, // timer period + false, // no timer reload (==one-shot) + (void *) (int) i, // init timer id = button index + TimerCallback // timer callback handler (all buttons use the same timer cn function) + ); } } @@ -132,7 +131,7 @@ void ButtonHandler::TimerCallback(TimerHandle_t xTimer) uint32_t timerId; - timerId = (uint32_t)pvTimerGetTimerID(xTimer); + timerId = (uint32_t) pvTimerGetTimerID(xTimer); if (timerId < BSP_BUTTON_COUNT) { uint8_t btnIdx = timerId; diff --git a/examples/lock-app/efr32/src/init_board.c b/examples/lock-app/efr32/src/init_board.c index 247a4514c486ae..d6478b58b969bb 100644 --- a/examples/lock-app/efr32/src/init_board.c +++ b/examples/lock-app/efr32/src/init_board.c @@ -1,19 +1,22 @@ -/***************************************************************************//** - * @file - * @brief init_board.c - ******************************************************************************* - * # License - * Copyright 2018 Silicon Laboratories Inc. www.silabs.com - ******************************************************************************* - * - * The licensor of this software is Silicon Laboratories Inc. Your use of this - * software is governed by the terms of Silicon Labs Master Software License - * Agreement (MSLA) available at - * www.silabs.com/about-us/legal/master-software-license-agreement. This - * software is distributed to you in Source Code format and is governed by the - * sections of the MSLA applicable to Source Code. - * - ******************************************************************************/ +/***************************************************************************/ /** + * @file + * @brief init_board.c + ******************************************************************************* + * # License + * Copyright 2018 Silicon Laboratories Inc. + *www.silabs.com + ******************************************************************************* + * + * The licensor of this software is Silicon + *Laboratories Inc. Your use of this software is + *governed by the terms of Silicon Labs Master + *Software License Agreement (MSLA) available at + * www.silabs.com/about-us/legal/master-software-license-agreement. + *This software is distributed to you in Source Code + *format and is governed by the sections of the MSLA + *applicable to Source Code. + * + ******************************************************************************/ #if defined(HAL_CONFIG) #include "bsphalconfig.h" @@ -25,7 +28,6 @@ #include "board_features.h" #include "em_cmu.h" - #include "em_cmu.h" #include "em_usart.h" @@ -36,52 +38,44 @@ void initBoard(void) { - // Enable clock for CRYOTIMER - CMU_ClockEnable(cmuClock_CRYOTIMER, true); -#if ((HAL_VCOM_ENABLE == 1) \ - || (HAL_USART3_ENABLE == 1) \ - || (HAL_USART1_ENABLE == 1) \ - || (HAL_USART0_ENABLE == 1)) + // Enable clock for CRYOTIMER + CMU_ClockEnable(cmuClock_CRYOTIMER, true); +#if ((HAL_VCOM_ENABLE == 1) || (HAL_USART3_ENABLE == 1) || (HAL_USART1_ENABLE == 1) || (HAL_USART0_ENABLE == 1)) #if defined(FEATURE_EXP_HEADER_USART3) - // Enable clock for USART3 - CMU_ClockEnable(cmuClock_USART3, true); + // Enable clock for USART3 + CMU_ClockEnable(cmuClock_USART3, true); #elif defined(FEATURE_EXP_HEADER_USART1) - // Enable clock for USART1 - CMU_ClockEnable(cmuClock_USART1, true); + // Enable clock for USART1 + CMU_ClockEnable(cmuClock_USART1, true); #else - // Enable clock for USART0 - CMU_ClockEnable(cmuClock_USART0, true); + // Enable clock for USART0 + CMU_ClockEnable(cmuClock_USART0, true); #endif #endif //(HAL_VCOM_ENABLE == 1) -#if ((HAL_I2CSENSOR_ENABLE == 1) \ - || (HAL_VCOM_ENABLE == 1) \ - || (HAL_SPIDISPLAY_ENABLE == 1) \ - || (HAL_USART3_ENABLE == 1) \ - || (HAL_USART1_ENABLE == 1) \ - || (HAL_USART0_ENABLE == 1)) - // Enable clock for PRS - CMU_ClockEnable(cmuClock_PRS, true); - // Enable GPIO clock source - CMU_ClockEnable(cmuClock_GPIO, true); -#endif /* ((HAL_I2CSENSOR_ENABLE == 1) \ - || (HAL_VCOM_ENABLE == 1) \ - || (HAL_SPIDISPLAY_ENABLE == 1) \ - || (HAL_USART3_ENABLE == 1) \ - || (HAL_USART1_ENABLE == 1) \ +#if ((HAL_I2CSENSOR_ENABLE == 1) || (HAL_VCOM_ENABLE == 1) || (HAL_SPIDISPLAY_ENABLE == 1) || (HAL_USART3_ENABLE == 1) || \ + (HAL_USART1_ENABLE == 1) || (HAL_USART0_ENABLE == 1)) + // Enable clock for PRS + CMU_ClockEnable(cmuClock_PRS, true); + // Enable GPIO clock source + CMU_ClockEnable(cmuClock_GPIO, true); +#endif /* ((HAL_I2CSENSOR_ENABLE == 1) \ + || (HAL_VCOM_ENABLE == 1) \ + || (HAL_SPIDISPLAY_ENABLE == 1) \ + || (HAL_USART3_ENABLE == 1) \ + || (HAL_USART1_ENABLE == 1) \ || (HAL_USART0_ENABLE == 1)) */ - // Put the SPI flash into Deep Power Down mode for those radio boards where it is available - MX25_init(); - MX25_DP(); - // We must disable SPI communication - MX25_deinit(); - + // Put the SPI flash into Deep Power Down mode for those radio boards where it is available + MX25_init(); + MX25_DP(); + // We must disable SPI communication + MX25_deinit(); } void initVcomEnable(void) { #if defined(HAL_VCOM_ENABLE) - // Enable VCOM if requested - GPIO_PinModeSet(BSP_VCOM_ENABLE_PORT, BSP_VCOM_ENABLE_PIN, gpioModePushPull, HAL_VCOM_ENABLE); + // Enable VCOM if requested + GPIO_PinModeSet(BSP_VCOM_ENABLE_PORT, BSP_VCOM_ENABLE_PIN, gpioModePushPull, HAL_VCOM_ENABLE); #endif // HAL_VCOM_ENABLE -} \ No newline at end of file +} diff --git a/examples/lock-app/efr32/src/init_mcu.c b/examples/lock-app/efr32/src/init_mcu.c index 5feea243fde378..4e0425082f0e4d 100644 --- a/examples/lock-app/efr32/src/init_mcu.c +++ b/examples/lock-app/efr32/src/init_mcu.c @@ -1,19 +1,22 @@ -/***************************************************************************//** - * @file - * @brief init_mcu.c - ******************************************************************************* - * # License - * Copyright 2018 Silicon Laboratories Inc. www.silabs.com - ******************************************************************************* - * - * The licensor of this software is Silicon Laboratories Inc. Your use of this - * software is governed by the terms of Silicon Labs Master Software License - * Agreement (MSLA) available at - * www.silabs.com/about-us/legal/master-software-license-agreement. This - * software is distributed to you in Source Code format and is governed by the - * sections of the MSLA applicable to Source Code. - * - ******************************************************************************/ +/***************************************************************************/ /** + * @file + * @brief init_mcu.c + ******************************************************************************* + * # License + * Copyright 2018 Silicon Laboratories Inc. + *www.silabs.com + ******************************************************************************* + * + * The licensor of this software is Silicon + *Laboratories Inc. Your use of this software is + *governed by the terms of Silicon Labs Master + *Software License Agreement (MSLA) available at + * www.silabs.com/about-us/legal/master-software-license-agreement. + *This software is distributed to you in Source Code + *format and is governed by the sections of the MSLA + *applicable to Source Code. + * + ******************************************************************************/ #if defined(HAL_CONFIG) #include "bsphalconfig.h" @@ -33,139 +36,141 @@ #include "init_mcu.h" - // Bit [19] in MODULEINFO is the HFXOCALVAL: // 1=No factory cal, use default XO tunning value in FW // 0=Factory Cal, use XO tunning value in DI -#define DEVINFO_MODULEINFO_HFXOCALVAL_MASK 0x00080000UL +#define DEVINFO_MODULEINFO_HFXOCALVAL_MASK 0x00080000UL // Calibration value for HFXO CTUNE is at DEVINFO Offset 0x08 -#define DEVINFO_MODULEINFO_CRYSTALOSCCALVAL (*((uint16_t *) (uint32_t)(DEVINFO_BASE+0x8UL))) +#define DEVINFO_MODULEINFO_CRYSTALOSCCALVAL (*((uint16_t *) (uint32_t)(DEVINFO_BASE + 0x8UL))) // [15:9] : (LFXOTUNING) Calibration for LFXO TUNING // [8:0] : (HFXOCTUNE) Calibration for HFXO CTUNE -#define DEVINFO_HFXOCTUNE_MASK 0x01FFUL +#define DEVINFO_HFXOCTUNE_MASK 0x01FFUL -#define set_HFXO_CTUNE(val) do {hfxoInit.ctuneSteadyState = (val);} while (0) +#define set_HFXO_CTUNE(val) \ + do \ + { \ + hfxoInit.ctuneSteadyState = (val); \ + } while (0) static void initMcu_clocks(void); static void initHFXO(void); void initMcu(void) { - // Device errata - CHIP_Init(); - - // Set up DC-DC converter - EMU_DCDCInit_TypeDef dcdcInit = BSP_DCDC_INIT; - #if HAL_DCDC_BYPASS - dcdcInit.dcdcMode = emuDcdcMode_Bypass; - #endif - EMU_DCDCInit(&dcdcInit); - - // Set up clocks - initMcu_clocks(); - - - RTCC_Init_TypeDef rtccInit = RTCC_INIT_DEFAULT; - rtccInit.enable = true; - rtccInit.debugRun = false; - rtccInit.precntWrapOnCCV0 = false; - rtccInit.cntWrapOnCCV1 = false; - rtccInit.prescMode = rtccCntTickPresc; - rtccInit.presc = rtccCntPresc_1; - rtccInit.enaOSCFailDetect = false; - rtccInit.cntMode = rtccCntModeNormal; - RTCC_Init(&rtccInit); + // Device errata + CHIP_Init(); + + // Set up DC-DC converter + EMU_DCDCInit_TypeDef dcdcInit = BSP_DCDC_INIT; +#if HAL_DCDC_BYPASS + dcdcInit.dcdcMode = emuDcdcMode_Bypass; +#endif + EMU_DCDCInit(&dcdcInit); + + // Set up clocks + initMcu_clocks(); + + RTCC_Init_TypeDef rtccInit = RTCC_INIT_DEFAULT; + rtccInit.enable = true; + rtccInit.debugRun = false; + rtccInit.precntWrapOnCCV0 = false; + rtccInit.cntWrapOnCCV1 = false; + rtccInit.prescMode = rtccCntTickPresc; + rtccInit.presc = rtccCntPresc_1; + rtccInit.enaOSCFailDetect = false; + rtccInit.cntMode = rtccCntModeNormal; + RTCC_Init(&rtccInit); #if defined(EMU_VSCALE_PRESENT) - // Set up EM0, EM1 energy mode configuration - EMU_EM01Init_TypeDef em01Init = EMU_EM01INIT_DEFAULT; - EMU_EM01Init(&em01Init); + // Set up EM0, EM1 energy mode configuration + EMU_EM01Init_TypeDef em01Init = EMU_EM01INIT_DEFAULT; + EMU_EM01Init(&em01Init); #endif // EMU_VSCALE_PRESENT - // Set up EM2, EM3 energy mode configuration - EMU_EM23Init_TypeDef em23init = EMU_EM23INIT_DEFAULT; + // Set up EM2, EM3 energy mode configuration + EMU_EM23Init_TypeDef em23init = EMU_EM23INIT_DEFAULT; #if defined(EMU_VSCALE_PRESENT) - em23init.vScaleEM23Voltage = emuVScaleEM23_LowPower; + em23init.vScaleEM23Voltage = emuVScaleEM23_LowPower; #endif // EMU_VSCALE_PRESENT - EMU_EM23Init(&em23init); - + EMU_EM23Init(&em23init); #if defined(RMU_PRESENT) - // Set reset mode for sysreset back to DEFAULT (extended), this might have - // been changed by the bootloader to FULL reset. - RMU->CTRL = (RMU->CTRL & ~_RMU_CTRL_SYSRMODE_MASK) | RMU_CTRL_SYSRMODE_DEFAULT; + // Set reset mode for sysreset back to DEFAULT (extended), this might have + // been changed by the bootloader to FULL reset. + RMU->CTRL = (RMU->CTRL & ~_RMU_CTRL_SYSRMODE_MASK) | RMU_CTRL_SYSRMODE_DEFAULT; #endif - } static void initMcu_clocks(void) { - // Initialize HFXO - initHFXO(); + // Initialize HFXO + initHFXO(); - // Set system HFXO frequency - SystemHFXOClockSet(BSP_CLK_HFXO_FREQ); + // Set system HFXO frequency + SystemHFXOClockSet(BSP_CLK_HFXO_FREQ); - // Enable HFXO oscillator, and wait for it to be stable - CMU_OscillatorEnable(cmuOsc_HFXO, true, true); + // Enable HFXO oscillator, and wait for it to be stable + CMU_OscillatorEnable(cmuOsc_HFXO, true, true); - // Enable HFXO Autostart only if EM2 voltage scaling is disabled. - // In 1.0 V mode the chip does not support frequencies > 21 MHz, - // this is why HFXO autostart is not supported in this case. -#if!defined(_EMU_CTRL_EM23VSCALE_MASK) - // Automatically start and select HFXO - CMU_HFXOAutostartEnable(0, true, true); + // Enable HFXO Autostart only if EM2 voltage scaling is disabled. + // In 1.0 V mode the chip does not support frequencies > 21 MHz, + // this is why HFXO autostart is not supported in this case. +#if !defined(_EMU_CTRL_EM23VSCALE_MASK) + // Automatically start and select HFXO + CMU_HFXOAutostartEnable(0, true, true); #else - CMU_ClockSelectSet(cmuClock_HF, cmuSelect_HFXO); -#endif//_EMU_CTRL_EM23VSCALE_MASK - - // HFRCO not needed when using HFXO - CMU_OscillatorEnable(cmuOsc_HFRCO, false, false); - - // Enabling HFBUSCLKLE clock for LE peripherals - CMU_ClockEnable(cmuClock_HFLE, true); - - - // Initialize LFXO - CMU_LFXOInit_TypeDef lfxoInit = BSP_CLK_LFXO_INIT; - lfxoInit.ctune = BSP_CLK_LFXO_CTUNE; - CMU_LFXOInit(&lfxoInit); - // Set system LFXO frequency - SystemLFXOClockSet(BSP_CLK_LFXO_FREQ); - - // Set LFXO if selected as LFCLK - CMU_ClockSelectSet(cmuClock_LFA, cmuSelect_LFXO); - CMU_ClockSelectSet(cmuClock_LFB, cmuSelect_LFXO); - CMU_ClockSelectSet(cmuClock_LFE, cmuSelect_LFXO); - CMU_ClockEnable(cmuClock_GPIO, true); + CMU_ClockSelectSet(cmuClock_HF, cmuSelect_HFXO); +#endif //_EMU_CTRL_EM23VSCALE_MASK + + // HFRCO not needed when using HFXO + CMU_OscillatorEnable(cmuOsc_HFRCO, false, false); + + // Enabling HFBUSCLKLE clock for LE peripherals + CMU_ClockEnable(cmuClock_HFLE, true); + + // Initialize LFXO + CMU_LFXOInit_TypeDef lfxoInit = BSP_CLK_LFXO_INIT; + lfxoInit.ctune = BSP_CLK_LFXO_CTUNE; + CMU_LFXOInit(&lfxoInit); + // Set system LFXO frequency + SystemLFXOClockSet(BSP_CLK_LFXO_FREQ); + + // Set LFXO if selected as LFCLK + CMU_ClockSelectSet(cmuClock_LFA, cmuSelect_LFXO); + CMU_ClockSelectSet(cmuClock_LFB, cmuSelect_LFXO); + CMU_ClockSelectSet(cmuClock_LFE, cmuSelect_LFXO); + CMU_ClockEnable(cmuClock_GPIO, true); } static void initHFXO(void) { - // Initialize HFXO - // Use BSP_CLK_HFXO_INIT as last result (4th) - CMU_HFXOInit_TypeDef hfxoInit = BSP_CLK_HFXO_INIT; - // if Factory Cal exists in DEVINFO then use it above all (1st) - if (0 == (DEVINFO->MODULEINFO & DEVINFO_MODULEINFO_HFXOCALVAL_MASK)) { + // Initialize HFXO + // Use BSP_CLK_HFXO_INIT as last result (4th) + CMU_HFXOInit_TypeDef hfxoInit = BSP_CLK_HFXO_INIT; + // if Factory Cal exists in DEVINFO then use it above all (1st) + if (0 == (DEVINFO->MODULEINFO & DEVINFO_MODULEINFO_HFXOCALVAL_MASK)) + { #if defined(_SILICON_LABS_32B_SERIES_1) - set_HFXO_CTUNE(DEVINFO_MODULEINFO_CRYSTALOSCCALVAL); + set_HFXO_CTUNE(DEVINFO_MODULEINFO_CRYSTALOSCCALVAL); #elif defined(_SILICON_LABS_32B_SERIES_2) - set_HFXO_CTUNE(DEVINFO->MODXOCAL & _DEVINFO_MODXOCAL_HFXOCTUNEXIANA_MASK); + set_HFXO_CTUNE(DEVINFO->MODXOCAL & _DEVINFO_MODXOCAL_HFXOCTUNEXIANA_MASK); #endif - } - // if User page has CTUNE from studio use that in 2nd place + } + // if User page has CTUNE from studio use that in 2nd place #if (MFG_CTUNE_EN == 1) - else if (MFG_CTUNE_VAL != 0xFFFF) { - set_HFXO_CTUNE(MFG_CTUNE_VAL); - } + else if (MFG_CTUNE_VAL != 0xFFFF) + { + set_HFXO_CTUNE(MFG_CTUNE_VAL); + } #endif - // 3rd option, get data from header defined for product/board + // 3rd option, get data from header defined for product/board #if defined(BSP_CLK_HFXO_CTUNE) && BSP_CLK_HFXO_CTUNE >= 0 - else { - set_HFXO_CTUNE(BSP_CLK_HFXO_CTUNE); - } + else + { + set_HFXO_CTUNE(BSP_CLK_HFXO_CTUNE); + } #endif - CMU_HFXOInit(&hfxoInit); + CMU_HFXOInit(&hfxoInit); - // Set system HFXO frequency - SystemHFXOClockSet(BSP_CLK_HFXO_FREQ); + // Set system HFXO frequency + SystemHFXOClockSet(BSP_CLK_HFXO_FREQ); } diff --git a/examples/lock-app/nrf5/main/AppTask.cpp b/examples/lock-app/nrf5/main/AppTask.cpp index 6b4ddfaa078cba..3b6bf2190e3818 100644 --- a/examples/lock-app/nrf5/main/AppTask.cpp +++ b/examples/lock-app/nrf5/main/AppTask.cpp @@ -32,11 +32,11 @@ #include -#define FACTORY_RESET_TRIGGER_TIMEOUT 3000 +#define FACTORY_RESET_TRIGGER_TIMEOUT 3000 #define FACTORY_RESET_CANCEL_WINDOW_TIMEOUT 3000 -#define APP_TASK_STACK_SIZE (4096) -#define APP_TASK_PRIORITY 2 -#define APP_EVENT_QUEUE_SIZE 10 +#define APP_TASK_STACK_SIZE (4096) +#define APP_TASK_PRIORITY 2 +#define APP_EVENT_QUEUE_SIZE 10 APP_TIMER_DEF(sFunctionTimer); @@ -50,12 +50,12 @@ static LEDWidget sLockLED; static LEDWidget sUnusedLED; static LEDWidget sUnusedLED_1; -static bool sIsThreadProvisioned = false; -static bool sIsThreadEnabled = false; -static bool sIsThreadAttached = false; -static bool sIsPairedToAccount = false; -static bool sHaveBLEConnections = false; -static bool sHaveServiceConnectivity = false; +static bool sIsThreadProvisioned = false; +static bool sIsThreadEnabled = false; +static bool sIsThreadAttached = false; +static bool sIsPairedToAccount = false; +static bool sHaveBLEConnections = false; +static bool sHaveServiceConnectivity = false; using namespace ::chip::DeviceLayer; @@ -178,11 +178,11 @@ void AppTask::AppTaskMain(void * pvParameter) // task is busy (e.g. with a long crypto operation). if (PlatformMgr().TryLockChipStack()) { - sIsThreadProvisioned = ConnectivityMgr().IsThreadProvisioned(); - sIsThreadEnabled = ConnectivityMgr().IsThreadEnabled(); - sIsThreadAttached = ConnectivityMgr().IsThreadAttached(); - sHaveBLEConnections = (ConnectivityMgr().NumBLEConnections() != 0); - sHaveServiceConnectivity = ConnectivityMgr().HaveServiceConnectivity(); + sIsThreadProvisioned = ConnectivityMgr().IsThreadProvisioned(); + sIsThreadEnabled = ConnectivityMgr().IsThreadEnabled(); + sIsThreadAttached = ConnectivityMgr().IsThreadAttached(); + sHaveBLEConnections = (ConnectivityMgr().NumBLEConnections() != 0); + sHaveServiceConnectivity = ConnectivityMgr().HaveServiceConnectivity(); PlatformMgr().UnlockChipStack(); } @@ -233,7 +233,7 @@ void AppTask::LockActionEventHandler(AppEvent * aEvent) { bool initiated = false; BoltLockManager::Action_t action; - int32_t actor = 0; + int32_t actor = 0; ret_code_t ret = NRF_SUCCESS; if (aEvent->Type == AppEvent::kEventType_Lock) @@ -251,7 +251,6 @@ void AppTask::LockActionEventHandler(AppEvent * aEvent) { action = BoltLockManager::UNLOCK_ACTION; } - } else { diff --git a/examples/lock-app/nrf5/main/BoltLockManager.cpp b/examples/lock-app/nrf5/main/BoltLockManager.cpp index 36d7b6f53c29ae..5b9f61036b4d14 100644 --- a/examples/lock-app/nrf5/main/BoltLockManager.cpp +++ b/examples/lock-app/nrf5/main/BoltLockManager.cpp @@ -41,16 +41,15 @@ int BoltLockManager::Init() APP_ERROR_HANDLER(ret); } - mState = kState_LockingCompleted; + mState = kState_LockingCompleted; mAutoLockTimerArmed = false; - mAutoRelock = false; - mAutoLockDuration = 0; + mAutoRelock = false; + mAutoLockDuration = 0; return ret; } -void BoltLockManager::SetCallbacks(Callback_fn_initiated aActionInitiated_CB, - Callback_fn_completed aActionCompleted_CB) +void BoltLockManager::SetCallbacks(Callback_fn_initiated aActionInitiated_CB, Callback_fn_completed aActionCompleted_CB) { mActionInitiated_CB = aActionInitiated_CB; mActionCompleted_CB = aActionCompleted_CB; @@ -166,7 +165,7 @@ void BoltLockManager::TimerEventHandler(void * p_context) void BoltLockManager::AutoReLockTimerEventHandler(AppEvent * aEvent) { BoltLockManager * lock = static_cast(aEvent->TimerEvent.Context); - int32_t actor = 0; + int32_t actor = 0; // Make sure auto lock timer is still armed. if (!lock->mAutoLockTimerArmed) diff --git a/examples/lock-app/nrf5/main/include/BoltLockManager.h b/examples/lock-app/nrf5/main/include/BoltLockManager.h index 05886bc2213925..77a356c01a42f9 100644 --- a/examples/lock-app/nrf5/main/include/BoltLockManager.h +++ b/examples/lock-app/nrf5/main/include/BoltLockManager.h @@ -70,7 +70,7 @@ class BoltLockManager static void TimerEventHandler(void * p_context); static void AutoReLockTimerEventHandler(AppEvent * aEvent); - static void ActuatorMovementTimerEventHandler(AppEvent *aEvent); + static void ActuatorMovementTimerEventHandler(AppEvent * aEvent); static BoltLockManager sLock; }; diff --git a/examples/lock-app/nrf5/main/include/CHIPProjectConfig.h b/examples/lock-app/nrf5/main/include/CHIPProjectConfig.h index 5e6b117ac1afc9..29b52cf2639607 100644 --- a/examples/lock-app/nrf5/main/include/CHIPProjectConfig.h +++ b/examples/lock-app/nrf5/main/include/CHIPProjectConfig.h @@ -28,13 +28,13 @@ #ifndef CHIP_PROJECT_CONFIG_H #define CHIP_PROJECT_CONFIG_H -#if BUILD_RELEASE // release build +#if BUILD_RELEASE // release build // Security and Authentication enabled for release build. #define CHIP_CONFIG_SECURITY_TEST_MODE 0 #define CHIP_CONFIG_REQUIRE_AUTH 1 -#else // development build +#else // development build // Security and Authentication disabled for development build. // For convenience, enable CHIP Security Test Mode and disable the requirement for @@ -65,7 +65,7 @@ */ #define CHIP_DEVICE_CONFIG_USE_TEST_SERIAL_NUMBER "DUMMY_SN" -# endif // BUILD_RELEASE +#endif // BUILD_RELEASE /** * CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID diff --git a/examples/lock-app/nrf5/main/include/FreeRTOSConfig.h b/examples/lock-app/nrf5/main/include/FreeRTOSConfig.h index cc0c623cb311d7..22683417138605 100644 --- a/examples/lock-app/nrf5/main/include/FreeRTOSConfig.h +++ b/examples/lock-app/nrf5/main/include/FreeRTOSConfig.h @@ -26,7 +26,6 @@ * 1 tab == 4 spaces! */ - #ifndef FREERTOS_CONFIG_H #define FREERTOS_CONFIG_H @@ -36,163 +35,161 @@ #endif #include "app_util_platform.h" -#define FREERTOS_USE_RTC 0 /**< Use real time clock for the system */ -#define FREERTOS_USE_SYSTICK 1 /**< Use SysTick timer for system */ - -#define configTICK_SOURCE FREERTOS_USE_RTC - -#define configUSE_PREEMPTION 1 -#define configUSE_PORT_OPTIMISED_TASK_SELECTION 1 -#define configUSE_TICKLESS_IDLE 1 -#define configUSE_TICKLESS_IDLE_SIMPLE_DEBUG 1 /* See into vPortSuppressTicksAndSleep source code for explanation */ -#define configCPU_CLOCK_HZ ( SystemCoreClock ) -#define configTICK_RATE_HZ 1024 -#define configMAX_PRIORITIES ( 3 ) -#define configMINIMAL_STACK_SIZE ( 100 ) -#define configTOTAL_HEAP_SIZE 0 /* FreeRTOS heap functions mapped to malloc/free (heap_3.c) */ -#define configMAX_TASK_NAME_LEN ( 8 ) -#define configUSE_16_BIT_TICKS 0 -#define configIDLE_SHOULD_YIELD 1 -#define configUSE_MUTEXES 1 -#define configUSE_RECURSIVE_MUTEXES 1 -#define configUSE_COUNTING_SEMAPHORES 1 -#define configUSE_ALTERNATIVE_API 0 /* Deprecated! */ -#define configQUEUE_REGISTRY_SIZE 2 -#define configUSE_QUEUE_SETS 0 -#define configUSE_TIME_SLICING 0 -#define configUSE_NEWLIB_REENTRANT 0 -#define configENABLE_BACKWARD_COMPATIBILITY 1 +#define FREERTOS_USE_RTC 0 /**< Use real time clock for the system */ +#define FREERTOS_USE_SYSTICK 1 /**< Use SysTick timer for system */ + +#define configTICK_SOURCE FREERTOS_USE_RTC + +#define configUSE_PREEMPTION 1 +#define configUSE_PORT_OPTIMISED_TASK_SELECTION 1 +#define configUSE_TICKLESS_IDLE 1 +#define configUSE_TICKLESS_IDLE_SIMPLE_DEBUG 1 /* See into vPortSuppressTicksAndSleep source code for explanation */ +#define configCPU_CLOCK_HZ (SystemCoreClock) +#define configTICK_RATE_HZ 1024 +#define configMAX_PRIORITIES (3) +#define configMINIMAL_STACK_SIZE (100) +#define configTOTAL_HEAP_SIZE 0 /* FreeRTOS heap functions mapped to malloc/free (heap_3.c) */ +#define configMAX_TASK_NAME_LEN (8) +#define configUSE_16_BIT_TICKS 0 +#define configIDLE_SHOULD_YIELD 1 +#define configUSE_MUTEXES 1 +#define configUSE_RECURSIVE_MUTEXES 1 +#define configUSE_COUNTING_SEMAPHORES 1 +#define configUSE_ALTERNATIVE_API 0 /* Deprecated! */ +#define configQUEUE_REGISTRY_SIZE 2 +#define configUSE_QUEUE_SETS 0 +#define configUSE_TIME_SLICING 0 +#define configUSE_NEWLIB_REENTRANT 0 +#define configENABLE_BACKWARD_COMPATIBILITY 1 /* Hook function related definitions. */ -#define configUSE_IDLE_HOOK 0 -#define configUSE_TICK_HOOK 0 -#define configCHECK_FOR_STACK_OVERFLOW 0 -#define configUSE_MALLOC_FAILED_HOOK 0 +#define configUSE_IDLE_HOOK 0 +#define configUSE_TICK_HOOK 0 +#define configCHECK_FOR_STACK_OVERFLOW 0 +#define configUSE_MALLOC_FAILED_HOOK 0 /* Run time and task stats gathering related definitions. */ -#define configGENERATE_RUN_TIME_STATS 0 -#define configUSE_STATS_FORMATTING_FUNCTIONS 0 +#define configGENERATE_RUN_TIME_STATS 0 +#define configUSE_STATS_FORMATTING_FUNCTIONS 0 /* Co-routine definitions. */ -#define configUSE_CO_ROUTINES 0 -#define configMAX_CO_ROUTINE_PRIORITIES ( 2 ) +#define configUSE_CO_ROUTINES 0 +#define configMAX_CO_ROUTINE_PRIORITIES (2) /* Software timer definitions. */ -#define configUSE_TIMERS 1 -#define configTIMER_TASK_PRIORITY ( 2 ) -#define configTIMER_QUEUE_LENGTH 32 -#define configTIMER_TASK_STACK_DEPTH ( 256 ) +#define configUSE_TIMERS 1 +#define configTIMER_TASK_PRIORITY (2) +#define configTIMER_QUEUE_LENGTH 32 +#define configTIMER_TASK_STACK_DEPTH (256) /* Tickless Idle configuration. */ -#define configEXPECTED_IDLE_TIME_BEFORE_SLEEP 2 +#define configEXPECTED_IDLE_TIME_BEFORE_SLEEP 2 /* Tickless idle/low power functionality. */ /* */ -#define configSUPPORT_DYNAMIC_ALLOCATION 1 +#define configSUPPORT_DYNAMIC_ALLOCATION 1 /* Debugging support. */ -#define configINCLUDE_FREERTOS_TASK_C_ADDITIONS_H 1 -#define configUSE_TRACE_FACILITY 1 +#define configINCLUDE_FREERTOS_TASK_C_ADDITIONS_H 1 +#define configUSE_TRACE_FACILITY 1 /* Define to trap errors during development. */ #if defined(DEBUG_NRF) || defined(DEBUG_NRF_USER) -#define configASSERT( x ) ASSERT(x) +#define configASSERT(x) ASSERT(x) #endif /* FreeRTOS MPU specific definitions. */ -#define configINCLUDE_APPLICATION_DEFINED_PRIVILEGED_FUNCTIONS 1 +#define configINCLUDE_APPLICATION_DEFINED_PRIVILEGED_FUNCTIONS 1 /* Optional functions - most linkers will remove unused functions anyway. */ -#define INCLUDE_vTaskPrioritySet 1 -#define INCLUDE_uxTaskPriorityGet 1 -#define INCLUDE_vTaskDelete 1 -#define INCLUDE_vTaskSuspend 1 -#define INCLUDE_xResumeFromISR 1 -#define INCLUDE_vTaskDelayUntil 1 -#define INCLUDE_vTaskDelay 1 -#define INCLUDE_xTaskGetSchedulerState 1 -#define INCLUDE_xTaskGetCurrentTaskHandle 1 -#define INCLUDE_uxTaskGetStackHighWaterMark 1 -#define INCLUDE_xTaskGetIdleTaskHandle 1 -#define INCLUDE_xTimerGetTimerDaemonTaskHandle 0 -#define INCLUDE_pcTaskGetTaskName 1 -#define INCLUDE_eTaskGetState 1 -#define INCLUDE_xEventGroupSetBitFromISR 1 -#define INCLUDE_xTimerPendFunctionCall 0 +#define INCLUDE_vTaskPrioritySet 1 +#define INCLUDE_uxTaskPriorityGet 1 +#define INCLUDE_vTaskDelete 1 +#define INCLUDE_vTaskSuspend 1 +#define INCLUDE_xResumeFromISR 1 +#define INCLUDE_vTaskDelayUntil 1 +#define INCLUDE_vTaskDelay 1 +#define INCLUDE_xTaskGetSchedulerState 1 +#define INCLUDE_xTaskGetCurrentTaskHandle 1 +#define INCLUDE_uxTaskGetStackHighWaterMark 1 +#define INCLUDE_xTaskGetIdleTaskHandle 1 +#define INCLUDE_xTimerGetTimerDaemonTaskHandle 0 +#define INCLUDE_pcTaskGetTaskName 1 +#define INCLUDE_eTaskGetState 1 +#define INCLUDE_xEventGroupSetBitFromISR 1 +#define INCLUDE_xTimerPendFunctionCall 0 /* The lowest interrupt priority that can be used in a call to a "set priority" function. */ -#define configLIBRARY_LOWEST_INTERRUPT_PRIORITY 0xf +#define configLIBRARY_LOWEST_INTERRUPT_PRIORITY 0xf /* The highest interrupt priority that can be used by any interrupt service routine that makes calls to interrupt safe FreeRTOS API functions. DO NOT CALL INTERRUPT SAFE FREERTOS API FUNCTIONS FROM ANY INTERRUPT THAT HAS A HIGHER PRIORITY THAN THIS! (higher priorities are lower numeric values. */ -#define configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY _PRIO_APP_HIGH - +#define configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY _PRIO_APP_HIGH /* Interrupt priorities used by the kernel port layer itself. These are generic to all Cortex-M ports, and do not rely on any particular library functions. */ -#define configKERNEL_INTERRUPT_PRIORITY configLIBRARY_LOWEST_INTERRUPT_PRIORITY +#define configKERNEL_INTERRUPT_PRIORITY configLIBRARY_LOWEST_INTERRUPT_PRIORITY /* !!!! configMAX_SYSCALL_INTERRUPT_PRIORITY must not be set to zero !!!! See http://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html. */ -#define configMAX_SYSCALL_INTERRUPT_PRIORITY configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY +#define configMAX_SYSCALL_INTERRUPT_PRIORITY configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY /* Definitions that map the FreeRTOS port interrupt handlers to their CMSIS standard names - or at least those used in the unmodified vector table. */ -#define vPortSVCHandler SVC_Handler -#define xPortPendSVHandler PendSV_Handler - +#define vPortSVCHandler SVC_Handler +#define xPortPendSVHandler PendSV_Handler /*----------------------------------------------------------- * Settings that are generated automatically * basing on the settings above */ #if (configTICK_SOURCE == FREERTOS_USE_SYSTICK) - // do not define configSYSTICK_CLOCK_HZ for SysTick to be configured automatically - // to CPU clock source - #define xPortSysTickHandler SysTick_Handler +// do not define configSYSTICK_CLOCK_HZ for SysTick to be configured automatically +// to CPU clock source +#define xPortSysTickHandler SysTick_Handler #elif (configTICK_SOURCE == FREERTOS_USE_RTC) - #define configSYSTICK_CLOCK_HZ ( 32768UL ) - #define xPortSysTickHandler RTC1_IRQHandler +#define configSYSTICK_CLOCK_HZ (32768UL) +#define xPortSysTickHandler RTC1_IRQHandler #else - #error Unsupported configTICK_SOURCE value +#error Unsupported configTICK_SOURCE value #endif /* Code below should be only used by the compiler, and not the assembler. */ #if !(defined(__ASSEMBLY__) || defined(__ASSEMBLER__)) - #include "nrf.h" - #include "nrf_assert.h" - - /* This part of definitions may be problematic in assembly - it uses definitions from files that are not assembly compatible. */ - /* Cortex-M specific definitions. */ - #ifdef __NVIC_PRIO_BITS - /* __BVIC_PRIO_BITS will be specified when CMSIS is being used. */ - #define configPRIO_BITS __NVIC_PRIO_BITS - #else - #error "This port requires __NVIC_PRIO_BITS to be defined" - #endif - - /* Access to current system core clock is required only if we are ticking the system by systimer */ - #if (configTICK_SOURCE == FREERTOS_USE_SYSTICK) - #include - extern uint32_t SystemCoreClock; - #endif +#include "nrf.h" +#include "nrf_assert.h" + +/* This part of definitions may be problematic in assembly - it uses definitions from files that are not assembly compatible. */ +/* Cortex-M specific definitions. */ +#ifdef __NVIC_PRIO_BITS +/* __BVIC_PRIO_BITS will be specified when CMSIS is being used. */ +#define configPRIO_BITS __NVIC_PRIO_BITS +#else +#error "This port requires __NVIC_PRIO_BITS to be defined" +#endif + +/* Access to current system core clock is required only if we are ticking the system by systimer */ +#if (configTICK_SOURCE == FREERTOS_USE_SYSTICK) +#include +extern uint32_t SystemCoreClock; +#endif #endif /* !assembler */ /** Implementation note: Use this with caution and set this to 1 ONLY for debugging * ---------------------------------------------------------- - * Set the value of configUSE_DISABLE_TICK_AUTO_CORRECTION_DEBUG to below for enabling or disabling RTOS tick auto correction: - * 0. This is default. If the RTC tick interrupt is masked for more than 1 tick by higher priority interrupts, then most likely - * one or more RTC ticks are lost. The tick interrupt inside RTOS will detect this and make a correction needed. This is needed - * for the RTOS internal timers to be more accurate. - * 1. The auto correction for RTOS tick is disabled even though few RTC tick interrupts were lost. This feature is desirable when debugging - * the RTOS application and stepping though the code. After stepping when the application is continued in debug mode, the auto-corrections of - * RTOS tick might cause asserts. Setting configUSE_DISABLE_TICK_AUTO_CORRECTION_DEBUG to 1 will make RTC and RTOS go out of sync but could be - * convenient for debugging. - */ -#define configUSE_DISABLE_TICK_AUTO_CORRECTION_DEBUG 0 + * Set the value of configUSE_DISABLE_TICK_AUTO_CORRECTION_DEBUG to below for enabling or disabling RTOS tick auto correction: + * 0. This is default. If the RTC tick interrupt is masked for more than 1 tick by higher priority interrupts, then most likely + * one or more RTC ticks are lost. The tick interrupt inside RTOS will detect this and make a correction needed. This is needed + * for the RTOS internal timers to be more accurate. + * 1. The auto correction for RTOS tick is disabled even though few RTC tick interrupts were lost. This feature is desirable when + * debugging the RTOS application and stepping though the code. After stepping when the application is continued in debug mode, the + * auto-corrections of RTOS tick might cause asserts. Setting configUSE_DISABLE_TICK_AUTO_CORRECTION_DEBUG to 1 will make RTC and + * RTOS go out of sync but could be convenient for debugging. + */ +#define configUSE_DISABLE_TICK_AUTO_CORRECTION_DEBUG 0 #endif /* FREERTOS_CONFIG_H */ diff --git a/examples/lock-app/nrf5/main/include/OpenThreadConfig.h b/examples/lock-app/nrf5/main/include/OpenThreadConfig.h index d71acb31b093a5..e2fa01fa228e1f 100644 --- a/examples/lock-app/nrf5/main/include/OpenThreadConfig.h +++ b/examples/lock-app/nrf5/main/include/OpenThreadConfig.h @@ -33,13 +33,13 @@ // When operating in a less than ideal RF environment, having a more forgiving configuration // of OpenThread makes thread a great deal more reliable. #define OPENTHREAD_CONFIG_ADDRESS_QUERY_MAX_RETRY_DELAY 120 // default is 28800 -#define OPENTHREAD_CONFIG_MAC_MAX_FRAME_RETRIES_DIRECT 15 // default is 3 -#define OPENTHREAD_CONFIG_MAC_MAX_FRAME_RETRIES_INDIRECT 1 // default is 0 +#define OPENTHREAD_CONFIG_MAC_MAX_FRAME_RETRIES_DIRECT 15 // default is 3 +#define OPENTHREAD_CONFIG_MAC_MAX_FRAME_RETRIES_INDIRECT 1 // default is 0 #define OPENTHREAD_CONFIG_MAX_TX_ATTEMPTS_INDIRECT_POLLS 16 // default is 4 // Enable periodic parent search to speed up finding a better parent. -#define OPENTHREAD_CONFIG_ENABLE_PERIODIC_PARENT_SEARCH 1 // default is 0 -#define OPENTHREAD_CONFIG_PARENT_SEARCH_RSS_THRESHOLD -45 // default is -65 +#define OPENTHREAD_CONFIG_ENABLE_PERIODIC_PARENT_SEARCH 1 // default is 0 +#define OPENTHREAD_CONFIG_PARENT_SEARCH_RSS_THRESHOLD -45 // default is -65 #define OPENTHREAD_CONFIG_INFORM_PREVIOUS_PARENT_ON_REATTACH 1 // default is 0 // Use smaller maximum interval to speed up reattaching. @@ -54,5 +54,3 @@ #include "openthread-core-nrf52840-config.h" #endif // OPENTHREAD_PLATFORM_CONFIG_H - - diff --git a/examples/lock-app/nrf5/main/include/app_config.h b/examples/lock-app/nrf5/main/include/app_config.h index 2ae450ee59feec..2f7403a579ff90 100644 --- a/examples/lock-app/nrf5/main/include/app_config.h +++ b/examples/lock-app/nrf5/main/include/app_config.h @@ -119,23 +119,23 @@ // ---- Lock Example App Config ---- -#define LOCK_BUTTON BUTTON_2 -#define FUNCTION_BUTTON BUTTON_1 -#define FUNCTION_BUTTON_DEBOUNCE_PERIOD_MS 50 +#define LOCK_BUTTON BUTTON_2 +#define FUNCTION_BUTTON BUTTON_1 +#define FUNCTION_BUTTON_DEBOUNCE_PERIOD_MS 50 -#define SYSTEM_STATE_LED BSP_LED_0 -#define LOCK_STATE_LED BSP_LED_1 +#define SYSTEM_STATE_LED BSP_LED_0 +#define LOCK_STATE_LED BSP_LED_1 // Time it takes in ms for the simulated actuator to move from one // state to another. -#define ACTUATOR_MOVEMENT_PERIOS_MS 2000 +#define ACTUATOR_MOVEMENT_PERIOS_MS 2000 // ---- Lock Example SWU Config ---- -#define SWU_INTERVAl_WINDOW_MIN_MS (23*60*60*1000) // 23 hours -#define SWU_INTERVAl_WINDOW_MAX_MS (24*60*60*1000) // 24 hours +#define SWU_INTERVAl_WINDOW_MIN_MS (23 * 60 * 60 * 1000) // 23 hours +#define SWU_INTERVAl_WINDOW_MAX_MS (24 * 60 * 60 * 1000) // 24 hours // ---- Thread Polling Config ---- -#define THREAD_ACTIVE_POLLING_INTERVAL_MS 100 -#define THREAD_INACTIVE_POLLING_INTERVAL_MS 1000 +#define THREAD_ACTIVE_POLLING_INTERVAL_MS 100 +#define THREAD_INACTIVE_POLLING_INTERVAL_MS 1000 -#endif //APP_CONFIG_H +#endif // APP_CONFIG_H diff --git a/examples/lock-app/nrf5/main/include/freertos_tasks_c_additions.h b/examples/lock-app/nrf5/main/include/freertos_tasks_c_additions.h index ec915ebe7ee1ab..013ad149ecc537 100644 --- a/examples/lock-app/nrf5/main/include/freertos_tasks_c_additions.h +++ b/examples/lock-app/nrf5/main/include/freertos_tasks_c_additions.h @@ -48,8 +48,7 @@ /* * FreeRTOS debugging configuration information structure. */ -const uint8_t FreeRTOSDebugConfig[] __attribute__((section(".rodata"))) = -{ +const uint8_t FreeRTOSDebugConfig[] __attribute__((section(".rodata"))) = { FREERTOS_DEBUG_CONFIG_MAJOR_VERSION, FREERTOS_DEBUG_CONFIG_MINOR_VERSION, tskKERNEL_VERSION_MAJOR, @@ -72,5 +71,4 @@ const uint8_t FreeRTOSDebugConfig[] __attribute__((section(".rodata"))) = 0 /* padding */ }; - #endif /* FREERTOS_TASKS_C_ADDITIONS_H */ diff --git a/examples/lock-app/nrf5/main/include/nrf_log_ctrl_internal.h b/examples/lock-app/nrf5/main/include/nrf_log_ctrl_internal.h index b061bf59768f12..b5b2d0ef3facc2 100644 --- a/examples/lock-app/nrf5/main/include/nrf_log_ctrl_internal.h +++ b/examples/lock-app/nrf5/main/include/nrf_log_ctrl_internal.h @@ -22,8 +22,6 @@ * the Nordic nRF5 SDK. */ - - // Include the version of nrf_log_ctrl_internal.h supplied by the nRF5 SDK. #include_next "nrf_log_ctrl_internal.h" @@ -38,11 +36,13 @@ // Override the NRF_LOG_INTERNAL_FLUSH define to wrap the process of flushing // pending log entries in a critical section. #undef NRF_LOG_INTERNAL_FLUSH -#define NRF_LOG_INTERNAL_FLUSH() \ - do { \ - CRITICAL_REGION_ENTER(); \ - while (NRF_LOG_INTERNAL_PROCESS()); \ - CRITICAL_REGION_EXIT(); \ +#define NRF_LOG_INTERNAL_FLUSH() \ + do \ + { \ + CRITICAL_REGION_ENTER(); \ + while (NRF_LOG_INTERNAL_PROCESS()) \ + ; \ + CRITICAL_REGION_EXIT(); \ } while (0) #endif // !NRF_LOG_NON_DEFFERED_CRITICAL_REGION_ENABLED diff --git a/examples/lock-app/nrf5/main/main.cpp b/examples/lock-app/nrf5/main/main.cpp index 6b64dd41f4d95c..83a47f0551febc 100644 --- a/examples/lock-app/nrf5/main/main.cpp +++ b/examples/lock-app/nrf5/main/main.cpp @@ -96,20 +96,11 @@ static void OnSoCEvent(uint32_t sys_evt, void * p_context) #if JLINK_MMD -extern "C" void JLINK_MONITOR_OnExit(void) -{ +extern "C" void JLINK_MONITOR_OnExit(void) {} -} +extern "C" void JLINK_MONITOR_OnEnter(void) {} -extern "C" void JLINK_MONITOR_OnEnter(void) -{ - -} - -extern "C" void JLINK_MONITOR_OnPoll(void) -{ - -} +extern "C" void JLINK_MONITOR_OnPoll(void) {} #endif // JLINK_MMD @@ -132,7 +123,9 @@ int main(void) nrf_drv_clock_lfclk_request(NULL); // Wait for the clock to be ready. - while (!nrf_clock_lf_is_running()) { } + while (!nrf_clock_lf_is_running()) + { + } #if NRF_LOG_ENABLED @@ -168,7 +161,9 @@ int main(void) NRF_LOG_INFO("Waiting for SoftDevice to be enabled"); - while (!nrf_sdh_is_enabled()) { } + while (!nrf_sdh_is_enabled()) + { + } // Register a handler for SOC events. NRF_SDH_SOC_OBSERVER(m_soc_observer, NRF_SDH_SOC_STACK_OBSERVER_PRIO, OnSoCEvent, NULL); @@ -228,7 +223,7 @@ int main(void) NRF_LOG_INFO("PlatformMgr().StartEventLoopTask() failed"); APP_ERROR_HANDLER(ret); } - + ret = GetAppTask().StartAppTask(); if (ret != NRF_SUCCESS) { @@ -238,13 +233,13 @@ int main(void) // Activate deep sleep mode SCB->SCR |= SCB_SCR_SLEEPDEEP_Msk; -/* - { - struct mallinfo minfo = mallinfo(); - NRF_LOG_INFO("System Heap Utilization: heap size %" PRId32 ", arena size %" PRId32 ", in use %" PRId32 ", free %" PRId32, - GetHeapTotalSize(), minfo.arena, minfo.uordblks, minfo.fordblks); - } -*/ + /* + { + struct mallinfo minfo = mallinfo(); + NRF_LOG_INFO("System Heap Utilization: heap size %" PRId32 ", arena size %" PRId32 ", in use %" PRId32 ", free %" + PRId32, GetHeapTotalSize(), minfo.arena, minfo.uordblks, minfo.fordblks); + } + */ NRF_LOG_INFO("Starting FreeRTOS scheduler"); /* Start FreeRTOS scheduler. */ diff --git a/examples/lock-app/nrf5/main/support/AltPrintf.c b/examples/lock-app/nrf5/main/support/AltPrintf.c index 9d86edba65d01a..825c673553a562 100644 --- a/examples/lock-app/nrf5/main/support/AltPrintf.c +++ b/examples/lock-app/nrf5/main/support/AltPrintf.c @@ -39,20 +39,20 @@ #undef vsnprintf #undef vprintf -int printf(const char* format, ...) +int printf(const char * format, ...) { /* Stdio not supported */ return -1; } -int sprintf(char* buffer, const char* format, ...) +int sprintf(char * buffer, const char * format, ...) { /* Dangerous; should not be called */ buffer[0] = 0; return -1; } -int snprintf(char* buffer, size_t count, const char* format, ...) +int snprintf(char * buffer, size_t count, const char * format, ...) { int res; va_list va; @@ -62,31 +62,31 @@ int snprintf(char* buffer, size_t count, const char* format, ...) return res; } -int vprintf(const char* format, va_list va) +int vprintf(const char * format, va_list va) { /* Stdio not supported */ return -1; } -int vsprintf(char* buffer, const char* format, va_list va) +int vsprintf(char * buffer, const char * format, va_list va) { /* Dangerous; should not be called */ buffer[0] = 0; return -1; } -int vsnprintf(char* buffer, size_t count, const char* format, va_list va) +int vsnprintf(char * buffer, size_t count, const char * format, va_list va) { return vsnprintf_(buffer, count, format, va); } -int fprintf(FILE *stream, const char *format, ...) +int fprintf(FILE * stream, const char * format, ...) { /* Stdio not supported */ return -1; } -int vfprintf(FILE *stream, const char *format, va_list ap) +int vfprintf(FILE * stream, const char * format, va_list ap) { /* Stdio not supported */ return -1; @@ -94,20 +94,20 @@ int vfprintf(FILE *stream, const char *format, va_list ap) /* iprintf variants */ -int iprintf(const char* format, ...) +int iprintf(const char * format, ...) { /* Stdio not supported */ return -1; } -int siprintf(char* buffer, const char* format, ...) +int siprintf(char * buffer, const char * format, ...) { /* Dangerous; should not be called */ buffer[0] = 0; return -1; } -int sniprintf(char* buffer, size_t count, const char* format, ...) +int sniprintf(char * buffer, size_t count, const char * format, ...) { int res; va_list va; @@ -117,31 +117,31 @@ int sniprintf(char* buffer, size_t count, const char* format, ...) return res; } -int viprintf(const char* format, va_list va) +int viprintf(const char * format, va_list va) { /* Stdio not supported */ return -1; } -int vsiprintf(char* buffer, const char* format, va_list va) +int vsiprintf(char * buffer, const char * format, va_list va) { /* Dangerous; should not be called */ buffer[0] = 0; return -1; } -int vsniprintf(char* buffer, size_t count, const char* format, va_list va) +int vsniprintf(char * buffer, size_t count, const char * format, va_list va) { return vsnprintf_(buffer, count, format, va); } -int fiprintf(FILE *stream, const char *format, ...) +int fiprintf(FILE * stream, const char * format, ...) { /* Stdio not supported */ return -1; } -int vfiprintf(FILE *stream, const char *format, va_list ap) +int vfiprintf(FILE * stream, const char * format, va_list ap) { /* Stdio not supported */ return -1; diff --git a/examples/lock-app/nrf5/main/support/CXXExceptionStubs.cpp b/examples/lock-app/nrf5/main/support/CXXExceptionStubs.cpp index b465b8246fbec2..a4ef5137758023 100644 --- a/examples/lock-app/nrf5/main/support/CXXExceptionStubs.cpp +++ b/examples/lock-app/nrf5/main/support/CXXExceptionStubs.cpp @@ -53,7 +53,7 @@ void __cxa_free_dependent_exception(void *) abort(); } -void __cxa_throw(void *, void *, void (*)(void*)) +void __cxa_throw(void *, void *, void (*)(void *)) { abort(); } @@ -73,9 +73,8 @@ void __cxa_end_catch() abort(); } -void * __cxa_get_exception_ptr(void*) +void * __cxa_get_exception_ptr(void *) { abort(); } - } diff --git a/examples/lock-app/nrf5/main/support/FreeRTOSNewlibLockSupport.c b/examples/lock-app/nrf5/main/support/FreeRTOSNewlibLockSupport.c index 3fed562fffcb68..344c4d9b9abc4e 100644 --- a/examples/lock-app/nrf5/main/support/FreeRTOSNewlibLockSupport.c +++ b/examples/lock-app/nrf5/main/support/FreeRTOSNewlibLockSupport.c @@ -47,8 +47,7 @@ SemaphoreHandle_t __lock___arc4random_mutex; * * This is called automatically at system start by the C runtime. */ -__attribute__((constructor)) -static void InitNewlibMutexes(void) +__attribute__((constructor)) static void InitNewlibMutexes(void) { #if USE_STATIC_NEWLIB_MUTEXES @@ -90,54 +89,54 @@ static void InitNewlibMutexes(void) void __retarget_lock_init(_LOCK_T * lock) { - *lock = (_LOCK_T)xSemaphoreCreateMutex(); + *lock = (_LOCK_T) xSemaphoreCreateMutex(); } void __retarget_lock_init_recursive(_LOCK_T * lock) { - *lock = (_LOCK_T)xSemaphoreCreateRecursiveMutex(); + *lock = (_LOCK_T) xSemaphoreCreateRecursiveMutex(); } void __retarget_lock_close(_LOCK_T lock) { - vSemaphoreDelete((SemaphoreHandle_t)lock); + vSemaphoreDelete((SemaphoreHandle_t) lock); } void __retarget_lock_close_recursive(_LOCK_T lock) { - vSemaphoreDelete((SemaphoreHandle_t)lock); + vSemaphoreDelete((SemaphoreHandle_t) lock); } void __retarget_lock_acquire(_LOCK_T lock) { TickType_t waitTicks = (xTaskGetSchedulerState() == taskSCHEDULER_NOT_STARTED) ? 0 : portMAX_DELAY; - xSemaphoreTake((SemaphoreHandle_t)lock, waitTicks); + xSemaphoreTake((SemaphoreHandle_t) lock, waitTicks); } void __retarget_lock_acquire_recursive(_LOCK_T lock) { TickType_t waitTicks = (xTaskGetSchedulerState() == taskSCHEDULER_NOT_STARTED) ? 0 : portMAX_DELAY; - xSemaphoreTakeRecursive((SemaphoreHandle_t)lock, waitTicks); + xSemaphoreTakeRecursive((SemaphoreHandle_t) lock, waitTicks); } int __retarget_lock_try_acquire(_LOCK_T lock) { - return xSemaphoreTake((SemaphoreHandle_t)lock, 0) == pdTRUE ? 1 : 0; + return xSemaphoreTake((SemaphoreHandle_t) lock, 0) == pdTRUE ? 1 : 0; } int __retarget_lock_try_acquire_recursive(_LOCK_T lock) { - return xSemaphoreTakeRecursive((SemaphoreHandle_t)lock, 0) == pdTRUE ? 1 : 0; + return xSemaphoreTakeRecursive((SemaphoreHandle_t) lock, 0) == pdTRUE ? 1 : 0; } void __retarget_lock_release(_LOCK_T lock) { - xSemaphoreGive((SemaphoreHandle_t)lock); + xSemaphoreGive((SemaphoreHandle_t) lock); } void __retarget_lock_release_recursive(_LOCK_T lock) { - xSemaphoreGiveRecursive((SemaphoreHandle_t)lock); + xSemaphoreGiveRecursive((SemaphoreHandle_t) lock); } /* @@ -156,4 +155,3 @@ void __malloc_unlock(struct _reent * r) { taskEXIT_CRITICAL(); } - diff --git a/examples/lock-app/nrf5/main/support/nRF5Sbrk.c b/examples/lock-app/nrf5/main/support/nRF5Sbrk.c index 4f2e74968f077e..27287c34ec13fe 100644 --- a/examples/lock-app/nrf5/main/support/nRF5Sbrk.c +++ b/examples/lock-app/nrf5/main/support/nRF5Sbrk.c @@ -54,14 +54,12 @@ void * _sbrk(ptrdiff_t inc) __HeapBreak = &__HeapBase; } - if (inc < 0 - ? (inc < (&__HeapBase - __HeapBreak)) - : (inc > (&__HeapLimit - __HeapBreak))) + if (inc < 0 ? (inc < (&__HeapBase - __HeapBreak)) : (inc > (&__HeapLimit - __HeapBreak))) { OnSBRKFail(&__HeapBase, &__HeapLimit, __HeapBreak, inc); errno = ENOMEM; - return (void *)-1; + return (void *) -1; } res = __HeapBreak; @@ -81,6 +79,4 @@ size_t GetHeapFreeSize(void) return (size_t)(&__HeapLimit - __HeapBreak); } -void __attribute__((weak)) OnSBRKFail(char * heapBase, char * heapLimit, char * heapBreak, ptrdiff_t inc) -{ -} +void __attribute__((weak)) OnSBRKFail(char * heapBase, char * heapLimit, char * heapBreak, ptrdiff_t inc) {}