Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

manifest: sdk-connectedhomeip: Update revision #20470

Merged
merged 2 commits into from
Feb 24, 2025
+18 −10
Merged

manifest: sdk-connectedhomeip: Update revision #20470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ddd526
manifest: Update sdk-connectedhomeip revision (auto-manifest PR)
NordicBuilder Feb 18, 2025
71ce19d
samples: matter: Fix includes
adigie Feb 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion samples/matter/thermostat/src/temp_sensor_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 1 addition & 0 deletions samples/matter/thermostat/src/temp_sensor_manager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

#include <app-common/zap-generated/attributes/Accessors.h>
#include <lib/core/CHIPError.h>
#include <zephyr/kernel.h>

using namespace chip;

Expand Down
24 changes: 16 additions & 8 deletions samples/matter/thermostat/src/temperature_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
*/

#include "temperature_manager.h"
#include "app_task.h"
#include <app-common/zap-generated/cluster-objects.h>
#include <platform/PlatformManager.h>
#include <zephyr/logging/log.h>

LOG_MODULE_DECLARE(app, CONFIG_CHIP_APP_LOG_LEVEL);
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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: {
Expand Down
2 changes: 1 addition & 1 deletion west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ manifest:
- name: matter
repo-path: sdk-connectedhomeip
path: modules/lib/matter
revision: cb40b0d0dcc8135c7cf9dc78f2b47d89404047ad
revision: 7e18666ee36cd752e69924c6cf0eb1056716a3cb
west-commands: scripts/west/west-commands.yml
submodules:
- name: nlio
Expand Down
Loading