Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restyle [format] Manually correct code style of examples. #419

Closed
wants to merge 4 commits into from
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
[format] Manually correct code style of examples.
  • Loading branch information
turon committed Apr 17, 2020
commit 7fc96cdd70c1c5e76c7649c51feb20b9263e6b4d
16 changes: 8 additions & 8 deletions examples/lock-app/efr32/include/BoltLockManager.h
Original file line number Diff line number Diff line change
@@ -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;
}
18 changes: 9 additions & 9 deletions examples/lock-app/efr32/include/LEDWidget.h
Original file line number Diff line number Diff line change
@@ -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);
};
6 changes: 1 addition & 5 deletions examples/lock-app/efr32/include/ble-configuration.h
Original file line number Diff line number Diff line change
@@ -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__
595 changes: 161 additions & 434 deletions examples/lock-app/efr32/include/board_features.h

Large diffs are not rendered by default.

139 changes: 70 additions & 69 deletions examples/lock-app/efr32/include/hal-config-app-common.h
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
/***************************************************************************//**
* @file
* @brief hal-config-app-common.h
*******************************************************************************
* # License
* <b>Copyright 2018 Silicon Laboratories Inc. www.silabs.com</b>
*******************************************************************************
*
* 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
* <b>Copyright 2018 Silicon Laboratories Inc.
*www.silabs.com</b>
*******************************************************************************
*
* 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 */
Loading