diff -r 5a18725d2c20 -r 35788ddd1825 Hardware/Heatmaster/Heatmaster.cs --- a/Hardware/Heatmaster/Heatmaster.cs Sat Apr 23 14:18:02 2011 +0000 +++ b/Hardware/Heatmaster/Heatmaster.cs Sat Apr 30 16:03:58 2011 +0000 @@ -134,8 +134,10 @@ return WriteField(device, field, '"' + value + '"'); } - public Heatmaster(string portName, ISettings settings) { - + public Heatmaster(string portName, ISettings settings) + : base("Heatmaster", new Identifier("heatmaster", + portName.TrimStart(new [] {'/'}).ToLowerInvariant()), settings) + { this.portName = portName; try { serialPort = new SerialPort(portName, 38400, Parity.None, 8, @@ -209,17 +211,6 @@ get { return HardwareType.Heatmaster; } } - public override Identifier Identifier { - get { - return new Identifier("heatmaster", - serialPort.PortName.TrimStart(new [] {'/'}).ToLowerInvariant()); - } - } - - public override string Name { - get { return "Heatmaster"; } - } - private void ProcessUpdateLine(string line) { Match match = Regex.Match(line, @">\[0:(\d+)\]([0-9:\|-]+)"); if (match.Success) {