UPS_Device and WinNUT data polling cleanup

- Reorganized some lines in UPS_Device
- Made Socket object access private, WinNUT now gets connection status from UPS_Device only.
- Began implementation of max load calculation algorithm
- Relocated static UPS device info display logic out of variable update function and into UPS initialization function.
- Also cleaned up some unused code in WinNUT.vb.

Author: gbakeman

WinNUT_V2/WinNUT-Client/WinNUT.vb

@@ -300,12 +300,12 @@ Public Class WinNUT
         Dim upsConf = nutUps.Nut_Config
         LogFile.LogTracing(upsConf.UPSName & " has indicated it's ready to start sending data.", LogLvl.LOG_DEBUG, Me)
 
-        ' Setup and begin polling data from UPS.
-        ' Polling_Interval = Arr_Reg_Key.Item("Delay")
-        'With Update_Data
-        '    .Interval = Polling_Interval
-        '    ' .Enabled = True
-        'End With
+        With UPS_Device.UPS_Datas
+            Lbl_VMfr.Text = .Mfr
+            Lbl_VName.Text = .Model
+            Lbl_VSerial.Text = .Serial
+            Lbl_VFirmware.Text = .Firmware
+        End With
 
         Menu_UPS_Var.Enabled = True
         UpdateIcon_NotifyIcon()
@@ -542,7 +542,7 @@ Public Class WinNUT
         Dim Status As String = "Unknown"
         Select Case Reason
             Case Nothing, "Deconnected", "Lost Connect"
-                If (UPS_Device IsNot Nothing) AndAlso Not UPS_Device.Nut_Socket.IsConnected Then
+                If (UPS_Device IsNot Nothing) AndAlso Not UPS_Device.IsConnected Then
                     PBox_Battery_State.Image = Nothing
                 End If
                 Status = "Unknown"
@@ -620,15 +620,7 @@ Public Class WinNUT
 
     Private Sub Update_UPS_Data() Handles UPS_Device.DataUpdated
         LogFile.LogTracing("Updating UPS data for Form.", LogLvl.LOG_DEBUG, Me)
-        With UPS_Device.UPS_Datas
-            If Lbl_VMfr.Text = "" And Lbl_VName.Text = "" And Lbl_VSerial.Text = "" And Lbl_VFirmware.Text = "" Then
-                LogFile.LogTracing("Retrieve UPS Informations", LogLvl.LOG_DEBUG, Me)
-                Lbl_VMfr.Text = .Mfr
-                Lbl_VName.Text = .Model
-                Lbl_VSerial.Text = .Serial
-                Lbl_VFirmware.Text = .Firmware
-            End If
-        End With
+
         With UPS_Device.UPS_Datas.UPS_Value
             UPS_BattCh = .Batt_Charge
             UPS_BattV = .Batt_Voltage
@@ -638,7 +630,6 @@ Public Class WinNUT
             UPS_InputV = .Input_Voltage
             UPS_OutputV = .Output_Voltage
             UPS_Load = .Load
-            'Me.UPS_Status = Me.Device_Data
             UPS_Status = "OL"
             UPS_OutPower = .Output_Power
 
@@ -669,25 +660,6 @@ Public Class WinNUT
             Else
                 Lbl_VOLoad.BackColor = Color.White
             End If
-            'If Me.UPS_Status <> Nothing Then
-            'If Me.UPS_Status.Trim().StartsWith("OL") Or StrReverse(Me.UPS_Status.Trim()).StartsWith("LO") Then
-            '    LogFile.LogTracing("UPS is plugged", LogLvl.LOG_DEBUG, Me)
-            '    Lbl_VOL.BackColor = Color.Green
-            '    Lbl_VOB.BackColor = Color.White
-            '    ActualAppIconIdx = AppIconIdx.IDX_OL
-            'Else
-            '    LogFile.LogTracing("UPS is unplugged", LogLvl.LOG_DEBUG, Me)
-            '    Lbl_VOL.BackColor = Color.Yellow
-            '    Lbl_VOB.BackColor = Color.Green
-            '    ActualAppIconIdx = 0
-            'End If
-
-            'If Me.UPS_Load > 100 Then
-            '        LogFile.LogTracing("UPS Overload", LogLvl.LOG_ERROR, Me)
-            '        Lbl_VOLoad.BackColor = Color.Red
-            '    Else
-            '        Lbl_VOLoad.BackColor = Color.White
-            '    End If
 
             LogFile.LogTracing("Updating battery icons based on charge percent: " & UPS_BattCh & "%", LogLvl.LOG_DEBUG, Me)
 

WinNUT_V2/WinNUT-Client_Common/UPS_Device.vb

@@ -64,11 +64,17 @@ Public Class UPS_Device
         End Set
     End Property
 
+    Private _MaxLoad As Integer
+
+    Public ReadOnly Property MaxLoad As Integer
+        Get
+            Return _MaxLoad
+        End Get
+    End Property
+
 #End Region
 
 #Region "Events"
-
-    ' Public Event Unknown_UPS()
     Public Event DataUpdated()
     Public Event Connected(sender As UPS_Device)
     Public Event ReConnected(sender As UPS_Device)
@@ -79,8 +85,6 @@ Public Class UPS_Device
     ' Error encountered when trying to connect.
     Public Event ConnectionError(sender As UPS_Device, innerException As Exception)
     Public Event New_Retry()
-    ' Public Event Shutdown_Condition()
-    ' Public Event Stop_Shutdown()
 
     ''' <summary>
     ''' Raised when the NUT server returns an error during normal communication and is deemed important for the client
@@ -90,6 +94,12 @@ Public Class UPS_Device
     ''' <param name="nutEx">An exception detailing the error and cirucmstances surrounding it.</param>
     Public Event EncounteredNUTException(sender As UPS_Device, nutEx As NutException)
 
+    ''' <summary>
+    ''' Raise an event when a status code is added to the UPS that wasn't there before.
+    ''' </summary>
+    ''' <param name="newStatuses">The bitmask of status flags that are currently set on the UPS.</param>
+    Public Event StatusesChanged(sender As UPS_Device, newStatuses As UPS_States)
+
 #End Region
 
     Private Const CosPhi As Double = 0.6
@@ -107,7 +117,7 @@ Public Class UPS_Device
     ' Public UPSData As New UPSData
 
 
-    Public WithEvents Nut_Socket As Nut_Socket
+    Private WithEvents Nut_Socket As Nut_Socket
 
     Public Retry As Integer = 0
     Public MaxRetry As Integer = 30
@@ -118,12 +128,6 @@ Public Class UPS_Device
 
     Private LogFile As Logger
 
-    ''' <summary>
-    ''' Raise an event when a status code is added to the UPS that wasn't there before.
-    ''' </summary>
-    ''' <param name="newStatuses">The bitmask of status flags that are currently set on the UPS.</param>
-    Public Event StatusesChanged(sender As UPS_Device, newStatuses As UPS_States)
-
     Public Sub New(ByRef Nut_Config As Nut_Parameter, ByRef LogFile As Logger, pollInterval As Integer)
         Me.LogFile = LogFile
         Me.Nut_Config = Nut_Config
@@ -236,6 +240,10 @@ Public Class UPS_Device
         Return freshData
     End Function
 
+    Private Function FindMaxLoad() As Integer
+
+    End Function
+
     Private oldStatusBitmask As Integer
 
     Public Sub Retrieve_UPS_Datas() Handles Update_Data.Tick ' As UPSData