Convert power sensors to HWiNFO

todo: network support
Pyrepenol · Nov 29, 2018 · 014e29a · 014e29a
1 parent f44acc6
commit 014e29a
Show file tree

Hide file tree

Showing 2 changed files with 166 additions and 33 deletions.
diff --git a/Skins/ForceXtended/Network/Network.ini b/Skins/ForceXtended/Network/Network.ini
@@ -2,8 +2,13 @@
 ; Config
 ;============================================================================
 
+; HWiNFO support not implemented
+
 [Rainmeter]
 @include=#@#Includes\Rainmeter.inc
+; emulate addgadgets.com Network Meter behavior; double-click brings up "Network and Sharing Center" (both lines are equivalent)
+;LeftMouseDoubleClickAction=[control.exe /name Microsoft.NetworkandSharingCenter]
+LeftMouseDoubleClickAction=[Shell:::{8E908FC9-BECC-40f6-915B-F4CA0E70D03D}]
 
 [Metadata]
 Name=ForceXtended - Network
@@ -39,24 +44,50 @@ ImageName=status_online.png
 [TCPOut]
 Measure=NetOut
 INTERFACE=#INTERFACE#
+; Measure=Plugin
+; Plugin=HWiNFO.dll
+; HWiNFOSensorId=0xf000ea00
+; HWiNFOSensorInstance=0x0
+; HWiNFOEntryId=0x8000003
+; HWiNFOType=CurrentValue
 MinValue=0
 UpdateDivider=1
+;AutoScale=1k
 
 [TCPOutTotal]
 Measure=NetOut
 INTERFACE=#INTERFACE#
+; Measure=Plugin
+; Plugin=HWiNFO.dll
+; HWiNFOSensorId=0xf000ea00
+; HWiNFOSensorInstance=0x0
+; HWiNFOEntryId=0x8000001
+; HWiNFOType=CurrentValue
 Cumulative=1
 UpdateDivider=2
 
 [TCPIn]
 Measure=NetIn
 INTERFACE=#INTERFACE#
+; Measure=Plugin
+; Plugin=HWiNFO.dll
+; HWiNFOSensorId=0xf000ea00
+; HWiNFOSensorInstance=0x0
+; HWiNFOEntryId=0x8000002
+; HWiNFOType=CurrentValue
 MinValue=0
 UpdateDivider=1
 
+
 [TCPInTotal]
 Measure=NetIn
 INTERFACE=#INTERFACE#
+; Measure=Plugin
+; Plugin=HWiNFO.dll
+; HWiNFOSensorId=0xf000ea00
+; HWiNFOSensorInstance=0x0
+; HWiNFOEntryId=0x8000000
+; HWiNFOType=CurrentValue
 Cumulative=1
 UpdateDivider=2
 
@@ -209,12 +240,13 @@ Meter=STRING
 MeterStyle=BodyString
 X=#PADDING_LEFT#
 Y=20r
-Text="Network Traffic UL:"
+Text="Upstream: "
 
 [TCPOutString]
 Meter=STRING
 MeterStyle=BodyString | SizeString
 MeasureName=TCPOut
+Postfix=b/s
 X=123r
 Y=0r
 StringAlign=Right
@@ -262,14 +294,15 @@ ImageName=#@#\Icons\bullet_arrow_up.png
 Meter=STRING
 MeterStyle=BodyString | NewLine
 X=#PADDING_LEFT#
-Text="Network Traffic DL:"
+Text="Downstream: "
 
 [TCPInString]
 Meter=STRING
 MeterStyle=BodyString | SizeString
 MeasureName=TCPIN
 X=123r
 Y=0r
+Postfix=b/s
 StringAlign=Right
 FontColor=#COLOUR9#
 

diff --git a/Skins/ForceXtended/Power/Power.ini b/Skins/ForceXtended/Power/Power.ini
@@ -2,6 +2,11 @@
 ; Config
 ;============================================================================
 
+; Requires:
+; HWiNFO64 https://www.hwinfo.com/
+; Must always update sensors to current hardware!
+; https://www.hwinfo.com/forum/Thread-Rainmeter-plug-in-for-HWiNFO
+
 [Rainmeter]
 @include=#@#Includes\Rainmeter.inc
 
@@ -37,47 +42,106 @@ ImageName=lightning.png
 ;============================================================================
 
 [ACLine]
+
+#Measure=Plugin
+#Plugin=PowerPlugin
+#PowerState=ACLine
+
 Measure=Plugin
-Plugin=PowerPlugin
-PowerState=ACLine
-IfCondition=(ACLine = 1) && (BatteryStatus < 128)
+Plugin=HWiNFO.dll
+HWiNFOSensorId=0xf5000660
+HWiNFOSensorInstance=0x0
+HWiNFOEntryId=0x8000001
+HWiNFOType=CurrentValue
+UpdateDivider=1
+IfCondition=ACLine
 IfTrueAction=[!SetOption ACLineConnectivityIcon ImageTint "#COLOUR9#"]
 IfFalseAction=[!SetOption ACLineConnectivityIcon ImageTint "#COLOUR12#"]
-IfCondition2=(ACLine = 1) && (BatteryStatus < 128)
-IfTrueAction2=[!SetOption ACLineString Text "Power Connected"][!RainmeterHideMeter BatteryLifetimeString]
-IfCondition3=(ACLine = 1) && (BatteryStatus >= 128)
-IfTrueAction3=[!SetOption ACLineString Text "Power Connected [no battery]"][!RainmeterHideMeter BatteryLifetimeString]
-IfCondition4=ACLine = 0
-IfTrueAction4=[!SetOption ACLineString Text "Running on Battery!"][!RainmeterShowMeter BatteryLifetimeString]
+IfCondition2=ACLine && BatteryPercent > 0
+IfTrueAction2=[!SetOption ACLineString Text "Power Connected"]
+IfCondition3=ACLine && !BatteryStatus && !BatteryStatus2
+IfTrueAction3=[!SetOption ACLineString Text "Power Connected [no battery]"]
+IfCondition4=!ACLine && BatteryStatus2
+IfTrueAction4=[!SetOption ACLineString Text "Running on Battery!"]
 UpdateDivider=3
 
+
 [BatteryStatus]
 Measure=Plugin
-Plugin=PowerPlugin
-PowerState=Status2
+
+##Plugin=PowerPlugin
+##PowerState=Status2
+
+Plugin=HWiNFO.dll
+HWiNFOSensorId=0xf5000660
+HWiNFOSensorInstance=0x0
+HWiNFOEntryId=0x8000002
+HWiNFOType=CurrentValue
 IfCondition=BatteryStatus = 1
-IfTrueAction=[!ShowMeterGroup "BatteryGroup"][!SetOption BatteryStatusString Text "Battery Level High"][!SetOption BatteryStatusString FontColor "#FONT3_COLOUR#"]
-IfCondition2=BatteryStatus = 2
-IfTrueAction2=[!ShowMeterGroup "BatteryGroup"][!SetOption BatteryStatusString Text "Battery Level Low"][!SetOption BatteryStatusString FontColor "#FONT5_COLOUR#"]
-IfCondition3=BatteryStatus = 4
-IfTrueAction3=[!ShowMeterGroup "BatteryGroup"][!SetOption BatteryStatusString Text "Warning: Battery Level Critical!"][!SetOption BatteryStatusString FontColor "#FONT6_COLOUR#"]
-IfCondition4=BatteryStatus = 8
-IfTrueAction4=[!ShowMeterGroup "BatteryGroup"][!SetOption BatteryStatusString Text "Battery Charging"][!SetOption BatteryStatusString FontColor "#FONT3_COLOUR#"]
-IfCondition5=BatteryStatus >= 128
-IfTrueAction5=[!HideMeterGroup "BatteryGroup"]
+IfTrueAction=[!ShowMeterGroup "BatteryGroup"][!SetOption BatteryStatusString Text "Battery Discharging!"][!SetOption BatteryStatusString FontColor "#FONT6_COLOUR#"]
+UpdateDivider=3
+
+[BatteryStatus2]
+Measure=Plugin
+
+##Plugin=PowerPlugin
+##PowerState=Status2
+
+Plugin=HWiNFO.dll
+HWiNFOSensorId=0xf5000660
+HWiNFOSensorInstance=0x0
+HWiNFOEntryId=0x8000003
+HWiNFOType=CurrentValue
+
+IfCondition=BatteryStatus2 = 1
+IfTrueAction=[!ShowMeterGroup "BatteryGroup"][!SetOption BatteryStatusString Text "Battery Charging"][!SetOption BatteryStatusString FontColor "#FONT3_COLOUR#"]
+#IfCondition2=(BatteryStatus = 0 ) && (BatteryStatus2 = 0)
+#IfTrueAction2=[!HideMeterGroup "BatteryGroup"]
 UpdateDivider=3
 
 [BatteryLifetime]
 Measure=Plugin
-Plugin=PowerPlugin
-PowerState=Lifetime
+Plugin=HWiNFO.dll
+HWiNFOSensorId=0xf5000660
+HWiNFOSensorInstance=0x0
+HWiNFOEntryId=0x8000000
+HWiNFOType=CurrentValue
+UpdateDivider=10
+
+[UPSWattage]
+Measure=Plugin
+Plugin=HWiNFO.dll
+HWiNFOSensorId=0xf5000660
+HWiNFOSensorInstance=0x0
+HWiNFOEntryId=0x5000000
+HWiNFOType=CurrentValue
+UpdateDivider=10
+
+[UPSLoad]
+Measure=Plugin
+Plugin=HWiNFO.dll
+HWiNFOSensorId=0xf5000660
+HWiNFOSensorInstance=0x0
+HWiNFOEntryId=0x7000000
+HWiNFOType=CurrentValue
+MinValue=0
+MaxValue=100
 UpdateDivider=10
 
 [BatteryPercent]
 Measure=Plugin
-Plugin=PowerPlugin
-PowerState=Percent
+Plugin=HWiNFO.dll
+HWiNFOSensorId=0xf5000660
+HWiNFOSensorInstance=0x0
+HWiNFOEntryId=0x7000001
+HWiNFOType=CurrentValue
 UpdateDivider=10
+IfCondition=BatteryPercent > 25
+IfTrueAction=[!ShowMeterGroup "BatteryGroup"][!SetOption BatteryStatusString Text "Battery Level Normal"][!SetOption BatteryStatusString FontColor "#FONT4_COLOUR#"]
+IfCondition2=BatteryPercent <= 25
+IfTrueAction2=[!ShowMeterGroup "BatteryGroup"][!SetOption BatteryStatusString Text "Battery Level Low"][!SetOption BatteryStatusString FontColor "#FONT5_COLOUR#"]
+IfCondition3=BatteryPercent <= 10
+IfTrueAction3=[!ShowMeterGroup "BatteryGroup"][!SetOption BatteryStatusString Text "Warning: Battery Level Critical!"][!SetOption BatteryStatusString FontColor "#FONT6_COLOUR#"]
 
 ;============================================================================
 ; Meters
@@ -112,11 +176,54 @@ Meter=String
 MeterStyle=BodyString | SizeString | UsageBarFreeString
 Text="[updating]"
 Y=15r
+X=#PADDING_LEFT#
+Group=BatteryGroup
+StringAlign=Left
+
+[BatteryLifetimeString]
+Meter=String
+MeasureName=BatteryLifetime
+MeterStyle=BodyString | SizeString | UsageBarTotalString
+Text="Run Time: %1min"
+Y=r
+UpdateDivider=10
+Group=BatteryGroup
+
+
+[UPSLoadString]
+Meter=String
+MeterStyle=BodyString | SizeString | UsageBarString
+MeasureName=UPSLoad
+Y=15r
+X=#PADDING_LEFT#
+Group=BatteryGroup
+
+[UPSLoadBarBack]
+Meter=Image
+MeterStyle=UsageBarBack
+W=100
+Group=BatteryGroup
+
+[UPSLoadBar]
+Meter=Bar
+MeterStyle=UsageBar
+MeasureName=UPSLoad
+W=100
+Group=BatteryGroup
+
+[UPSWattageString]
+Meter=String
+MeasureName=UPSWattage
+MeterStyle=BodyString | SizeString | UsageBarFreeString
+Y=-5r
+Text="%1W"
 Group=BatteryGroup
+StringAlign=Right
 
 [BatteryPercentString]
 Meter=String
 MeterStyle=BodyString | SizeString | UsageBarString
+
 MeasureName=BatteryPercent
 Group=BatteryGroup
 
@@ -131,10 +238,3 @@ MeterStyle=UsageBar
 MeasureName=BatteryPercent
 Group=BatteryGroup
 
-[BatteryLifetimeString]
-Meter=String
-MeasureName=BatteryLifetime
-MeterStyle=BodyString | SizeString | UsageBarTotalString
-Text="Lifetime: %1"
-UpdateDivider=10
-Group=BatteryGroup