♻️ (BLEKit): Add onHumidityRequested agglomerate with onTemperatureRequested

Author: YannLocatelli

libs/BLEKit/include/BLEServiceMonitoring.h

@@ -61,9 +61,9 @@ class BLEServiceMonitoring : public interface::BLEService
 
 	auto isScreensaverEnable() const -> bool { return _screensaver_enable; }
 
-	void onTemperatureRequested(const std::function<void()> &callback)
+	void onTemperatureHumidityRequested(const std::function<void()> &callback)
 	{
-		_on_temperature_requested_callback = callback;
+		_on_temperature_humidity_requested_callback = callback;
 	}
 
 	void onDataReceived(const data_received_handle_t &params) final
@@ -89,9 +89,10 @@ class BLEServiceMonitoring : public interface::BLEService
 
 	void onDataRequested(const data_requested_handle_t &params) final
 	{
-		if (params.handle == _temperature_characteristic.getValueHandle() &&
-			_on_temperature_requested_callback != nullptr) {
-			_on_temperature_requested_callback();
+		if ((params.handle == _temperature_characteristic.getValueHandle() ||
+			 params.handle == _humidity_characteristic.getValueHandle()) &&
+			_on_temperature_humidity_requested_callback != nullptr) {
+			_on_temperature_humidity_requested_callback();
 		}
 	}
 
@@ -107,13 +108,14 @@ class BLEServiceMonitoring : public interface::BLEService
 	ReadOnlyArrayGattCharacteristic<uint8_t, 4> _temperature_characteristic {
 		service::monitoring::characteristic::temperature, temperature.begin(),
 		GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_NOTIFY};
-	std::function<void()> _on_temperature_requested_callback {};
 
 	std::array<uint8_t, 4> humidity {};
 	ReadOnlyArrayGattCharacteristic<uint8_t, 4> _humidity_characteristic {
 		service::monitoring::characteristic::humidity, humidity.begin(),
 		GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_NOTIFY};
 
+	std::function<void()> _on_temperature_humidity_requested_callback {};
+
 	bool _screensaver_enable {true};
 	WriteOnlyGattCharacteristic<bool> _screensaver_enable_characteristic {
 		service::monitoring::characteristic::screensaver_enable,

libs/BLEKit/tests/BLEServiceMonitoring_test.cpp

@@ -90,20 +90,20 @@ TEST_F(BLEServiceMonitoringTest, setHumidity)
 	EXPECT_EQ(actual_humidity, expected_humidity);
 }
 
-TEST_F(BLEServiceMonitoringTest, onTemperatureRequested)
+TEST_F(BLEServiceMonitoringTest, onTemperatureHumidityRequested)
 {
 	testing::MockFunction<void()> mock_callback {};
-	service_monitoring.onTemperatureRequested(mock_callback.AsStdFunction());
+	service_monitoring.onTemperatureHumidityRequested(mock_callback.AsStdFunction());
 
 	EXPECT_CALL(mock_callback, Call).Times(1);
 
 	service_monitoring.onDataRequested(data_requested_handle);
 }
 
-TEST_F(BLEServiceMonitoringTest, onTemperatureRequestedNotSameHandle)
+TEST_F(BLEServiceMonitoringTest, onTemperatureHumidityRequestedNotSameHandle)
 {
 	testing::MockFunction<void()> mock_callback {};
-	service_monitoring.onTemperatureRequested(mock_callback.AsStdFunction());
+	service_monitoring.onTemperatureHumidityRequested(mock_callback.AsStdFunction());
 
 	data_requested_handle.handle = 0xFFFF;
 
@@ -112,9 +112,9 @@ TEST_F(BLEServiceMonitoringTest, onTemperatureRequestedNotSameHandle)
 	service_monitoring.onDataRequested(data_requested_handle);
 }
 
-TEST_F(BLEServiceMonitoringTest, onTemperatureRequestedtUnset)
+TEST_F(BLEServiceMonitoringTest, onTemperatureHumidityRequestedtUnset)
 {
-	service_monitoring.onTemperatureRequested(nullptr);
+	service_monitoring.onTemperatureHumidityRequested(nullptr);
 
 	service_monitoring.onDataRequested(data_requested_handle);
 }