add min/max values to hwinfo screen

mhwlng · Dec 25, 2020 · a76fc50 · a76fc50
1 parent 412c501
commit a76fc50
Show file tree

Hide file tree

Showing 3 changed files with 88 additions and 25 deletions.
diff --git a/Elite/HWINFO.inc b/Elite/HWINFO.inc
@@ -19,20 +19,78 @@ SSDTemp-SensorId=0xf0000100
 SSDTemp-SensorInstance=0x0
 SSDTemp-EntryId=0x1000000
 
+MotherboardTemp-SensorId=0xf7067980
+MotherboardTemp-SensorInstance=0x0
+MotherboardTemp-EntryId=0x1000000
+
+ChipsetTemp-SensorId=0xf0ec0502
+ChipsetTemp-SensorInstance=0x0
+ChipsetTemp-EntryId=0x1000001
+
+VRMTemp-SensorId=0xf0ec0502
+VRMTemp-SensorInstance=0x0
+VRMTemp-EntryId=0x1000000
+
+GPUFanSpeed-SensorId=0xe0002000
+GPUFanSpeed-SensorInstance=0x0
+GPUFanSpeed-EntryId=0x3000000
+
 PumpSpeed-SensorId=0xfc04a100
 PumpSpeed-SensorInstance=0x30
 PumpSpeed-EntryId=0x3000002
 
+RadiatorFanSpeed-SensorId=0xfc04a100
+RadiatorFanSpeed-SensorInstance=0x30
+RadiatorFanSpeed-EntryId=0x3000000
+
+ChipsetFanSpeed-SensorId=0xf0ec0502
+ChipsetFanSpeed-SensorInstance=0x0
+ChipsetFanSpeed-EntryId=0x3000002
+
+CPUUsage-SensorId=0xf0000300
+CPUUsage-SensorInstance=0x0
+CPUUsage-EntryId=0x7000021
+
+GPUUsage-SensorId=0xe0002000
+GPUUsage-SensorInstance=0x0
+GPUUsage-EntryId=0x7000000
+
+CPUPower-SensorId=0xf0000501
+CPUPower-SensorInstance=0x0
+CPUPower-EntryId=0x5000000
+
+GPUPower-SensorId=0xe0002000
+GPUPower-SensorInstance=0x0
+GPUPower-EntryId=0x5000000
+
+FrameRate-SensorId=0xf00f5000
+FrameRate-SensorInstance=0x0
+FrameRate-EntryId=0x8000000
+
+[HWINFO-Config-FRAME RATE]
+FrameRate=Frame Rate
+
+[HWINFO-Config-USAGE]
+CPUUsage=CPU
+GPUUsage=GPU
+
 [HWINFO-Config-TEMPERATURES]
 CPUTemp=CPU
 GPUTemp=GPU
 RAMTemp=RAM
 SSDTemp=SSD
+VRMTemp=VRM
+ChipsetTemp=Chipset
+MotherboardTemp=Motherboard
 WaterTemp=Water
 
 [HWINFO-Config-FAN SPEEDS]
+GPUFanSpeed=GPU
 PumpSpeed=Pump
+RadiatorFanSpeed=Radiator
+ChipsetFanSpeed=Chipset
 
-
-
+[HWINFO-Config-POWER]
+CPUPower=CPU
+GPUPower=GPU
 
diff --git a/Elite/Properties/AssemblyInfo.cs b/Elite/Properties/AssemblyInfo.cs
@@ -31,7 +31,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.6.0.0")]
-[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyVersion("1.6.1.0")]
+[assembly: AssemblyFileVersion("1.6.1.0")]
 
 [assembly: log4net.Config.XmlConfigurator(Watch = true)]
diff --git a/Elite/Templates/hwinfo.cshtml b/Elite/Templates/hwinfo.cshtml
@@ -15,31 +15,36 @@
     <table class="zebratable">
         <tbody>
 
-        @foreach (var m in Model.SensorData)
-        {
-            <tr>
-                <td class="caption center" colspan="2">@m.SensorNameUser</td>
-            </tr>
-
-            var odd = true;
-
-            foreach (var e in m.Elements)
-            {
-                <tr class="@(odd ? "zebraodd" : "zebraeven")">
-                    <td class="caption">@e.LabelUser</td>
-                    <td class="data right">@e.Value</td>
-                </tr>
-                odd = !odd;
-            }
-
-            if (!((List<HWInfo.SensorObj>)Model.SensorData).Last().Equals((HWInfo.SensorObj)m))
+            @foreach (var m in Model.SensorData)
             {
                 <tr>
-                    <td class="divider" colspan="2">&nbsp;</td>
+                    <td class="caption center" colspan="2">@m.SensorNameUser</td>
                 </tr>
-            }
 
-        }            
+                var odd = true;
+
+                foreach (var e in m.Elements)
+                {
+                    <tr class="@(odd ? "zebraodd" : "zebraeven")">
+                        <td rowspan="2" class="caption">@e.LabelUser</td>
+                        <td rowspan="2" class="data right">@e.Value</td>
+                        <td  class="data right smallfont">@e.ValueMax</td>
+                    </tr>
+                    <tr class="@(odd ? "zebraodd" : "zebraeven")">
+                        <td class="data right smallfont">@e.ValueMin</td>
+                    </tr>
+
+                    odd = !odd;
+                }
+
+                if (!((List<HWInfo.SensorObj>)Model.SensorData).Last().Equals((HWInfo.SensorObj)m))
+                {
+                    <tr>
+                        <td class="divider" colspan="3">&nbsp;</td>
+                    </tr>
+                }
+
+            }
         </tbody>
     </table>