Encapsulate nimble code into NimbleController.
Handle all GAP events.
This commit is contained in:
parent
dd6aecbf6b
commit
2c9ce1cfc7
|
@ -53,6 +53,7 @@ set(NIMBLE_SRC
|
||||||
libs/mynewt-nimble/nimble/host/src/ble_hs_conn.c
|
libs/mynewt-nimble/nimble/host/src/ble_hs_conn.c
|
||||||
libs/mynewt-nimble/nimble/host/src/ble_att_svr.c
|
libs/mynewt-nimble/nimble/host/src/ble_att_svr.c
|
||||||
libs/mynewt-nimble/nimble/host/src/ble_store.c
|
libs/mynewt-nimble/nimble/host/src/ble_store.c
|
||||||
|
libs/mynewt-nimble/nimble/host/src/ble_store_util.c
|
||||||
libs/mynewt-nimble/nimble/host/src/ble_hs_pvcy.c
|
libs/mynewt-nimble/nimble/host/src/ble_hs_pvcy.c
|
||||||
libs/mynewt-nimble/nimble/host/src/ble_hs_hci.c
|
libs/mynewt-nimble/nimble/host/src/ble_hs_hci.c
|
||||||
libs/mynewt-nimble/nimble/host/src/ble_hs_log.c
|
libs/mynewt-nimble/nimble/host/src/ble_hs_log.c
|
||||||
|
@ -315,6 +316,7 @@ list(APPEND SOURCE_FILES
|
||||||
Components/Ble/NotificationManager.cpp
|
Components/Ble/NotificationManager.cpp
|
||||||
Components/DateTime/DateTimeController.cpp
|
Components/DateTime/DateTimeController.cpp
|
||||||
Components/Brightness/BrightnessController.cpp
|
Components/Brightness/BrightnessController.cpp
|
||||||
|
Components/Ble/NimbleController.cpp
|
||||||
drivers/Cst816s.cpp
|
drivers/Cst816s.cpp
|
||||||
FreeRTOS/port.c
|
FreeRTOS/port.c
|
||||||
FreeRTOS/port_cmsis_systick.c
|
FreeRTOS/port_cmsis_systick.c
|
||||||
|
@ -359,6 +361,7 @@ set(INCLUDE_FILES
|
||||||
Components/Ble/NotificationManager.h
|
Components/Ble/NotificationManager.h
|
||||||
Components/DateTime/DateTimeController.h
|
Components/DateTime/DateTimeController.h
|
||||||
Components/Brightness/BrightnessController.h
|
Components/Brightness/BrightnessController.h
|
||||||
|
Components/Ble/NimbleController.h
|
||||||
drivers/Cst816s.h
|
drivers/Cst816s.h
|
||||||
FreeRTOS/portmacro.h
|
FreeRTOS/portmacro.h
|
||||||
FreeRTOS/portmacro_cmsis.h
|
FreeRTOS/portmacro_cmsis.h
|
||||||
|
|
148
src/Components/Ble/NimbleController.cpp
Normal file
148
src/Components/Ble/NimbleController.cpp
Normal file
|
@ -0,0 +1,148 @@
|
||||||
|
#include "NimbleController.h"
|
||||||
|
#include <services/gatt/ble_svc_gatt.h>
|
||||||
|
#include <services/gap/ble_svc_gap.h>
|
||||||
|
#include <host/util/util.h>
|
||||||
|
#include <host/ble_hs_id.h>
|
||||||
|
#include <host/ble_hs.h>
|
||||||
|
#include <host/ble_gap.h>
|
||||||
|
|
||||||
|
|
||||||
|
using namespace Pinetime::Controllers;
|
||||||
|
|
||||||
|
int GAPEventCallback(struct ble_gap_event *event, void *arg) {
|
||||||
|
auto nimbleController = static_cast<NimbleController*>(arg);
|
||||||
|
return nimbleController->OnGAPEvent(event);
|
||||||
|
}
|
||||||
|
|
||||||
|
void NimbleController::Init() {
|
||||||
|
while (!ble_hs_synced()) {}
|
||||||
|
|
||||||
|
ble_svc_gap_init();
|
||||||
|
ble_svc_gatt_init();
|
||||||
|
|
||||||
|
int res;
|
||||||
|
res = ble_hs_util_ensure_addr(0);
|
||||||
|
res = ble_hs_id_infer_auto(0, &addrType);
|
||||||
|
res = ble_svc_gap_device_name_set(deviceName);
|
||||||
|
}
|
||||||
|
|
||||||
|
void NimbleController::StartAdvertising() {
|
||||||
|
ble_svc_gap_device_name_set("Pinetime-JF");
|
||||||
|
|
||||||
|
/* set adv parameters */
|
||||||
|
struct ble_gap_adv_params adv_params;
|
||||||
|
struct ble_hs_adv_fields fields;
|
||||||
|
/* advertising payload is split into advertising data and advertising
|
||||||
|
response, because all data cannot fit into single packet; name of device
|
||||||
|
is sent as response to scan request */
|
||||||
|
struct ble_hs_adv_fields rsp_fields;
|
||||||
|
|
||||||
|
/* fill all fields and parameters with zeros */
|
||||||
|
memset(&adv_params, 0, sizeof(adv_params));
|
||||||
|
memset(&fields, 0, sizeof(fields));
|
||||||
|
memset(&rsp_fields, 0, sizeof(rsp_fields));
|
||||||
|
|
||||||
|
adv_params.conn_mode = BLE_GAP_CONN_MODE_UND;
|
||||||
|
adv_params.disc_mode = BLE_GAP_DISC_MODE_GEN;
|
||||||
|
|
||||||
|
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.num_uuids128 = 0;
|
||||||
|
fields.uuids128_is_complete = 0;;
|
||||||
|
fields.tx_pwr_lvl = BLE_HS_ADV_TX_PWR_LVL_AUTO;
|
||||||
|
|
||||||
|
rsp_fields.name = (uint8_t *)"Pinetime-JF";
|
||||||
|
rsp_fields.name_len = strlen("Pinetime-JF");
|
||||||
|
rsp_fields.name_is_complete = 1;
|
||||||
|
|
||||||
|
int res;
|
||||||
|
res = ble_gap_adv_set_fields(&fields);
|
||||||
|
assert(res == 0);
|
||||||
|
|
||||||
|
res = ble_gap_adv_rsp_set_fields(&rsp_fields);
|
||||||
|
|
||||||
|
res = ble_gap_adv_start(addrType, NULL, 10000,
|
||||||
|
&adv_params, GAPEventCallback, this);
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
int NimbleController::OnGAPEvent(ble_gap_event *event) {
|
||||||
|
switch (event->type) {
|
||||||
|
case BLE_GAP_EVENT_ADV_COMPLETE:
|
||||||
|
NRF_LOG_INFO("Advertising event : BLE_GAP_EVENT_ADV_COMPLETE");
|
||||||
|
NRF_LOG_INFO("advertise complete; reason=%d", event->adv_complete.reason);
|
||||||
|
StartAdvertising();
|
||||||
|
break;
|
||||||
|
case BLE_GAP_EVENT_CONNECT: {
|
||||||
|
NRF_LOG_INFO("Advertising event : BLE_GAP_EVENT_CONNECT");
|
||||||
|
|
||||||
|
/* A new connection was established or a connection attempt failed. */
|
||||||
|
NRF_LOG_INFO("connection %s; status=%d ", event->connect.status == 0 ? "established" : "failed",
|
||||||
|
event->connect.status);
|
||||||
|
|
||||||
|
if (event->connect.status != 0) {
|
||||||
|
/* Connection failed; resume advertising. */
|
||||||
|
StartAdvertising();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case BLE_GAP_EVENT_DISCONNECT:
|
||||||
|
NRF_LOG_INFO("Advertising event : BLE_GAP_EVENT_DISCONNECT");
|
||||||
|
NRF_LOG_INFO("disconnect; reason=%d ", event->disconnect.reason);
|
||||||
|
|
||||||
|
/* Connection terminated; resume advertising. */
|
||||||
|
StartAdvertising();
|
||||||
|
break;
|
||||||
|
case BLE_GAP_EVENT_CONN_UPDATE:
|
||||||
|
NRF_LOG_INFO("Advertising event : BLE_GAP_EVENT_CONN_UPDATE");
|
||||||
|
/* The central has updated the connection parameters. */
|
||||||
|
NRF_LOG_INFO("connection updated; status=%d ", event->conn_update.status);
|
||||||
|
break;
|
||||||
|
case BLE_GAP_EVENT_ENC_CHANGE:
|
||||||
|
/* Encryption has been enabled or disabled for this connection. */
|
||||||
|
NRF_LOG_INFO("encryption change event; status=%d ", event->enc_change.status);
|
||||||
|
return 0;
|
||||||
|
case BLE_GAP_EVENT_SUBSCRIBE:
|
||||||
|
NRF_LOG_INFO("subscribe event; conn_handle=%d attr_handle=%d "
|
||||||
|
"reason=%d prevn=%d curn=%d previ=%d curi=???\n",
|
||||||
|
event->subscribe.conn_handle,
|
||||||
|
event->subscribe.attr_handle,
|
||||||
|
event->subscribe.reason,
|
||||||
|
event->subscribe.prev_notify,
|
||||||
|
event->subscribe.cur_notify,
|
||||||
|
event->subscribe.prev_indicate);
|
||||||
|
return 0;
|
||||||
|
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);
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
case BLE_GAP_EVENT_REPEAT_PAIRING: {
|
||||||
|
/* We already have a bond with the peer, but it is attempting to
|
||||||
|
* establish a new secure link. This app sacrifices security for
|
||||||
|
* convenience: just throw away the old bond and accept the new link.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* Delete the old bond. */
|
||||||
|
struct ble_gap_conn_desc desc;
|
||||||
|
ble_gap_conn_find(event->repeat_pairing.conn_handle, &desc);
|
||||||
|
ble_store_util_delete_peer(&desc.peer_id_addr);
|
||||||
|
|
||||||
|
/* Return BLE_GAP_REPEAT_PAIRING_RETRY to indicate that the host should
|
||||||
|
* continue with the pairing operation.
|
||||||
|
*/
|
||||||
|
}
|
||||||
|
return BLE_GAP_REPEAT_PAIRING_RETRY;
|
||||||
|
default:
|
||||||
|
NRF_LOG_INFO("Advertising event : %d", event->type);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
19
src/Components/Ble/NimbleController.h
Normal file
19
src/Components/Ble/NimbleController.h
Normal file
|
@ -0,0 +1,19 @@
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <cstdint>
|
||||||
|
#include <host/ble_gap.h>
|
||||||
|
|
||||||
|
namespace Pinetime {
|
||||||
|
namespace Controllers {
|
||||||
|
|
||||||
|
class NimbleController {
|
||||||
|
public:
|
||||||
|
void Init();
|
||||||
|
void StartAdvertising();
|
||||||
|
int OnGAPEvent(ble_gap_event *event);
|
||||||
|
private:
|
||||||
|
static constexpr char* deviceName = "Pinetime-JF";
|
||||||
|
uint8_t addrType;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
|
@ -5,7 +5,6 @@
|
||||||
#include <hal/nrf_rtc.h>
|
#include <hal/nrf_rtc.h>
|
||||||
#include <BLE/BleManager.h>
|
#include <BLE/BleManager.h>
|
||||||
#include <Components/Ble/NotificationManager.h>
|
#include <Components/Ble/NotificationManager.h>
|
||||||
#include <services/gap/ble_svc_gap.h>
|
|
||||||
#include <host/ble_gatt.h>
|
#include <host/ble_gatt.h>
|
||||||
#include <host/ble_hs_adv.h>
|
#include <host/ble_hs_adv.h>
|
||||||
#include "SystemTask.h"
|
#include "SystemTask.h"
|
||||||
|
@ -13,6 +12,7 @@
|
||||||
#include <host/ble_gap.h>
|
#include <host/ble_gap.h>
|
||||||
#include <host/util/util.h>
|
#include <host/util/util.h>
|
||||||
#include "../main.h"
|
#include "../main.h"
|
||||||
|
|
||||||
using namespace Pinetime::System;
|
using namespace Pinetime::System;
|
||||||
|
|
||||||
SystemTask::SystemTask(Drivers::SpiMaster &spi, Drivers::St7789 &lcd, Drivers::Cst816S &touchPanel,
|
SystemTask::SystemTask(Drivers::SpiMaster &spi, Drivers::St7789 &lcd, Drivers::Cst816S &touchPanel,
|
||||||
|
@ -37,86 +37,15 @@ void SystemTask::Process(void *instance) {
|
||||||
app->Work();
|
app->Work();
|
||||||
}
|
}
|
||||||
|
|
||||||
static int _gap_event_cb(struct ble_gap_event *event, void *arg)
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int
|
|
||||||
adv_event(struct ble_gap_event *event, void *arg)
|
|
||||||
{
|
|
||||||
switch (event->type) {
|
|
||||||
case BLE_GAP_EVENT_ADV_COMPLETE:
|
|
||||||
return 0;
|
|
||||||
case BLE_GAP_EVENT_CONNECT:
|
|
||||||
return 0;
|
|
||||||
case BLE_GAP_EVENT_DISCONNECT:
|
|
||||||
return 0;
|
|
||||||
default:
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void SystemTask::Work() {
|
void SystemTask::Work() {
|
||||||
// watchdog.Setup(7);
|
// watchdog.Setup(7);
|
||||||
// watchdog.Start();
|
// watchdog.Start();
|
||||||
NRF_LOG_INFO("Last reset reason : %s", Pinetime::Drivers::Watchdog::ResetReasonToString(watchdog.ResetReason()));
|
NRF_LOG_INFO("Last reset reason : %s", Pinetime::Drivers::Watchdog::ResetReasonToString(watchdog.ResetReason()));
|
||||||
APP_GPIOTE_INIT(2);
|
APP_GPIOTE_INIT(2);
|
||||||
// bool erase_bonds=true;
|
|
||||||
// ble_manager_init_peer_manager();
|
|
||||||
// nrf_sdh_freertos_init(ble_manager_start_advertising, &erase_bonds);
|
|
||||||
/* BLE */
|
/* BLE */
|
||||||
while (!ble_hs_synced()) {}
|
nimbleController.Init();
|
||||||
|
nimbleController.StartAdvertising();
|
||||||
int res;
|
|
||||||
res = ble_hs_util_ensure_addr(0);
|
|
||||||
assert(res == 0);
|
|
||||||
uint8_t addrType;
|
|
||||||
res = ble_hs_id_infer_auto(0, &addrType);
|
|
||||||
assert(res == 0);
|
|
||||||
|
|
||||||
res = ble_svc_gap_device_name_set("Pinetime-JF");
|
|
||||||
assert(res == 0);
|
|
||||||
|
|
||||||
|
|
||||||
/* set adv parameters */
|
|
||||||
struct ble_gap_adv_params adv_params;
|
|
||||||
struct ble_hs_adv_fields fields;
|
|
||||||
/* advertising payload is split into advertising data and advertising
|
|
||||||
response, because all data cannot fit into single packet; name of device
|
|
||||||
is sent as response to scan request */
|
|
||||||
struct ble_hs_adv_fields rsp_fields;
|
|
||||||
|
|
||||||
/* fill all fields and parameters with zeros */
|
|
||||||
memset(&adv_params, 0, sizeof(adv_params));
|
|
||||||
memset(&fields, 0, sizeof(fields));
|
|
||||||
memset(&rsp_fields, 0, sizeof(rsp_fields));
|
|
||||||
|
|
||||||
adv_params.conn_mode = BLE_GAP_CONN_MODE_UND;
|
|
||||||
adv_params.disc_mode = BLE_GAP_DISC_MODE_GEN;
|
|
||||||
|
|
||||||
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.num_uuids128 = 0;
|
|
||||||
fields.uuids128_is_complete = 0;;
|
|
||||||
fields.tx_pwr_lvl = BLE_HS_ADV_TX_PWR_LVL_AUTO;
|
|
||||||
|
|
||||||
rsp_fields.name = (uint8_t *)"Pinetime-JF";
|
|
||||||
rsp_fields.name_len = strlen("Pinetime-JF");
|
|
||||||
rsp_fields.name_is_complete = 1;
|
|
||||||
|
|
||||||
res = ble_gap_adv_set_fields(&fields);
|
|
||||||
assert(res == 0);
|
|
||||||
|
|
||||||
res = ble_gap_adv_rsp_set_fields(&rsp_fields);
|
|
||||||
|
|
||||||
res = ble_gap_adv_start(addrType, NULL, 36000,
|
|
||||||
&adv_params, adv_event, NULL);
|
|
||||||
assert(res == 0);
|
|
||||||
|
|
||||||
/* /BLE*/
|
/* /BLE*/
|
||||||
|
|
||||||
spi.Init();
|
spi.Init();
|
||||||
|
|
|
@ -8,6 +8,7 @@
|
||||||
#include <Components/Battery/BatteryController.h>
|
#include <Components/Battery/BatteryController.h>
|
||||||
#include <DisplayApp/DisplayApp.h>
|
#include <DisplayApp/DisplayApp.h>
|
||||||
#include <drivers/Watchdog.h>
|
#include <drivers/Watchdog.h>
|
||||||
|
#include <Components/Ble/NimbleController.h>
|
||||||
|
|
||||||
namespace Pinetime {
|
namespace Pinetime {
|
||||||
namespace System {
|
namespace System {
|
||||||
|
@ -44,6 +45,7 @@ namespace Pinetime {
|
||||||
Pinetime::Drivers::Watchdog watchdog;
|
Pinetime::Drivers::Watchdog watchdog;
|
||||||
Pinetime::Drivers::WatchdogView watchdogView;
|
Pinetime::Drivers::WatchdogView watchdogView;
|
||||||
Pinetime::Controllers::NotificationManager& notificationManager;
|
Pinetime::Controllers::NotificationManager& notificationManager;
|
||||||
|
Pinetime::Controllers::NimbleController nimbleController;
|
||||||
|
|
||||||
|
|
||||||
static constexpr uint8_t pinSpiSck = 2;
|
static constexpr uint8_t pinSpiSck = 2;
|
||||||
|
|
|
@ -27,7 +27,6 @@
|
||||||
#include <hal/nrf_wdt.h>
|
#include <hal/nrf_wdt.h>
|
||||||
#include <host/util/util.h>
|
#include <host/util/util.h>
|
||||||
#include <services/gap/ble_svc_gap.h>
|
#include <services/gap/ble_svc_gap.h>
|
||||||
#include <services/gatt/ble_svc_gatt.h>
|
|
||||||
|
|
||||||
|
|
||||||
#if NRF_LOG_ENABLED
|
#if NRF_LOG_ENABLED
|
||||||
|
@ -242,8 +241,7 @@ int main(void) {
|
||||||
systemTask->Start();
|
systemTask->Start();
|
||||||
|
|
||||||
nimble_port_init();
|
nimble_port_init();
|
||||||
ble_svc_gap_init();
|
|
||||||
ble_svc_gatt_init();
|
|
||||||
|
|
||||||
// ble_manager_init();
|
// ble_manager_init();
|
||||||
// ble_manager_set_new_time_callback(OnNewTime);
|
// ble_manager_set_new_time_callback(OnNewTime);
|
||||||
|
|
Loading…
Reference in a new issue