Skip to content

Commit a082437

Browse files
committed
Merge branch 'master' of github.com:adafruit/Adafruit_nRF52_Arduino
2 parents 2bab7d0 + f97008f commit a082437

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

libraries/Bluefruit52Lib/examples/Projects/rssi_proximity/rssi_proximity_peripheral/rssi_proximity_peripheral.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ void setup()
6060
blinkTimer.begin(1000, blink_timer_callback);
6161
blinkTimer.start();
6262

63-
if (Bluefruit.begin())
63+
if (!Bluefruit.begin())
6464
{
6565
Serial.println("Unable to init Bluefruit");
6666
while(1)

libraries/Bluefruit52Lib/src/bluefruit.cpp

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -580,12 +580,22 @@ void AdafruitBluefruit::setConnLedInterval(uint32_t ms)
580580
if ( !active ) xTimerStop(_led_blink_th, 0);
581581
}
582582

583-
bool AdafruitBluefruit::setApperance(uint16_t appear)
583+
bool AdafruitBluefruit::setApperance(uin16_t appear)
584+
{
585+
setAppearance(appear);
586+
}
587+
588+
bool AdafruitBluefruit::setAppearance(uint16_t appear)
584589
{
585590
return ERROR_NONE == sd_ble_gap_appearance_set(appear);
586591
}
587592

588-
uint16_t AdafruitBluefruit::getApperance(void)
593+
bool AdafruitBluefruit::getApperance(void)
594+
{
595+
getAppearance(void);
596+
}
597+
598+
uint16_t AdafruitBluefruit::getAppearance(void)
589599
{
590600
uint16_t appear = 0;
591601
(void) sd_ble_gap_appearance_get(&appear);

libraries/Bluefruit52Lib/src/bluefruit.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,9 @@ class AdafruitBluefruit
154154
int8_t getTxPower (void);
155155

156156
bool setApperance (uint16_t appear);
157+
bool setAppearance (uint16_t appear);
157158
uint16_t getApperance (void);
159+
uint16_t getAppearance (void);
158160

159161
ble_gap_sec_params_t getSecureParam(void)
160162
{

0 commit comments

Comments
 (0)