Release 4.8.1 - Don't always retreive consumption

BJReplay · Mar 27, 2022 · 99facf2 · 99facf2
1 parent 13f3d2a
commit 99facf2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/PowerwallService/My Project/AssemblyInfo.vb b/PowerwallService/My Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("4.8.0.0")>
-<Assembly: AssemblyFileVersion("4.8.0.0")>
+<Assembly: AssemblyVersion("4.8.1.0")>
+<Assembly: AssemblyFileVersion("4.8.1.0")>
diff --git a/PowerwallService/PowerwallService.vb b/PowerwallService/PowerwallService.vb
@@ -460,8 +460,10 @@ Public Class PowerwallService
     Private Sub GetPeakConsumption()
         PeakConsumption = 0
         Try
-            PeakConsumption = CInt(SPs.fnGetMonthlyPeakLoad(PeakStartHour:=PeakStartHour, PeakEndHour:=(OffPeakStartHour - 1)))
-            EventLog.WriteEntry(String.Format("Peak Consumption Set To: {0}", PeakConsumption), EventLogEntryType.Information, 803)
+            If My.Settings.PWPeakConsumptionUseHistory Then
+                PeakConsumption = CInt(SPs.fnGetMonthlyPeakLoad(PeakStartHour:=PeakStartHour, PeakEndHour:=(OffPeakStartHour - 1)))
+                EventLog.WriteEntry(String.Format("Peak Consumption Set To: {0}", PeakConsumption), EventLogEntryType.Information, 803)
+            End If
         Catch ex As Exception
             EventLog.WriteEntry(String.Format("Failed to get Peak Consumption: Exception: {0}, Stack Trace: {1}", ex.Message, ex.StackTrace), EventLogEntryType.Error, 804)
         End Try