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.

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

Add config for enabling LE Secure Connections. #60

Merged
merged 2 commits into from
Dec 21, 2024
Merged

Add config for enabling LE Secure Connections. #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7fd8809
Add config for enabling LE Secure Connections.
h2zero Dec 13, 2024
3ac5705
Update examples for NimBLE-Arduino 2.x
h2zero Dec 20, 2024
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
6 changes: 5 additions & 1 deletion cores/nRF5/nimble_config/nrf51_nimconfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,10 @@
#define CONFIG_NIMBLE_STACK_USE_MEM_POOLS 0
#endif

#ifndef CONFIG_NIMBLE_USE_SECURE_CONNECTIONS
#define CONFIG_NIMBLE_USE_SECURE_CONNECTIONS 0
#endif

#ifdef USE_LFRC
#define MYNEWT_VAL_BLE_LL_SCA (500)
#endif
Expand Down Expand Up @@ -719,7 +723,7 @@
#endif

#ifndef MYNEWT_VAL_BLE_SM_SC
#define MYNEWT_VAL_BLE_SM_SC (0)
#define MYNEWT_VAL_BLE_SM_SC (CONFIG_NIMBLE_USE_SECURE_CONNECTIONS)
#endif

#ifndef MYNEWT_VAL_BLE_SM_SC_DEBUG_KEYS
Expand Down
6 changes: 5 additions & 1 deletion cores/nRF5/nimble_config/nrf52810_nimconfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,10 @@
#define CONFIG_NIMBLE_STACK_USE_MEM_POOLS 0
#endif

#ifndef CONFIG_NIMBLE_USE_SECURE_CONNECTIONS
#define CONFIG_NIMBLE_USE_SECURE_CONNECTIONS 0
#endif

#if CONFIG_BT_NIMBLE_ENABLE_PERIODIC_ADV && !CONFIG_BT_NIMBLE_EXT_ADV
# error Extended advertising must be enabled to use periodic advertising.
#endif
Expand Down Expand Up @@ -740,7 +744,7 @@
#endif

#ifndef MYNEWT_VAL_BLE_SM_SC
#define MYNEWT_VAL_BLE_SM_SC (0)
#define MYNEWT_VAL_BLE_SM_SC (CONFIG_NIMBLE_USE_SECURE_CONNECTIONS)
#endif

#ifndef MYNEWT_VAL_BLE_SM_SC_DEBUG_KEYS
Expand Down
6 changes: 5 additions & 1 deletion cores/nRF5/nimble_config/nrf52832_nimconfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,10 @@
#define CONFIG_NIMBLE_STACK_USE_MEM_POOLS 0
#endif

#ifndef CONFIG_NIMBLE_USE_SECURE_CONNECTIONS
#define CONFIG_NIMBLE_USE_SECURE_CONNECTIONS 1
#endif

#if CONFIG_BT_NIMBLE_ENABLE_PERIODIC_ADV && !CONFIG_BT_NIMBLE_EXT_ADV
# error Extended advertising must be enabled to use periodic advertising.
#endif
Expand Down Expand Up @@ -740,7 +744,7 @@
#endif

#ifndef MYNEWT_VAL_BLE_SM_SC
#define MYNEWT_VAL_BLE_SM_SC (0)
#define MYNEWT_VAL_BLE_SM_SC (CONFIG_NIMBLE_USE_SECURE_CONNECTIONS)
#endif

#ifndef MYNEWT_VAL_BLE_SM_SC_DEBUG_KEYS
Expand Down
6 changes: 5 additions & 1 deletion cores/nRF5/nimble_config/nrf52833_nimconfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,10 @@
#define CONFIG_NIMBLE_STACK_USE_MEM_POOLS 0
#endif

#ifndef CONFIG_NIMBLE_USE_SECURE_CONNECTIONS
#define CONFIG_NIMBLE_USE_SECURE_CONNECTIONS 1
#endif

#if CONFIG_BT_NIMBLE_ENABLE_PERIODIC_ADV && !CONFIG_BT_NIMBLE_EXT_ADV
# error Extended advertising must be enabled to use periodic advertising.
#endif
Expand Down Expand Up @@ -740,7 +744,7 @@
#endif

#ifndef MYNEWT_VAL_BLE_SM_SC
#define MYNEWT_VAL_BLE_SM_SC (0)
#define MYNEWT_VAL_BLE_SM_SC (CONFIG_NIMBLE_USE_SECURE_CONNECTIONS)
#endif

#ifndef MYNEWT_VAL_BLE_SM_SC_DEBUG_KEYS
Expand Down
6 changes: 5 additions & 1 deletion cores/nRF5/nimble_config/nrf52840_nimconfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,10 @@
#define CONFIG_NIMBLE_STACK_USE_MEM_POOLS 0
#endif

#ifndef CONFIG_NIMBLE_USE_SECURE_CONNECTIONS
#define CONFIG_NIMBLE_USE_SECURE_CONNECTIONS 1
#endif

#if CONFIG_BT_NIMBLE_ENABLE_PERIODIC_ADV && !CONFIG_BT_NIMBLE_EXT_ADV
# error Extended advertising must be enabled to use periodic advertising.
#endif
Expand Down Expand Up @@ -740,7 +744,7 @@
#endif

#ifndef MYNEWT_VAL_BLE_SM_SC
#define MYNEWT_VAL_BLE_SM_SC (0)
#define MYNEWT_VAL_BLE_SM_SC (CONFIG_NIMBLE_USE_SECURE_CONNECTIONS)
#endif

#ifndef MYNEWT_VAL_BLE_SM_SC_DEBUG_KEYS
Expand Down
2 changes: 1 addition & 1 deletion libraries/n-able/examples/BLE_Advertiser/BLE_Advertiser.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ void setup() {
void loop() {
if (!pAdvertising->isAdvertising()) {
// Update the advertised data
pAdvertising->setServiceData(dataUuid, std::string((char*)&count, sizeof(count)));
pAdvertising->setServiceData(dataUuid, reinterpret_cast<uint8_t*>(&count), sizeof(count));

// Start advertising the data
pAdvertising->start(5);
Expand Down
16 changes: 8 additions & 8 deletions libraries/n-able/examples/BLE_Scan/BLE_Scan.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
#include "NimBLEDevice.h"

NimBLEScan* pBLEScan;
uint32_t scanTime = 30; // Scan duration in seconds (0 = forever)
uint32_t scanTimeMs = 30 * 1000; // Scan duration in seconds (0 = forever)

// Callback class for received advertisements
class MyAdvertisedDeviceCallbacks: public NimBLEAdvertisedDeviceCallbacks {
void onResult(NimBLEAdvertisedDevice* advertisedDevice) {
class ScanCallbacks: public NimBLEScanCallbacks {
void onResult(const NimBLEAdvertisedDevice* advertisedDevice) {
Serial.printf("Advertised Device: %s \n", advertisedDevice->toString().c_str());
}
};
} scanCallbacks;

void setup() {
Serial.begin(115200);
Expand All @@ -32,16 +32,16 @@ void setup() {
pBLEScan = NimBLEDevice::getScan();

// Set the callback for when devices are discovered, no duplicates.
pBLEScan->setAdvertisedDeviceCallbacks(new MyAdvertisedDeviceCallbacks(), false);
pBLEScan->setScanCallbacks(&scanCallbacks, false);

// Set active scanning, this will get scan response data from the advertiser.
pBLEScan->setActiveScan(true);

// Set how often the scan occurs/switches channels; in milliseconds,
pBLEScan->setInterval(97);
pBLEScan->setInterval(100);

// How long to scan during the interval; in milliseconds.
pBLEScan->setWindow(37);
pBLEScan->setWindow(100);

// Do not store the scan results, use callback only.
pBLEScan->setMaxResults(0);
Expand All @@ -51,7 +51,7 @@ void loop() {
// When the scan stops, restart it. This will cause duplicate devices to be reported again.
if(pBLEScan->isScanning() == false) {
// Start scan with: duration = scanTime (seconds), no scan ended callback, not a continuation of a previous scan.
pBLEScan->start(scanTime, nullptr, false);
pBLEScan->start(scanTimeMs);
}

// Short delay to allow the stack to reset states.
Expand Down
Loading