From 70d2b7cd0c8fe5dfb29bb2baf96997575ade2bac Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 08 七月 2021 18:34:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/newBranch1' into WJC
---
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index c279705..9357a40 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -258,7 +258,7 @@
}
}
break;
- case SPK.SensoruUtrasonic:
+ case SPK.SensorUtrasonic:
{
string str = "";
foreach (var dic in dicList)
@@ -315,7 +315,7 @@
}
}
break;
- case SPK.SenesorEnvironment:
+ case SPK.SensorEnvironment:
{
string strtext = "";
foreach (var dic in dicList)
@@ -599,7 +599,7 @@
{
//鐢╯id鎵惧埌璁惧锛�
var device = LogicMethod.CurrLogicMethod.GetDevice(inputCondition.sid);
- if (device.spk == SPK.SenesorEnvironment)
+ if (device.spk == SPK.SensorEnvironment)
{
//杩欎釜璁惧姣旇緝鐗规畩
ConditionDeviceFunList conditionDeviceFunList = new ConditionDeviceFunList();
@@ -1549,7 +1549,7 @@
}
}
break;
- case SPK.SensoruUtrasonic:
+ case SPK.SensorUtrasonic:
{
foreach (var dic in dicList)
{
--
Gitblit v1.8.0