Commit a6ed3828 authored by leon.huang's avatar leon.huang

merge origin master

parents ff16860c 5c95addb
...@@ -348,7 +348,6 @@ namespace ModbusDemo.application ...@@ -348,7 +348,6 @@ namespace ModbusDemo.application
"西·中转池", "西·中转池",
out usWcontrolB out usWcontrolB
); );
ModualControl.cPoolLevelConfig.Remove(ModualControl.cPoolLevelConfig[i]);
} }
if (ModualControl.cPoolLevelConfig[i].byModbusID == LevelmodbusID[1]) if (ModualControl.cPoolLevelConfig[i].byModbusID == LevelmodbusID[1])
{ {
...@@ -363,10 +362,12 @@ namespace ModbusDemo.application ...@@ -363,10 +362,12 @@ namespace ModbusDemo.application
"东·中转池", "东·中转池",
out usEcontrolB out usEcontrolB
); );
ModualControl.cPoolLevelConfig.Remove(ModualControl.cPoolLevelConfig[i]);
} }
ModualControl.cPoolLevelConfig.Remove(ModualControl.cPoolLevelConfig[i]);
} }
Automatic_control(usWcontrolB.status, usEcontrolB.status); Automatic_control(usWcontrolB.status, usEcontrolB.status);
} }
else if (file.Length!= 0) else if (file.Length!= 0)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment