🚧 Apply suggestion from sonardcloud

leka · Apr 11, 2022 · 0f7c662 · 0f7c662
1 parent 238af47
commit 0f7c662
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 30 deletions.
diff --git a/libs/BLEKit/include/AdvertisingData.h b/libs/BLEKit/include/AdvertisingData.h
@@ -11,12 +11,15 @@
 namespace leka {
 
 struct AdvertisingData {
-	const char *name	= "Leka";	// TODO: Get default name from configuration files
-	uint8_t battery		= 0;
-	uint8_t is_charging = 0;
-	uint8_t led_red		= 0;
-	uint8_t led_green	= 0;
-	uint8_t led_blue	= 0;
+	const char *name = "Leka";	 // TODO: Get default name from configuration files
+	uint8_t battery {};
+	uint8_t is_charging {};
+	uint8_t led_red {};
+	uint8_t led_green {};
+	uint8_t led_blue {};
+
+	static inline int _advertising_data_size = 5;
+	std::array<uint8_t, 16> data {};
 
 	auto getData() -> std::span<const uint8_t>
 	{
@@ -25,11 +28,7 @@ struct AdvertisingData {
 		return std::span<uint8_t> {data.data(), std::size(tmp)};
 	}
 
-	auto getDataSize() -> int { return _advertising_data_size; }
-
-  private:
-	static constexpr int _advertising_data_size = 5;
-	std::array<uint8_t, 16> data {};
+	[[nodiscard]] auto getDataSize() const -> int { return _advertising_data_size; }
 };
 
 }	// namespace leka
diff --git a/libs/BLEKit/include/BLEKit.h b/libs/BLEKit/include/BLEKit.h
@@ -22,8 +22,8 @@ class BLEKit
 
 	void init();
 
-	void setAdvertisingData(AdvertisingData &advertising_data);
-	auto getAdvertisingData() -> AdvertisingData;
+	void setAdvertisingData(const AdvertisingData &advertising_data);
+	[[nodiscard]] auto getAdvertisingData() const -> AdvertisingData;
 
   private:
 	// ? mbed::BLE specific function

diff --git a/libs/BLEKit/source/BLEKit.cpp b/libs/BLEKit/source/BLEKit.cpp
@@ -30,14 +30,14 @@ void BLEKit::processEvents(BLE::OnEventsToProcessCallbackContext *context)
 	_event_queue.callMbedCallback(mbed::callback(&context->ble, &BLE::processEvents));
 }
 
-void BLEKit::setAdvertisingData(AdvertisingData &advertising_data)
+void BLEKit::setAdvertisingData(const AdvertisingData &advertising_data)
 {
 	_advertising_data = advertising_data;
 
 	_core_gap.refreshAdvertising(_advertising_data);
 }
 
-auto BLEKit::getAdvertisingData() -> AdvertisingData
+auto BLEKit::getAdvertisingData() const -> AdvertisingData
 {
 	return _advertising_data;
 }
diff --git a/libs/BLEKit/tests/AdvertisingData_test.cpp b/libs/BLEKit/tests/AdvertisingData_test.cpp
@@ -17,13 +17,8 @@ TEST(AdvertisingDataTest, initialisation)
 
 TEST(AdvertisingDataTest, getData)
 {
-	auto advertising_data = AdvertisingData {};
-
-	advertising_data.battery	 = 0x2A;
-	advertising_data.is_charging = 0x2B;
-	advertising_data.led_red	 = 0x2C;
-	advertising_data.led_green	 = 0x2D;
-	advertising_data.led_blue	 = 0x2E;
+	auto advertising_data =
+		AdvertisingData {.battery = 0x2A, .is_charging = 0x2B, .led_red = 0x2C, .led_green = 0x2D, .led_blue = 0x2E};
 
 	auto expected_data_array =
 		std::to_array({advertising_data.battery, advertising_data.is_charging, advertising_data.led_red,

diff --git a/libs/BLEKit/tests/CoreGap_test.cpp b/libs/BLEKit/tests/CoreGap_test.cpp
@@ -150,14 +150,9 @@ TEST_F(CoreGapTest, onInitializationComplete)
 TEST_F(CoreGapTest, refreshAdvertising)
 {
 	std::array<uint8_t, 64> buffer {};
-	auto data_builder				 = AdvertisingDataBuilder {{buffer.begin(), buffer.end()}};
-	auto new_advertising_data		 = AdvertisingData {};
-	new_advertising_data.name		 = "NewLeka";
-	new_advertising_data.battery	 = 0x42;
-	new_advertising_data.is_charging = 0x01;
-	new_advertising_data.led_red	 = 0x2A;
-	new_advertising_data.led_green	 = 0x2B;
-	new_advertising_data.led_blue	 = 0x2C;
+	auto data_builder		  = AdvertisingDataBuilder {{buffer.begin(), buffer.end()}};
+	auto new_advertising_data = AdvertisingData {
+		.name = "NewLeka", .battery = 0x42, .is_charging = 0x01, .led_red = 0x2A, .led_green = 0x2B, .led_blue = 0x2C};
 
 	data_builder.setName(new_advertising_data.name);
 	data_builder.setServiceData(