WindowCovering: fixes + simplification (#16841)

* DEV: Add ComputePercent100thsStep function to server * DEV: Simplify/Factorize OperationalStatus Scheduling update * Fix: Compilator ask for cast * Fix: Bug with GoTos wrong parameter * DEV: App possibility to SetNull to all Position attributes * DEV: Factorize SchedulePositionSet for Tilt/Lift * FIX: Bug where all attribute weren't updated properly * FIX: Missing prototype updates * DEV: Simplify/Factorize Up and Down for Tilt/Lift * DEV: Add Small comments about NVM * Restyled by clang-format * Fix: Conversion mistake lift tilt Co-authored-by: Restyled.io <[email protected]>
project-chip · Feb 20, 2024 · 1067202 · 1067202
1 parent 4fd5a43
commit 1067202
Show file tree

Hide file tree

Showing 4 changed files with 157 additions and 182 deletions.
diff --git a/examples/window-app/common/include/WindowApp.h b/examples/window-app/common/include/WindowApp.h
@@ -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();
 
@@ -139,6 +141,7 @@ class WindowApp
         struct CoverWorkData
         {
             chip::EndpointId mEndpointId;
+            bool isTilt;
 
             union
             {
@@ -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();