Ver código fonte

Merge pull request #452 from nickbabcock/bump-libre

Bump librehardware monitor to latest
Nick Babcock 7 meses atrás
pai
commit
cf87a65022

+ 1 - 1
OhmGraphite/OhmGraphite.csproj

@@ -35,7 +35,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="LibreHardwareMonitorLib" Version="0.9.4-pre277" />
+    <PackageReference Include="LibreHardwareMonitorLib" Version="0.9.4-pre339" />
     <PackageReference Include="InfluxDB.Client" Version="4.15.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.0" />

+ 2 - 0
OhmGraphite/PrometheusCollection.cs

@@ -95,6 +95,8 @@ namespace OhmGraphite
                         return "watt_hours";
                     case SensorType.Noise:
                         return "dba";
+                    case SensorType.Conductivity:
+                        return "microsiemens_per_centimeter";
                     case SensorType.Factor: // 1
                     default:
                         return report.SensorType.ToString().ToLowerInvariant();

+ 3 - 0
OhmGraphite/Translation.cs

@@ -27,6 +27,7 @@ namespace OhmGraphite
         Energy, // milliwatt-hour (mWh)
         Noise, // dBA
         Humidity, // %
+        Conductivity, // µS/cm
     }
 
     /// <summary>
@@ -94,6 +95,8 @@ namespace OhmGraphite
                     return SensorType.Noise;
                 case LibreHardwareMonitor.Hardware.SensorType.Humidity:
                     return SensorType.Humidity;
+                case LibreHardwareMonitor.Hardware.SensorType.Conductivity:
+                    return SensorType.Conductivity;
                 default:
                     throw new ArgumentOutOfRangeException(nameof(s), s, "unexpected hardware monitor sensor translation");
             }