Implemented Matter temperature measurement accessory.

Signed-off-by: Marcin Kajor <[email protected]>

.gitignore

@@ -0,0 +1 @@
+build

src/app_config.h

@@ -13,6 +13,9 @@
 #define FUNCTION_BUTTON DK_BTN1
 #define FUNCTION_BUTTON_MASK DK_BTN1_MSK
 
+#define SENSOR_BUTTON DK_BTN4
+#define SENSOR_BUTTON_MASK DK_BTN4_MSK
+
 #define SYSTEM_STATE_LED DK_LED1
 #define FACTORY_RESET_SIGNAL_LED DK_LED2
 

src/app_event.h

@@ -12,7 +12,17 @@
 
 class LEDWidget;
 
-enum class AppEventType : uint8_t { None = 0, Button, ButtonPushed, ButtonReleased, Timer, UpdateLedState };
+enum class AppEventType : uint8_t {
+	None = 0,
+	Button,
+	ButtonPushed,
+	ButtonReleased,
+	Timer,
+	UpdateLedState,
+	StartMeas,
+	StopMeas,
+	FetchMeas
+};
 
 enum class FunctionEvent : uint8_t { NoneSelected = 0, FactoryReset };
 

src/app_task.cpp

@@ -23,6 +23,9 @@
 #include <lib/support/CodeUtils.h>
 #include <system/SystemError.h>
 
+#include <app-common/zap-generated/attributes/Accessors.h>
+#include <app/clusters/on-off-server/on-off-server.h>
+
 #ifdef CONFIG_CHIP_WIFI
 #include <app/clusters/network-commissioning/network-commissioning.h>
 #include <platform/nrfconnect/wifi/NrfWiFiDriver.h>
@@ -36,6 +39,8 @@
 #include <zephyr/logging/log.h>
 #include <zephyr/zephyr.h>
 
+#include <zephyr/drivers/sensor.h>
+
 LOG_MODULE_DECLARE(app, CONFIG_MATTER_LOG_LEVEL);
 
 using namespace ::chip;
@@ -50,6 +55,7 @@ constexpr uint32_t kFactoryResetTriggerTimeout = 6000;
 
 K_MSGQ_DEFINE(sAppEventQueue, sizeof(AppEvent), kAppEventQueueSize, alignof(AppEvent));
 k_timer sFunctionTimer;
+k_timer sSensorTimer;
 
 LEDWidget sStatusLED;
 #if NUMBER_OF_LEDS == 2
@@ -62,6 +68,10 @@ FactoryResetLEDsWrapper<3> sFactoryResetLEDs{ { FACTORY_RESET_SIGNAL_LED, FACTOR
 bool sIsNetworkProvisioned = false;
 bool sIsNetworkEnabled = false;
 bool sHaveBLEConnections = false;
+bool sSensorActive = false;
+
+const struct device *sTemperatureSensor = DEVICE_DT_GET_ONE(nordic_nrf_temp);
+
 } /* namespace */
 
 namespace LedConsts
@@ -155,6 +165,17 @@ CHIP_ERROR AppTask::Init()
 	k_timer_init(&sFunctionTimer, &AppTask::FunctionTimerTimeoutCallback, nullptr);
 	k_timer_user_data_set(&sFunctionTimer, this);
 
+	k_timer_init(
+		&sSensorTimer,
+		[](k_timer *timer) {
+			AppEvent event;
+			event.Type = AppEventType::FetchMeas;
+			event.TimerEvent.Context = k_timer_user_data_get(timer);
+			event.Handler = UpdateTemperatureClusterState;
+			PostEvent(event);
+		},
+		nullptr);
+
 	/* Initialize CHIP server */
 #if CONFIG_CHIP_FACTORY_DATA
 	ReturnErrorOnFailure(mFactoryDataProvider.Init());
@@ -209,12 +230,21 @@ void AppTask::ButtonEventHandler(uint32_t buttonState, uint32_t hasChanged)
 
 	if (FUNCTION_BUTTON_MASK & hasChanged) {
 		button_event.ButtonEvent.PinNo = FUNCTION_BUTTON;
-		button_event.ButtonEvent.Action =
-			static_cast<uint8_t>((FUNCTION_BUTTON_MASK & buttonState) ? AppEventType::ButtonPushed :
-										    AppEventType::ButtonReleased);
+		button_event.ButtonEvent.Action = static_cast<uint8_t>(
+			(FUNCTION_BUTTON_MASK & buttonState) ? AppEventType::ButtonPushed :
+							       AppEventType::ButtonReleased);
 		button_event.Handler = FunctionHandler;
 		PostEvent(button_event);
 	}
+
+	if (SENSOR_BUTTON_MASK & hasChanged) {
+		button_event.ButtonEvent.PinNo = SENSOR_BUTTON;
+		button_event.ButtonEvent.Action = static_cast<uint8_t>(
+			(SENSOR_BUTTON_MASK & buttonState) ? AppEventType::ButtonPushed :
+							     AppEventType::ButtonReleased);
+		button_event.Handler = ControlSensorHandler;
+		PostEvent(button_event);
+	}
 }
 
 void AppTask::FunctionTimerTimeoutCallback(k_timer *timer)
@@ -356,3 +386,67 @@ void AppTask::DispatchEvent(const AppEvent &event)
 		LOG_INF("Event received with no handler. Dropping event.");
 	}
 }
+
+void AppTask::UpdateTemperatureClusterState(const AppEvent &)
+{
+	static constexpr int16_t kTemperatureMeasurementAttributeMaxValue = 0x7fff;
+	static constexpr int16_t kTemperatureMeasurementAttributeMinValue = 0x954d;
+	static constexpr int16_t kTemperatureMeasurementAttributeInvalidValue = 0x8000;
+	static constexpr uint8_t kTemperatureMeasurementEndpointId = 1;
+
+	struct sensor_value sTemperature;
+	EmberAfStatus status;
+	int err = sensor_sample_fetch(sTemperatureSensor);
+	if (!err) {
+		err = sensor_channel_get(sTemperatureSensor, SENSOR_CHAN_DIE_TEMP, &sTemperature);
+		if (!err) {
+			int16_t newValue = static_cast<int16_t>(sTemperature.val1 * 100 +
+								sTemperature.val2 / 10000);
+
+			if (newValue > kTemperatureMeasurementAttributeMaxValue ||
+			    newValue < kTemperatureMeasurementAttributeMinValue) {
+				/* Read value exceeds permitted limits, so assign invalid value code to it. */
+				newValue = kTemperatureMeasurementAttributeInvalidValue;
+			}
+
+			LOG_INF("Current temperature: %d", newValue);
+
+			status = Clusters::TemperatureMeasurement::Attributes::MeasuredValue::Set(
+				kTemperatureMeasurementEndpointId, newValue);
+			if (status != EMBER_ZCL_STATUS_SUCCESS) {
+				LOG_ERR("Updating temperature measurement failed %x", status);
+			}
+		} else {
+			LOG_ERR("Getting temperature measurement data from sensor failed with: %d",
+				err);
+		}
+
+	} else {
+		LOG_ERR("Fetching data from temperature sensor failed with: %d", err);
+	}
+}
+
+void AppTask::ControlSensorHandler(const AppEvent &event)
+{
+	if (event.ButtonEvent.Action == static_cast<uint8_t>(AppEventType::ButtonPushed)) {
+		sSensorActive = !sSensorActive;
+		if (sSensorActive) {
+			ChipLogDetail(DeviceLayer, "Starting timer");
+			k_timer_start(&sSensorTimer, K_SECONDS(2), K_SECONDS(2));
+		} else {
+			ChipLogDetail(DeviceLayer, "Stopping timer");
+			k_timer_stop(&sSensorTimer);
+		}
+
+		DeviceLayer::SystemLayer().ScheduleLambda([] {
+			// write the new on/off value
+			if (EMBER_ZCL_STATUS_SUCCESS !=
+			    OnOffServer::Instance().setOnOffValue(1, sSensorActive, false)) {
+				ChipLogError(DeviceLayer, "Could not update the OnOff cluster");
+			} else {
+				ChipLogDetail(DeviceLayer, "Set OnOff cluster with value: %d",
+					      sSensorActive);
+			}
+		});
+	}
+}

src/app_task.h

@@ -18,7 +18,7 @@
 struct k_timer;
 
 class AppTask {
-public:
+    public:
 	static AppTask &Instance()
 	{
 		static AppTask sAppTask;
@@ -29,7 +29,7 @@ class AppTask {
 
 	static void PostEvent(const AppEvent &event);
 
-private:
+    private:
 	CHIP_ERROR Init();
 
 	void CancelTimer();
@@ -45,6 +45,9 @@ class AppTask {
 	static void LEDStateUpdateHandler(LEDWidget &ledWidget);
 	static void FunctionTimerTimeoutCallback(k_timer *timer);
 	static void UpdateStatusLED();
+	static void UpdateTemperatureClusterState(const AppEvent &event);
+	static void SensorFetchMeasurement();
+	static void ControlSensorHandler(const AppEvent &event);
 
 	FunctionEvent mFunction = FunctionEvent::NoneSelected;
 	bool mFunctionTimerActive = false;