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

WindowCovering: Update xml config to latest specs #13076

Merged
merged 16 commits into from
Dec 21, 2021
Merged

WindowCovering: Update xml config to latest specs #13076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
6edabae
DEV: zzz_generated update
jmeg-sfy Dec 11, 2021
4525e21
DEV: Update Window Covering XML to specs compliance
jmeg-sfy Dec 11, 2021
1299cdc
DEV: WC Update code to use nullable Attribute
jmeg-sfy Dec 11, 2021
9377e82
[Test] WC Update tests to support nullable
jmeg-sfy Dec 12, 2021
8e0be75
FIX: Apply types patch from Boris Zbarsky
jmeg-sfy Dec 13, 2021
af3cf55
Rollback the Tests WNCV 2-1
jmeg-sfy Dec 13, 2021
5b40b30
DEV: Split isOpen and isClose
jmeg-sfy Dec 17, 2021
3b20608
Restyled by whitespace
restyled-commits Dec 17, 2021
f5ea310
Restyled by clang-format
restyled-commits Dec 17, 2021
34576f9
Rebase/Regen
jmeg-sfy Dec 17, 2021
5633252
FIX: Check target and current nullabilities
jmeg-sfy Dec 17, 2021
c8174f8
Harmonize Wc Enum and fix compliance on command
jmeg-sfy Dec 17, 2021
7a35763
Fix Current declaration
jmeg-sfy Dec 17, 2021
75e8a09
Use define for open
jmeg-sfy Dec 17, 2021
d3ed3d9
Rebase/Regen
jmeg-sfy Dec 17, 2021
d2982a3
Rebase/Regen
jmeg-sfy Dec 20, 2021
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
75 changes: 55 additions & 20 deletions examples/window-app/common/src/WindowApp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,9 +425,15 @@ void WindowApp::Cover::Finish()

void WindowApp::Cover::LiftUp()
{
uint16_t percent100ths = 0;
EmberAfStatus status;
chip::app::DataModel::Nullable<chip::Percent100ths> current;
chip::Percent100ths percent100ths = 5000; // set at middle

status = Attributes::CurrentPositionLiftPercent100ths::Get(mEndpoint, current);

if ((status == EMBER_ZCL_STATUS_SUCCESS) && !current.IsNull())
percent100ths = current.Value();

Attributes::CurrentPositionLiftPercent100ths::Get(mEndpoint, &percent100ths);
if (percent100ths < 9000)
{
percent100ths += 1000;
Expand All @@ -441,9 +447,15 @@ void WindowApp::Cover::LiftUp()

void WindowApp::Cover::LiftDown()
{
uint16_t percent100ths = 0;
EmberAfStatus status;
chip::app::DataModel::Nullable<chip::Percent100ths> current;
chip::Percent100ths percent100ths = 5000; // set at middle

status = Attributes::CurrentPositionLiftPercent100ths::Get(mEndpoint, current);

if ((status == EMBER_ZCL_STATUS_SUCCESS) && !current.IsNull())
percent100ths = current.Value();

Attributes::CurrentPositionLiftPercent100ths::Get(mEndpoint, &percent100ths);
if (percent100ths > 1000)
{
percent100ths -= 1000;
Expand All @@ -457,10 +469,15 @@ void WindowApp::Cover::LiftDown()

void WindowApp::Cover::GotoLift(EventId action)
{
uint16_t current = 0;
uint16_t target = 0;
Attributes::TargetPositionLiftPercent100ths::Get(mEndpoint, &target);
Attributes::CurrentPositionLiftPercent100ths::Get(mEndpoint, &current);
chip::app::DataModel::Nullable<chip::Percent100ths> current;
chip::app::DataModel::Nullable<chip::Percent100ths> target;
Attributes::TargetPositionLiftPercent100ths::Get(mEndpoint, target);
Attributes::CurrentPositionLiftPercent100ths::Get(mEndpoint, current);

if (current.IsNull() || target.IsNull())
{
return;
}

if (EventId::None != action)
{
Expand All @@ -469,7 +486,7 @@ void WindowApp::Cover::GotoLift(EventId action)

if (EventId::LiftUp == mLiftAction)
{
if (current < target)
if (current.Value() < target.Value())
jmeg-sfy marked this conversation as resolved.
Show resolved Hide resolved
{
LiftUp();
}
Expand All @@ -480,7 +497,7 @@ void WindowApp::Cover::GotoLift(EventId action)
}
else
{
if (current > target)
if (current.Value() > target.Value())
{
LiftDown();
}
Expand All @@ -498,8 +515,15 @@ void WindowApp::Cover::GotoLift(EventId action)

void WindowApp::Cover::TiltUp()
{
uint16_t percent100ths = 0;
Attributes::CurrentPositionTiltPercent100ths::Get(mEndpoint, &percent100ths);
EmberAfStatus status;
chip::app::DataModel::Nullable<chip::Percent100ths> current;
chip::Percent100ths percent100ths = 5000; // set at middle

status = Attributes::CurrentPositionTiltPercent100ths::Get(mEndpoint, current);

if ((status == EMBER_ZCL_STATUS_SUCCESS) && !current.IsNull())
percent100ths = current.Value();

if (percent100ths < 9000)
{
percent100ths += 1000;
Expand All @@ -513,8 +537,15 @@ void WindowApp::Cover::TiltUp()

void WindowApp::Cover::TiltDown()
{
uint16_t percent100ths = 0;
Attributes::CurrentPositionTiltPercent100ths::Get(mEndpoint, &percent100ths);
EmberAfStatus status;
chip::app::DataModel::Nullable<chip::Percent100ths> current;
chip::Percent100ths percent100ths = 5000; // set at middle

status = Attributes::CurrentPositionTiltPercent100ths::Get(mEndpoint, current);
jmeg-sfy marked this conversation as resolved.
Show resolved Hide resolved

if ((status == EMBER_ZCL_STATUS_SUCCESS) && !current.IsNull())
percent100ths = current.Value();

if (percent100ths > 1000)
{
percent100ths -= 1000;
Expand All @@ -528,11 +559,15 @@ void WindowApp::Cover::TiltDown()

void WindowApp::Cover::GotoTilt(EventId action)
{
uint16_t current = 0;
uint16_t target = 0;
chip::app::DataModel::Nullable<chip::Percent100ths> current;
chip::app::DataModel::Nullable<chip::Percent100ths> target;
Attributes::TargetPositionTiltPercent100ths::Get(mEndpoint, target);
Attributes::CurrentPositionTiltPercent100ths::Get(mEndpoint, current);

Attributes::TargetPositionTiltPercent100ths::Get(mEndpoint, &target);
Attributes::CurrentPositionTiltPercent100ths::Get(mEndpoint, &current);
if (current.IsNull() || target.IsNull())
{
return;
}

if (EventId::None != action)
{
Expand All @@ -541,7 +576,7 @@ void WindowApp::Cover::GotoTilt(EventId action)

if (EventId::TiltUp == mTiltAction)
{
if (current < target)
if (current.Value() < target.Value())
jmeg-sfy marked this conversation as resolved.
Show resolved Hide resolved
{
TiltUp();
}
Expand All @@ -552,7 +587,7 @@ void WindowApp::Cover::GotoTilt(EventId action)
}
else
{
if (current > target)
if (current.Value() > target.Value())
{
TiltDown();
}
Expand Down
43 changes: 25 additions & 18 deletions examples/window-app/common/src/ZclCallbacks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,9 @@ void MatterPostAttributeChangeCallback(const app::ConcreteAttributePath & attrib

WindowApp & app = WindowApp::Instance();
EndpointId endpoint = attributePath.mEndpointId;
uint16_t current;
uint16_t target;

chip::app::DataModel::Nullable<chip::Percent100ths> current;
chip::app::DataModel::Nullable<chip::Percent100ths> target;

switch (attributePath.mAttributeId)
{
Expand All @@ -73,28 +74,34 @@ void MatterPostAttributeChangeCallback(const app::ConcreteAttributePath & attrib
break;

case Attributes::TargetPositionLiftPercent100ths::Id:
Attributes::TargetPositionLiftPercent100ths::Get(endpoint, &target);
Attributes::CurrentPositionLiftPercent100ths::Get(endpoint, &current);
if (current > target)
{
app.PostEvent(WindowApp::Event(WindowApp::EventId::LiftDown, endpoint));
}
else if (current < target)
Attributes::TargetPositionLiftPercent100ths::Get(endpoint, target);
Attributes::CurrentPositionLiftPercent100ths::Get(endpoint, current);
if (!current.IsNull() && !target.IsNull())
{
app.PostEvent(WindowApp::Event(WindowApp::EventId::LiftUp, endpoint));
if (current.Value() > target.Value())
{
app.PostEvent(WindowApp::Event(WindowApp::EventId::LiftDown, endpoint));
}
else if (current.Value() < target.Value())
{
app.PostEvent(WindowApp::Event(WindowApp::EventId::LiftUp, endpoint));
}
}
break;

case Attributes::TargetPositionTiltPercent100ths::Id:
Attributes::TargetPositionTiltPercent100ths::Get(endpoint, &target);
Attributes::CurrentPositionTiltPercent100ths::Get(endpoint, &current);
if (current > target)
{
app.PostEvent(WindowApp::Event(WindowApp::EventId::TiltDown, endpoint));
}
else if (current < target)
Attributes::TargetPositionTiltPercent100ths::Get(endpoint, target);
Attributes::CurrentPositionTiltPercent100ths::Get(endpoint, current);
if (!current.IsNull() && !target.IsNull())
{
app.PostEvent(WindowApp::Event(WindowApp::EventId::TiltUp, endpoint));
if (current.Value() > target.Value())
{
app.PostEvent(WindowApp::Event(WindowApp::EventId::TiltDown, endpoint));
}
else if (current.Value() < target.Value())
{
app.PostEvent(WindowApp::Event(WindowApp::EventId::TiltUp, endpoint));
}
}
break;

Expand Down
18 changes: 11 additions & 7 deletions examples/window-app/efr32/src/WindowAppImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,11 +327,11 @@ void WindowAppImpl::UpdateLEDs()
{
mActionLED.Blink(100);
}
else if (IsOpen(cover.mEndpoint))
else if (IsLiftOpen(cover.mEndpoint))
{
mActionLED.Set(true);
}
else if (IsClosed(cover.mEndpoint))
else if (IsLiftClosed(cover.mEndpoint))
{
mActionLED.Set(false);
}
Expand All @@ -350,11 +350,15 @@ void WindowAppImpl::UpdateLCD()
{
Cover & cover = GetCover();
EmberAfWcType type = TypeGet(cover.mEndpoint);
uint16_t lift = 0;
uint16_t tilt = 0;
Attributes::CurrentPositionLift::Get(cover.mEndpoint, &lift);
Attributes::CurrentPositionTilt::Get(cover.mEndpoint, &tilt);
LcdPainter::Paint(type, static_cast<uint8_t>(lift), static_cast<uint8_t>(tilt), mIcon);
chip::app::DataModel::Nullable<uint16_t> lift;
chip::app::DataModel::Nullable<uint16_t> tilt;
Attributes::CurrentPositionLift::Get(cover.mEndpoint, lift);
Attributes::CurrentPositionTilt::Get(cover.mEndpoint, tilt);

if (!tilt.IsNull() && !lift.IsNull())
{
LcdPainter::Paint(type, static_cast<uint8_t>(lift.Value()), static_cast<uint8_t>(tilt.Value()), mIcon);
}
}
else
{
Expand Down
Loading