ckaczor/WeatherService
1
0
Fork 0
mirror of https://github.com/ckaczor/WeatherService.git synced 2026-01-15 17:25:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

More cleanup

Browse Source
This commit is contained in:
Chris Kaczor
2015-01-16 18:44:29 -05:00
parent 7413a23886
commit f4f1c3c784
17 changed files with 277 additions and 464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Devices/HumidityDevice.cs
View File

@@ -1,5 +1,5 @@
using System.Runtime.Serialization;
using OneWireAPI;
using System.Runtime.Serialization;
using WeatherService.Values;
namespace WeatherService.Devices
@@ -7,28 +7,19 @@ namespace WeatherService.Devices
[DataContract]
public class HumidityDevice : DeviceBase
{
#region Member variables
private readonly Value _temperatureValue;
private readonly Value _humidityValue;
#endregion
#region Constructor
public HumidityDevice(Session session, owDevice device) : base(session, device, DeviceType.Humidity)
public HumidityDevice(Session session, Device device)
: base(session, device, DeviceType.Humidity)
{
_temperatureValue = new Value(WeatherValueType.Temperature, this);
_humidityValue = new Value(WeatherValueType.Humidity, this);
_valueList.Add(WeatherValueType.Temperature, _temperatureValue);
_valueList.Add(WeatherValueType.Humidity, _humidityValue);
Values.Add(WeatherValueType.Temperature, _temperatureValue);
Values.Add(WeatherValueType.Humidity, _humidityValue);
}
#endregion
#region Internal methods
internal override void RefreshCache()
{
_temperatureValue.SetValue(ReadTemperature());
@@ -40,33 +31,31 @@ namespace WeatherService.Devices
internal double ReadTemperature()
{
// Cast the device to its specific type
owDeviceFamily26 oDevice = (owDeviceFamily26) _device;
var device = (DeviceFamily26) OneWireDevice;
// Return the temperature from the device
return oDevice.GetTemperature();
return device.GetTemperature();
}
internal double ReadHumidity()
{
// Cast the device to its specific type
owDeviceFamily26 oDevice = (owDeviceFamily26) _device;
var device = (DeviceFamily26) OneWireDevice;
// Get the supply voltage
double dSupplyVoltage = oDevice.GetSupplyVoltage();
var supplyVoltage = device.GetSupplyVoltage();
// Get the output voltage
double dOutputVoltage = oDevice.GetOutputVoltage();
var outputVoltage = device.GetOutputVoltage();
// Get the temperature
double dTemperature = oDevice.GetTemperature();
var temperature = device.GetTemperature();
// Calculate the humidity
double dHumidity = (((dOutputVoltage / dSupplyVoltage) - 0.16F) / 0.0062F) / (1.0546F - 0.00216F * dTemperature);
var humidity = (((outputVoltage / supplyVoltage) - 0.16F) / 0.0062F) / (1.0546F - 0.00216F * temperature);
// Return the result
return dHumidity;
return humidity;
}
#endregion
}
}