From 48ba446936b51fffafa7c3600c0dadc6ac0e8c20 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 10 七月 2020 10:52:13 +0800
Subject: [PATCH] 2020-07-10-01
---
ZigbeeApp/Shared/Phone/ZigBee/Device/TemperatureSensor.cs | 95 ++++++++++++-----------------------------------
1 files changed, 24 insertions(+), 71 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/TemperatureSensor.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/TemperatureSensor.cs
index 501f5c3..992f964 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/TemperatureSensor.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/TemperatureSensor.cs
@@ -5,85 +5,38 @@
{
public class TemperatureSensor: CommonDevice
{
+ /// <summary>
+ /// 鍥犱负杩欎袱涓笢瑗垮叡鐢ㄥ悓涓�涓澶嘔D锛屾墍浠� 1锛氭俯搴︿紶鎰熷櫒 2:婀垮害浼犳劅鍣�
+ /// </summary>
+ public int SensorDiv = 1;
+
+ /// <summary>
+ /// 娓╁害
+ /// </summary>
+ public decimal Temperatrue;
+ /// <summary>
+ /// 婀垮害
+ /// </summary>
+ public decimal Humidity;
+
public TemperatureSensor()
{
- //this.Type = DeviceType.TemperatureSensor ;
+ this.Type = DeviceType.TemperatureSensor ;
}
/// <summary>
- /// 褰撳墠娓╁害鍊�
- /// </summary>
- public int CurentTemperature = 999;
-
- /// <summary>
- ///
- /// </summary>
- public int MinTemperature=999;
-
- /// <summary>
- ///
- /// </summary>
- public int MaxTemperature=999;
- /// <summary>
- ///
- /// </summary>
- public int TorleranceTemperature= 999;
-
- /// <summary>
- /// 褰撳墠婀垮害鍊�
- /// </summary>
- public int CurentHumidity= 999;
-
- /// <summary>
- ///
- /// </summary>
- public int MinHumidity= 999;
-
- /// <summary>
- ///
- /// </summary>
- public int MaxHumidity= 999;
-
- /// <summary>
- ///
- /// </summary>
- public int ToleranceHumidity= 999;
-
- /// <summary>
/// 璇诲彇娓�/婀垮害
/// </summary>
- public void ReadTemperature()
+ public void ReadTemperatureOrHumidity()
{
- ReadAttri(Device.Cluster_ID.TemperatureMeasurement, AttriButeId.MeasuredValue );
- ReadAttri(Device.Cluster_ID.RelativeHumidityMeasurement, AttriButeId.MeasuredValue);
-
- }
-
- /// <summary>
- /// 娓�/婀垮害涓嬮檺
- /// </summary>
- public void ReadMinMeasuredValue()
- {
- ReadAttri(Device.Cluster_ID.TemperatureMeasurement, AttriButeId.MinMeasuredValue );
- ReadAttri(Device.Cluster_ID.RelativeHumidityMeasurement, AttriButeId.MinMeasuredValue);
- }
-
- /// <summary>
- /// 娓�/婀垮害涓婇檺
- /// </summary>
- public void ReadMaxMeasuredValue()
- {
- ReadAttri(Device.Cluster_ID.TemperatureMeasurement, AttriButeId.MaxMeasuredValue );
- ReadAttri(Device.Cluster_ID.RelativeHumidityMeasurement, AttriButeId.MaxMeasuredValue);
- }
-
- /// <summary>
- /// 娴嬮噺璇樊
- /// </summary>
- public void ReadTolerance()
- {
- ReadAttri(Device.Cluster_ID.TemperatureMeasurement, AttriButeId.Tolerance );
- ReadAttri(Device.Cluster_ID.RelativeHumidityMeasurement, AttriButeId.Tolerance);
+ if (SensorDiv == 1)
+ {
+ ReadAttri(Device.Cluster_ID.TemperatureMeasurement, AttriButeId.MeasuredValue);
+ }
+ else if (SensorDiv == 2)
+ {
+ ReadAttri(Device.Cluster_ID.RelativeHumidityMeasurement, AttriButeId.MeasuredValue);
+ }
}
}
}
--
Gitblit v1.8.0