Skip to content

P
PastureGateway
Commit 7728813d authored by leon.huang's avatar leon.huang
Browse files
Options

temper commit

parents b5aebba5 2b471f9a
Hide whitespace changes
Inline Side-by-side
Showing with 102 additions and 146 deletions
ModbusDemo/Common/Totxt.cs
View file @ 7728813d
......@@ -36,17 +36,6 @@ namespace ModbusDemo.windows
}
writer.WriteLine(DateTime.Now + ": " + info);
}
catch (Exception e)
{
if (writer != null)
{
writer.Close();
writer.Dispose();
fileStream.Close();
fileStream.Dispose();
}
throw;
}
finally
{
if (writer != null)
......
ModbusDemo/MessageFormat/ModbusComm.cs
View file @ 7728813d
......@@ -46,7 +46,7 @@ namespace ModbusDemo.MessageFormat
if (exception.Source.Equals("System"))
{
Console.WriteLine(DateTime.Now.ToString() + " " + exception.Message);
Form1.totxt.Log(DateTime.Now.ToString() + " " + exception.Message);
Form1.totxt.Log(DateTime.Now.ToString() + " " + exception.Message+ "Modbus_ReadHoldingRegistersTask");
OutputValue = new ushort[numberOfPoints];
ModbusErrorCode = eModbusErrorCode.MB_ETIMEDOUT;
usCommunFailTimes++;
......@@ -127,7 +127,7 @@ namespace ModbusDemo.MessageFormat
if (exception.Source.Equals("System"))
{
Console.WriteLine(DateTime.Now.ToString() + " " + exception.Message);
Form1.totxt.Log(DateTime.Now.ToString() + " " + exception.Message);
Form1.totxt.Log(DateTime.Now.ToString() + " " + exception.Message+ "Modbus_ReadCoilsTask");
OutputValue = new bool[numberOfPoints];
ModbusErrorCode = eModbusErrorCode.MB_ETIMEDOUT;
usCommunFailTimes++;
......@@ -208,7 +208,7 @@ namespace ModbusDemo.MessageFormat
if (exception.Source.Equals("System"))
{
Console.WriteLine(DateTime.Now.ToString() + " " + exception.Message);
Form1.totxt.Log(DateTime.Now.ToString() + " " + exception.Message);
Form1.totxt.Log(DateTime.Now.ToString() + " " + exception.Message+ "Modbus_WriteSingleCoil");
ModbusErrorCode = eModbusErrorCode.MB_ETIMEDOUT;
}
//The server return error code.
......@@ -286,7 +286,7 @@ namespace ModbusDemo.MessageFormat
if (exception.Source.Equals("System"))
{
Console.WriteLine(DateTime.Now.ToString() + " " + exception.Message);
Form1.totxt.Log(DateTime.Now.ToString() + " " + exception.Message);
Form1.totxt.Log(DateTime.Now.ToString() + " " + exception.Message+ "Modbus_WriteMultipleCoils");
ModbusErrorCode = eModbusErrorCode.MB_ETIMEDOUT;
}
//The server return error code.
......
ModbusDemo/ModbusDemo.csproj
View file @ 7728813d
......@@ -167,11 +167,11 @@
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<SsdtUnitTestVersion>3.1</SsdtUnitTestVersion>
</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)' == ''" />
<PropertyGroup>
<!-- <SsdtUnitTestVersion>3.1</SsdtUnitTestVersion> -->
<!-- </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)' == ''" /> -->
<!-- <PropertyGroup> -->
<SsdtUnitTestVersion>3.1</SsdtUnitTestVersion>
</PropertyGroup>
<Import Project="$(SQLDBExtensionsRefPath)\Microsoft.Data.Tools.Schema.Sql.UnitTesting.targets" Condition="$(VisualStudioVersion) != '15.0' And '$(SQLDBExtensionsRefPath)' != ''" />
......
ModbusDemo/windows/Form1.Designer.cs
View file @ 7728813d
......@@ -70,20 +70,18 @@
this.cmbStopBit.Items.AddRange(new object[] {
"1",
"2"});
this.cmbStopBit.Location = new System.Drawing.Point(461, 98);
this.cmbStopBit.Margin = new System.Windows.Forms.Padding(4);
this.cmbStopBit.Location = new System.Drawing.Point(346, 78);
this.cmbStopBit.Name = "cmbStopBit";
this.cmbStopBit.Size = new System.Drawing.Size(73, 24);
this.cmbStopBit.Size = new System.Drawing.Size(56, 22);
this.cmbStopBit.TabIndex = 70;
//
// btCloseCOM
//
this.btCloseCOM.Enabled = false;
this.btCloseCOM.Font = new System.Drawing.Font("Arial", 8F);
this.btCloseCOM.Location = new System.Drawing.Point(432, 130);
this.btCloseCOM.Margin = new System.Windows.Forms.Padding(4);
this.btCloseCOM.Location = new System.Drawing.Point(324, 104);
this.btCloseCOM.Name = "btCloseCOM";
this.btCloseCOM.Size = new System.Drawing.Size(104, 29);
this.btCloseCOM.Size = new System.Drawing.Size(78, 23);
this.btCloseCOM.TabIndex = 72;
this.btCloseCOM.Text = "Close";
this.btCloseCOM.Click += new System.EventHandler(this.btCloseCOM_Click);
......@@ -95,19 +93,17 @@
"0-None Parity",
"1-Odd Parity",
"2-Even Parity"});
this.cmbParity.Location = new System.Drawing.Point(311, 98);
this.cmbParity.Margin = new System.Windows.Forms.Padding(4);
this.cmbParity.Location = new System.Drawing.Point(233, 78);
this.cmbParity.Name = "cmbParity";
this.cmbParity.Size = new System.Drawing.Size(132, 24);
this.cmbParity.Size = new System.Drawing.Size(100, 22);
this.cmbParity.TabIndex = 69;
//
// btOpenCOM
//
this.btOpenCOM.Font = new System.Drawing.Font("Arial", 8F);
this.btOpenCOM.Location = new System.Drawing.Point(311, 130);
this.btOpenCOM.Margin = new System.Windows.Forms.Padding(4);
this.btOpenCOM.Location = new System.Drawing.Point(233, 104);
this.btOpenCOM.Name = "btOpenCOM";
this.btOpenCOM.Size = new System.Drawing.Size(104, 29);
this.btOpenCOM.Size = new System.Drawing.Size(78, 23);
this.btOpenCOM.TabIndex = 71;
this.btOpenCOM.Text = "Open";
this.btOpenCOM.Click += new System.EventHandler(this.btOpenCOM_Click);
......@@ -118,19 +114,17 @@
this.cmbDataBit.Items.AddRange(new object[] {
"7",
"8"});
this.cmbDataBit.Location = new System.Drawing.Point(236, 98);
this.cmbDataBit.Margin = new System.Windows.Forms.Padding(4);
this.cmbDataBit.Location = new System.Drawing.Point(177, 78);
this.cmbDataBit.Name = "cmbDataBit";
this.cmbDataBit.Size = new System.Drawing.Size(63, 24);
this.cmbDataBit.Size = new System.Drawing.Size(48, 22);
this.cmbDataBit.TabIndex = 68;
//
// labStopBit
//
this.labStopBit.Font = new System.Drawing.Font("Arial", 8F);
this.labStopBit.Location = new System.Drawing.Point(461, 79);
this.labStopBit.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.labStopBit.Location = new System.Drawing.Point(346, 63);
this.labStopBit.Name = "labStopBit";
this.labStopBit.Size = new System.Drawing.Size(75, 19);
this.labStopBit.Size = new System.Drawing.Size(56, 15);
this.labStopBit.TabIndex = 73;
this.labStopBit.Text = "Stop Bit";
this.labStopBit.TextAlign = System.Drawing.ContentAlignment.TopCenter;
......@@ -138,10 +132,9 @@
// labParity
//
this.labParity.Font = new System.Drawing.Font("Arial", 8F);
this.labParity.Location = new System.Drawing.Point(313, 79);
this.labParity.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.labParity.Location = new System.Drawing.Point(235, 63);
this.labParity.Name = "labParity";
this.labParity.Size = new System.Drawing.Size(131, 19);
this.labParity.Size = new System.Drawing.Size(98, 15);
this.labParity.TabIndex = 74;
this.labParity.Text = "Parity";
this.labParity.TextAlign = System.Drawing.ContentAlignment.TopCenter;
......@@ -149,10 +142,9 @@
// labBaud
//
this.labBaud.Font = new System.Drawing.Font("Arial", 8F);
this.labBaud.Location = new System.Drawing.Point(124, 79);
this.labBaud.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.labBaud.Location = new System.Drawing.Point(93, 63);
this.labBaud.Name = "labBaud";
this.labBaud.Size = new System.Drawing.Size(100, 19);
this.labBaud.Size = new System.Drawing.Size(75, 15);
this.labBaud.TabIndex = 75;
this.labBaud.Text = "Baudrate";
this.labBaud.TextAlign = System.Drawing.ContentAlignment.TopCenter;
......@@ -160,10 +152,9 @@
// labDataBit
//
this.labDataBit.Font = new System.Drawing.Font("Arial", 8F);
this.labDataBit.Location = new System.Drawing.Point(236, 79);
this.labDataBit.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.labDataBit.Location = new System.Drawing.Point(177, 63);
this.labDataBit.Name = "labDataBit";
this.labDataBit.Size = new System.Drawing.Size(64, 19);
this.labDataBit.Size = new System.Drawing.Size(48, 15);
this.labDataBit.TabIndex = 76;
this.labDataBit.Text = "Data Bit";
this.labDataBit.TextAlign = System.Drawing.ContentAlignment.TopCenter;
......@@ -180,19 +171,17 @@
"38400",
"57600",
"115200"});
this.cmbBaud.Location = new System.Drawing.Point(123, 98);
this.cmbBaud.Margin = new System.Windows.Forms.Padding(4);
this.cmbBaud.Location = new System.Drawing.Point(92, 78);
this.cmbBaud.Name = "cmbBaud";
this.cmbBaud.Size = new System.Drawing.Size(100, 24);
this.cmbBaud.Size = new System.Drawing.Size(76, 22);
this.cmbBaud.TabIndex = 67;
//
// labPort
//
this.labPort.Font = new System.Drawing.Font("Arial", 8F);
this.labPort.Location = new System.Drawing.Point(16, 79);
this.labPort.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.labPort.Location = new System.Drawing.Point(12, 63);
this.labPort.Name = "labPort";
this.labPort.Size = new System.Drawing.Size(100, 19);
this.labPort.Size = new System.Drawing.Size(75, 15);
this.labPort.TabIndex = 66;
this.labPort.Text = "COM Port";
this.labPort.TextAlign = System.Drawing.ContentAlignment.TopCenter;
......@@ -200,32 +189,30 @@
// cmbPort
//
this.cmbPort.Font = new System.Drawing.Font("Arial", 8F);
this.cmbPort.Location = new System.Drawing.Point(16, 98);
this.cmbPort.Margin = new System.Windows.Forms.Padding(4);
this.cmbPort.Location = new System.Drawing.Point(12, 78);
this.cmbPort.Name = "cmbPort";
this.cmbPort.Size = new System.Drawing.Size(99, 24);
this.cmbPort.Size = new System.Drawing.Size(75, 22);
this.cmbPort.TabIndex = 65;
//
// label7
//
this.label7.Font = new System.Drawing.Font("Arial", 8F);
this.label7.ForeColor = System.Drawing.Color.Blue;
this.label7.Location = new System.Drawing.Point(16, 58);
this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label7.Location = new System.Drawing.Point(12, 46);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(187, 21);
this.label7.Size = new System.Drawing.Size(140, 17);
this.label7.TabIndex = 64;
this.label7.Text = "Connection Status";
//
// txtReceiveMessage
//
this.txtReceiveMessage.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtReceiveMessage.Location = new System.Drawing.Point(563, 14);
this.txtReceiveMessage.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txtReceiveMessage.Location = new System.Drawing.Point(422, 11);
this.txtReceiveMessage.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.txtReceiveMessage.Multiline = true;
this.txtReceiveMessage.Name = "txtReceiveMessage";
this.txtReceiveMessage.ScrollBars = System.Windows.Forms.ScrollBars.Both;
this.txtReceiveMessage.Size = new System.Drawing.Size(600, 640);
this.txtReceiveMessage.Size = new System.Drawing.Size(509, 529);
this.txtReceiveMessage.TabIndex = 77;
this.txtReceiveMessage.TextChanged += new System.EventHandler(this.txtReceiveMessage_TextChanged);
//
......@@ -237,40 +224,35 @@
this.updateops.Controls.Add(this.label13);
this.updateops.Controls.Add(this.UpdateBar);
this.updateops.Controls.Add(this.UpdateBtn);
this.updateops.Location = new System.Drawing.Point(20, 218);
this.updateops.Margin = new System.Windows.Forms.Padding(4);
this.updateops.Location = new System.Drawing.Point(15, 174);
this.updateops.Name = "updateops";
this.updateops.Padding = new System.Windows.Forms.Padding(4);
this.updateops.Size = new System.Drawing.Size(516, 139);
this.updateops.Size = new System.Drawing.Size(387, 111);
this.updateops.TabIndex = 92;
this.updateops.TabStop = false;
this.updateops.Text = "更新操作";
//
// imagesname
//
this.imagesname.Location = new System.Drawing.Point(75, 88);
this.imagesname.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.imagesname.Location = new System.Drawing.Point(56, 70);
this.imagesname.Name = "imagesname";
this.imagesname.Size = new System.Drawing.Size(144, 15);
this.imagesname.Size = new System.Drawing.Size(108, 12);
this.imagesname.TabIndex = 5;
this.imagesname.Text = "wtd.bin";
//
// label12
//
this.label12.AutoSize = true;
this.label12.Location = new System.Drawing.Point(21, 88);
this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label12.Location = new System.Drawing.Point(16, 70);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(52, 15);
this.label12.Size = new System.Drawing.Size(41, 12);
this.label12.TabIndex = 4;
this.label12.Text = "镜像：";
//
// choosebth
//
this.choosebth.Location = new System.Drawing.Point(243, 81);
this.choosebth.Margin = new System.Windows.Forms.Padding(4);
this.choosebth.Location = new System.Drawing.Point(182, 65);
this.choosebth.Name = "choosebth";
this.choosebth.Size = new System.Drawing.Size(100, 29);
this.choosebth.Size = new System.Drawing.Size(75, 23);
this.choosebth.TabIndex = 3;
this.choosebth.Text = "选择bin";
this.choosebth.UseVisualStyleBackColor = true;
......@@ -279,27 +261,24 @@
// label13
//
this.label13.AutoSize = true;
this.label13.Location = new System.Drawing.Point(21, 32);
this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label13.Location = new System.Drawing.Point(16, 26);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(52, 15);
this.label13.Size = new System.Drawing.Size(41, 12);
this.label13.TabIndex = 2;
this.label13.Text = "进度：";
//
// UpdateBar
//
this.UpdateBar.Location = new System.Drawing.Point(77, 25);
this.UpdateBar.Margin = new System.Windows.Forms.Padding(4);
this.UpdateBar.Location = new System.Drawing.Point(58, 20);
this.UpdateBar.Name = "UpdateBar";
this.UpdateBar.Size = new System.Drawing.Size(373, 29);
this.UpdateBar.Size = new System.Drawing.Size(280, 23);
this.UpdateBar.TabIndex = 1;
//
// UpdateBtn
//
this.UpdateBtn.Location = new System.Drawing.Point(351, 81);
this.UpdateBtn.Margin = new System.Windows.Forms.Padding(4);
this.UpdateBtn.Location = new System.Drawing.Point(263, 65);
this.UpdateBtn.Name = "UpdateBtn";
this.UpdateBtn.Size = new System.Drawing.Size(100, 29);
this.UpdateBtn.Size = new System.Drawing.Size(75, 23);
this.UpdateBtn.TabIndex = 0;
this.UpdateBtn.Text = "一键更新";
this.UpdateBtn.UseVisualStyleBackColor = true;
......@@ -314,10 +293,9 @@
//
this.label1.AutoSize = true;
this.label1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.Location = new System.Drawing.Point(44, 446);
this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Location = new System.Drawing.Point(33, 357);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(69, 20);
this.label1.Size = new System.Drawing.Size(56, 16);
this.label1.TabIndex = 93;
this.label1.Text = "温度：";
//
......@@ -325,39 +303,35 @@
//
this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.Location = new System.Drawing.Point(44, 487);
this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label2.Location = new System.Drawing.Point(33, 390);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(69, 20);
this.label2.Size = new System.Drawing.Size(56, 16);
this.label2.TabIndex = 94;
this.label2.Text = "水位：";
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(108, 451);
this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label3.Location = new System.Drawing.Point(81, 361);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(55, 15);
this.label3.Size = new System.Drawing.Size(41, 12);
this.label3.TabIndex = 95;
this.label3.Text = "label3";
//
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(108, 492);
this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label4.Location = new System.Drawing.Point(81, 394);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(55, 15);
this.label4.Size = new System.Drawing.Size(41, 12);
this.label4.TabIndex = 96;
this.label4.Text = "label4";
//
// button2
//
this.button2.Location = new System.Drawing.Point(371, 476);
this.button2.Margin = new System.Windows.Forms.Padding(4);
this.button2.Location = new System.Drawing.Point(278, 381);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(100, 29);
this.button2.Size = new System.Drawing.Size(75, 23);
this.button2.TabIndex = 97;
this.button2.Text = "test";
this.button2.UseVisualStyleBackColor = true;
......@@ -365,10 +339,9 @@
//
// SubscribeBut
//
this.SubscribeBut.Location = new System.Drawing.Point(371, 432);
this.SubscribeBut.Margin = new System.Windows.Forms.Padding(4);
this.SubscribeBut.Location = new System.Drawing.Point(278, 346);
this.SubscribeBut.Name = "SubscribeBut";
this.SubscribeBut.Size = new System.Drawing.Size(100, 29);
this.SubscribeBut.Size = new System.Drawing.Size(75, 23);
this.SubscribeBut.TabIndex = 98;
this.SubscribeBut.Text = "订阅消息";
this.SubscribeBut.UseVisualStyleBackColor = true;
......@@ -377,26 +350,28 @@
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(111, 528);
this.label5.Location = new System.Drawing.Point(83, 422);
this.label5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(55, 15);
this.label5.Size = new System.Drawing.Size(41, 12);
this.label5.TabIndex = 99;
this.label5.Text = "label5";
//
// label6
//
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(23, 528);
this.label6.Location = new System.Drawing.Point(17, 422);
this.label6.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(82, 15);
this.label6.Size = new System.Drawing.Size(65, 12);
this.label6.TabIndex = 100;
this.label6.Text = "超时次数：";
//
// Form1
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1184, 672);
this.ClientSize = new System.Drawing.Size(942, 551);
this.Controls.Add(this.label6);
this.Controls.Add(this.label5);
this.Controls.Add(this.SubscribeBut);
......@@ -421,7 +396,6 @@
this.Controls.Add(this.cmbPort);
this.Controls.Add(this.label7);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "Form1";
this.Text = "牧场项目";
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.Form1_FormClosed);
......
ModbusDemo/windows/Form1.cs
View file @ 7728813d
......@@ -22,7 +22,6 @@ using ModbusDemo.application;
using System.Collections;
using ModbusDemo.Modular;
using ModbusDemo.MessageFormat;
namespace ModbusDemo
{
public partial class Form1 : Form
......@@ -114,11 +113,11 @@ namespace ModbusDemo
mqttTopic = "Witium/WTDS78X/" + mqttSn + "/Data";
if (Debug_test == true)
{
mqttIp = "172.16.1.24";
mqttIp = "47.101.50.24";
mqttClientId = GetTimeStamp() + "sxz";
mqttPort = 1883;
mqttUsername = "pasture";
mqttPwd = "Pasture37774020";
mqttUsername = "root";
mqttPwd = "public";
}
else
{
......@@ -490,7 +489,7 @@ namespace ModbusDemo
{
control(ctrl.ss[0].getAddr(), address, on_off);//根据下发确定控制通道
mqttData_Back = JsonConvert.SerializeObject(ctrl2);
Modbus_polling();
//Modbus_polling();
await Publish();
await Back();
}
......@@ -526,7 +525,7 @@ namespace ModbusDemo
{
control(ID, address, false);//根据下发确定控制通道
control(ID, (ushort)(address+1), false);//根据下发确定控制通道
Modbus_polling();
//Modbus_polling();
await Publish();
time = 0;
n = 0;
......@@ -541,7 +540,7 @@ namespace ModbusDemo
private void GetData()
{
timer.Interval = 9000;
timer.Interval = 120000;
timer.Enabled = true;
timer.AutoReset = true;//设置是执行一次（false）还是一直执行(true)；
timer.Start();
......@@ -554,7 +553,7 @@ namespace ModbusDemo
private void Sendout()
{
Control.CheckForIllegalCrossThreadCalls = false;
MQTTTimer.Interval = 7000;
MQTTTimer.Interval = 120500;
MQTTTimer.Enabled = true;
MQTTTimer.AutoReset = true;//设置是执行一次（false）还是一直执行(true)；
MQTTTimer.Start();
......@@ -562,8 +561,8 @@ namespace ModbusDemo
{
try
{
label5.Text =ModbusComm.usCommunFailTimes.ToString();
await Publish();
totxt.Log(mqttData + Environment.NewLine + "\n");
}
catch (Exception ex)
{
......@@ -585,10 +584,10 @@ namespace ModbusDemo
{
await Task.Run(() =>
{
//Modbus_polling();
totxt.Log("开始执行");
ModualPoll.vAllNodePoll();
mqttData = ModualPoll.stAll_Poll_Package();
ModualPoll.vCheckAlarm_And_Send(mqttClient);
totxt.Log("执行结束");
});
}
......@@ -614,12 +613,12 @@ namespace ModbusDemo
else
{
//txtbox.Text = message;
totxt.Log(message);
//totxt.Log(message);
}
}
public void Modbus_ReadHoldingRegistersTask(out ushort[] OutputValue, byte slaveAddress, ushort startAddress, ushort numberOfPoints, out int Caution)
{
label5.Text= usCommunFailTimes.ToString();
label5.Text = usCommunFailTimes.ToString();
try
{
OutputValue = master.ReadHoldingRegisters(slaveAddress, startAddress, numberOfPoints);
......@@ -716,7 +715,7 @@ namespace ModbusDemo
timer.Stop();
Console.WriteLine(DateTime.Now.ToString() + " " + exception.Message);
totxt.Log(DateTime.Now.ToString() + " " + exception.Message);
OutputValue = new bool [numberOfPoints];
OutputValue = new bool[numberOfPoints];
Caution = -1;
usCommunFailTimes++;
}
......@@ -861,6 +860,7 @@ namespace ModbusDemo
Caution = -1;
}
}
private async void Modbus_polling()
{
//float EastTemperature = 0;
......@@ -1026,6 +1026,7 @@ namespace ModbusDemo
return;
}
#endregion
#region json字符串转对象
......@@ -1574,9 +1575,8 @@ namespace ModbusDemo
private void button2_Click(object sender, EventArgs e)
{
//Modbus_polling();
//ModualPoll.vAllNodePoll();
//mqttData = ModualPoll.stAll_Poll_Package();
ModualPoll.vAllNodePoll();
mqttData=ModualPoll.stAll_Poll_Package();
}
private async void SubscribeBut_Click(object sender, EventArgs e)
......@@ -1590,16 +1590,16 @@ namespace ModbusDemo
private void btOpenCOM_Click(object sender, EventArgs e)
{
//if (Debug_test == true)
//{
// comPort.PortName = "COM2";
// comPort.BaudRate = 9600;
// comPort.Parity = Parity.None;
// comPort.StopBits = StopBits.One;
// comPort.DataBits = 8;
//}
//else
//{
if (Debug_test == true)
{
comPort.PortName = "COM2";
comPort.BaudRate = 9600;
comPort.Parity = Parity.None;
comPort.StopBits = StopBits.One;
comPort.DataBits = 8;
}
else
{
if (cmbPort.Text == "")
{
MessageBox.Show("串口打开错误");
......@@ -1628,7 +1628,7 @@ namespace ModbusDemo
{
comPort.StopBits = StopBits.One;
}
//}
}
try
{
comPort.Open();
......@@ -1638,20 +1638,13 @@ namespace ModbusDemo
simpleDelegate1.BeginInvoke(null, null);
MQTT_thread = new MethodInvoker(Sendout);
MQTT_thread.BeginInvoke(null,null);
Task.Run(async () => { await ConnectMqttServerAsync(); });
master = ModbusSerialMaster.CreateRtu(comPort);
master.Transport.Retries = 0; //重试次数
master.Transport.ReadTimeout = 1000; //读取串口数据超时时间(ms)
master.Transport.WriteTimeout = 1000;//写入串口数据超时时间(ms)
master.Transport.WaitToRetryMilliseconds = 0;//重试间隔(ms)
ModbusComm.Modbus = ModbusSerialMaster.CreateRtu(comPort);
ModbusComm.Modbus.Transport.Retries = 0;
ModbusComm.Modbus.Transport.ReadTimeout = 1000;
ModbusComm.Modbus.Transport.ReadTimeout = 1000;
ModbusComm.Modbus.Transport.WriteTimeout = 1000;
ModbusComm.Modbus.Transport.WaitToRetryMilliseconds = 0;
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