Skip to content

P
PastureGateway
Commit 4b2cc5fe authored by leon.huang's avatar leon.huang
Browse files
Options

merge origin/master

parent d6df55a2
Hide whitespace changes
Inline Side-by-side
Showing with 137 additions and 52 deletions
ModbusDemo/ModbusDemo.csproj
View file @ 4b2cc5fe
......@@ -180,6 +180,12 @@
</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
=======
<PropertyGroup>
<SsdtUnitTestVersion>3.1</SsdtUnitTestVersion>
</PropertyGroup>
>>>>>>> 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/application/AutoControl.cs
View file @ 4b2cc5fe
......@@ -6,6 +6,8 @@ using System.Text;
using System.Threading.Tasks;
using ModbusDemo.windows;
using ModbusDemo.Modular;
using ModbusDemo.MessageFormat;
namespace ModbusDemo.application
{
public class AutoControl
......@@ -23,36 +25,31 @@ namespace ModbusDemo.application
}
public class Control : Status
{
public bool Enablation;
public bool Enablation; //任务使能
public double maxLevel;
public double minLevel;
public double DifferenceValue;
public double realTimeLevel;
public bool status;
public bool status;
public string Name;
public double StatusTime;
public int modularx;
}
public static void CriticalValueMonitoring(
bool Enabl, double MaxLevel,
double MinLevel, double ActualValue,
string Affiliation, out Control control)
public static void CriticalValueMonitoring(bool Enabl, string Affiliation, out Control control)
{
System.Diagnostics.Stopwatch stopwatch = new System.Diagnostics.Stopwatch();
Control usControl = new Control
{
Enablation = Enabl,
realTimeLevel = ActualValue,
Name = Affiliation
};
if (usControl.Enablation == true)
{
if (MaxLevel != 0.0 && MinLevel != 0.0)
if (usControl.maxLevel != 0.0 && usControl.minLevel != 0.0)
{
InIHelper.WriteConfig("MaxLevel", Affiliation, MaxLevel.ToString());
InIHelper.WriteConfig("MinLevel", Affiliation, MinLevel.ToString());
usControl.maxLevel = InIHelper.ReadConfig<float>("MaxLevel", Affiliation);
usControl.minLevel = InIHelper.ReadConfig<float>("MinLevel", Affiliation);
InIHelper.WriteConfig("MaxLevel", Affiliation, usControl.maxLevel.ToString());
InIHelper.WriteConfig("MinLevel", Affiliation, usControl.minLevel.ToString());
}
else
{
......@@ -106,5 +103,35 @@ namespace ModbusDemo.application
Value = MeanValue[0] * 0.1 + MeanValue[5] * 0.3 + MeanValue[9] * 0.6;
return Value;
}
public static byte[] EmodbusId ={5,51};
public static byte[] WmodbusId = {37,8};
public static bool[] state_ON = {true, true, true, true, true, true };
public static bool[] state_OFF = {false, false, false, false, false, false };
public static void Automatic_control(bool Eenabl,bool Wenabl)
{
for (int i = 0; i < 2; i++)
{
//for (int j = 0; j < ModualPoll.byX66cNumber; j++)
//{
//}
if (Eenabl == true)
{
ModbusComm.Modbus_WriteMultipleCoils(EmodbusId[i], 0, state_ON);
}
else
{
ModbusComm.Modbus_WriteMultipleCoils(EmodbusId[i], 0, state_OFF);
}
if (Wenabl ==true)
{
ModbusComm.Modbus_WriteMultipleCoils(WmodbusId[i], 0, state_ON);
}
else
{
ModbusComm.Modbus_WriteMultipleCoils(WmodbusId[i], 0, state_OFF);
}
}
}
}
}
ModbusDemo/application/InIHelper.cs
View file @ 4b2cc5fe
......@@ -11,7 +11,7 @@ namespace ModbusDemo.application
{
public class InIHelper
{
private static string FileName = Application.StartupPath + "\\AppConfig.ini";
public static string FileName = Application.StartupPath + "\\AppConfig.ini";
/// <summary>
/// 读取配置文件
/// </summary>
......
ModbusDemo/windows/Form1.cs
View file @ 4b2cc5fe
......@@ -31,6 +31,7 @@ namespace ModbusDemo
AutoResetEvent exitEvent;
private int waitTime;
private Thread t_UpgradeConn;
private Thread t_AutoControl;
public delegate void invokeDelegate();
System.Timers.Timer MQTTTimer = new System.Timers.Timer();
BackgroundWorker m_bgw0 = new BackgroundWorker();
......@@ -69,11 +70,13 @@ namespace ModbusDemo
public static ModbusMaster master;
private MethodInvoker MQTT_thread;
private
string mqttIp;
string mqttClientId;
int mqttPort;
string mqttUsername;
string mqttPwd;
byte[] LevelmodbusID = { 6, 3};
public const string mqttSn = "66666666";
public const string mqttSubscribeControlTopic = "Witium/WTDS78X/" + mqttSn + "/Ctrl";
public const string mqttBackTopic = "Witium/WTDS78X/" + mqttSn + "/Back";
......@@ -365,8 +368,93 @@ namespace ModbusDemo
#endregion
#region modbus线程
private static bool bSetDataIsRunning = false;
private Thread ModbusPollThread;
private void T_AutoControl()
{
while (true)
{
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++)
{
for (int j = 0; j < ModualPoll.byX18xNumber; j++)
{
if (ModualPoll.cx18x.byModbusID[j] == LevelmodbusID[0])
{
usEcontrol.realTimeLevel =
ModualPoll.cx18x.sX18xDataStruct[j].dNowConvertData[0];
usEcontrol.modularx = j;
}
if (ModualPoll.cx18x.byModbusID[j] == LevelmodbusID[1])
{
usWcontrol.realTimeLevel =
ModualPoll.cx18x.sX18xDataStruct[j].dNowConvertData[0];
usWcontrol.modularx = j;
}
}
if (ModualControl.cPoolLevelConfig[i].byModbusID == LevelmodbusID[0])
{
usWcontrol.maxLevel = ModualControl.cPoolLevelConfig[i].dUpLevel;
usWcontrol.minLevel = ModualControl.cPoolLevelConfig[i].dDownLevel;
usWcontrol.Name = "西·中转池";
usWcontrol.Enablation = true;
AutoControl.CriticalValueMonitoring(true,
"西·中转池",
out usWcontrol
);
InIHelper.WriteConfig("Channel number", "西液位通道", usWcontrol.modularx.ToString());
}
if (ModualControl.cPoolLevelConfig[i].byModbusID == LevelmodbusID[1])
{
usEcontrol.maxLevel = ModualControl.cPoolLevelConfig[i].dUpLevel;
usEcontrol.minLevel = ModualControl.cPoolLevelConfig[i].dDownLevel;
usEcontrol.Name = "东·中转池";
usEcontrol.Enablation = true;
AutoControl.CriticalValueMonitoring(true,
"东·中转池",
out usEcontrol
);
InIHelper.WriteConfig("Channel number", "东液位通道", usEcontrol.modularx.ToString());
}
}
AutoControl.Automatic_control(usWcontrol.status, usEcontrol.status);
}
else if (InIHelper.FileName.Length!= 0)
{
usEcontrol.modularx = InIHelper.ReadConfig<int>("Channel number", "东液位通道");
usWcontrol.modularx = InIHelper.ReadConfig<int>("Channel number", "西液位通道");
usWcontrol.maxLevel = InIHelper.ReadConfig<float>("MaxLevel", "西·中转池");
usWcontrol.minLevel = InIHelper.ReadConfig<float>("MinLevel", "西·中转池");
usEcontrol.maxLevel = InIHelper.ReadConfig<float>("MaxLevel", "东·中转池");
usEcontrol.minLevel = InIHelper.ReadConfig<float>("MaxLevel", "东·中转池");
usEcontrol.realTimeLevel =
ModualPoll.cx18x.sX18xDataStruct[usEcontrol.modularx].dNowConvertData[0];
usWcontrol.realTimeLevel =
ModualPoll.cx18x.sX18xDataStruct[usWcontrol.modularx].dNowConvertData[0];
AutoControl.CriticalValueMonitoring(true,
"东·中转池",
out usEcontrol
);
AutoControl.CriticalValueMonitoring(true,
"西·中转池",
out usWcontrol
);
AutoControl.Automatic_control(usWcontrol.status, usEcontrol.status);
}
else
{
usWcontrol.status = false;
usEcontrol.status = false;
AutoControl.Automatic_control(usWcontrol.status, usEcontrol.status);
totxt.Log("Self - control has not started");
}
}
}
private void vModbusPoll()
{
while (true)
......@@ -981,42 +1069,6 @@ namespace ModbusDemo
private void button2_Click(object sender, EventArgs e)
{
//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
// );
// }
// }
//}
}
......@@ -1075,14 +1127,14 @@ namespace ModbusDemo
MQTT_thread = new MethodInvoker(Sendout);
MQTT_thread.BeginInvoke(null, null);
Task.Run(async () => { await ConnectMqttServerAsync(); });
ModbusComm.Modbus = ModbusSerialMaster.CreateRtu(comPort);
ModbusComm.Modbus.Transport.Retries = 0;
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();
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