fix(Drive): Rollback to using PerfMon for Disk activity

- Drive: Apparently HWiNFO can't provide Disk activity for logical disks. Also old issue with PerfMon providing values > 100 is solved by setting `MinValue` and `MaxValue` - Player: Fix Artist and Title wrapping - GPU: Fade usage string when value is `0` - Add changelog to the repository
nikolay-borzov · Sep 25, 2022 · 7dfdda8 · 7dfdda8
1 parent 8bfb8c9
commit 7dfdda8
Show file tree

Hide file tree

Showing 20 changed files with 86 additions and 36 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,57 @@
+## v1.6.0 (2022-09-25)
+
+- Drive: Apparently HWiNFO can't provide Disk activity for logical disks. Also old issue with PerfMon providing values > 100 is solved by setting `MinValue` and `MaxValue`
+- Player: Fix Artist and Title wrapping
+- GPU: Fade usage string when value is `0`
+
+## v1.5.0 (2022-08-23)
+
+- GPU: Get GPU usage value and allocated memory from HWiNFO
+- GPU: Fix getting GPU total memory. Support GPU with > 4 GiB
+- GPU: Allow setting GPU total memory as workaround when there is no total memory value in the registry
+- GPU: Allow hiding GPU Fan
+- GPU: Rename GPU "Dedicated memory" to less verbose "Memory"
+- Drive: Get drive total activity from HWiNFO
+- Drive: Display SSD remaining life in a tooltip
+- Unify variables' names
+
+## v1.4.0 (2022-03-20)
+
+- Drive: how Drive identifier in tooltip
+- Drive: Add separate variables for HWiNFO Drive S.M.A.R.T. Temperature Entry ID
+- Add `Drive_6` skin
+
+## v1.3.1 (2021-10-29)
+
+- Memory, Drive, GPU: Use binary prefixes for memory values (e.g. GiB)
+
+## v1.3.0 (2021-04-16)
+
+- Add localization support. Available locales are "en" and "ru"
+- Add context menu item "Open Config" that opens `Config.inc`
+
+## v1.2.0 (2021-04-07)
+
+-To keep user values on update copy all configurable variables from `Variables.inc` to `Config.inc`
+
+- Highlight that HWiNFO < 7.0.0 must be used unless you have Pro subscription
+- Network: Fix missing default value for `NetworkInterface`
+- Drive: Add tooltip for Drive label displaying disk total size
+- GPU: Remove `GPU_Registry_GUID` variable - take adapter name and total dedicated memory size (as reported by `dxdiag`) from WinSAT
+- Network: Fade zero network In and Out values
+
+## v1.1.0 (2021-03-21)
+
+- Allow toggling skin borders visibility:
+
+```ini
+; 0 - hide, 1 - show
+CPUBorderTop=1
+CPUBorderRight=0
+CPUBorderBottom=1
+CPUBorderLeft=0
+```
+
+## v1.0.0 (2021-03-03)
+
+- Initial public version updated
diff --git a/README.md b/README.md
@@ -145,11 +145,9 @@ See `Drives` section in `Config.inc`
 You might want to load `Drive_Header` skin to add header for drives skins
 
 - `DriveHWiNFOSMARTSensorId` - S.M.A.R.T. Sensor ID (the same for all drives)
-- `DriveHWiNFODriveSensorId` - Drive Sensor ID (the same for all drives)
 - `Drive1`...`Drive6` - Drive's letter (e.g. `C:`)
 - `Drive1HWiNFOSensorInstance`...`Drive6HWiNFOSensorInstance` - S.M.A.R.T. Sensor Instance
 - `Drive1HWiNFOTemperatureEntryId`..`Drive6HWiNFOTemperatureEntryId` - S.M.A.R.T. Drive Temperature Entry ID
-- `Drive1HWiNFOTotalActivityEntryId`..`Drive6HWiNFOTotalActivityEntryId` - Drive Total Activity Entry ID
 - `Drive1HWiNFORemainingLifeEntryId`..`Drive6HWiNFORemainingLifeEntryId` - S.M.A.R.T. Drive Remaining Life Entry ID. Only available for SSD. Set to `-1` for HDD
 - `DrivesHeaderBorderTop`, `DrivesHeaderBorderRight`, `DrivesHeaderBorderBottom` and `DrivesHeaderBorderLeft` - Toggles Drives Header skin border visibility
 - `Drive1BorderTop`...`Drive6BorderTop`, `Drive1BorderRight`...`Drive6BorderRight`, `Drive1BorderBottom`...`Drive6BorderBottom` and `Drive1BorderLeft`...`Drive6BorderLeft` - Toggles skin border visibility

diff --git a/images/cpu.png b/images/cpu.png
diff --git a/meta.json b/meta.json
@@ -1,7 +1,7 @@
 {
   "Name": "Monochrome",
   "Author": "nikolay-borzov",
-  "Version": "1.5.0",
+  "Version": "1.6.0",
   "Plugins": [
     "HWiNFO.dll"
   ],

diff --git a/src/@Resources/Config.inc b/src/@Resources/Config.inc
@@ -201,13 +201,11 @@ DrivesHeaderBorderLeft=1
 
 ; Common for all drives
 DriveHWiNFOSMARTSensorId=0xf0000100
-DriveHWiNFODriveSensorId=0xf0000101
 
 Drive1=C:
 ; Common for S.M.A.R.T. and Drive sensors
 Drive1HWiNFOSensorInstance=0x0
 Drive1HWiNFOTemperatureEntryId=0x1000000
-Drive1HWiNFOTotalActivityEntryId=0x7000002
 ; Only for SSD. Set to -1 to disable
 Drive1HWiNFORemainingLifeEntryId=0x7000000
 ; 0 - hide, 1 - show
@@ -219,7 +217,6 @@ Drive1BorderLeft=1
 Drive2=D:
 Drive2HWiNFOSensorInstance=0x1
 Drive2HWiNFOTemperatureEntryId=0x1000000
-Drive2HWiNFOTotalActivityEntryId=0x7000002
 ; Only for SSD. Set to -1 to disable
 Drive2HWiNFORemainingLifeEntryId=-1
 ; 0 - hide, 1 - show
@@ -231,7 +228,6 @@ Drive2BorderLeft=1
 Drive3=E:
 Drive3HWiNFOSensorInstance=0x2
 Drive3HWiNFOTemperatureEntryId=0x1000000
-Drive3HWiNFOTotalActivityEntryId=0x7000002
 ; Only for SSD. Set to -1 to disable
 Drive3HWiNFORemainingLifeEntryId=-1
 ; 0 - hide, 1 - show
@@ -243,7 +239,6 @@ Drive3BorderLeft=1
 Drive4=F:
 Drive4HWiNFOSensorInstance=0x3
 Drive4HWiNFOTemperatureEntryId=0x1000000
-Drive4HWiNFOTotalActivityEntryId=0x7000002
 ; Only for SSD. Set to -1 to disable
 Drive4HWiNFORemainingLifeEntryId=-1
 ; 0 - hide, 1 - show
@@ -255,7 +250,6 @@ Drive4BorderLeft=1
 Drive5=G:
 Drive5HWiNFOSensorInstance=0x4
 Drive5HWiNFOTemperatureEntryId=0x1000000
-Drive5HWiNFOTotalActivityEntryId=0x7000002
 ; Only for SSD. Set to -1 to disable
 Drive5HWiNFORemainingLifeEntryId=-1
 ; 0 - hide, 1 - show
@@ -267,7 +261,6 @@ Drive5BorderLeft=1
 Drive6=H:
 Drive6HWiNFOSensorInstance=0x5
 Drive6HWiNFOTemperatureEntryId=0x1000000
-Drive6HWiNFOTotalActivityEntryId=0x7000002
 ; Only for SSD. Set to -1 to disable
 Drive6HWiNFORemainingLifeEntryId=-1
 ; 0 - hide, 1 - show

diff --git a/src/@Resources/Drive.inc b/src/@Resources/Drive.inc
@@ -56,14 +56,15 @@ Disabled=1
 IfAboveValue=0
 IfAboveAction=[!SetVariable "RemainingLifeString" "#CRLF##LabelDriveRemainingLife#: [MeasureRemainingLife]%"]
 
+; Use "LogicalDisk" in order to track logical disk parameters
 [MeasureActivity]
 Measure=Plugin
-Plugin=HWiNFO.dll
-HWiNFOSensorId=#DriveHWiNFODriveSensorId#
-HWiNFOSensorInstance=#DriveHWiNFOSensorInstance#
-HWiNFOEntryId=#DriveHWiNFOTotalActivityEntryId#
-HWiNFOType=CurrentValue
+Plugin=UsageMonitor
+Category=LogicalDisk
+Counter=% Disk Time
+Name=#Drive#
 MinValue=0
+; Performance Monitor reports values > 100
 MaxValue=100
 IfCondition=MeasureActivity > 0
 IfTrueAction=[!SetVariable "ActivityFontColor" #FontColor#][!Redraw]

diff --git a/src/CPU/CPU.ini b/src/CPU/CPU.ini
@@ -4,7 +4,7 @@
 [Metadata]
 Name=Monochrome: CPU
 Information=Displays CPU usage/temperature values and values as line meter, processes count and 1-5 top processes. When "CPU" label is hovered the processor name is displayed as a tooltip
-Version=1.5.0
+Version=1.6.0
 Author=nikolay-borzov
 License=Creative Commons Attribution Share Alike 4.0 International
 

diff --git a/src/Drives/1/Drive_1.ini b/src/Drives/1/Drive_1.ini
@@ -4,15 +4,14 @@
 [Metadata]
 Name=Monochrome: Drive #1
 Information=Displays Drive #1 free/occupied space, temperature, activity, read/write speed
-Version=1.5.0
+Version=1.6.0
 Author=nikolay-borzov
 License=Creative Commons Attribution Share Alike 4.0 International
 
 [Variables]
 Drive=#Drive1#
 DriveHWiNFOSensorInstance=#Drive1HWiNFOSensorInstance#
 DriveHWiNFOTemperatureEntryId=#Drive1HWiNFOTemperatureEntryId#
-DriveHWiNFOTotalActivityEntryId=#Drive1HWiNFOTotalActivityEntryId#
 DriveHWiNFORemainingLifeEntryId=#Drive1HWiNFORemainingLifeEntryId#
 BorderTop=#Drive1BorderTop#
 BorderRight=#Drive1BorderRight#

diff --git a/src/Drives/2/Drive_2.ini b/src/Drives/2/Drive_2.ini
@@ -4,15 +4,14 @@
 [Metadata]
 Name=Monochrome: Drive #2
 Information=Displays Drive #2 free/occupied space, temperature, activity, read/write speed
-Version=1.5.0
+Version=1.6.0
 Author=nikolay-borzov
 License=Creative Commons Attribution Share Alike 4.0 International
 
 [Variables]
 Drive=#Drive2#
 DriveHWiNFOSensorInstance=#Drive2HWiNFOSensorInstance#
 DriveHWiNFOTemperatureEntryId=#Drive2HWiNFOTemperatureEntryId#
-DriveHWiNFOTotalActivityEntryId=#Drive2HWiNFOTotalActivityEntryId#
 DriveHWiNFORemainingLifeEntryId=#Drive2HWiNFORemainingLifeEntryId#
 BorderTop=#Drive2BorderTop#
 BorderRight=#Drive2BorderRight#

diff --git a/src/Drives/3/Drive_3.ini b/src/Drives/3/Drive_3.ini
@@ -4,15 +4,14 @@
 [Metadata]
 Name=Monochrome: Drive #3
 Information=Displays Drive #3 free/occupied space, temperature, activity, read/write speed
-Version=1.5.0
+Version=1.6.0
 Author=nikolay-borzov
 License=Creative Commons Attribution Share Alike 4.0 International
 
 [Variables]
 Drive=#Drive3#
 DriveHWiNFOSensorInstance=#Drive3HWiNFOSensorInstance#
 DriveHWiNFOTemperatureEntryId=#Drive3HWiNFOTemperatureEntryId#
-DriveHWiNFOTotalActivityEntryId=#Drive3HWiNFOTotalActivityEntryId#
 DriveHWiNFORemainingLifeEntryId=#Drive3HWiNFORemainingLifeEntryId#
 BorderTop=#Drive3BorderTop#
 BorderRight=#Drive3BorderRight#

diff --git a/src/Drives/4/Drive_4.ini b/src/Drives/4/Drive_4.ini
@@ -4,15 +4,14 @@
 [Metadata]
 Name=Monochrome: Drive #4
 Information=Displays Drive #4 free/occupied space, temperature, activity, read/write speed
-Version=1.5.0
+Version=1.6.0
 Author=nikolay-borzov
 License=Creative Commons Attribution Share Alike 4.0 International
 
 [Variables]
 Drive=#Drive4#
 DriveHWiNFOSensorInstance=#Drive4HWiNFOSensorInstance#
 DriveHWiNFOTemperatureEntryId=#Drive4HWiNFOTemperatureEntryId#
-DriveHWiNFOTotalActivityEntryId=#Drive4HWiNFOTotalActivityEntryId#
 DriveHWiNFORemainingLifeEntryId=#Drive4HWiNFORemainingLifeEntryId#
 BorderTop=#Drive4BorderTop#
 BorderRight=#Drive4BorderRight#

diff --git a/src/Drives/5/Drive_5.ini b/src/Drives/5/Drive_5.ini
@@ -4,15 +4,14 @@
 [Metadata]
 Name=Monochrome: Drive #5
 Information=Displays Drive #5 free/occupied space, temperature, activity, read/write speed
-Version=1.5.0
+Version=1.6.0
 Author=nikolay-borzov
 License=Creative Commons Attribution Share Alike 4.0 International
 
 [Variables]
 Drive=#Drive5#
 DriveHWiNFOSensorInstance=#Drive5HWiNFOSensorInstance#
 DriveHWiNFOTemperatureEntryId=#Drive5HWiNFOTemperatureEntryId#
-DriveHWiNFOTotalActivityEntryId=#Drive5HWiNFOTotalActivityEntryId#
 DriveHWiNFORemainingLifeEntryId=#Drive5HWiNFORemainingLifeEntryId#
 BorderTop=#Drive5BorderTop#
 BorderRight=#Drive5BorderRight#

diff --git a/src/Drives/6/Drive_6.ini b/src/Drives/6/Drive_6.ini
@@ -4,15 +4,14 @@
 [Metadata]
 Name=Monochrome: Drive #6
 Information=Displays Drive #6 free/occupied space, temperature, activity, read/write speed
-Version=1.5.0
+Version=1.6.0
 Author=nikolay-borzov
 License=Creative Commons Attribution Share Alike 4.0 International
 
 [Variables]
 Drive=#Drive6#
 DriveHWiNFOSensorInstance=#Drive6HWiNFOSensorInstance#
 DriveHWiNFOTemperatureEntryId=#Drive6HWiNFOTemperatureEntryId#
-DriveHWiNFOTotalActivityEntryId=#Drive6HWiNFOTotalActivityEntryId#
 DriveHWiNFORemainingLifeEntryId=#Drive6HWiNFORemainingLifeEntryId#
 BorderTop=#Drive6BorderTop#
 BorderRight=#Drive6BorderRight#

diff --git a/src/Drives/Header/Drives_Header.ini b/src/Drives/Header/Drives_Header.ini
@@ -4,7 +4,7 @@
 [Metadata]
 Name=Monochrome: Drives Header
 Information=Header for Drives skin
-Version=1.5.0
+Version=1.6.0
 Author=nikolay-borzov
 License=Creative Commons Attribution Share Alike 4.0 International
 

diff --git a/src/GPU/GPU.ini b/src/GPU/GPU.ini
@@ -4,11 +4,12 @@
 [Metadata]
 Name=Monochrome: GPU
 Information=Displays GPU usage/temperature, fan speed, memory usage and 1-5 top processes using GPU. When memory bar is hovered a percent of used memory is displayed. When "GPU" label is hovered the GPU adapter name is displayed as a tooltip
-Version=1.5.0
+Version=1.6.0
 Author=nikolay-borzov
 License=Creative Commons Attribution Share Alike 4.0 International
 
 [Variables]
+UsageFontColor=#FontColorDisabled#
 UpdateDividerTopProcess=#UpdateDividerGPUTopProcess#
 TopProcessColor_1=#FontColorDisabled#
 TopProcessColor_2=#FontColorDisabled#
@@ -68,6 +69,9 @@ HWiNFOEntryId=#GPUHWiNFOCoreLoadEntryId#
 HWiNFOType=CurrentValue
 MinValue=0
 MaxValue=100
+IfCondition=MeasureUsage > 0
+IfTrueAction=[!SetVariable "UsageFontColor" #FontColor#][!Redraw]
+IfFalseAction=[!SetVariable "UsageFontColor" #FontColorDisabled#][!Redraw]
 
 [MeasureTemperature]
 Measure=Plugin
@@ -242,6 +246,7 @@ UpdateDivider=-1
 [MeterUsageString]
 Meter=String
 MeterStyle=StringStyle | MeterPercentStringStyle | LineMeterContainerStringAlignLeftTopStyle
+FontColor=#UsageFontColor#
 Container=MeterUsageLineContainer
 DynamicVariables=1
 Text="[MeasureUsage:0]%"

diff --git a/src/IO/IO.ini b/src/IO/IO.ini
@@ -4,7 +4,7 @@
 [Metadata]
 Name=Monochrome: I/O
 Information=Displays I/O information (file, network and device I/Os)
-Version=1.5.0
+Version=1.6.0
 Author=nikolay-borzov
 License=Creative Commons Attribution Share Alike 4.0 International
 

diff --git a/src/Memory/Memory.ini b/src/Memory/Memory.ini
@@ -4,7 +4,7 @@
 [Metadata]
 Name=Monochrome: Memory
 Information=Displays RAM usage and 1-5 top processes using RAM. When used memory bar is hovered a percent of used memory is displayed
-Version=1.5.0
+Version=1.6.0
 Author=nikolay-borzov
 License=Creative Commons Attribution Share Alike 4.0 International
 

diff --git a/src/Network/Network.ini b/src/Network/Network.ini
diff --git a/src/Player/Player.ini b/src/Player/Player.ini
@@ -4,7 +4,7 @@
 [Metadata]
 Name=Monochrome: Player
 Information=Displays currently playing track information - Track title, track artist and track duration. It has basic controls - previous track, pause/play. next track. When header label is clicked player is launched/closed
-Version=1.5.0
+Version=1.6.0
 Author=nikolay-borzov
 License=Creative Commons Attribution Share Alike 4.0 International
 
@@ -88,7 +88,8 @@ MeasureName=MeasurePlayer
 MeterStyle=StringStyle
 W=#ContentWidth#
 ClipString=2
-ClipStringH=(#LineHeight# * 2)
+; Give more space to fit 2 lines
+ClipStringH=(#LineHeight# * 3)
 Text="%1"
 TooltipText="%1"
 Container=MeterTrackTitleContainer
@@ -111,7 +112,8 @@ MeasureName=MeasureArtist
 MeterStyle=StringStyle
 ClipString=2
 W=#ContentWidth#
-ClipStringH=(#LineHeightSmall# * 2)
+; Give more space to fit 2 lines
+ClipStringH=(#LineHeight# * 3)
 FontSize=#FontSizeSmall#
 Text="%1"
 TooltipText="%1"

diff --git a/src/Uptime/Uptime.ini b/src/Uptime/Uptime.ini
@@ -4,7 +4,7 @@
 [Metadata]
 Name=Monochrome: Uptime
 Information=Displays computer uptime
-Version=1.5.0
+Version=1.6.0
 Author=nikolay-borzov
 License=Creative Commons Attribution Share Alike 4.0 International