Skip to content

P
PastureGateway
Commit 6e241f93 authored by leon.huang's avatar leon.huang
Browse files
Options

add inturrupt close

parent f07825d9
Hide whitespace changes
Inline Side-by-side
Showing with 317 additions and 711 deletions
ModbusDemo/Common/ModualAlarm.cs
View file @ 6e241f93
......@@ -26,6 +26,7 @@ namespace ModbusDemo.Common
ChannelDataChangeError = 8,
ChannelLevelError = 16,
ChannelControlError = 32,
ChannelRunOverTimeError = 64,
}
public static void vSetAlarmList(ushort usAddress, ushort[] usChannel, ushort[] usChannelAlarmcode)
{
......@@ -56,7 +57,6 @@ namespace ModbusDemo.Common
.Build();
await mqttClient.PublishAsync(message);
}
public static void vSet_Modual_Alarm(byte byModbusID,ushort usAlarmCodde,bool bSetAlarm,byte byCommFailTimes,params string[] strChannalList)
{
for (int i = 0; i < ModualPoll.byX14pNumber;i++)
......
ModbusDemo/MessageFormat/ModbusComm.cs
View file @ 6e241f93
......@@ -28,20 +28,11 @@ namespace ModbusDemo.MessageFormat
MB_EMASTERSENT,
MB_RTUERNOERR
}
<<<<<<< HEAD
public static ModbusMaster Modbus;
public static ushort usCommunFailTimes = 0;
private static object oLock = new object();
public static eModbusErrorCode Modbus_ReadHoldingRegistersTask(out ushort[] OutputValue, byte slaveAddress, ushort startAddress, ushort numberOfPoints)
{
=======
public static ModbusMaster Modbus;
public static ushort usCommunFailTimes = 0;
static object oLock = new object();
public static eModbusErrorCode Modbus_ReadHoldingRegistersTask(out ushort[] OutputValue, byte slaveAddress, ushort startAddress, ushort numberOfPoints)
{
>>>>>>> 5635bdf708c90bb2146f99466d1145dda5dabb37
lock (oLock)
{
eModbusErrorCode ModbusErrorCode;
......@@ -126,10 +117,6 @@ namespace ModbusDemo.MessageFormat
}
public static eModbusErrorCode Modbus_ReadCoilsTask(out bool[] OutputValue, byte slaveAddress, ushort startAddress, ushort numberOfPoints)
{
<<<<<<< HEAD
=======
//object oLock = new object();
>>>>>>> 5635bdf708c90bb2146f99466d1145dda5dabb37
lock (oLock)
{
eModbusErrorCode ModbusErrorCode;
......@@ -214,10 +201,6 @@ namespace ModbusDemo.MessageFormat
}
public static eModbusErrorCode Modbus_WriteSingleCoil(byte slaveAddress, ushort startAddress, bool value)
{
<<<<<<< HEAD
=======
//object oLock = new object();
>>>>>>> 5635bdf708c90bb2146f99466d1145dda5dabb37
lock (oLock)
{
eModbusErrorCode ModbusErrorCode;
......@@ -300,10 +283,6 @@ namespace ModbusDemo.MessageFormat
}
public static eModbusErrorCode Modbus_WriteMultipleCoils(byte slaveAddress, ushort startAddress, bool[] data)
{
<<<<<<< HEAD
=======
//object oLock = new object();
>>>>>>> 5635bdf708c90bb2146f99466d1145dda5dabb37
lock (oLock)
{
eModbusErrorCode ModbusErrorCode;
......
ModbusDemo/MessageFormat/ModualControl.cs
View file @ 6e241f93
......@@ -32,7 +32,6 @@ namespace ModbusDemo.MessageFormat
public UInt64 ts { get; set; }
}
public class SsItem
{
public string addr { get; set; }
......@@ -59,7 +58,6 @@ namespace ModbusDemo.MessageFormat
public string upper { get; set; }
public UInt64 ts { get; set; }
}
public class pcCfgSsItem
{
public string addr { get; set; }
......@@ -88,12 +86,6 @@ namespace ModbusDemo.MessageFormat
{
public List<pcModualControlIndex> chMap { get; set; }
}
public struct ModualRespControl
{
public byte byResModualID;
public string stResChannel;
public modual.eModualType eModualType;
}
public class ModualCntrol
{
public bool bStartControl;
......@@ -106,12 +98,11 @@ namespace ModbusDemo.MessageFormat
public bool[] bControlBit = new bool[8];
public modual.eModualType eModualType;
public bool bOpenMachine;
public ModualRespControl xModualRespControl;
public string[] strOperationChannelName;
}
private const double OPENCURRENT = 2;
private const double CLOSECURRENT = 0;
private const double OPENCURRENT = 4.1;
private const double CLOSECURRENT = 4;
public class pcLiquidLevelConfig
{
public byte byModbusID;
......@@ -122,7 +113,6 @@ namespace ModbusDemo.MessageFormat
public static List<pcLiquidLevelConfig> cPoolLevelConfig = new List<pcLiquidLevelConfig>();
public static List<ModualCntrol> liModuualControl = new List<ModualCntrol>();
public const ushort usDefineControlTimes = 1;
private static pcControlMap cControlMap = new pcControlMap();
private static object obLock = new object();
#if DEBUG_TEST
public const string strMapCfg = "{chMap:[" +
......@@ -163,9 +153,9 @@ namespace ModbusDemo.MessageFormat
bool[] btReadTempData = new bool[6];
ModualCntrol cModualCntrol = new ModualCntrol
{
sbModbusID = byte.Parse(cControl.ss[i].addr),
sbModbusID = byte.Parse(cControl.ss[i].addr),
usDurationTime = (ushort)(cControl.ss[i].op.duration * 60),
ulStartTime = cControl.ss[i].op.startTime
ulStartTime = cControl.ss[i].op.startTime
};
cModualCntrol.bControlStatus = ModualPoll.bGet_channel_Value<bool>(cModualCntrol.sbModbusID, out cModualCntrol.bControlData, "d0", "d1", "d1", "d2", "d3", "d4", "d5");
if (jsonObj["ss"][i]["op"] != null)
......@@ -178,10 +168,12 @@ namespace ModbusDemo.MessageFormat
{
if (Convert.ToBoolean(jsonObj["ss"][i]["op"].Value<int>(str)) == true)
{
cModualCntrol.bControlData[j] = true;
cModualCntrol.bOpenMachine = true;
}
else
{
cModualCntrol.bControlData[j] = false;
cModualCntrol.bOpenMachine = false;
}
cModualCntrol.bControlBit[j] = true;
......@@ -197,7 +189,7 @@ namespace ModbusDemo.MessageFormat
{
cModualCntrol.bStartControl = true;
cModualCntrol.strOperationChannelName = strOperation.ToArray();
if (ControlMap.bControl_Map(cModualCntrol.bOpenMachine, cModualCntrol.sbModbusID, cModualCntrol.strOperationChannelName[0]))
if (ControlMap.bControl_Map(cModualCntrol.bOpenMachine, cModualCntrol.sbModbusID,cModualCntrol.bControlData, cModualCntrol.strOperationChannelName[0]))
{
cModualCntrol.bControlStatus = ControlMap.bDelege_Operation(cModualCntrol.bControlData);
}
......@@ -223,7 +215,7 @@ namespace ModbusDemo.MessageFormat
}
for (int k = 0; k < 8; k++)
{
if (cModualCntrol.bControlBit[k] == true && cModualCntrol.bStartControl == true)
if (cModualCntrol.bControlBit[k] == true && cModualCntrol.bControlStatus == true)
{
string str = "d" + k.ToString();
jsonObj["ss"][i]["op"][str] = 1;
......@@ -240,12 +232,11 @@ namespace ModbusDemo.MessageFormat
public static void vControl_Poll()
{
cControlMap = JsonConvert.DeserializeObject<pcControlMap>(strMapCfg);
while (true)
{
lock (obLock)
{
for (sbyte i = 0; i < liModuualControl.Count; i++)
for(sbyte i = 0; i < liModuualControl.Count; i++)
{
if (liModuualControl[i].bStartControl == false)
{
......@@ -254,7 +245,7 @@ namespace ModbusDemo.MessageFormat
liModuualControl[i].bStartControl = true;
bool[] bControlData;
liModuualControl[i].bControlStatus = ModualPoll.bGet_channel_Value<bool>(liModuualControl[i].sbModbusID, out bControlData,"d0","d1","d1","d2","d3","d4","d5","d6","d7");
if (ControlMap.bControl_Map(liModuualControl[i].bOpenMachine, liModuualControl[i].sbModbusID,liModuualControl[i].strOperationChannelName[0]))
if (ControlMap.bControl_Map(liModuualControl[i].bOpenMachine, liModuualControl[i].sbModbusID,liModuualControl[i].bControlData,liModuualControl[i].strOperationChannelName[0]))
{
liModuualControl[i].bControlStatus = ControlMap.bDelege_Operation(bControlData);
}
......@@ -266,7 +257,7 @@ namespace ModbusDemo.MessageFormat
{
bool[] bControlData;
liModuualControl[i].bControlStatus = ModualPoll.bGet_channel_Value<bool>(liModuualControl[i].sbModbusID, out bControlData,"d0","d1","d1","d2","d3","d4","d5","d6","d7");
if (ControlMap.bControl_Map(liModuualControl[i].bOpenMachine, liModuualControl[i].sbModbusID, liModuualControl[i].strOperationChannelName[0]))
if (ControlMap.bControl_Map(liModuualControl[i].bOpenMachine, liModuualControl[i].sbModbusID,liModuualControl[i].bControlData, liModuualControl[i].strOperationChannelName[0]))
{
liModuualControl[i].bControlStatus = ControlMap.bDelege_Operation(bControlData);
}
......@@ -275,6 +266,30 @@ namespace ModbusDemo.MessageFormat
}
}
}
for(sbyte sbEastTransitPoolIndex = 0;sbEastTransitPoolIndex < AllPond.EastTransitPoolList.Count();sbEastTransitPoolIndex++)
{
if (AllPond.EastTransitPoolList[sbEastTransitPoolIndex].bHadRefControl == true && AllPond.EastTransitPoolList[sbEastTransitPoolIndex].bHadOpenPumb == true)
{
if (AllPond.EastTransitPoolList[sbEastTransitPoolIndex].dChannelCurrent < OPENCURRENT)
{
bool[] bControlData;
if (ModualPoll.bGet_channel_Value<bool>(AllPond.EastTransitPoolList[sbEastTransitPoolIndex].byModbusID, out bControlData, "d0", "d1", "d2", "d3", "d4", "d5", "d6", "d7") == true)
{
if (AllPond.EastTransitPoolList[sbEastTransitPoolIndex].bClose_Machine(bControlData) == true)
{
ModualAlarm.vSet_Modual_Alarm(AllPond.EastTransitPoolList[sbEastTransitPoolIndex].byModbusID,(ushort)ModualAlarm.eAlarmCode.ChannelControlError,true,1,AllPond.EastTransitPoolList[sbEastTransitPoolIndex].strChannelNumber);
}
}
}
}
if (AllPond.EastTransitPoolList[sbEastTransitPoolIndex].bHadRefControl == true && AllPond.EastTransitPoolList[sbEastTransitPoolIndex].bHadOpenPumb == false)
{
if (AllPond.EastTransitPoolList[sbEastTransitPoolIndex].dChannelCurrent > CLOSECURRENT)
{
ModualAlarm.vSet_Modual_Alarm(AllPond.EastTransitPoolList[sbEastTransitPoolIndex].byModbusID, (ushort)ModualAlarm.eAlarmCode.ChannelControlError, true, 1, AllPond.EastTransitPoolList[sbEastTransitPoolIndex].strChannelNumber);
}
}
}
}
Thread.Sleep(100);
}
......@@ -307,90 +322,6 @@ namespace ModbusDemo.MessageFormat
return modual.eModualType.IDLE;
}
//private static void vFindChannelMap(string stContrID, string stChannelName, bool bControlValue,ref ModualCntrol cModualCntrol)
//{
// bool bHadRef = false;
// if (bControlValue == true)
// {
// cModualCntrol.bOpenMachine = true;
// }
// for (int i = 0; i < cControlMap.chMap.Count; i++)
// {
// if (cControlMap.chMap[i].srcId == stContrID)
// {
// bHadRef = true;
// if (cControlMap.chMap[i].srcCh == stChannelName && cControlMap.chMap[i].dstCh.Count != 0)
// {
// if (cControlMap.chMap[i].opType == "durOp")
// {
// cModualCntrol.usDurationTime = 1;
// cModualCntrol.ulStartTime = 0xFF;
// }
// for (int j = 0; j < cControlMap.chMap[i].dstCh.Count; j++)
// {
// for (int k = 0; k < 8; k++)
// {
// string str = "d" + k.ToString();
// if (cControlMap.chMap[i].dstCh[j] == str)
// {
// if (cControlMap.chMap[i].dstCh.Count == 3)
// {
// if (j == 0)
// {
// cModualCntrol.bControlData[k] = bControlValue;
// }
// else if (j == 1)
// {
// cModualCntrol.bControlData[k] = true;
// }
// else if (j == 2)
// {
// cModualCntrol.bControlData[k] = !bControlValue;
// }
// else
// {
// cModualCntrol.bControlData[k] = bControlValue;
// }
// }
// else if (cControlMap.chMap[i].dstCh.Count == 2)
// {
// cModualCntrol.bControlData[k] = bControlValue;
// }
// cModualCntrol.bControlBit[k] = true;
// }
// }
// }
// cModualCntrol.xModualRespControl.byResModualID = byte.Parse(cControlMap.chMap[i].resId);
// cModualCntrol.xModualRespControl.eModualType = eModdusId_Find_ModualType(cControlMap.chMap[i].resId);
// cModualCntrol.xModualRespControl.stResChannel = cControlMap.chMap[i].resCh;
// }
// else
// {
// for (int k = 0; k < 8; k++)
// {
// string str = "d" + k.ToString();
// if (stChannelName == str)
// {
// cModualCntrol.bControlData[k] = bControlValue;
// cModualCntrol.bControlBit[k] = true;
// }
// }
// }
// }
// }
// if (bHadRef == false)
// {
// for (int k = 0; k < 8; k++)
// {
// string str = "d" + k.ToString();
// if (stChannelName == str)
// {
// cModualCntrol.bControlData[k] = bControlValue;
// cModualCntrol.bControlBit[k] = true;
// }
// }
// }
//}
public static bool bOperation_Machine(bool bOpenMachine, byte sbModbusID,bool[] bControlData,bool[] bControlBit, byte byResModualID,string stResChannel)
{
bool bControlStatus = true;
......@@ -399,6 +330,7 @@ namespace ModbusDemo.MessageFormat
if (bOpenMachine == true && stResChannel != null)
{
double[] dConvertData;
Thread.Sleep(1000);
bControlStatus = ModualPoll.bGet_channel_Value<double>(byResModualID, out dConvertData, stResChannel);
if (dConvertData[0] > OPENCURRENT && bControlStatus == true)
{
......@@ -412,6 +344,7 @@ namespace ModbusDemo.MessageFormat
else if (bOpenMachine == false && stResChannel != null)
{
double[] dConvertData;
Thread.Sleep(1000);
bControlStatus = ModualPoll.bGet_channel_Value<double>(byResModualID, out dConvertData, stResChannel);
if (dConvertData[0] < CLOSECURRENT && bControlStatus == true)
{
......
ModbusDemo/ModbusDemo.csproj
View file @ 6e241f93
......@@ -91,10 +91,8 @@
<Compile Include="application\AutoControl.cs" />
<Compile Include="application\ControlMap.cs" />
<Compile Include="application\InIHelper.cs" />
<Compile Include="application\PoolModbusSet.cs" />
<Compile Include="application\ModualPool.cs" />
<Compile Include="application\AllPond.cs" />
<Compile Include="application\UsThread.cs" />
<Compile Include="Common\ModualAlarm.cs" />
<Compile Include="Common\OperIni.cs" />
<Compile Include="MessageFormat\ModualControl.cs" />
......@@ -180,15 +178,15 @@
</PropertyGroup>
<Import Project="$(SQLDBExtensionsRefPath)\Microsoft.Data.Tools.Schema.Sql.UnitTesting.targets" Condition="$(VisualStudioVersion) != '15.0' And '$(SQLDBExtensionsRefPath)' != ''" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.Sql.UnitTesting.targets" Condition="$(VisualStudioVersion) != '15.0' And '$(SQLDBExtensionsRefPath)' == ''" />
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 5635bdf708c90bb2146f99466d1145dda5dabb37
<!-- <<<<<<< HEAD -->
<!-- <<<<<<< HEAD -->
<!-- ======= -->
<!-- ======= -->
<!-- >>>>>>> 5635bdf708c90bb2146f99466d1145dda5dabb37 -->
<PropertyGroup>
<SsdtUnitTestVersion>3.1</SsdtUnitTestVersion>
</PropertyGroup>
>>>>>>> origin/master
<!-- >>>>>>> origin/master -->
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
......
ModbusDemo/Modular/ModualPoll.cs
View file @ 6e241f93
......@@ -36,7 +36,7 @@ namespace ModbusDemo.Modular
#if DEBUG_TEST
public const byte byX18xNumber = 1;
public static byte[] byX18xIdlist = { 13 };
private static modual.eX18xSensorChannelType[,] sX18xChannelType = new modual.eX18xSensorChannelType[byX18xNumber, byX18xReadDataNumber] { { modual.eX18xSensorChannelType.Mike_6, modual.eX18xSensorChannelType.Null, modual.eX18xSensorChannelType.NormalCurrent, modual.eX18xSensorChannelType.Null, modual.eX18xSensorChannelType.Null, modual.eX18xSensorChannelType.Null, modual.eX18xSensorChannelType.Null, modual.eX18xSensorChannelType.Null } };
private static modual.eX18xSensorChannelType[,] sX18xChannelType = new modual.eX18xSensorChannelType[byX18xNumber, byX18xReadDataNumber] { { modual.eX18xSensorChannelType.NormalCurrent, modual.eX18xSensorChannelType.Null, modual.eX18xSensorChannelType.NormalCurrent, modual.eX18xSensorChannelType.Null, modual.eX18xSensorChannelType.Null, modual.eX18xSensorChannelType.Null, modual.eX18xSensorChannelType.Null, modual.eX18xSensorChannelType.Null } };
#else
public const byte byX18xNumber = 6;
public static byte[] byX18xIdlist = {3,53,6,12,21,25};
......
ModbusDemo/Modular/modual.cs
View file @ 6e241f93
......@@ -89,8 +89,6 @@ namespace ModbusDemo.Modular
{
this.sX18xDataStruct[i].dBeforeConvertData = new double[ModualPoll.byX18xReadDataNumber];
this.sX18xDataStruct[i].dNowConvertData = new double[ModualPoll.byX18xReadDataNumber];
//this.sX18xDataStruct[i].usRegData = new ushort[ModualPoll.byX18xReadDataNumber];
//this.sX18xDataStruct[i].usTypeData = new ushort[ModualPoll.byX18xReadDataNumber];
this.sX18xAlarmstruct[i].usBeforeAlarmCode = new ushort[ModualPoll.byX18xReadDataNumber];
this.sX18xAlarmstruct[i].usNowAlarmCode = new ushort[ModualPoll.byX18xReadDataNumber];
this.sX18xAlarmstruct[i].usCommFailTimes = new ushort[ModualPoll.byX18xReadDataNumber];
......
ModbusDemo/application/AllPond.cs
View file @ 6e241f93
......@@ -8,114 +8,126 @@ using ModbusDemo;
using ModbusDemo.application;
namespace ModbusDemo.application
{
public static class AllPond
{
private static ModualPool.pcTemperature cEastTransitPoolTemper = new ModualPool.pcTemperature("EastTransitPoolTemper", 27, "d0");
private static ModualPool.pcLiquidlevel cEastTransitPoolLevel = new ModualPool.pcLiquidlevel("EastTransitPoolLevel", 13, "d0");
private static ModualPool.pcOperation cEastTransitPoolSouthWaterBase = new ModualPool.pcOperation
private static ModualPool.pcTemperature cEastTransitPoolTemper = new ModualPool.pcTemperature("EastTransitPoolTemper", 27, "d0");
private static ModualPool.pcLiquidlevel cEastTransitPoolLevel = new ModualPool.pcLiquidlevel("EastTransitPoolLevel", 13, "d0");
private static ModualPool.pcOperation cEastTransitPoolSouthWaterBase = new ModualPool.pcOperation
{
byModbusID = 16,
strOperationNumber = "d0",
strChannelNumber = new string[] { "d0", "d1" },
bOpenOperation = new bool[] { true, true },
bCloseOperation = new bool[] { false, false },
bHadRefControl = false,
byResModbusID = 0xFF,
byModbusID = 31,
strOperationNumber = "d1",
strChannelNumber = new string[] { "d1","d2" },
bOpenOperation = new bool[] { true,true },
bCloseOperation = new bool[] { false,false },
bHadRefControl = false,
byResModbusID = 0,
strResChannelNumber = null
};
private static ModualPool.pcMachine cEastTransitPoolSouthWater = new ModualPool.pcMachine("EastTransitPoolSouthWater", cEastTransitPoolSouthWaterBase);
private static ModualPool.pcMachine cEastTransitPoolSouthWater = new ModualPool.pcMachine("EastTransitPoolSouthWater", cEastTransitPoolSouthWaterBase);
private static ModualPool.pcOperation cEastTransitPoolNorthWaterBase = new ModualPool.pcOperation
private static ModualPool.pcOperation cEastTransitPoolNorthWaterBase = new ModualPool.pcOperation
{
byModbusID = 16,
strOperationNumber = "d2",
strChannelNumber = new string[] { "d2", "d3" },
bOpenOperation = new bool[] { true, true },
bCloseOperation = new bool[] { false, false },
bHadRefControl = false,
byResModbusID = 0xFF,
byModbusID = 16,
strOperationNumber = "d0",
strChannelNumber = new string[] { "d0", "d1" },
bOpenOperation = new bool[] { true, true },
bCloseOperation = new bool[] { false, false },
bHadRefControl = false,
byResModbusID = 0xFF,
strResChannelNumber = null
};
private static ModualPool.pcMachine cEastTransitPoolNorthWater = new ModualPool.pcMachine("EastTransitPoolNorthWater", cEastTransitPoolNorthWaterBase);
private static ModualPool.pcMachine cEastTransitPoolNorthWater = new ModualPool.pcMachine("EastTransitPoolNorthWater", cEastTransitPoolNorthWaterBase);
private static ModualPool.pcOperation cEastTransitPoolPumb1Base = new ModualPool.pcOperation
private static ModualPool.pcOperation cEastTransitPoolPumb1Base = new ModualPool.pcOperation
{
byModbusID = 16,
strOperationNumber = "d0",
strChannelNumber = new string[] { "d0", "d1" },
bOpenOperation = new bool[] { true, true },
bCloseOperation = new bool[] { false, false },
bHadRefControl = false,
byResModbusID = 0xFF,
byModbusID = 16,
strOperationNumber = "d2",
strChannelNumber = new string[] { "d2","d3"},
bOpenOperation = new bool[] { true ,true},
bCloseOperation = new bool[] { false,false},
bHadRefControl = false,
byResModbusID = 0,
strResChannelNumber = null
};
private static ModualPool.pcMachine cEastTransitPoolPumb1 = new ModualPool.pcMachine("EastTransitPoolPumb_1", cEastTransitPoolPumb1Base);
private static ModualPool.pcMachine cEastTransitPoolPumb1 = new ModualPool.pcMachine("EastTransitPoolPumb_1", cEastTransitPoolPumb1Base);
private static ModualPool.pcOperation cEastTransitPoolPumb2Base = new ModualPool.pcOperation
private static ModualPool.pcOperation cEastTransitPoolPumb2Base = new ModualPool.pcOperation
{
byModbusID = 16,
strOperationNumber = "d0",
strChannelNumber = new string[] { "d0", "d1" },
bOpenOperation = new bool[] { true, true },
bCloseOperation = new bool[] { false, false },
bHadRefControl = false,
byResModbusID = 0xFF,
byModbusID = 35,
strOperationNumber = "d0",
strChannelNumber = new string[] {"d0","d1"},
bOpenOperation = new bool[] { true,true},
bCloseOperation = new bool[] { false,true},
bHadRefControl = false,
byResModbusID = 0,
strResChannelNumber = null
};
private static ModualPool.pcMachine cEastTransitPoolPumb2 = new ModualPool.pcMachine("EastTransitPoolPumb_2", cEastTransitPoolPumb2Base);
private static ModualPool.pcMachine cEastTransitPoolPumb2 = new ModualPool.pcMachine("EastTransitPoolPumb_2", cEastTransitPoolPumb2Base);
private static ModualPool.pcOperation cEastTransitPoolStirrer1Base = new ModualPool.pcOperation
private static ModualPool.pcOperation cEastTransitPoolStirrer1Base = new ModualPool.pcOperation
{
byModbusID = 16,
strOperationNumber = "d0",
strChannelNumber = new string[] { "d0", "d1" },
bOpenOperation = new bool[] { true, true },
bCloseOperation = new bool[] { false, false },
bHadRefControl = false,
byResModbusID = 0xFF,
byModbusID = 35,
strOperationNumber = "d2",
strChannelNumber = new string[] { "d2","d3" },
bOpenOperation = new bool[] { true,true},
bCloseOperation = new bool[] { false,false},
bHadRefControl = false,
byResModbusID = 0,
strResChannelNumber = null
};
private static ModualPool.pcMachine cEastTransitPoolStirrer1 = new ModualPool.pcMachine("EastTransitPoolStirrer_1", cEastTransitPoolStirrer1Base);
private static ModualPool.pcMachine cEastTransitPoolStirrer1 = new ModualPool.pcMachine("EastTransitPoolStirrer_1", cEastTransitPoolStirrer1Base);
private static ModualPool.pcOperation cEastTransitPoolStirrer2Base = new ModualPool.pcOperation
private static ModualPool.pcOperation cEastTransitPoolStirrer2Base = new ModualPool.pcOperation
{
byModbusID = 16,
strOperationNumber = "d0",
strChannelNumber = new string[] { "d0", "d1" },
bOpenOperation = new bool[] { true, true },
bCloseOperation = new bool[] { false, false },
bHadRefControl = false,
byResModbusID = 0xFF,
byModbusID = 39,
strOperationNumber = "d0",
strChannelNumber = new string[] { "d0", "d1" },
bOpenOperation = new bool[] { true, true },
bCloseOperation = new bool[] { false, false },
bHadRefControl = true,
byResModbusID = 13,
strResChannelNumber = "d0"
};
private static ModualPool.pcMachine cEastTransitPoolStirrer2 = new ModualPool.pcMachine("EastTransitPoolStirrer_2", cEastTransitPoolStirrer2Base);
private static ModualPool.pcOperation cEastTransitPoolStirrer3Base = new ModualPool.pcOperation
{
byModbusID = 39,
strOperationNumber = "d2",
strChannelNumber = new string[] { "d2", "d3" },
bOpenOperation = new bool[] { true, true },
bCloseOperation = new bool[] { false, false },
bHadRefControl = false,
byResModbusID = 0xFF,
strResChannelNumber = null
};
private static ModualPool.pcMachine cEastTransitPoolStirrer2 = new ModualPool.pcMachine("EastTransitPoolStirrer_2", cEastTransitPoolStirrer2Base);
private static ModualPool.pcMachine cEastTransitPoolStirrer3 = new ModualPool.pcMachine("EastTransitPoolStirrer_3", cEastTransitPoolStirrer3Base);
private static ModualPool.pcOperation cEastTransitPoolStirrer3Base = new ModualPool.pcOperation
private static ModualPool.pcOperation cEastTransitPoolStirrer4Base = new ModualPool.pcOperation
{
byModbusID = 16,
strOperationNumber = "d0",
strChannelNumber = new string[] { "d0", "d1" },
bOpenOperation = new bool[] { true, true },
bCloseOperation = new bool[] { false, false },
strOperationNumber = "d4",
strChannelNumber = new string[] { "d4" },
bOpenOperation = new bool[] { true },
bCloseOperation = new bool[] { false },
bHadRefControl = false,
byResModbusID = 0xFF,
strResChannelNumber = null
};
private static ModualPool.pcMachine cEastTransitPoolStirrer3 = new ModualPool.pcMachine("EastTransitPoolStirrer_3", cEastTransitPoolStirrer3Base);
private static ModualPool.pcMachine cEastTransitPoolStirrer4 = new ModualPool.pcMachine("EastTransitPoolStirrer_4", cEastTransitPoolStirrer4Base);
private static ModualPool.pcOperation cEastTransitPoolStirrer4Base = new ModualPool.pcOperation
private static ModualPool.pcButtonOperation cEastTransitPoolButton1Base = new ModualPool.pcButtonOperation
{
byModbusID = 16,
strOperationNumber = "d0",
strChannelNumber = new string[] { "d0", "d1" },
bOpenOperation = new bool[] { true, true },
bCloseOperation = new bool[] { false, false },
bHadRefControl = false,
byResModbusID = 0xFF,
strResChannelNumber = null
strOperationNumber = "d0",
strChannelNumber = new string[]{ "d0","d1"},
bOpenOperation = new bool[] { true,true},
bCloseOperation = new bool[] { false,false}
};
private static ModualPool.pcMachine cEastTransitPoolStirrer4 = new ModualPool.pcMachine("EastTransitPoolStirrer_4", cEastTransitPoolStirrer4Base);
private static ModualPool.pcButton cEastTransitPoolButton1 = new ModualPool.pcButton("EastTransitPoolButton1",cEastTransitPoolButton1Base);
public static List<ModualPool.pcMachine> EastTransitPoolList = new List<ModualPool.pcMachine>(new ModualPool.pcMachine[] {cEastTransitPoolSouthWater,cEastTransitPoolNorthWater,cEastTransitPoolPumb1,cEastTransitPoolPumb2,cEastTransitPoolStirrer1,cEastTransitPoolStirrer2,cEastTransitPoolStirrer3,cEastTransitPoolStirrer4});
public static class cEastTransitPool
{
......@@ -131,7 +143,7 @@ namespace ModbusDemo.application
public static ModualPool.pcMachine cStirrer2 {get => cEastTransitPoolStirrer2; set => cEastTransitPoolStirrer2 = value; }
public static ModualPool.pcMachine cStirrer3 {get => cEastTransitPoolStirrer3; set => cEastTransitPoolStirrer3 = value; }
public static ModualPool.pcMachine cStirrer4 {get => cEastTransitPoolStirrer4; set => cEastTransitPoolStirrer4 = value; }
public static ModualPool.pcButton cButton1 {get => cEastTransitPoolButton1; set => cEastTransitPoolButton1 = value; }
private static void vSet_Poll_Max_Level(double dData)
{
vSetMaxLevel = dData;
......
ModbusDemo/application/ControlMap.cs
View file @ 6e241f93
......@@ -4,39 +4,113 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using ModbusDemo.application;
using ModbusDemo.MessageFormat;
namespace ModbusDemo.application
{
public class ControlMap
{
public delegate bool bDelege_Handle(bool[] bControlData);
public static bDelege_Handle bDelege_Operation;
public static bool bControl_Map(bool bOpen, byte byControlID, params string[] strOperationChannelName)
public static byte byMapIdleID;
public static bool[] byMapIdleControlData;
public static string[] strMapIdleChannelName;
public static bool bMap_Idle_Operation_Control(bool[] bControldata)
{
bool[] bControlBit = new bool[bControldata.Count()];
bool bStatus;
for (int i = 0; i < bControldata.Count(); i++)
{
string str = "d" + i.ToString();
for (int j = 0; j < strMapIdleChannelName.Count(); j++)
{
if (str == strMapIdleChannelName[j])
{
bControlBit[i] = true;
bControldata[i] = byMapIdleControlData[i];
}
}
}
bStatus = ModualControl.bOperation_Machine(true, byMapIdleID, bControldata, bControlBit, 0, null);
return bStatus;
}
public static bool bControl_Map(bool bOpen, byte byControlID,bool[] bControlData, params string[] strOperationChannelName)
{
bool bMapStatus = true;
if (bOpen == true)
{
if (byControlID == 16 && strOperationChannelName[0] == "d0")
if (byControlID == 31 && strOperationChannelName[0] == "d1")
{
bDelege_Operation = AllPond.cEastTransitPool.cPumb1.bOpen_Machine;
bDelege_Operation = AllPond.cEastTransitPool.cSouthWater.bOpen_Machine;
}
else if (byControlID == 16 && strOperationChannelName[0] == "d0")
{
bDelege_Operation = AllPond.cEastTransitPool.cNorthWater.bOpen_Machine;
}
else if (byControlID == 16 && strOperationChannelName[0] == "d2")
{
bDelege_Operation = AllPond.cEastTransitPool.cPumb1.bOpen_Machine;
}
else if (byControlID == 35 && strOperationChannelName[0] == "d0")
{
bDelege_Operation = AllPond.cEastTransitPool.cPumb2.bOpen_Machine;
}
else if (byControlID == 35 && strOperationChannelName[0] == "d2")
{
bDelege_Operation = AllPond.cEastTransitPool.cStirrer1.bOpen_Machine;
}
else if (byControlID == 39 && strOperationChannelName[0] == "d0")
{
bDelege_Operation = AllPond.cEastTransitPool.cStirrer2.bOpen_Machine;
}
else if (byControlID == 39 && strOperationChannelName[0] == "d2")
{
bDelege_Operation = AllPond.cEastTransitPool.cStirrer3.bOpen_Machine;
}
else
{
byMapIdleID = byControlID;
strMapIdleChannelName = strOperationChannelName;
byMapIdleControlData = bControlData;
bDelege_Operation = bMap_Idle_Operation_Control;
}
}
else
{
if (byControlID == 16 && strOperationChannelName[0] == "d0")
if (byControlID == 31 && strOperationChannelName[0] == "d1")
{
bDelege_Operation = AllPond.cEastTransitPool.cPumb1.bClose_Machine;
bDelege_Operation = AllPond.cEastTransitPool.cSouthWater.bClose_Machine;
}
else if (byControlID == 16 && strOperationChannelName[0] == "d0")
{
bDelege_Operation = AllPond.cEastTransitPool.cNorthWater.bClose_Machine;
}
else if (byControlID == 16 && strOperationChannelName[0] == "d2")
{
bDelege_Operation = AllPond.cEastTransitPool.cPumb1.bClose_Machine;
}
else if (byControlID == 35 && strOperationChannelName[0] == "d0")
{
bDelege_Operation = AllPond.cEastTransitPool.cPumb2.bClose_Machine;
}
else if (byControlID == 35 && strOperationChannelName[0] == "d2")
{
bDelege_Operation = AllPond.cEastTransitPool.cStirrer1.bClose_Machine;
}
else if (byControlID == 39 && strOperationChannelName[0] == "d0")
{
bDelege_Operation = AllPond.cEastTransitPool.cStirrer2.bClose_Machine;
}
else if (byControlID == 39 && strOperationChannelName[0] == "d2")
{
bDelege_Operation = AllPond.cEastTransitPool.cStirrer3.bClose_Machine;
}
else
{
byMapIdleID = byControlID;
strMapIdleChannelName = strOperationChannelName;
byMapIdleControlData = bControlData;
bDelege_Operation = bMap_Idle_Operation_Control;
}
}
return bMapStatus;
}
......
ModbusDemo/application/ModualPool.cs
View file @ 6e241f93
......@@ -48,15 +48,15 @@ namespace ModbusDemo.application
}
public class pcLiquidlevel
{
private string strLevel;
public double dCurrentlevel { get => vGet_ResCurrent();}
private byte byModbusID;
private string strLevel;
public double dCurrentlevel { get => vGet_ResCurrent();}
private byte byModbusID;
private string[] strChannelNumber;
public pcLiquidlevel(string strName, byte byModbusID,params string[] strChannelNumber)
{
this.strLevel = strName;
this.byModbusID = byModbusID;
this.strChannelNumber = strChannelNumber;
this.strLevel = strName;
this.byModbusID = byModbusID;
this.strChannelNumber = strChannelNumber;
}
private double vGet_ResCurrent()
{
......@@ -83,34 +83,22 @@ namespace ModbusDemo.application
}
public class pcOperation
{
public byte byModbusID;
public string[] strChannelNumber;
public string strOperationNumber;
public bool[] bOpenOperation;
public bool[] bCloseOperation;
public bool bHadRefControl;
public byte byResModbusID;
public string strResChannelNumber;
public byte byModbusID;
public string[] strChannelNumber;
public string strOperationNumber;
public bool[] bOpenOperation;
public bool[] bCloseOperation;
//public pcOperation(byte byControlID, string[] strChannelNumber,string strOperationNumber,bool bHadRefControl,byte byResID,string strResChannelName,bool[] bOpenData,bool[] bCloseData)
//{
// this.byModbusID = byControlID;
// this.strChannelNumber = strChannelNumber;
// this.strOperationNumber = strOperationNumber;
// this.bHadRefControl = bHadRefControl;
// this.byResModbusID = byResID;
// this.strResChannelNumber = strResChannelName;
// this.bOpenOperation = bOpenData;
// this.bCloseOperation = bCloseData;
//}
public bool bHadRefControl;
public byte byResModbusID;
public string strResChannelNumber;
}
public class pcMachine:pcOperation
public class pcMachine : pcOperation
{
public string strMachinebName;
public double dChannelCurrent { get => vGet_ResCurrent();}
public bool bHadOpenPumb;
public bool[] bCurrentRelay;
public string strMachinebName;
public double dChannelCurrent { get => vGet_ResCurrent();}
public bool bHadOpenPumb;
public bool[] bCurrentRelay { get => bGet_Current_Relay();}
public pcMachine(string strMachineName,pcOperation pcOperation) // base(pcOperation.byModbusID,pcOperation.strChannelNumber,pcOperation.strOperationNumber,pcOperation.bHadRefControl,pcOperation.byResModbusID,pcOperation.strResChannelNumber,pcOperation.bOpenOperation,pcOperation.bCloseOperation)
{
this.strMachinebName = strMachineName;
......@@ -123,7 +111,6 @@ namespace ModbusDemo.application
this.bOpenOperation = pcOperation.bOpenOperation;
this.bCloseOperation = pcOperation.bCloseOperation;
}
public bool bOpen_Machine(bool[] bControldata)
{
bool[] bControlBit = new bool[bControldata.Count()];
......@@ -146,7 +133,6 @@ namespace ModbusDemo.application
}
return bStatus;
}
public bool bClose_Machine(bool[] bControldata)
{
bool[] bControlBit = new bool[bControldata.Count()];
......@@ -169,16 +155,96 @@ namespace ModbusDemo.application
}
return bStatus;
}
private double vGet_ResCurrent()
{
double[] dConvertData;
if (ModualPoll.bGet_channel_Value<double>(byResModbusID, out dConvertData, strResChannelNumber) == true)
if (bHadRefControl == true && ModualPoll.bGet_channel_Value<double>(byResModbusID, out dConvertData, strResChannelNumber) == true)
{
return dConvertData[0];
}
return 0;
}
private bool[] bGet_Current_Relay()
{
bool[] bRelaydata;
if (ModualPoll.bGet_channel_Value<bool>(byModbusID, out bRelaydata, strChannelNumber) == true)
{
return bRelaydata;
}
else
{
return bRelaydata;
}
}
}
public class pcButtonOperation
{
public byte byModbusID;
public string[] strChannelNumber;
public string strOperationNumber;
public bool[] bOpenOperation;
public bool[] bCloseOperation;
}
public class pcButton :pcButtonOperation
{
public string strButtonName;
public bool[] bCurrentRelay { get => bGet_Current_Relay();}
public pcButton(string strButtonName,pcButtonOperation cButtonOperation)
{
this.strButtonName = strButtonName;
this.byModbusID = cButtonOperation.byModbusID;
this.strOperationNumber = cButtonOperation.strOperationNumber;
this.strChannelNumber = cButtonOperation.strChannelNumber;
this.bOpenOperation = cButtonOperation.bOpenOperation;
this.bCloseOperation = cButtonOperation.bCloseOperation;
}
public bool bOpreation_Button(bool[] bControldata)
{
bool bStatus;
bool[] bControlBit = new bool[bControldata.Count()];
for (int i = 0; i < bControldata.Count(); i++)
{
string str = "d" + i.ToString();
for (int j = 0; j < strChannelNumber.Count(); j++)
{
if (str == strChannelNumber[j])
{
bControlBit[i] = true;
bControldata[i] = bOpenOperation[j];
}
}
}
if ((bStatus = ModualControl.bOperation_Machine(true, byModbusID, bControldata, bControlBit, 0, null)) == true)
{
for (int i = 0; i < bControldata.Count(); i++)
{
string str = "d" + i.ToString();
for (int j = 0; j < strChannelNumber.Count(); j++)
{
if (str == strChannelNumber[j])
{
bControlBit[i] = true;
bControldata[i] = bCloseOperation[j];
}
}
}
bStatus = ModualControl.bOperation_Machine(true, byModbusID, bControldata, bControlBit, 0, null);
}
return bStatus;
}
private bool[] bGet_Current_Relay()
{
bool[] bRelaydata;
if (ModualPoll.bGet_channel_Value<bool>(byModbusID, out bRelaydata, strChannelNumber) == true)
{
return bRelaydata;
}
else
{
return bRelaydata;
}
}
}
}
}
ModbusDemo/application/PoolModbusSet.cs deleted 100644 → 0
View file @ f07825d9
////using System;
////using System.Collections.Generic;
////using System.Linq;
////using System.Text;
////using System.Threading.Tasks;
////namespace ModbusDemo.application
////{
//// public struct psTemperData
//// {
//// public byte byModbusID;
//// public ushort usTemperRegAddress;
//// public ushort usTypeRegAddress;
//// public psTemperData(byte bySetModbusID, ushort usSetTempRegAddress, ushort usSetRegAddress)
//// {
//// this.byModbusID = bySetModbusID;
//// this.usTemperRegAddress = usSetTempRegAddress;
//// this.usTypeRegAddress = usSetRegAddress;
//// }
//// }
//// public struct psLevelData
//// {
//// public byte byModbusID;
//// public ushort[] usDataAddressList;
//// public ushort[] usTypeAddressList;
//// public psLevelData(byte byInitModbusID, ushort[] usDataRegAddress, ushort[] usDataTypeRegAddress)
//// {
//// this.byModbusID = byInitModbusID;
//// this.usDataAddressList = usDataRegAddress;
//// this.usTypeAddressList = usDataTypeRegAddress;
//// }
//// }
//// public struct psBumpOperation
//// {
//// public byte byModbusID;
//// public ushort[] usRegAddList;
//// public bool[] bOpenStatus;
//// public psBumpOperation(byte byInitModbusID, ushort[] usInitRegAddressInit, bool[] bInitOPen)
//// {
//// this.byModbusID = byInitModbusID;
//// this.usRegAddList = usInitRegAddressInit;
//// this.bOpenStatus = bInitOPen;
//// }
//// }
//// public struct psPumbData
//// {
//// public byte byModbusID;
//// public ushort[] usRegAddList;
//// public psPumbData(byte byInitModbusID, ushort[] usInitRegAddressInit)
//// {
//// this.byModbusID = byInitModbusID;
//// this.usRegAddList = usInitRegAddressInit;
//// }
//// }
//// public struct psAgitatorOperation
//// {
//// public byte byModbusID;
//// public ushort[] usRegAddList;
//// public bool[] bOpenStatus;
//// public psAgitatorOperation(byte byInitModbusID, ushort[] usInitRegAddressInit, bool[] bInitOPen)
//// {
//// this.byModbusID = byInitModbusID;
//// this.usRegAddList = usInitRegAddressInit;
//// this.bOpenStatus = bInitOPen;
//// }
//// }
//// public struct psAgitatorData
//// {
//// public byte byModbusID;
//// public ushort[] usRegAddList;
//// public psAgitatorData(byte byInitModbusID, ushort[] usInitRegAddressInit)
//// {
//// this.byModbusID = byInitModbusID;
//// this.usRegAddList = usInitRegAddressInit;
//// }
//// }
//// static class pcPoolInit
//// {
//// private static psTemperData sTemper = new psTemperData(1, 1, 10);
//// private static ModbusToPool.pcPoolTemperature cPoolTemperature = new ModbusToPool.pcPoolTemperature(sTemper.byModbusID, sTemper.usTemperRegAddress, sTemper.usTypeRegAddress);
//// public static double Get_Current_temper()
//// {
//// cPoolTemperature.vRead_Pumb_Data();
//// cPoolTemperature.vRead_Pumb_Type();
//// return cPoolTemperature.usReadData[0];
//// }
//// public const sbyte PoolLevelNumber = 1;
//// static ushort[] usLevelDataReg = { 1};
//// static ushort[] usLevelTypeReg = { 16 };
//// private static psLevelData sLevelData = new psLevelData(1, usLevelDataReg, usLevelTypeReg);
//// private static ModbusToPool.pcPoolLevel[] cPoolLevel= new ModbusToPool.pcPoolLevel[] { new ModbusToPool.pcPoolLevel(sLevelData.byModbusID, sLevelData.usDataAddressList, sLevelData.usTypeAddressList) };
//// public static double Get_Current_Level()
//// {
//// ushort usPoolLevel = 0;
//// sbyte NormalDataNumber = 0;
//// for (short i = 0; i < cPoolLevel.Length; i++)
//// {
//// cPoolLevel[i].vRead_Level_Data();
//// cPoolLevel[i].vRead_Level_Type();
//// if (cPoolLevel[i].bCommunicationStatus = true && (cPoolLevel[i].usReadData[0] >= 1 && cPoolLevel[i].usReadData[0] >= 7) && cPoolLevel[i].usReadType[0] == 1)
//// {
//// usPoolLevel += cPoolLevel[i].usReadData[0];
//// NormalDataNumber++;
//// }
//// }
//// return usPoolLevel/ NormalDataNumber;
//// }
//// public const sbyte PoolBumpOperatNumber = 1;
//// static ushort[] usBumpOperatReg = { 16, 17 };
//// static bool[] usBumpOpenStatus = { true, false };
//// private static psBumpOperation psBumpData = new psBumpOperation(2, usBumpOperatReg, usBumpOpenStatus);
//// public static ModbusToPool.pcModbusOperationPumb[] cPumbOperat = new ModbusToPool.pcModbusOperationPumb[PoolBumpOperatNumber] { new ModbusToPool.pcModbusOperationPumb(psBumpData.byModbusID, psBumpData.usRegAddList, psBumpData.bOpenStatus) };
//// public const sbyte PoolBumpCurrentNumber = 1;
//// static ushort[] usBumpCurrentDataReg = { 1 };
//// private static psPumbData psBumpReadCurrentData = new psPumbData(3, usBumpCurrentDataReg);
//// public static ModbusToPool.pcReadPumbOtherData[] cPumbCurrent = new ModbusToPool.pcReadPumbOtherData[PoolBumpCurrentNumber] { new ModbusToPool.pcReadPumbOtherData(psBumpReadCurrentData.byModbusID, psBumpReadCurrentData.usRegAddList) };
//// public const sbyte PoolBumpVoltageNumber = 1;
//// static ushort[] usBumpVoltageReg = { 1 };
//// private static psPumbData psBumpReadVoltageData = new psPumbData(4, usBumpVoltageReg);
//// public static ModbusToPool.pcReadPumbOtherData[] cPumbVoltage = new ModbusToPool.pcReadPumbOtherData[PoolBumpCurrentNumber] { new ModbusToPool.pcReadPumbOtherData(psBumpReadVoltageData.byModbusID, psBumpReadVoltageData.usRegAddList) };
//// public const sbyte PoolAgitatorOperatNumber = 1;
//// static ushort[] usAgitatorOperatReg = { 16,17 };
//// static bool[] usAgitatorOpenStatus = { true, true };
//// private static psAgitatorOperation psAgitatorData = new psAgitatorOperation(5, usAgitatorOperatReg, usAgitatorOpenStatus);
//// public static ModbusToPool.pcModbusOperationAgitator[] cAgitatorOperat = new ModbusToPool.pcModbusOperationAgitator[PoolBumpOperatNumber] { new ModbusToPool.pcModbusOperationAgitator(psBumpData.byModbusID, psAgitatorData.usRegAddList, psAgitatorData.bOpenStatus) };
//// public const sbyte PoolAgitatorCurrentNumber = 1;
//// static ushort[] usAgitatorCurrentDataReg = {1};
//// private static psAgitatorData psAgitatorReadCurrentData = new psAgitatorData(6, usAgitatorCurrentDataReg);
//// public static ModbusToPool.pcReadAgitatorOtherData[] cAgitatorCurrent = new ModbusToPool.pcReadAgitatorOtherData[PoolAgitatorCurrentNumber] { new ModbusToPool.pcReadAgitatorOtherData(psAgitatorReadCurrentData.byModbusID, psAgitatorReadCurrentData.usRegAddList) };
//// public const sbyte PoolAgitatorVoltageNumber = 1;
//// static ushort[] usAgitatorVoltageReg = { 1 };
//// private static psAgitatorData psAgitatorReadVoltageData = new psAgitatorData(7, usAgitatorVoltageReg);
//// public static ModbusToPool.pcReadAgitatorOtherData[] cAgitatorVoltage = new ModbusToPool.pcReadAgitatorOtherData[PoolBumpCurrentNumber] { new ModbusToPool.pcReadAgitatorOtherData(psAgitatorReadVoltageData.byModbusID, psAgitatorReadVoltageData.usRegAddList) };
//// }
//// public class pcBump
//// {
//// private double[] dBumpCurrent = new double[pcPoolInit.PoolBumpCurrentNumber] { pcPoolInit.cPumbCurrent[0].vRead_Pumb_Data()};
//// public double[] dBumpVoltage = new double[pcPoolInit.PoolBumpVoltageNumber] { pcPoolInit.cPumbVoltage[0].vRead_Pumb_Data()} ;
//// public bool[] bBumpStatus = new bool[pcPoolInit.PoolBumpOperatNumber];
//// public bool[] bpcBumpHasOpen = new bool[pcPoolInit.PoolBumpOperatNumber];
//// public void vOpen_Bump(ushort usPumbNumber)
//// {
//// try
//// {
//// pcPoolInit.cPumbOperat[usPumbNumber].bSetStatus = pcPoolInit.cPumbOperat[usPumbNumber].bOpenStatus;
//// pcPoolInit.cPumbOperat[usPumbNumber].vSet_Module_Channel_Status();
//// this.bBumpStatus[usPumbNumber] = pcPoolInit.cPumbOperat[usPumbNumber].bCommunicationStatus;
//// this.bpcBumpHasOpen[usPumbNumber] = true;
//// }
//// catch (Exception exception)
//// {
//// Form1.totxt.Log(exception + "Bump Open Operation Error");
//// throw;
//// }
//// }
//// public void vClose_Bump(ushort usPumbNumber)
//// {
//// try
//// {
//// for (short i = 0; i < pcPoolInit.cPumbOperat[usPumbNumber].bSetStatus.Length; i++)
//// {
//// pcPoolInit.cPumbOperat[usPumbNumber].bSetStatus[i] = !pcPoolInit.cPumbOperat[usPumbNumber].bSetStatus[i];
//// this.bBumpStatus[usPumbNumber] = pcPoolInit.cPumbOperat[usPumbNumber].bCommunicationStatus;
//// this.bpcBumpHasOpen[usPumbNumber] = false;
//// }
//// pcPoolInit.cPumbOperat[usPumbNumber].vSet_Module_Channel_Status();
//// }
//// catch (Exception exception)
//// {
//// Form1.totxt.Log(exception + "Bump Close Operation Error");
//// throw;
//// }
//// }
//// public bool[] vGet_Pumb_Status(ushort usPumbNumber)
//// {
//// try
//// {
//// return pcPoolInit.cPumbOperat[usPumbNumber].vGet_Module_Channel_Status();
//// }
//// catch (Exception exception)
//// {
//// Form1.totxt.Log(exception + "Bump Read Status Error");
//// throw;
//// }
//// }
//// }
//// public class pcAgitator
//// {
//// private double[] dAgitatorCurrent = new double[pcPoolInit.PoolAgitatorCurrentNumber] { pcPoolInit.cAgitatorCurrent[0].vRead_Agitator_Data() };
//// public double[] dAgitatorVoltage = new double[pcPoolInit.PoolAgitatorVoltageNumber] { pcPoolInit.cAgitatorVoltage[0].vRead_Agitator_Data() };
//// public bool[] bAgitatorStatus = new bool[pcPoolInit.PoolBumpOperatNumber];
//// public bool[] bAgitatorHasOpen = new bool[pcPoolInit.PoolBumpOperatNumber];
//// public void vOpen_Agitator(ushort usAgitatorNumber)
//// {
//// try
//// {
//// pcPoolInit.cAgitatorOperat[usAgitatorNumber].bSetStatus = pcPoolInit.cAgitatorOperat[usAgitatorNumber].bOpenStatus;
//// pcPoolInit.cAgitatorOperat[usAgitatorNumber].vSet_Module_Channel_Status();
//// this.bAgitatorStatus[usAgitatorNumber] = pcPoolInit.cAgitatorOperat[usAgitatorNumber].bCommunicationStatus;
//// this.bAgitatorHasOpen[usAgitatorNumber] = true;
//// }
//// catch (Exception exception)
//// {
//// Form1.totxt.Log(exception + "Agitator Open Operation Error");
//// throw;
//// }
//// }
//// public void vClose_Agitator(ushort usAgitatorNumber)
//// {
//// try
//// {
//// for (short i = 0; i < pcPoolInit.cAgitatorOperat[usAgitatorNumber].bSetStatus.Length; i++)
//// {
//// pcPoolInit.cAgitatorOperat[usAgitatorNumber].bSetStatus[i] = !pcPoolInit.cAgitatorOperat[usAgitatorNumber].bSetStatus[i];
//// this.bAgitatorStatus[usAgitatorNumber] = pcPoolInit.cAgitatorOperat[usAgitatorNumber].bCommunicationStatus;
//// this.bAgitatorHasOpen[usAgitatorNumber] = false;
//// }
//// pcPoolInit.cAgitatorOperat[usAgitatorNumber].vSet_Module_Channel_Status();
//// }
//// catch(Exception exception)
//// {
//// Form1.totxt.Log(exception + "Agitator Close Operation Error");
//// throw;
//// }
//// }
//// public bool[] vGet_Agitator_Status(ushort usAgitatorNumber)
//// {
//// try
//// {
//// return pcPoolInit.cAgitatorOperat[usAgitatorNumber].vGet_Module_Channel_Status();
//// }
//// catch (Exception exception)
//// {
//// Form1.totxt.Log(exception + "Agitator Read Status Error");
//// throw;
//// }
//// }
//// }
//// public class pcPool
//// {
//// public string ePondName;
//// public double dMaxlevel;//液位最低水位
//// public double dMinlevel;//液位最高水位
//<<<<<<< HEAD
// public void vOpen_Bump(ushort usPumbNumber)
// {
// try
// {
// pcPoolInit.cPumbOperat[usPumbNumber].bSetStatus = pcPoolInit.cPumbOperat[usPumbNumber].bOpenStatus;
// pcPoolInit.cPumbOperat[usPumbNumber].vSet_Module_Channel_Status();
// this.bBumpStatus[usPumbNumber] = pcPoolInit.cPumbOperat[usPumbNumber].bCommunicationStatus;
// this.bpcBumpHasOpen[usPumbNumber] = true;
// }
// catch (Exception exception)
// {
// Form1.totxt.Log(exception+"Bump Open Operation Error");
// throw;
// }
// }
// public void vClose_Bump(ushort usPumbNumber)
// {
// try
// {
// for (short i = 0; i < pcPoolInit.cPumbOperat[usPumbNumber].bSetStatus.Length; i++)
// {
// pcPoolInit.cPumbOperat[usPumbNumber].bSetStatus[i] = !pcPoolInit.cPumbOperat[usPumbNumber].bSetStatus[i];
// this.bBumpStatus[usPumbNumber] = pcPoolInit.cPumbOperat[usPumbNumber].bCommunicationStatus;
// this.bpcBumpHasOpen[usPumbNumber] = false;
// }
// pcPoolInit.cPumbOperat[usPumbNumber].vSet_Module_Channel_Status();
// }
// catch (Exception exception)
// {
// Form1.totxt.Log(exception+"Bump Close Operation Error");
// throw;
// }
// }
// public bool[] vGet_Pumb_Status(ushort usPumbNumber)
// {
// try
// {
// return pcPoolInit.cPumbOperat[usPumbNumber].vGet_Module_Channel_Status();
// }
// catch (Exception exception)
// {
// Form1.totxt.Log(exception+"Bump Read Status Error");
// throw;
// }
// }
// }
// public class pcAgitator
// {
// private double[] dAgitatorCurrent = new double[pcPoolInit.PoolAgitatorCurrentNumber] { pcPoolInit.cAgitatorCurrent[0].vRead_Agitator_Data() };
// public double[] dAgitatorVoltage = new double[pcPoolInit.PoolAgitatorVoltageNumber] { pcPoolInit.cAgitatorVoltage[0].vRead_Agitator_Data() };
// public bool[] bAgitatorStatus = new bool[pcPoolInit.PoolBumpOperatNumber];
// public bool[] bAgitatorHasOpen = new bool[pcPoolInit.PoolBumpOperatNumber];
// public void vOpen_Bump(ushort usAgitatorNumber)
// {
// try
// {
// pcPoolInit.cAgitatorOperat[usAgitatorNumber].bSetStatus = pcPoolInit.cAgitatorOperat[usAgitatorNumber].bOpenStatus;
// pcPoolInit.cAgitatorOperat[usAgitatorNumber].vSet_Module_Channel_Status();
// this.bAgitatorStatus[usAgitatorNumber] = pcPoolInit.cAgitatorOperat[usAgitatorNumber].bCommunicationStatus;
// this.bAgitatorHasOpen[usAgitatorNumber] = true;
// }
// catch (Exception exception)
// {
// Form1.totxt.Log(exception +"Agitator Open Operation Error");
// throw;
// }
// }
// public void vClose_Bump(ushort usAgitatorNumber)
// {
// try
// {
// for (short i = 0; i < pcPoolInit.cAgitatorOperat[usAgitatorNumber].bSetStatus.Length; i++)
// {
// pcPoolInit.cAgitatorOperat[usAgitatorNumber].bSetStatus[i] = !pcPoolInit.cAgitatorOperat[usAgitatorNumber].bSetStatus[i];
// this.bAgitatorStatus[usAgitatorNumber] = pcPoolInit.cAgitatorOperat[usAgitatorNumber].bCommunicationStatus;
// this.bAgitatorHasOpen[usAgitatorNumber] = false;
// }
// pcPoolInit.cAgitatorOperat[usAgitatorNumber].vSet_Module_Channel_Status();
// }
// catch(Exception exception)
// {
// Form1.totxt.Log(exception+"Agitator Close Operation Error");
// throw;
// }
// }
// public bool[] vGet_Pumb_Status(ushort usAgitatorNumber)
// {
// try
// {
// return pcPoolInit.cAgitatorOperat[usAgitatorNumber].vGet_Module_Channel_Status();
// }
// catch (Exception exception)
// {
// Form1.totxt.Log(exception+"Agitator Read Status Error");
// throw;
// }
// }
// }
// public class pcPool
// {
// public string ePondName;
// public double dMaxlevel;//液位最低水位
// public double dMinlevel;//液位最高水位
// public double dMaxTemper;
// public double dMinTemper;
// public pcPump cPump;
// public pcAgitator cAgitator;
// public double dPondCurrentLevel { get => pcPoolInit.Get_Current_Level(); }
// public double dPondCurentTemper { get => pcPoolInit.Get_Current_temper(); }
// public pcPool(string eInitPondName)
// {
// this.ePondName = eInitPondName;
// }
// }
//}
//=======
//// public double dMaxTemper;
//// public double dMinTemper;
//// public pcBump cBump;
//// public pcAgitator cAgitator;
//// public double dPondCurrentLevel { get => pcPoolInit.Get_Current_Level(); }
//// public double dPondCurentTemper { get => pcPoolInit.Get_Current_temper(); }
//// public pcPool(string eInitPondName)
//// {
//// this.ePondName = eInitPondName;
//// }
//// }
////}
//>>>>>>> origin/master
ModbusDemo/application/UsThread.cs deleted 100644 → 0
View file @ f07825d9
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Threading;
namespace ModbusDemo.application
{
}
ModbusDemo/windows/Form1.cs
View file @ 6e241f93
......@@ -26,7 +26,7 @@ namespace ModbusDemo
{
public partial class Form1 : Form
{
const bool LOCALDEBUG = true;
const bool LOCALDEBUG = false;
private bool bStart = false;
AutoResetEvent exitEvent;
private int waitTime;
......@@ -1069,48 +1069,6 @@ namespace ModbusDemo
private void button2_Click(object sender, EventArgs e)
{
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
//AutoControl.Control usEcontrol = new AutoControl.Control();
//AutoControl.Control usWcontrol = new AutoControl.Control();
//if (ModualControl.cPoolLevelConfig.Count!=0)
//{
// for (int i = 0; i < ModualControl.cPoolLevelConfig.Count; i++)
// {
// if (ModualControl.cPoolLevelConfig[i].byModbusID == 6)
// {
// usWcontrol.maxLevel = ModualControl.cPoolLevelConfig[i].dUpLevel;
// usWcontrol.minLevel = ModualControl.cPoolLevelConfig[i].dDownLevel;
// usWcontrol.Name = "西·中转池";
// usWcontrol.Enablation = true;
// AutoControl.CriticalValueMonitoring(true, ModualControl.cPoolLevelConfig[1].dUpLevel,
// ModualControl.cPoolLevelConfig[0].dDownLevel, ModualPoll.cx18x.sX18xDataStruct[1].dNowConvertData[1],
// "西·中转池",
// out usWcontrol
// );
// }
// if (ModualControl.cPoolLevelConfig[i].byModbusID == 3)
// {
// usEcontrol.maxLevel = ModualControl.cPoolLevelConfig[i].dUpLevel;
// usEcontrol.minLevel = ModualControl.cPoolLevelConfig[i].dDownLevel;
// usEcontrol.Name = "东·中转池";
// usEcontrol.Enablation = true;
// AutoControl.CriticalValueMonitoring(true, ModualControl.cPoolLevelConfig[0].dUpLevel,
// ModualControl.cPoolLevelConfig[0].dDownLevel, ModualPoll.cx18x.sX18xDataStruct[0].dNowConvertData[0],
// "东·中转池",
// out usEcontrol
// );
// }
// }
//}
>>>>>>> 83d8d9d1b2182210455375f355bb9f6860d45dc2
>>>>>>> 5635bdf708c90bb2146f99466d1145dda5dabb37
}
......@@ -1174,9 +1132,9 @@ namespace ModbusDemo
ModbusComm.Modbus.Transport.ReadTimeout = 1000;
ModbusComm.Modbus.Transport.WriteTimeout = 1000;
ModbusComm.Modbus.Transport.WaitToRetryMilliseconds = 0;
t_AutoControl = new Thread(T_AutoControl);
t_AutoControl.IsBackground = true;
t_AutoControl.Start();
//t_AutoControl = new Thread(T_AutoControl);
//t_AutoControl.IsBackground = true;
//t_AutoControl.Start();
modbus_Timer.Enabled = true;
btOpenCOM.Enabled = false;
btCloseCOM.Enabled = true;
......
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