From a7adf98ff4ac801342853b1f9231cc1ab5acebf3 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 14 十一月 2019 17:25:42 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/ZigBee/Device/Rollershade.cs | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/Rollershade.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/Rollershade.cs
index 70007db..78f02ed 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/Rollershade.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/Rollershade.cs
@@ -543,10 +543,10 @@
switch (installedLimit)
{
case CurtainPrivateInstalledLimi.UpLimit:
- tempLimit = 1;
+ tempLimit = 2;
break;
case CurtainPrivateInstalledLimi.DownLimit:
- tempLimit = 2;
+ tempLimit = 1;
break;
}
var jObject = new JObject { { "DeviceAddr", DeviceAddr }, { "Epoint", DeviceEpoint }, { "Cluster_ID", 258 }, { "Command", 120 } };
@@ -584,11 +584,11 @@
/// <summary>
/// 绐楀笜鍏ㄥ紑鎵�鍦ㄧ殑浣嶇疆(涓婇檺浣�)
/// </summary>
- UpLimit = 1,
+ UpLimit = 2,
/// <summary>
/// 绐楀笜鍏ㄥ叧鎵�鍦ㄧ殑浣嶇疆(涓嬮檺浣�)
/// </summary>
- DownLimit = 2,
+ DownLimit = 1,
}
#endregion
@@ -750,10 +750,10 @@
switch (limiType)
{
case LimiType.DownLimit:
- tempLimit = 8;
+ tempLimit = 2;
break;
case LimiType.UpLimit:
- tempLimit = 2;
+ tempLimit = 8;
break;
}
var jObject = new JObject { { "DeviceAddr", DeviceAddr }, { "Epoint", DeviceEpoint }, { "Cluster_ID", 258 }, { "Command", 120 } };
@@ -791,11 +791,11 @@
/// <summary>
/// 鍒犻櫎绐楀笜涓婇檺浣�
/// </summary>
- UpLimit = 0x02,
+ UpLimit = 0x08,
/// <summary>
/// 鍒犻櫎绐楀笜涓嬮檺浣�
/// </summary>
- DownLimit = 0x08,
+ DownLimit = 0x02,
}
#endregion
--
Gitblit v1.8.0