From 8a5617ccbbbd6043386b0666bb00652391958490 Mon Sep 17 00:00:00 2001 From: shark219-hub Date: Wed, 27 Nov 2024 17:44:53 +0900 Subject: [PATCH] =?UTF-8?q?DispCtrl.cs=20=ED=98=84=EC=9E=A5=EC=97=90?= =?UTF-8?q?=EC=84=9C=20=EC=98=88=EC=99=B8=20=EB=AC=B8=EC=A0=9C=EB=A1=9C=20?= =?UTF-8?q?=EC=86=8C=EC=8A=A4=20=ED=96=89=EB=B2=88=ED=98=B8=20=EB=A1=9C?= =?UTF-8?q?=EA=B7=B8=20=EA=B8=B0=EB=8A=A5=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TEST/DigitalIndicator/Form1.Designer.cs | 2 +- TEST/DigitalIndicator/Form1.cs | 1 + cVMS.NET_CS/Device/DigitalIndicator.cs | 2 +- cVMS.NET_CS/HMI/MainDisplay/DispCtrl.cs | 9 ++++++--- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/TEST/DigitalIndicator/Form1.Designer.cs b/TEST/DigitalIndicator/Form1.Designer.cs index 31f5f84..6423d3b 100644 --- a/TEST/DigitalIndicator/Form1.Designer.cs +++ b/TEST/DigitalIndicator/Form1.Designer.cs @@ -156,7 +156,7 @@ this.button3.Location = new System.Drawing.Point(17, 199); this.button3.Margin = new System.Windows.Forms.Padding(5, 8, 5, 8); this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(593, 84); + this.button3.Size = new System.Drawing.Size(693, 84); this.button3.TabIndex = 9; this.button3.Text = "샘플데이터쓰기(40001=100 ~ 40020=0)"; this.button3.UseVisualStyleBackColor = true; diff --git a/TEST/DigitalIndicator/Form1.cs b/TEST/DigitalIndicator/Form1.cs index dcce417..40ea76f 100644 --- a/TEST/DigitalIndicator/Form1.cs +++ b/TEST/DigitalIndicator/Form1.cs @@ -17,6 +17,7 @@ namespace DigitalIndicator { ModbusSerialMaster modbus; System.IO.Ports.SerialPort dev; + public Form1() { InitializeComponent(); diff --git a/cVMS.NET_CS/Device/DigitalIndicator.cs b/cVMS.NET_CS/Device/DigitalIndicator.cs index e825808..fbb12cb 100644 --- a/cVMS.NET_CS/Device/DigitalIndicator.cs +++ b/cVMS.NET_CS/Device/DigitalIndicator.cs @@ -10,7 +10,7 @@ namespace vmsnet /// /// default value = 1 /// - public byte SlaveID { get; set; } = 1; + public byte SlaveID { get; set; } = 1; // Slave No public DigitalIndicator(byte slaveID = 0) : base("", new RtuConfigure { BaudRate = 9600, DataBits = 8, StopBits = System.IO.Ports.StopBits.One, Parity = System.IO.Ports.Parity.None }) { diff --git a/cVMS.NET_CS/HMI/MainDisplay/DispCtrl.cs b/cVMS.NET_CS/HMI/MainDisplay/DispCtrl.cs index ab98b4d..457c6a2 100644 --- a/cVMS.NET_CS/HMI/MainDisplay/DispCtrl.cs +++ b/cVMS.NET_CS/HMI/MainDisplay/DispCtrl.cs @@ -1086,7 +1086,7 @@ namespace vmsnet.HMI // UI 디스플레이 중, 예외발생 문제 PUB.log.AddE($"NullReferenceException Message={ex1.Message}, 파일명={fileName}, 행번호={lineNumber}"); - + return; } catch (Exception ex2) { @@ -1098,6 +1098,7 @@ namespace vmsnet.HMI // Else Error !!! PUB.log.AddE($"Exception Message={ex2.Message}, 파일명={fileName}, 행번호={lineNumber}"); + return; } } @@ -1632,7 +1633,7 @@ namespace vmsnet.HMI // UI 디스플레이 중, 예외발생 문제 PUB.log.AddE($"NullReferenceException Message={ex1.Message}, 파일명={fileName}, 행번호={lineNumber}"); - + return; } catch (Exception ex2) { @@ -1644,6 +1645,7 @@ namespace vmsnet.HMI // Else Error !!! PUB.log.AddE($"Exception Message={ex2.Message}, 파일명={fileName}, 행번호={lineNumber}"); + return; } } @@ -1866,7 +1868,7 @@ namespace vmsnet.HMI // UI 디스플레이 중, 예외발생 문제 PUB.log.AddE($"NullReferenceException Message={ex1.Message}, 파일명={fileName}, 행번호={lineNumber}"); - + return; } catch (Exception ex2) { @@ -1878,6 +1880,7 @@ namespace vmsnet.HMI // Else Error !!! PUB.log.AddE($"Exception Message={ex2.Message}, 파일명={fileName}, 행번호={lineNumber}"); + return; } }