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

Jump to bottom

WindowCovering: fixes + simplification #16841

Merged
merged 12 commits into from
Mar 31, 2022
Merged

WindowCovering: fixes + simplification #16841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
669c306
DEV: Add ComputePercent100thsStep function to server
jmeg-sfy Mar 30, 2022
8da4375
DEV: Simplify/Factorize OperationalStatus Scheduling update
jmeg-sfy Mar 30, 2022
ae7b69f
Fix: Compilator ask for cast
jmeg-sfy Mar 30, 2022
dd1fda2
Fix: Bug with GoTos wrong parameter
jmeg-sfy Mar 30, 2022
5cd6479
DEV: App possibility to SetNull to all Position attributes
jmeg-sfy Mar 30, 2022
7498fa9
DEV: Factorize SchedulePositionSet for Tilt/Lift
jmeg-sfy Mar 30, 2022
239ef7d
FIX: Bug where all attribute weren't updated properly
jmeg-sfy Mar 30, 2022
f2314f4
FIX: Missing prototype updates
jmeg-sfy Mar 30, 2022
4b4fb9a
DEV: Simplify/Factorize Up and Down for Tilt/Lift
jmeg-sfy Mar 30, 2022
ca78294
DEV: Add Small comments about NVM
jmeg-sfy Mar 30, 2022
12d4032
Restyled by clang-format
restyled-commits Mar 30, 2022
5ee682c
Fix: Conversion mistake lift tilt
jmeg-sfy Mar 30, 2022
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
18 changes: 11 additions & 7 deletions examples/window-app/common/include/WindowApp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,14 +110,16 @@ class WindowApp
void LiftUpdate(bool newTarget);
void LiftGoToTarget() { LiftUpdate(true); }
void LiftContinueToTarget() { LiftUpdate(false); }
void LiftUp();
void LiftDown();
void LiftStepToward(OperationalState direction);
void LiftSchedulePositionSet(chip::Percent100ths position) { SchedulePositionSet(position, false); }

void TiltUpdate(bool newTarget);
void TiltGoToTarget() { TiltUpdate(true); }
void TiltContinueToTarget() { TiltUpdate(false); }
void TiltUp();
void TiltDown();
void TiltStepToward(OperationalState direction);
void TiltSchedulePositionSet(chip::Percent100ths position) { SchedulePositionSet(position, true); }

void StepToward(OperationalState direction, bool isTilt);

EmberAfWcType CycleType();

Expand All @@ -139,6 +141,7 @@ class WindowApp
struct CoverWorkData
{
chip::EndpointId mEndpointId;
bool isTilt;

union
{
Expand All @@ -147,9 +150,10 @@ class WindowApp
};
};

static void ScheduleTiltPositionSet(intptr_t arg);
static void ScheduleLiftPositionSet(intptr_t arg);
static void ScheduleOperationalStatusSetWithGlobalUpdate(intptr_t arg);
void SchedulePositionSet(chip::Percent100ths position, bool isTilt);
static void CallbackPositionSet(intptr_t arg);
void ScheduleOperationalStatusSetWithGlobalUpdate(OperationalStatus opStatus);
static void CallbackOperationalStatusSetWithGlobalUpdate(intptr_t arg);
};

static WindowApp & Instance();
Expand Down
Loading