Skip to content

[pull] master from espressif:master #9

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.

Sign up for GitHub

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

Merged
merged 16 commits into from
Jan 20, 2020
Merged

[pull] master from espressif:master #9

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
579e04b
Cleanup SPI_Multiple_Buses (#3527)
muman613 Jan 20, 2020
2f13a96
Add WIFI_REASON_CONNECTION_FAIL in WiFiGeneric.cpp (#3529)
felixstorm-c4a8 Jan 20, 2020
c2b37d9
Updated BLERemoteCharacteristic to exposre esp_gatt_auth_req_t parame…
cipherz Jan 20, 2020
915d45d
Defined BLE setAdvertisementType (#3535)
syonbori Jan 20, 2020
6e77f7f
Setting loging level to VERBOSE on Semaphore::take (#3545)
I-Connect Jan 20, 2020
0607d36
HardwareSerial::write(const char*, ...) API compatibility to AVR, ESP…
dok-net Jan 20, 2020
dd78794
Update CaptivePortal.ino (#3628)
DanielLester83 Jan 20, 2020
e7c9813
Added Piranha ESP-32 and Metro ESP-32 boards (#3542)
drondistortion Jan 20, 2020
82e208c
Fixed incorrect board name for TinyPICO - You can now use this to det…
UnexpectedMaker Jan 20, 2020
5960cd3
update coreESP32 boards.txt (#3569)
radiumray Jan 20, 2020
86de90f
Added partition and flash size menus for VintLabs boards (#3602)
pvint Jan 20, 2020
89351e3
Update WiFiClient.cpp (#3608)
Vigeant Jan 20, 2020
cb005fc
Extend BLEDevice::setPower() to include powerType parameter. It's opt…
robert-alfaro Jan 20, 2020
8d938c8
Add HONEYLemon board (#3640)
jackrobotics Jan 20, 2020
2195109
Added the channel parameter to the scan fucntion in order to select w…
ingframin Jan 20, 2020
ac9d04a
Add BLEDevice::stopAdvertising() helper method to compliment startAdv…
robert-alfaro Jan 20, 2020
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Defined BLE setAdvertisementType (espressif#3535) 
Currently we have no way to set BLE Advertisement Type. We have an initial value of ADV_TYPE_IND and the member is private. iBeacon should advertise with ADV_TYPE_NONCONN_IND. esp-idf's example code specifies this value. https://github.com/espressif/esp-idf/blob/93a8603c545fb8e54741d6685146e2f3b874378d/examples/bluetooth/bluedroid/ble/ble_ibeacon/main/ibeacon_demo.c#L57
  • Loading branch information
@syonbori @me-no-dev
syonbori authored and me-no-dev committed Jan 20, 2020
commit 915d45de7d41899f1721fedc8d71d239b84708a0
1 change: 1 addition & 0 deletions libraries/BLE/examples/BLE_iBeacon/BLE_iBeacon.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ void setBeacon() {

pAdvertising->setAdvertisementData(oAdvertisementData);
pAdvertising->setScanResponseData(oScanResponseData);
pAdvertising->setAdvertisementType(ADV_TYPE_NONCONN_IND);

}

Expand Down
4 changes: 4 additions & 0 deletions libraries/BLE/src/BLEAdvertising.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,10 @@ void BLEAdvertising::setAppearance(uint16_t appearance) {
m_advData.appearance = appearance;
} // setAppearance

void BLEAdvertising::setAdvertisementType(esp_ble_adv_type_t adv_type){
m_advParams.adv_type = adv_type;
} // setAdvertisementType

void BLEAdvertising::setMinInterval(uint16_t mininterval) {
m_advParams.adv_int_min = mininterval;
} // setMinInterval
Expand Down
3 changes: 2 additions & 1 deletion libraries/BLE/src/BLEAdvertising.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ class BLEAdvertising {
void start();
void stop();
void setAppearance(uint16_t appearance);
void setAdvertisementType(esp_ble_adv_type_t adv_type);
void setMaxInterval(uint16_t maxinterval);
void setMinInterval(uint16_t mininterval);
void setAdvertisementData(BLEAdvertisementData& advertisementData);
Expand All @@ -76,4 +77,4 @@ class BLEAdvertising {

};
#endif /* CONFIG_BT_ENABLED */
#endif /* COMPONENTS_CPP_UTILS_BLEADVERTISING_H_ */
#endif /* COMPONENTS_CPP_UTILS_BLEADVERTISING_H_ */