# HG changeset patch # User paulwerelds # Date 1287253607 0 # Node ID 1e8e0c82c1f5a119538ed00de79a8269c79da45a # Parent 04dbd92d111630f4cf75a9c3f4f21fe8c37bc962 AnkhSVN fails, TortoiseSVN to the rescue.. diff -r 04dbd92d1116 -r 1e8e0c82c1f5 WMIProvider/Hardware.cs --- a/WMIProvider/Hardware.cs Sat Oct 16 18:24:20 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,60 +0,0 @@ -/* - - Version: MPL 1.1/GPL 2.0/LGPL 2.1 - - The contents of this file are subject to the Mozilla Public License Version - 1.1 (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" basis, - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - for the specific language governing rights and limitations under the License. - - The Original Code is the Open Hardware Monitor code. - - The Initial Developer of the Original Code is - Paul Werelds . - Portions created by the Initial Developer are Copyright (C) 2009-2010 - the Initial Developer. All Rights Reserved. - - Contributor(s): - - Alternatively, the contents of this file may be used under the terms of - either the GNU General Public License Version 2 or later (the "GPL"), or - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - in which case the provisions of the GPL or the LGPL are applicable instead - of those above. If you wish to allow use of your version of this file only - under the terms of either the GPL or the LGPL, and not to allow others to - use your version of this file under the terms of the MPL, indicate your - decision by deleting the provisions above and replace them with the notice - and other provisions required by the GPL or the LGPL. If you do not delete - the provisions above, a recipient may use your version of this file under - the terms of any one of the MPL, the GPL or the LGPL. - -*/ - -using System.Management.Instrumentation; -using OpenHardwareMonitor.Hardware; - -namespace OpenHardwareMonitor.WMIProvider { - [InstrumentationClass(InstrumentationType.Instance)] - public class Hardware : IWmiObject { - #region WMI Exposed - - public string HardwareType { get; private set; } - public string Identifier { get; private set; } - public string Name { get; private set; } - - #endregion - - public Hardware(IHardware hardware) { - Name = hardware.Name; - Identifier = hardware.Identifier.ToString(); - HardwareType = hardware.HardwareType.ToString(); - } - - public void Update() { } - } -} diff -r 04dbd92d1116 -r 1e8e0c82c1f5 WMIProvider/IWmiObject.cs --- a/WMIProvider/IWmiObject.cs Sat Oct 16 18:24:20 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,47 +0,0 @@ -/* - - Version: MPL 1.1/GPL 2.0/LGPL 2.1 - - The contents of this file are subject to the Mozilla Public License Version - 1.1 (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" basis, - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - for the specific language governing rights and limitations under the License. - - The Original Code is the Open Hardware Monitor code. - - The Initial Developer of the Original Code is - Paul Werelds . - Portions created by the Initial Developer are Copyright (C) 2009-2010 - the Initial Developer. All Rights Reserved. - - Contributor(s): - - Alternatively, the contents of this file may be used under the terms of - either the GNU General Public License Version 2 or later (the "GPL"), or - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - in which case the provisions of the GPL or the LGPL are applicable instead - of those above. If you wish to allow use of your version of this file only - under the terms of either the GPL or the LGPL, and not to allow others to - use your version of this file under the terms of the MPL, indicate your - decision by deleting the provisions above and replace them with the notice - and other provisions required by the GPL or the LGPL. If you do not delete - the provisions above, a recipient may use your version of this file under - the terms of any one of the MPL, the GPL or the LGPL. - -*/ - -namespace OpenHardwareMonitor.WMIProvider { - interface IWmiObject { - // Both of these get exposed to WMI - string Name { get; } - string Identifier { get; } - - // Not exposed. - void Update(); - } -} diff -r 04dbd92d1116 -r 1e8e0c82c1f5 WMIProvider/Sensor.cs --- a/WMIProvider/Sensor.cs Sat Oct 16 18:24:20 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,80 +0,0 @@ -/* - - Version: MPL 1.1/GPL 2.0/LGPL 2.1 - - The contents of this file are subject to the Mozilla Public License Version - 1.1 (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" basis, - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - for the specific language governing rights and limitations under the License. - - The Original Code is the Open Hardware Monitor code. - - The Initial Developer of the Original Code is - Paul Werelds . - Portions created by the Initial Developer are Copyright (C) 2009-2010 - the Initial Developer. All Rights Reserved. - - Contributor(s): - - Alternatively, the contents of this file may be used under the terms of - either the GNU General Public License Version 2 or later (the "GPL"), or - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - in which case the provisions of the GPL or the LGPL are applicable instead - of those above. If you wish to allow use of your version of this file only - under the terms of either the GPL or the LGPL, and not to allow others to - use your version of this file under the terms of the MPL, indicate your - decision by deleting the provisions above and replace them with the notice - and other provisions required by the GPL or the LGPL. If you do not delete - the provisions above, a recipient may use your version of this file under - the terms of any one of the MPL, the GPL or the LGPL. - -*/ - -using System.Management.Instrumentation; -using OpenHardwareMonitor.Hardware; - -namespace OpenHardwareMonitor.WMIProvider { - [InstrumentationClass(InstrumentationType.Instance)] - public class Sensor : IWmiObject { - private ISensor sensor; - - #region WMI Exposed - - public string SensorType { get; private set; } - public string Identifier { get; private set; } - public string Parent { get; private set; } - public string Name { get; private set; } - public float Value { get; private set; } - public float Min { get; private set; } - public float Max { get; private set; } - public int Index { get; private set; } - - #endregion - - public Sensor(ISensor data) { - Name = data.Name; - Index = data.Index; - - SensorType = data.SensorType.ToString(); - Identifier = data.Identifier.ToString(); - Parent = data.Hardware.Identifier.ToString(); - - sensor = data; - } - - public void Update() { - Value = (sensor.Value != null) ? (float)sensor.Value : 0; - - if (sensor.Min != null) - Min = (float)sensor.Min; - - if (sensor.Max != null) - Max = (float)sensor.Max; - } - } -}