More cleanup

This commit is contained in:
2015-01-16 18:16:37 -05:00
parent be11e8c8cb
commit 632f3715d9
12 changed files with 119 additions and 168 deletions

View File

@@ -54,7 +54,7 @@ namespace OneWireAPI
public byte[] ReadDevice()
{
// Select and access the ID of the device we want to talk to
Adapter.Select(DeviceId);
Adapter.Select(Id);
// Data buffer to send over the network
var data = new byte[30];
@@ -88,7 +88,7 @@ namespace OneWireAPI
if (crcResult != matchCrc)
{
// Throw a CRC exception
throw new OneWireException(OneWireException.ExceptionFunction.Crc, DeviceId);
throw new OneWireException(OneWireException.ExceptionFunction.Crc, Id);
}
var state = new byte[2];
@@ -111,7 +111,7 @@ namespace OneWireAPI
data[dataCount++] = 0xFF;
// Select and access the ID of the device we want to talk to
Adapter.Select(DeviceId);
Adapter.Select(Id);
// Send the data
Adapter.SendBlock(data, dataCount);
@@ -128,7 +128,7 @@ namespace OneWireAPI
if (crcResult != matchCrc)
{
// Throw a CRC exception
throw new OneWireException(OneWireException.ExceptionFunction.Crc, DeviceId);
throw new OneWireException(OneWireException.ExceptionFunction.Crc, Id);
}
// Store the state data
@@ -140,7 +140,7 @@ namespace OneWireAPI
public void WriteDevice(byte[] state)
{
// Select and access the ID of the device we want to talk to
Adapter.Select(DeviceId);
Adapter.Select(Id);
// Data buffer to send over the network
var data = new byte[30];
@@ -177,7 +177,7 @@ namespace OneWireAPI
if (crcResult != matchCrc)
{
// Throw a CRC exception
throw new OneWireException(OneWireException.ExceptionFunction.Crc, DeviceId);
throw new OneWireException(OneWireException.ExceptionFunction.Crc, Id);
}
}
}