Add transition for lights (#21)

* Remove redundant project from csproj * Add config of light transition --------- Co-authored-by: x00Pavel <[email protected]>
x00Pavel · Oct 13, 2023 · d05ce18 · d05ce18
1 parent a9436f6
commit d05ce18
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/src/Automations/AutomationConfig/IFsmConfig.cs b/src/Automations/AutomationConfig/IFsmConfig.cs
@@ -25,5 +25,5 @@ public interface IFsmConfig<TFsmState> where TFsmState : Enum
     public Func<TimeSpan> StopAtTimeFunc { get; }
 
     public bool IsWorkingHours { get; }
-
+    public double Transition { get; set; }
 }
diff --git a/src/Extensions/LightExtensionMethods/LightExtensionMethods.cs b/src/Extensions/LightExtensionMethods/LightExtensionMethods.cs
@@ -34,12 +34,12 @@ public static void TurnOn(this IEnumerable<ILightEntityCore> target)
         target.CallService("turn_on");
     }
 
-    public static void Toggle(this ILightEntityCore target, long? transition = null, long? brightnessPct = null)
+    public static void Toggle(this ILightEntityCore target, double? transition = null, long? brightnessPct = null)
     {
         target.CallService("toggle", new LightParameters { Transition = transition, BrightnessPct = brightnessPct});
     }
 
-    public static void TurnOn(this IEnumerable<ILightEntityCore> target, long? transition = null, long? brightnessPct = null)
+    public static void TurnOn(this IEnumerable<ILightEntityCore> target, double? transition = null, long? brightnessPct = null)
     {
         target.CallService("toggle", new LightParameters { Transition = transition, BrightnessPct = brightnessPct});
     }

diff --git a/src/Extensions/LightExtensionMethods/LightParameters.cs b/src/Extensions/LightExtensionMethods/LightParameters.cs
@@ -5,7 +5,7 @@ namespace NetEntityAutomation.Extensions.LightExtensionMethods;
 public record LightParameters
 {
     [JsonPropertyName("transition")]
-    public long? Transition { get; init; }
+    public double? Transition { get; init; }
 
     [JsonPropertyName("brightness_pct")]
     public long? BrightnessPct { get; init; }

diff --git a/src/Extensions/Mapping/Mapping.csproj b/src/Extensions/Mapping/Mapping.csproj
@@ -14,7 +14,6 @@
     <ItemGroup>
       <ProjectReference Include="..\..\Automations\LightAutomation\LightAutomation.csproj" />
       <ProjectReference Include="..\..\FSM\LightFsm\LightFsm.csproj" />
-      <ProjectReference Include="..\LightAutomation\LightAutomation.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/src/FSM/LightFsm/FsmConfig.cs b/src/FSM/LightFsm/FsmConfig.cs
@@ -36,4 +36,6 @@ public bool IsWorkingHours
             return now >= StartAtTimeFunc() || now <= StopAtTimeFunc();
         }
     }
+
+    public double Transition { get; set; } = 2.5;
 }
diff --git a/src/FSM/LightFsm/LightFsm.cs b/src/FSM/LightFsm/LightFsm.cs
@@ -19,7 +19,7 @@ protected void TurnOnLights()
         }
         else
         {
-            Config.Lights.TurnOn(brightnessPct: 100);    
+            Config.Lights.TurnOn(brightnessPct: 100, transition: Config.Transition);    
         }
 
         Timer?.Dispose();
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,4 +36,6 @@ public bool IsWorkingHours @@
                 return now >= StartAtTimeFunc() || now <= StopAtTimeFunc();
             }
         }
+        public double Transition { get; set; } = 2.5;
     }