⚡ (ble): Use CoreGattServer in BLEKit

🚧 (ble): Do not use post_init in CoreGap
leka · Feb 9, 2022 · 933a762 · 933a762
1 parent 46e861e
commit 933a762
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 3 deletions.
diff --git a/libs/BLEKit/include/BLEKit.h b/libs/BLEKit/include/BLEKit.h
@@ -9,6 +9,7 @@
 
 #include "CoreEventQueue.h"
 #include "CoreGap.h"
+#include "CoreGattServer.h"
 
 namespace leka {
 
@@ -27,6 +28,7 @@ class BLEKit
 
 	BLE &_ble = BLE::Instance();
 	CoreGap _core_gap {_ble.gap()};
+	CoreGattServer _core_gatt_server {_ble.gattServer()};
 };
 
 }	// namespace leka

diff --git a/libs/BLEKit/include/CoreGap.h b/libs/BLEKit/include/CoreGap.h
@@ -23,6 +23,7 @@ class CoreGap
 
 	void setEventHandler();
 	void onInitializationComplete(BLE::InitializationCompleteCallbackContext *params);
+	// void onInit(std::function<void()> cb) { _post_init = cb; }
 
 	void setDeviceName(const char *name);
 
@@ -36,6 +37,8 @@ class CoreGap
 
 	CoreGapEventHandler _gap_event_handler;
 	ble::Gap &_gap;
+
+	// std::function<void()> _post_init;
 };
 
 }	// namespace leka

diff --git a/libs/BLEKit/source/BLEKit.cpp b/libs/BLEKit/source/BLEKit.cpp
@@ -12,12 +12,16 @@ void BLEKit::init()
 
 	_ble.onEventsToProcess({this, &BLEKit::processEvents});
 
-	_event_queue.dispatch_forever();
-
 	_core_gap.setDefaultAdvertising();
 	_core_gap.setDeviceName("Leka");
 
+	_core_gatt_server.setServer();
+	// _core_gap.onInit(std::bind(&CoreGattServer::updateData, &_core_gatt_server));
+	// _core_gap.onInit([this] { _core_gatt_server.updateData(); });	// clang suggestion
+
 	_ble.init(&_core_gap, &CoreGap::onInitializationComplete);
+
+	_event_queue.dispatch_forever();
 }
 
 void BLEKit::processEvents(BLE::OnEventsToProcessCallbackContext *context)

diff --git a/libs/BLEKit/source/CoreGap.cpp b/libs/BLEKit/source/CoreGap.cpp
@@ -22,6 +22,10 @@ void CoreGap::setEventHandler()
 void CoreGap::onInitializationComplete(BLE::InitializationCompleteCallbackContext *params)
 {
 	_gap_event_handler.onInitializationComplete(params);
+
+	// if (_post_init) {
+	// 	_post_init();
+	// }
 }
 
 void CoreGap::setDeviceName(const char *name)

diff --git a/libs/BLEKit/tests/BLEKit_test.cpp b/libs/BLEKit/tests/BLEKit_test.cpp
@@ -15,6 +15,7 @@ using namespace leka;
 using namespace ble;
 
 using ::testing::AnyNumber;
+using ::testing::AtLeast;
 using ::testing::Return;
 
 class BLEKitTest : public testing::Test
@@ -28,7 +29,8 @@ class BLEKitTest : public testing::Test
 	void TearDown() override { ble::delete_mocks(); }
 
 	BLEKit ble {};
-	GapMock &mock_gap = gap_mock();
+	GapMock &mock_gap		  = gap_mock();
+	GattServerMock &mock_gatt = gatt_server_mock();
 
 	void expectStartAdvertisingCall()
 	{
@@ -49,6 +51,8 @@ TEST_F(BLEKitTest, init)
 	spy_ble_hasInitialized_return_value = false;
 
 	EXPECT_CALL(mock_gap, setEventHandler).Times(1);
+	EXPECT_CALL(mock_gatt, setEventHandler).Times(1);
+	EXPECT_CALL(mock_gatt, addService).Times(AtLeast(1));
 	expectStartAdvertisingCall();
 
 	ble.init();
@@ -77,6 +81,8 @@ TEST_F(BLEKitTest, callOnEventsToProcess)
 	spy_CoreEventQueue_did_call_function = false;
 
 	EXPECT_CALL(mock_gap, setEventHandler).Times(AnyNumber());
+	EXPECT_CALL(mock_gatt, setEventHandler).Times(AnyNumber());
+	EXPECT_CALL(mock_gatt, addService).Times(AnyNumber());
 
 	ble.init();