From 2ddd52639d18418605d32d44033b5fea9712e732 Mon Sep 17 00:00:00 2001 From: Nordic Builder Date: Tue, 18 Feb 2025 15:10:23 +0000 Subject: [PATCH 1/2] manifest: Update sdk-connectedhomeip revision (auto-manifest PR) Automatically created by Github Action Signed-off-by: Nordic Builder --- west.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/west.yml b/west.yml index 15c08bac1ef..d0235a7202b 100644 --- a/west.yml +++ b/west.yml @@ -157,7 +157,7 @@ manifest: - name: matter repo-path: sdk-connectedhomeip path: modules/lib/matter - revision: cb40b0d0dcc8135c7cf9dc78f2b47d89404047ad + revision: pull/556/head west-commands: scripts/west/west-commands.yml submodules: - name: nlio From 71ce19dbca5e54a99590def6e580c9d5c5fb73ee Mon Sep 17 00:00:00 2001 From: Adrian Gielniewski Date: Fri, 21 Feb 2025 18:19:16 +0100 Subject: [PATCH 2/2] samples: matter: Fix includes Fix includes after changes in sdk-connectedhomeip. Signed-off-by: Adrian Gielniewski --- .../thermostat/src/temp_sensor_manager.cpp | 1 - .../thermostat/src/temp_sensor_manager.h | 1 + .../thermostat/src/temperature_manager.cpp | 24 ++++++++++++------- west.yml | 2 +- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/samples/matter/thermostat/src/temp_sensor_manager.cpp b/samples/matter/thermostat/src/temp_sensor_manager.cpp index a2604020d50..2dd8ce7111b 100644 --- a/samples/matter/thermostat/src/temp_sensor_manager.cpp +++ b/samples/matter/thermostat/src/temp_sensor_manager.cpp @@ -6,7 +6,6 @@ #include "temp_sensor_manager.h" #include "app/task_executor.h" -#include "app_task.h" #include "temperature_measurement/sensor.h" LOG_MODULE_DECLARE(app, CONFIG_CHIP_APP_LOG_LEVEL); diff --git a/samples/matter/thermostat/src/temp_sensor_manager.h b/samples/matter/thermostat/src/temp_sensor_manager.h index ddac6dd774e..45592d5b4ab 100644 --- a/samples/matter/thermostat/src/temp_sensor_manager.h +++ b/samples/matter/thermostat/src/temp_sensor_manager.h @@ -10,6 +10,7 @@ #include #include +#include using namespace chip; diff --git a/samples/matter/thermostat/src/temperature_manager.cpp b/samples/matter/thermostat/src/temperature_manager.cpp index e8fadf624ae..932344ed580 100644 --- a/samples/matter/thermostat/src/temperature_manager.cpp +++ b/samples/matter/thermostat/src/temperature_manager.cpp @@ -5,7 +5,8 @@ */ #include "temperature_manager.h" -#include "app_task.h" +#include +#include #include LOG_MODULE_DECLARE(app, CONFIG_CHIP_APP_LOG_LEVEL); @@ -44,11 +45,16 @@ CHIP_ERROR TemperatureManager::Init() PlatformMgr().LockChipStack(); - VerifyOrExit(Status::Success == LocalTemperature::Get(kThermostatEndpoint, mLocalTempCelsius), err = CHIP_IM_GLOBAL_STATUS(Failure)); - VerifyOrExit(Status::Success == OutdoorTemperature::Get(kThermostatEndpoint, mOutdoorTempCelsius), err = CHIP_IM_GLOBAL_STATUS(Failure)); - VerifyOrExit(Status::Success == OccupiedCoolingSetpoint::Get(kThermostatEndpoint, &mCoolingCelsiusSetPoint), err = CHIP_IM_GLOBAL_STATUS(Failure)); - VerifyOrExit(Status::Success == OccupiedHeatingSetpoint::Get(kThermostatEndpoint, &mHeatingCelsiusSetPoint), err = CHIP_IM_GLOBAL_STATUS(Failure)); - VerifyOrExit(Status::Success == SystemMode::Get(kThermostatEndpoint, &mThermMode), err = CHIP_IM_GLOBAL_STATUS(Failure)); + VerifyOrExit(Status::Success == LocalTemperature::Get(kThermostatEndpoint, mLocalTempCelsius), + err = CHIP_IM_GLOBAL_STATUS(Failure)); + VerifyOrExit(Status::Success == OutdoorTemperature::Get(kThermostatEndpoint, mOutdoorTempCelsius), + err = CHIP_IM_GLOBAL_STATUS(Failure)); + VerifyOrExit(Status::Success == OccupiedCoolingSetpoint::Get(kThermostatEndpoint, &mCoolingCelsiusSetPoint), + err = CHIP_IM_GLOBAL_STATUS(Failure)); + VerifyOrExit(Status::Success == OccupiedHeatingSetpoint::Get(kThermostatEndpoint, &mHeatingCelsiusSetPoint), + err = CHIP_IM_GLOBAL_STATUS(Failure)); + VerifyOrExit(Status::Success == SystemMode::Get(kThermostatEndpoint, &mThermMode), + err = CHIP_IM_GLOBAL_STATUS(Failure)); exit: PlatformMgr().UnlockChipStack(); @@ -88,12 +94,14 @@ void TemperatureManager::AttributeChangeHandler(EndpointId endpointId, Attribute switch (attributeId) { case LocalTemperature::Id: { status = LocalTemperature::Get(kThermostatEndpoint, mLocalTempCelsius); - VerifyOrReturn(Status::Success == status, LOG_ERR("Failed to get Thermostat LocalTemperature attribute")); + VerifyOrReturn(Status::Success == status, + LOG_ERR("Failed to get Thermostat LocalTemperature attribute")); } break; case OutdoorTemperature::Id: { status = OutdoorTemperature::Get(kThermostatEndpoint, mOutdoorTempCelsius); - VerifyOrReturn(Status::Success == status, LOG_ERR("Failed to get Thermostat OutdoorTemperature attribute")); + VerifyOrReturn(Status::Success == status, + LOG_ERR("Failed to get Thermostat OutdoorTemperature attribute")); } break; case OccupiedCoolingSetpoint::Id: { diff --git a/west.yml b/west.yml index d0235a7202b..420f8a63de3 100644 --- a/west.yml +++ b/west.yml @@ -157,7 +157,7 @@ manifest: - name: matter repo-path: sdk-connectedhomeip path: modules/lib/matter - revision: pull/556/head + revision: 7e18666ee36cd752e69924c6cf0eb1056716a3cb west-commands: scripts/west/west-commands.yml submodules: - name: nlio