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

[Silabs] feature/DIC feature support for thermostat app and window app #29084

Merged
merged 7 commits into from
Sep 12, 2023
Merged

[Silabs] feature/DIC feature support for thermostat app and window app #29084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
caa1172
feature/DIC feature support for thermostat app and window app
Thirsrin Sep 6, 2023
28bf4f0
Restyled by whitespace
restyled-commits Sep 6, 2023
9dba71e
Restyled by clang-format
restyled-commits Sep 6, 2023
3da7530
addressed review comments
Thirsrin Sep 6, 2023
e67f042
Restyled by clang-format
restyled-commits Sep 6, 2023
1c4d5fe
addressed review comments
Thirsrin Sep 7, 2023
43536d4
addressed review comments
Thirsrin Sep 8, 2023
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
7 changes: 7 additions & 0 deletions examples/thermostat/silabs/src/ZclCallbacks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@
#include <app/ConcreteAttributePath.h>
#include <lib/support/logging/CHIPLogging.h>

#ifdef DIC_ENABLE
#include "dic_control.h"
#endif // DIC_ENABLE

using namespace ::chip;
using namespace ::chip::app::Clusters;

Expand All @@ -46,5 +50,8 @@ void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath &
else if (clusterId == Thermostat::Id)
{
TempMgr().AttributeChangeHandler(attributePath.mEndpointId, attributeId, value, size);
#ifdef DIC_ENABLE
dic::control::AttributeHandler(attributePath.mEndpointId, attributeId);
#endif // DIC_ENABLE
}
}
23 changes: 22 additions & 1 deletion examples/window-app/silabs/src/WindowManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,12 @@ using namespace ::chip::DeviceLayer::Silabs;
#define APP_STATE_LED 0
#define APP_ACTION_LED 1

#ifdef DIC_ENABLE
#define DECIMAL 10
#define MSG_SIZE 6
#include "dic.h"
#endif // DIC_ENABLE

using namespace ::chip::Credentials;
using namespace ::chip::DeviceLayer;
using namespace chip::app::Clusters::WindowCovering;
Expand Down Expand Up @@ -502,10 +508,25 @@ void WindowManager::Cover::CallbackPositionSet(intptr_t arg)
position.SetNonNull(data->percent100ths);

if (data->isTilt)
{
TiltPositionSet(data->mEndpointId, position);
#ifdef DIC_ENABLE
uint16_t value = data->percent100ths;
char buffer[MSG_SIZE];
itoa(value, buffer, DECIMAL);
Thirsrin marked this conversation as resolved.
Show resolved Hide resolved
dic_sendmsg("tilt/position set", (const char *) (buffer));
#endif // DIC_ENABLE
}
else
{
LiftPositionSet(data->mEndpointId, position);

#ifdef DIC_ENABLE
uint16_t value = data->percent100ths;
char buffer[MSG_SIZE];
itoa(value, buffer, DECIMAL);
dic_sendmsg("lift/position set", (const char *) (buffer));
#endif // DIC_ENABLE
}
chip::Platform::Delete(data);
}

Expand Down