Merge branch 'evergreen22-refactor_adv' into develop
This commit is contained in:
commit
cf20b02c09
|
@ -92,6 +92,9 @@ set(SDK_SOURCE_FILES
|
||||||
set(TINYCRYPT_SRC
|
set(TINYCRYPT_SRC
|
||||||
libs/mynewt-nimble/ext/tinycrypt/src/aes_encrypt.c
|
libs/mynewt-nimble/ext/tinycrypt/src/aes_encrypt.c
|
||||||
libs/mynewt-nimble/ext/tinycrypt/src/utils.c
|
libs/mynewt-nimble/ext/tinycrypt/src/utils.c
|
||||||
|
libs/mynewt-nimble/ext/tinycrypt/src/cmac_mode.c
|
||||||
|
libs/mynewt-nimble/ext/tinycrypt/src/ecc.c
|
||||||
|
libs/mynewt-nimble/ext/tinycrypt/src/ecc_dh.c
|
||||||
)
|
)
|
||||||
|
|
||||||
set(NIMBLE_SRC
|
set(NIMBLE_SRC
|
||||||
|
@ -104,6 +107,10 @@ set(NIMBLE_SRC
|
||||||
libs/mynewt-nimble/nimble/host/src/ble_l2cap.c
|
libs/mynewt-nimble/nimble/host/src/ble_l2cap.c
|
||||||
libs/mynewt-nimble/nimble/host/src/ble_hs_mbuf.c
|
libs/mynewt-nimble/nimble/host/src/ble_hs_mbuf.c
|
||||||
libs/mynewt-nimble/nimble/host/src/ble_sm.c
|
libs/mynewt-nimble/nimble/host/src/ble_sm.c
|
||||||
|
libs/mynewt-nimble/nimble/host/src/ble_sm_cmd.c
|
||||||
|
libs/mynewt-nimble/nimble/host/src/ble_sm_lgcy.c
|
||||||
|
libs/mynewt-nimble/nimble/host/src/ble_sm_alg.c
|
||||||
|
libs/mynewt-nimble/nimble/host/src/ble_sm_sc.c
|
||||||
libs/mynewt-nimble/nimble/host/src/ble_gap.c
|
libs/mynewt-nimble/nimble/host/src/ble_gap.c
|
||||||
libs/mynewt-nimble/nimble/host/src/ble_gatts.c
|
libs/mynewt-nimble/nimble/host/src/ble_gatts.c
|
||||||
libs/mynewt-nimble/nimble/host/src/ble_gattc.c
|
libs/mynewt-nimble/nimble/host/src/ble_gattc.c
|
||||||
|
@ -127,10 +134,6 @@ set(NIMBLE_SRC
|
||||||
libs/mynewt-nimble/nimble/host/src/ble_hs_atomic.c
|
libs/mynewt-nimble/nimble/host/src/ble_hs_atomic.c
|
||||||
libs/mynewt-nimble/nimble/host/src/ble_hs_adv.c
|
libs/mynewt-nimble/nimble/host/src/ble_hs_adv.c
|
||||||
libs/mynewt-nimble/nimble/host/src/ble_hs_flow.c
|
libs/mynewt-nimble/nimble/host/src/ble_hs_flow.c
|
||||||
libs/mynewt-nimble/nimble/host/src/ble_sm.c
|
|
||||||
libs/mynewt-nimble/nimble/host/src/ble_sm_cmd.c
|
|
||||||
libs/mynewt-nimble/nimble/host/src/ble_sm_lgcy.c
|
|
||||||
libs/mynewt-nimble/nimble/host/src/ble_sm_alg.c
|
|
||||||
libs/mynewt-nimble/nimble/host/src/ble_hs_mqueue.c
|
libs/mynewt-nimble/nimble/host/src/ble_hs_mqueue.c
|
||||||
libs/mynewt-nimble/nimble/host/src/ble_hs_stop.c
|
libs/mynewt-nimble/nimble/host/src/ble_hs_stop.c
|
||||||
libs/mynewt-nimble/nimble/host/src/ble_hs_startup.c
|
libs/mynewt-nimble/nimble/host/src/ble_hs_startup.c
|
||||||
|
|
|
@ -42,6 +42,19 @@ NimbleController::NimbleController(Pinetime::System::SystemTask& systemTask,
|
||||||
serviceDiscovery({¤tTimeClient, &alertNotificationClient}) {
|
serviceDiscovery({¤tTimeClient, &alertNotificationClient}) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void nimble_on_reset(int reason) {
|
||||||
|
NRF_LOG_INFO("Resetting state; reason=%d\n", reason);
|
||||||
|
}
|
||||||
|
|
||||||
|
void nimble_on_sync(void) {
|
||||||
|
int rc;
|
||||||
|
|
||||||
|
rc = ble_hs_util_ensure_addr(0);
|
||||||
|
ASSERT(rc == 0);
|
||||||
|
|
||||||
|
nptr->StartAdvertising();
|
||||||
|
}
|
||||||
|
|
||||||
int GAPEventCallback(struct ble_gap_event* event, void* arg) {
|
int GAPEventCallback(struct ble_gap_event* event, void* arg) {
|
||||||
auto nimbleController = static_cast<NimbleController*>(arg);
|
auto nimbleController = static_cast<NimbleController*>(arg);
|
||||||
return nimbleController->OnGAPEvent(event);
|
return nimbleController->OnGAPEvent(event);
|
||||||
|
@ -51,6 +64,10 @@ void NimbleController::Init() {
|
||||||
while (!ble_hs_synced()) {
|
while (!ble_hs_synced()) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
nptr = this;
|
||||||
|
ble_hs_cfg.reset_cb = nimble_on_reset;
|
||||||
|
ble_hs_cfg.sync_cb = nimble_on_sync;
|
||||||
|
|
||||||
ble_svc_gap_init();
|
ble_svc_gap_init();
|
||||||
ble_svc_gatt_init();
|
ble_svc_gatt_init();
|
||||||
|
|
||||||
|
@ -64,28 +81,31 @@ void NimbleController::Init() {
|
||||||
batteryInformationService.Init();
|
batteryInformationService.Init();
|
||||||
immediateAlertService.Init();
|
immediateAlertService.Init();
|
||||||
heartRateService.Init();
|
heartRateService.Init();
|
||||||
int res;
|
|
||||||
res = ble_hs_util_ensure_addr(0);
|
int rc;
|
||||||
ASSERT(res == 0);
|
rc = ble_hs_util_ensure_addr(0);
|
||||||
res = ble_hs_id_infer_auto(0, &addrType);
|
ASSERT(rc == 0);
|
||||||
ASSERT(res == 0);
|
rc = ble_hs_id_infer_auto(0, &addrType);
|
||||||
res = ble_svc_gap_device_name_set(deviceName);
|
ASSERT(rc == 0);
|
||||||
ASSERT(res == 0);
|
rc = ble_svc_gap_device_name_set(deviceName);
|
||||||
|
ASSERT(rc == 0);
|
||||||
|
rc = ble_svc_gap_device_appearance_set(0xC2);
|
||||||
|
ASSERT(rc == 0);
|
||||||
Pinetime::Controllers::Ble::BleAddress address;
|
Pinetime::Controllers::Ble::BleAddress address;
|
||||||
res = ble_hs_id_copy_addr(addrType, address.data(), nullptr);
|
rc = ble_hs_id_copy_addr(addrType, address.data(), nullptr);
|
||||||
ASSERT(res == 0);
|
ASSERT(rc == 0);
|
||||||
bleController.AddressType((addrType == 0) ? Ble::AddressTypes::Public : Ble::AddressTypes::Random);
|
bleController.AddressType((addrType == 0) ? Ble::AddressTypes::Public : Ble::AddressTypes::Random);
|
||||||
bleController.Address(std::move(address));
|
bleController.Address(std::move(address));
|
||||||
|
|
||||||
res = ble_gatts_start();
|
rc = ble_gatts_start();
|
||||||
ASSERT(res == 0);
|
ASSERT(rc == 0);
|
||||||
|
|
||||||
|
if (!ble_gap_adv_active() && !bleController.IsConnected())
|
||||||
|
StartAdvertising();
|
||||||
}
|
}
|
||||||
|
|
||||||
void NimbleController::StartAdvertising() {
|
void NimbleController::StartAdvertising() {
|
||||||
if (bleController.IsConnected() || ble_gap_conn_active() || ble_gap_adv_active())
|
int rc;
|
||||||
return;
|
|
||||||
|
|
||||||
ble_svc_gap_device_name_set(deviceName);
|
|
||||||
|
|
||||||
/* set adv parameters */
|
/* set adv parameters */
|
||||||
struct ble_gap_adv_params adv_params;
|
struct ble_gap_adv_params adv_params;
|
||||||
|
@ -102,11 +122,17 @@ void NimbleController::StartAdvertising() {
|
||||||
|
|
||||||
adv_params.conn_mode = BLE_GAP_CONN_MODE_UND;
|
adv_params.conn_mode = BLE_GAP_CONN_MODE_UND;
|
||||||
adv_params.disc_mode = BLE_GAP_DISC_MODE_GEN;
|
adv_params.disc_mode = BLE_GAP_DISC_MODE_GEN;
|
||||||
|
/* fast advertise for 30 sec */
|
||||||
|
if (fastAdvCount < 15) {
|
||||||
|
adv_params.itvl_min = 32;
|
||||||
|
adv_params.itvl_max = 47;
|
||||||
|
fastAdvCount++;
|
||||||
|
} else {
|
||||||
|
adv_params.itvl_min = 1636;
|
||||||
|
adv_params.itvl_max = 1651;
|
||||||
|
}
|
||||||
|
|
||||||
fields.flags = BLE_HS_ADV_F_DISC_GEN | BLE_HS_ADV_F_BREDR_UNSUP;
|
fields.flags = BLE_HS_ADV_F_DISC_GEN | BLE_HS_ADV_F_BREDR_UNSUP;
|
||||||
// fields.uuids128 = BLE_UUID128(BLE_UUID128_DECLARE(
|
|
||||||
// 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
|
|
||||||
// 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff));
|
|
||||||
fields.uuids128 = &dfuServiceUuid;
|
fields.uuids128 = &dfuServiceUuid;
|
||||||
fields.num_uuids128 = 1;
|
fields.num_uuids128 = 1;
|
||||||
fields.uuids128_is_complete = 1;
|
fields.uuids128_is_complete = 1;
|
||||||
|
@ -116,28 +142,25 @@ void NimbleController::StartAdvertising() {
|
||||||
rsp_fields.name_len = strlen(deviceName);
|
rsp_fields.name_len = strlen(deviceName);
|
||||||
rsp_fields.name_is_complete = 1;
|
rsp_fields.name_is_complete = 1;
|
||||||
|
|
||||||
ble_gap_adv_set_fields(&fields);
|
rc = ble_gap_adv_set_fields(&fields);
|
||||||
// ASSERT(res == 0); // TODO this one sometimes fails with error 22 (notsync)
|
ASSERT(rc == 0);
|
||||||
|
|
||||||
ble_gap_adv_rsp_set_fields(&rsp_fields);
|
rc = ble_gap_adv_rsp_set_fields(&rsp_fields);
|
||||||
// ASSERT(res == 0);
|
ASSERT(rc == 0);
|
||||||
|
|
||||||
ble_gap_adv_start(addrType, NULL, 180000, &adv_params, GAPEventCallback, this);
|
rc = ble_gap_adv_start(addrType, NULL, 2000, &adv_params, GAPEventCallback, this);
|
||||||
// ASSERT(res == 0);// TODO I've disabled these ASSERT as they sometime asserts and reset the mcu.
|
ASSERT(rc == 0);
|
||||||
// For now, the advertising is restarted as soon as it ends. There may be a race condition
|
|
||||||
// that prevent the advertising from restarting reliably.
|
|
||||||
// I remove the assert to prevent this unnecessary crash, but in the long term, the management of
|
|
||||||
// the advertising should be improve (better error handling, and advertise for 3 minutes after
|
|
||||||
// the application has been woken up, for example.
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int NimbleController::OnGAPEvent(ble_gap_event* event) {
|
int NimbleController::OnGAPEvent(ble_gap_event* event) {
|
||||||
switch (event->type) {
|
switch (event->type) {
|
||||||
case BLE_GAP_EVENT_ADV_COMPLETE:
|
case BLE_GAP_EVENT_ADV_COMPLETE:
|
||||||
NRF_LOG_INFO("Advertising event : BLE_GAP_EVENT_ADV_COMPLETE");
|
NRF_LOG_INFO("Advertising event : BLE_GAP_EVENT_ADV_COMPLETE");
|
||||||
NRF_LOG_INFO("advertise complete; reason=%dn status=%d", event->adv_complete.reason, event->connect.status);
|
NRF_LOG_INFO("reason=%d; status=%d", event->adv_complete.reason, event->connect.status);
|
||||||
|
StartAdvertising();
|
||||||
break;
|
break;
|
||||||
case BLE_GAP_EVENT_CONNECT: {
|
|
||||||
|
case BLE_GAP_EVENT_CONNECT:
|
||||||
NRF_LOG_INFO("Advertising event : BLE_GAP_EVENT_CONNECT");
|
NRF_LOG_INFO("Advertising event : BLE_GAP_EVENT_CONNECT");
|
||||||
|
|
||||||
/* A new connection was established or a connection attempt failed. */
|
/* A new connection was established or a connection attempt failed. */
|
||||||
|
@ -145,35 +168,44 @@ int NimbleController::OnGAPEvent(ble_gap_event* event) {
|
||||||
|
|
||||||
if (event->connect.status != 0) {
|
if (event->connect.status != 0) {
|
||||||
/* Connection failed; resume advertising. */
|
/* Connection failed; resume advertising. */
|
||||||
StartAdvertising();
|
currentTimeClient.Reset();
|
||||||
|
alertNotificationClient.Reset();
|
||||||
|
connectionHandle = BLE_HS_CONN_HANDLE_NONE;
|
||||||
bleController.Disconnect();
|
bleController.Disconnect();
|
||||||
|
fastAdvCount = 0;
|
||||||
|
StartAdvertising();
|
||||||
} else {
|
} else {
|
||||||
|
connectionHandle = event->connect.conn_handle;
|
||||||
bleController.Connect();
|
bleController.Connect();
|
||||||
systemTask.PushMessage(Pinetime::System::Messages::BleConnected);
|
systemTask.PushMessage(Pinetime::System::Messages::BleConnected);
|
||||||
connectionHandle = event->connect.conn_handle;
|
// Service discovery is deferred via systemtask
|
||||||
// Service discovery is deffered via systemtask
|
|
||||||
}
|
}
|
||||||
} break;
|
break;
|
||||||
|
|
||||||
case BLE_GAP_EVENT_DISCONNECT:
|
case BLE_GAP_EVENT_DISCONNECT:
|
||||||
NRF_LOG_INFO("Advertising event : BLE_GAP_EVENT_DISCONNECT");
|
NRF_LOG_INFO("Advertising event : BLE_GAP_EVENT_DISCONNECT");
|
||||||
NRF_LOG_INFO("disconnect; reason=%d", event->disconnect.reason);
|
NRF_LOG_INFO("disconnect reason=%d", event->disconnect.reason);
|
||||||
|
|
||||||
/* Connection terminated; resume advertising. */
|
/* Connection terminated; resume advertising. */
|
||||||
currentTimeClient.Reset();
|
currentTimeClient.Reset();
|
||||||
alertNotificationClient.Reset();
|
alertNotificationClient.Reset();
|
||||||
connectionHandle = BLE_HS_CONN_HANDLE_NONE;
|
connectionHandle = BLE_HS_CONN_HANDLE_NONE;
|
||||||
bleController.Disconnect();
|
bleController.Disconnect();
|
||||||
|
fastAdvCount = 0;
|
||||||
StartAdvertising();
|
StartAdvertising();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case BLE_GAP_EVENT_CONN_UPDATE:
|
case BLE_GAP_EVENT_CONN_UPDATE:
|
||||||
NRF_LOG_INFO("Advertising event : BLE_GAP_EVENT_CONN_UPDATE");
|
NRF_LOG_INFO("Advertising event : BLE_GAP_EVENT_CONN_UPDATE");
|
||||||
/* The central has updated the connection parameters. */
|
/* The central has updated the connection parameters. */
|
||||||
NRF_LOG_INFO("connection updated; status=%d ", event->conn_update.status);
|
NRF_LOG_INFO("update status=%d ", event->conn_update.status);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case BLE_GAP_EVENT_ENC_CHANGE:
|
case BLE_GAP_EVENT_ENC_CHANGE:
|
||||||
/* Encryption has been enabled or disabled for this connection. */
|
/* Encryption has been enabled or disabled for this connection. */
|
||||||
NRF_LOG_INFO("encryption change event; status=%d ", event->enc_change.status);
|
NRF_LOG_INFO("encryption change event; status=%d ", event->enc_change.status);
|
||||||
return 0;
|
break;
|
||||||
|
|
||||||
case BLE_GAP_EVENT_SUBSCRIBE:
|
case BLE_GAP_EVENT_SUBSCRIBE:
|
||||||
NRF_LOG_INFO("subscribe event; conn_handle=%d attr_handle=%d "
|
NRF_LOG_INFO("subscribe event; conn_handle=%d attr_handle=%d "
|
||||||
"reason=%d prevn=%d curn=%d previ=%d curi=???\n",
|
"reason=%d prevn=%d curn=%d previ=%d curi=???\n",
|
||||||
|
@ -183,10 +215,12 @@ int NimbleController::OnGAPEvent(ble_gap_event* event) {
|
||||||
event->subscribe.prev_notify,
|
event->subscribe.prev_notify,
|
||||||
event->subscribe.cur_notify,
|
event->subscribe.cur_notify,
|
||||||
event->subscribe.prev_indicate);
|
event->subscribe.prev_indicate);
|
||||||
return 0;
|
break;
|
||||||
|
|
||||||
case BLE_GAP_EVENT_MTU:
|
case BLE_GAP_EVENT_MTU:
|
||||||
NRF_LOG_INFO("mtu update event; conn_handle=%d cid=%d mtu=%d\n", event->mtu.conn_handle, event->mtu.channel_id, event->mtu.value);
|
NRF_LOG_INFO("mtu update event; conn_handle=%d cid=%d mtu=%d\n",
|
||||||
return 0;
|
event->mtu.conn_handle, event->mtu.channel_id, event->mtu.value);
|
||||||
|
break;
|
||||||
|
|
||||||
case BLE_GAP_EVENT_REPEAT_PAIRING: {
|
case BLE_GAP_EVENT_REPEAT_PAIRING: {
|
||||||
/* We already have a bond with the peer, but it is attempting to
|
/* We already have a bond with the peer, but it is attempting to
|
||||||
|
@ -217,8 +251,7 @@ int NimbleController::OnGAPEvent(ble_gap_event* event) {
|
||||||
notifSize);
|
notifSize);
|
||||||
|
|
||||||
alertNotificationClient.OnNotification(event);
|
alertNotificationClient.OnNotification(event);
|
||||||
return 0;
|
} break;
|
||||||
}
|
|
||||||
/* Attribute data is contained in event->notify_rx.attr_data. */
|
/* Attribute data is contained in event->notify_rx.attr_data. */
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
@ -229,8 +262,10 @@ int NimbleController::OnGAPEvent(ble_gap_event* event) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void NimbleController::StartDiscovery() {
|
void NimbleController::StartDiscovery() {
|
||||||
|
if (connectionHandle != BLE_HS_CONN_HANDLE_NONE) {
|
||||||
serviceDiscovery.StartDiscovery(connectionHandle);
|
serviceDiscovery.StartDiscovery(connectionHandle);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
uint16_t NimbleController::connHandle() {
|
uint16_t NimbleController::connHandle() {
|
||||||
return connectionHandle;
|
return connectionHandle;
|
||||||
|
|
|
@ -72,6 +72,10 @@ namespace Pinetime {
|
||||||
uint16_t connHandle();
|
uint16_t connHandle();
|
||||||
void NotifyBatteryLevel(uint8_t level);
|
void NotifyBatteryLevel(uint8_t level);
|
||||||
|
|
||||||
|
void RestartFastAdv() {
|
||||||
|
fastAdvCount = 0;
|
||||||
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
static constexpr const char* deviceName = "InfiniTime";
|
static constexpr const char* deviceName = "InfiniTime";
|
||||||
Pinetime::System::SystemTask& systemTask;
|
Pinetime::System::SystemTask& systemTask;
|
||||||
|
@ -94,6 +98,7 @@ namespace Pinetime {
|
||||||
|
|
||||||
uint8_t addrType; // 1 = Random, 0 = PUBLIC
|
uint8_t addrType; // 1 = Random, 0 = PUBLIC
|
||||||
uint16_t connectionHandle = BLE_HS_CONN_HANDLE_NONE;
|
uint16_t connectionHandle = BLE_HS_CONN_HANDLE_NONE;
|
||||||
|
uint8_t fastAdvCount = 0;
|
||||||
|
|
||||||
ble_uuid128_t dfuServiceUuid {
|
ble_uuid128_t dfuServiceUuid {
|
||||||
.u {.type = BLE_UUID_TYPE_128},
|
.u {.type = BLE_UUID_TYPE_128},
|
||||||
|
@ -101,5 +106,7 @@ namespace Pinetime {
|
||||||
|
|
||||||
ServiceDiscovery serviceDiscovery;
|
ServiceDiscovery serviceDiscovery;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static NimbleController* nptr;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -128,7 +128,6 @@ void SystemTask::Work() {
|
||||||
fs.Init();
|
fs.Init();
|
||||||
|
|
||||||
nimbleController.Init();
|
nimbleController.Init();
|
||||||
nimbleController.StartAdvertising();
|
|
||||||
lcd.Init();
|
lcd.Init();
|
||||||
|
|
||||||
twiMaster.Init();
|
twiMaster.Init();
|
||||||
|
@ -229,7 +228,6 @@ void SystemTask::Work() {
|
||||||
touchPanel.Wakeup();
|
touchPanel.Wakeup();
|
||||||
}
|
}
|
||||||
|
|
||||||
nimbleController.StartAdvertising();
|
|
||||||
xTimerStart(dimTimer, 0);
|
xTimerStart(dimTimer, 0);
|
||||||
spiNorFlash.Wakeup();
|
spiNorFlash.Wakeup();
|
||||||
lcd.Wakeup();
|
lcd.Wakeup();
|
||||||
|
@ -237,6 +235,9 @@ void SystemTask::Work() {
|
||||||
displayApp.PushMessage(Pinetime::Applications::Display::Messages::GoToRunning);
|
displayApp.PushMessage(Pinetime::Applications::Display::Messages::GoToRunning);
|
||||||
heartRateApp.PushMessage(Pinetime::Applications::HeartRateTask::Messages::WakeUp);
|
heartRateApp.PushMessage(Pinetime::Applications::HeartRateTask::Messages::WakeUp);
|
||||||
|
|
||||||
|
if (!bleController.IsConnected())
|
||||||
|
nimbleController.RestartFastAdv();
|
||||||
|
|
||||||
isSleeping = false;
|
isSleeping = false;
|
||||||
isWakingUp = false;
|
isWakingUp = false;
|
||||||
isDimmed = false;
|
isDimmed = false;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user