Merge pull request #137 from MaxMadcc/dev-2.3

Fixed UPS_Status variable being forced set to "OL", and added ALARM status flag for Huawei UPS200A device.

Author: gbakeman

WinNUT_V2/WinNUT-Client/WinNUT.vb

@@ -695,7 +695,7 @@ Public Class WinNUT
             UPS_InputV = .Input_Voltage
             UPS_OutputV = .Output_Voltage
             UPS_Load = .Load
-            UPS_Status = "OL"
+            UPS_Status = .UPS_Status
             UPS_OutPower = .Output_Power
 
             If .UPS_Status.HasFlag(UPS_States.OL) Then

WinNUT_V2/WinNUT-Client_Common/Common_Enums.vb

@@ -115,6 +115,7 @@ Public Enum UPS_States
     OVER = 1 << 10
     TRIM = 1 << 11
     BOOST = 1 << 12
+    ALARM = 1 << 13
 End Enum
 
 Public Enum PowerMethod