Added support for reading more than one TBalancer fan controller.
authormoel.mich
Mon, 28 May 2012 13:45:38 +0000
changeset 351d389607e74ca
parent 350 6de77245e32b
child 352 0899f651d5cf
Added support for reading more than one TBalancer fan controller.
Hardware/TBalancer/TBalancerGroup.cs
Properties/AssemblyVersion.cs
     1.1 --- a/Hardware/TBalancer/TBalancerGroup.cs	Mon May 28 10:39:30 2012 +0000
     1.2 +++ b/Hardware/TBalancer/TBalancerGroup.cs	Mon May 28 13:45:38 2012 +0000
     1.3 @@ -4,7 +4,7 @@
     1.4    License, v. 2.0. If a copy of the MPL was not distributed with this
     1.5    file, You can obtain one at http://mozilla.org/MPL/2.0/.
     1.6   
     1.7 -  Copyright (C) 2009-2010 Michael Möller <mmoeller@openhardwaremonitor.org>
     1.8 +  Copyright (C) 2009-2012 Michael Möller <mmoeller@openhardwaremonitor.org>
     1.9  	
    1.10  */
    1.11  
    1.12 @@ -32,14 +32,14 @@
    1.13          catch (ArgumentNullException) { return; }
    1.14          catch (EntryPointNotFoundException) { return; }
    1.15          catch (BadImageFormatException) { return; }
    1.16 -     
    1.17 +   
    1.18        FT_DEVICE_INFO_NODE[] info = new FT_DEVICE_INFO_NODE[numDevices];
    1.19        if (FTD2XX.FT_GetDeviceInfoList(info, ref numDevices) != FT_STATUS.FT_OK) 
    1.20        {
    1.21          report.AppendLine("Status: FT_GetDeviceInfoList failed");        
    1.22          return;
    1.23        }
    1.24 -
    1.25 + 
    1.26        // make sure numDevices is not larger than the info array
    1.27        if (numDevices > info.Length)
    1.28          numDevices = (uint)info.Length;
    1.29 @@ -121,10 +121,11 @@
    1.30  
    1.31          if (isValid) {
    1.32            report.AppendLine("Status: OK");
    1.33 -          hardware.Add(new TBalancer(i, protocolVersion, settings));
    1.34 -          return;
    1.35 +          hardware.Add(new TBalancer(i, protocolVersion, settings));          
    1.36          }
    1.37 -        report.AppendLine();
    1.38 +
    1.39 +        if (i < numDevices - 1)
    1.40 +          report.AppendLine();
    1.41        }
    1.42      }
    1.43  
     2.1 --- a/Properties/AssemblyVersion.cs	Mon May 28 10:39:30 2012 +0000
     2.2 +++ b/Properties/AssemblyVersion.cs	Mon May 28 13:45:38 2012 +0000
     2.3 @@ -10,5 +10,5 @@
     2.4  
     2.5  using System.Reflection;
     2.6  
     2.7 -[assembly: AssemblyVersion("0.4.0.5")]
     2.8 -[assembly: AssemblyInformationalVersion("0.4.0.5 Alpha")]
     2.9 \ No newline at end of file
    2.10 +[assembly: AssemblyVersion("0.4.0.8")]
    2.11 +[assembly: AssemblyInformationalVersion("0.4.0.8 Alpha")]
    2.12 \ No newline at end of file