Commit d737921f 张东亮

温度调整

1 个父辈 ae9e9d82
......@@ -121,7 +121,9 @@ namespace OnlineStore.Common
public static string ReelHeightOffset = "ReelHeightOffset";
public static string humidityadjust = "humidityadjust";
public static string humiditylimited = "humiditylimited";
public static string Device_HumidityAdjust = "Device_HumidityAdjust";
public static string Device_HumidityLimited = "Device_HumidityLimited";
public static string Device_TemptureAdjust = "Device_TemptureAdjust";
public static string Device_TemptureLimited = "Device_TemptureLimited";
}
}
......@@ -106,8 +106,8 @@ namespace OnlineStore.DeviceLibrary
List<double> data = queryData(port );
if (data.Count.Equals(3))
{
double humidityadjust = (double)ConfigAppSettings.GetNumValue(Setting_Init.humidityadjust);
double humiditylimited = (double)ConfigAppSettings.GetNumValue(Setting_Init.humiditylimited);
double humidityadjust = (double)ConfigAppSettings.GetNumValue(Setting_Init.Device_HumidityAdjust);
double humiditylimited = (double)ConfigAppSettings.GetNumValue(Setting_Init.Device_HumidityLimited);
if (humidityadjust != 0 && humiditylimited != 0)
{
if (data[0] + humidityadjust < humiditylimited)
......@@ -117,6 +117,17 @@ namespace OnlineStore.DeviceLibrary
else
data[0] += humidityadjust;
}
double tempadjust = (double)ConfigAppSettings.GetNumValue(Setting_Init.Device_TemptureAdjust);
double templimited = (double)ConfigAppSettings.GetNumValue(Setting_Init.Device_TemptureLimited);
if (tempadjust != 0 && templimited != 0)
{
if (data[1] + tempadjust < templimited)
{
data[1] = templimited;
}
else
data[1] += tempadjust;
}
param = new HumitureParam(data[1], data[0], data[2]);
}
return param;
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!