chojy
/
INT69DB_2A
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.11.65:3000/chojy/INT69DB_2A

master
DESKTOP-999R8N3\CJY 2025-01-07 15:22:01 +09:00
parent 7631dd29bc e80d5a78d9
commit cb1251518a
23 changed files with 230 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
INT69DB_2A/Controls/ControlMainDisplayDotGraph10.Designer.cs generated
View File

@ -568,7 +568,7 @@
this.draw6.SetBackImageAutoSize = true;
this.draw6.Size = new System.Drawing.Size(750, 330);
this.draw6.TabIndex = 1095;
this.draw6.Text = "Line6";
this.draw6.Text = "Lane6";
//
// draw5
//
@ -585,7 +585,7 @@
this.draw5.SetBackImageAutoSize = true;
this.draw5.Size = new System.Drawing.Size(750, 330);
this.draw5.TabIndex = 1094;
this.draw5.Text = "Line5";
this.draw5.Text = "Lane5";
//
// draw4
//
@ -602,7 +602,7 @@
this.draw4.SetBackImageAutoSize = true;
this.draw4.Size = new System.Drawing.Size(750, 330);
this.draw4.TabIndex = 1093;
this.draw4.Text = "Line4";
this.draw4.Text = "Lane4";
//
// draw3
//
@ -619,7 +619,7 @@
this.draw3.SetBackImageAutoSize = true;
this.draw3.Size = new System.Drawing.Size(750, 330);
this.draw3.TabIndex = 1092;
this.draw3.Text = "Line3";
this.draw3.Text = "Lane3";
//
// draw2
//
@ -636,7 +636,7 @@
this.draw2.SetBackImageAutoSize = true;
this.draw2.Size = new System.Drawing.Size(750, 330);
this.draw2.TabIndex = 1091;
this.draw2.Text = "Line2";
this.draw2.Text = "Lane2";
//
// draw1
//
@ -670,7 +670,7 @@
this.draw7.SetBackImageAutoSize = true;
this.draw7.Size = new System.Drawing.Size(750, 330);
this.draw7.TabIndex = 1096;
this.draw7.Text = "Line7";
this.draw7.Text = "Lane7";
//
// draw8
//
@ -687,7 +687,7 @@
this.draw8.SetBackImageAutoSize = true;
this.draw8.Size = new System.Drawing.Size(750, 330);
this.draw8.TabIndex = 1097;
this.draw8.Text = "Line8";
this.draw8.Text = "Lane8";
//
// draw9
//
@ -704,7 +704,7 @@
this.draw9.SetBackImageAutoSize = true;
this.draw9.Size = new System.Drawing.Size(750, 330);
this.draw9.TabIndex = 1098;
this.draw9.Text = "Line9";
this.draw9.Text = "Lane9";
//
// draw10
//
@ -721,7 +721,7 @@
this.draw10.SetBackImageAutoSize = true;
this.draw10.Size = new System.Drawing.Size(750, 330);
this.draw10.TabIndex = 1099;
this.draw10.Text = "Line10";
this.draw10.Text = "Lane10";
//
// ControlMainDisplayDotGraph10
//

4
INT69DB_2A/Controls/ControlMainDisplayDotGraph2.Designer.cs generated
View File

@ -62,7 +62,7 @@
this.draw2.SetBackImageAutoSize = true;
this.draw2.Size = new System.Drawing.Size(750, 330);
this.draw2.TabIndex = 965;
this.draw2.Text = "Line2";
this.draw2.Text = "Lane2";
//
// draw1
//
@ -79,7 +79,7 @@
this.draw1.SetBackImageAutoSize = true;
this.draw1.Size = new System.Drawing.Size(750, 330);
this.draw1.TabIndex = 964;
this.draw1.Text = "Line1";
this.draw1.Text = "Lane1";
//
// pictureBoxBypass2
//

2
INT69DB_2A/Controls/ControlMainDisplayDotGraph2.cs
View File

@ -105,7 +105,7 @@ namespace INT69DB_2A.Controls
chartchPenStyle[0].m_chColor = Color.Yellow;
chartchPenStyle[0].m_iPenWidth = 2;
draw.SetChartCfg(103, 310, 627, 290, 2, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1);
draw.SetChartCfg(103, 310, 627, 290, 16, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1);
draw.ChartChannelPenStyle = chartchPenStyle;
}

6
INT69DB_2A/Controls/ControlMainDisplayDotGraph3.Designer.cs generated
View File

@ -66,7 +66,7 @@
this.draw3.SetBackImageAutoSize = true;
this.draw3.Size = new System.Drawing.Size(750, 330);
this.draw3.TabIndex = 953;
this.draw3.Text = "Line3";
this.draw3.Text = "Lane3";
//
// draw2
//
@ -83,7 +83,7 @@
this.draw2.SetBackImageAutoSize = true;
this.draw2.Size = new System.Drawing.Size(750, 330);
this.draw2.TabIndex = 952;
this.draw2.Text = "Line2";
this.draw2.Text = "Lane2";
//
// draw1
//
@ -100,7 +100,7 @@
this.draw1.SetBackImageAutoSize = true;
this.draw1.Size = new System.Drawing.Size(750, 330);
this.draw1.TabIndex = 951;
this.draw1.Text = "Line1";
this.draw1.Text = "Lane1";
//
// pictureBoxBypass3
//

2
INT69DB_2A/Controls/ControlMainDisplayDotGraph3.cs
View File

@ -108,7 +108,7 @@ namespace INT69DB_2A.Controls
chartchPenStyle[0].m_chColor = Color.Yellow;
chartchPenStyle[0].m_iPenWidth = 2;
draw.SetChartCfg(103, 310, 627, 290, 2, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1);
draw.SetChartCfg(103, 310, 627, 290, 16, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1);
draw.ChartChannelPenStyle = chartchPenStyle;
}

8
INT69DB_2A/Controls/ControlMainDisplayDotGraph4.Designer.cs generated
View File

@ -63,7 +63,7 @@
this.draw4.SetBackImageAutoSize = true;
this.draw4.Size = new System.Drawing.Size(750, 330);
this.draw4.TabIndex = 937;
this.draw4.Text = "Line4";
this.draw4.Text = "Lane4";
//
// draw3
//
@ -80,7 +80,7 @@
this.draw3.SetBackImageAutoSize = true;
this.draw3.Size = new System.Drawing.Size(750, 330);
this.draw3.TabIndex = 936;
this.draw3.Text = "Line3";
this.draw3.Text = "Lane3";
//
// draw2
//
@ -97,7 +97,7 @@
this.draw2.SetBackImageAutoSize = true;
this.draw2.Size = new System.Drawing.Size(750, 330);
this.draw2.TabIndex = 935;
this.draw2.Text = "Line2";
this.draw2.Text = "Lane2";
//
// draw1
//
@ -114,7 +114,7 @@
this.draw1.SetBackImageAutoSize = true;
this.draw1.Size = new System.Drawing.Size(750, 330);
this.draw1.TabIndex = 934;
this.draw1.Text = "Line1";
this.draw1.Text = "Lane1";
//
// pictureBoxBypass4
//

2
INT69DB_2A/Controls/ControlMainDisplayDotGraph4.cs
View File

@ -111,7 +111,7 @@ namespace INT69DB_2A.Controls
chartchPenStyle[0].m_chColor = Color.Yellow;
chartchPenStyle[0].m_iPenWidth = 2;
draw.SetChartCfg(103, 310, 627, 290, 2, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1);
draw.SetChartCfg(103, 310, 627, 290, 16, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1);
draw.ChartChannelPenStyle = chartchPenStyle;
}

10
INT69DB_2A/Controls/ControlMainDisplayDotGraph5.Designer.cs generated
View File

@ -66,7 +66,7 @@
this.draw5.SetBackImageAutoSize = true;
this.draw5.Size = new System.Drawing.Size(750, 330);
this.draw5.TabIndex = 918;
this.draw5.Text = "Line5";
this.draw5.Text = "Lane5";
//
// draw4
//
@ -83,7 +83,7 @@
this.draw4.SetBackImageAutoSize = true;
this.draw4.Size = new System.Drawing.Size(750, 330);
this.draw4.TabIndex = 917;
this.draw4.Text = "Line4";
this.draw4.Text = "Lane4";
//
// draw3
//
@ -100,7 +100,7 @@
this.draw3.SetBackImageAutoSize = true;
this.draw3.Size = new System.Drawing.Size(750, 330);
this.draw3.TabIndex = 916;
this.draw3.Text = "Line3";
this.draw3.Text = "Lane3";
//
// draw2
//
@ -117,7 +117,7 @@
this.draw2.SetBackImageAutoSize = true;
this.draw2.Size = new System.Drawing.Size(750, 330);
this.draw2.TabIndex = 915;
this.draw2.Text = "Line2";
this.draw2.Text = "Lane2";
//
// draw1
//
@ -134,7 +134,7 @@
this.draw1.SetBackImageAutoSize = true;
this.draw1.Size = new System.Drawing.Size(750, 330);
this.draw1.TabIndex = 914;
this.draw1.Text = "Line1";
this.draw1.Text = "Lane1";
//
// pictureBoxBypass5
//

2
INT69DB_2A/Controls/ControlMainDisplayDotGraph5.cs
View File

@ -114,7 +114,7 @@ namespace INT69DB_2A.Controls
chartchPenStyle[0].m_chColor = Color.Yellow;
chartchPenStyle[0].m_iPenWidth = 2;
draw.SetChartCfg(103, 310, 627, 290, 2, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1);
draw.SetChartCfg(103, 310, 627, 290, 16, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1);
draw.ChartChannelPenStyle = chartchPenStyle;
}

12
INT69DB_2A/Controls/ControlMainDisplayDotGraph6.Designer.cs generated
View File

@ -340,7 +340,7 @@
this.draw1.SetBackImageAutoSize = true;
this.draw1.Size = new System.Drawing.Size(750, 330);
this.draw1.TabIndex = 890;
this.draw1.Text = "Line1";
this.draw1.Text = "Lane1";
//
// draw2
//
@ -357,7 +357,7 @@
this.draw2.SetBackImageAutoSize = true;
this.draw2.Size = new System.Drawing.Size(750, 330);
this.draw2.TabIndex = 891;
this.draw2.Text = "Line2";
this.draw2.Text = "Lane2";
//
// draw3
//
@ -374,7 +374,7 @@
this.draw3.SetBackImageAutoSize = true;
this.draw3.Size = new System.Drawing.Size(750, 330);
this.draw3.TabIndex = 892;
this.draw3.Text = "Line3";
this.draw3.Text = "Lane3";
//
// draw4
//
@ -391,7 +391,7 @@
this.draw4.SetBackImageAutoSize = true;
this.draw4.Size = new System.Drawing.Size(750, 330);
this.draw4.TabIndex = 893;
this.draw4.Text = "Line4";
this.draw4.Text = "Lane4";
//
// draw5
//
@ -408,7 +408,7 @@
this.draw5.SetBackImageAutoSize = true;
this.draw5.Size = new System.Drawing.Size(750, 330);
this.draw5.TabIndex = 894;
this.draw5.Text = "Line5";
this.draw5.Text = "Lane5";
//
// draw6
//
@ -425,7 +425,7 @@
this.draw6.SetBackImageAutoSize = true;
this.draw6.Size = new System.Drawing.Size(750, 330);
this.draw6.TabIndex = 895;
this.draw6.Text = "Line6";
this.draw6.Text = "Lane6";
//
// ControlMainDisplayDotGraph6
//

2
INT69DB_2A/Controls/ControlMainDisplayDotGraph6.cs
View File

@ -117,7 +117,7 @@ namespace INT69DB_2A.Controls
chartchPenStyle[0].m_chColor = Color.Yellow;
chartchPenStyle[0].m_iPenWidth = 2;
draw.SetChartCfg(103, 310, 627, 290, 2, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1);
draw.SetChartCfg(103, 310, 627, 290, 16, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1);
draw.ChartChannelPenStyle = chartchPenStyle;
}

14
INT69DB_2A/Controls/ControlMainDisplayDotGraph7.Designer.cs generated
View File

@ -389,7 +389,7 @@
this.draw6.SetBackImageAutoSize = true;
this.draw6.Size = new System.Drawing.Size(750, 330);
this.draw6.TabIndex = 1075;
this.draw6.Text = "Line6";
this.draw6.Text = "Lane6";
//
// draw5
//
@ -406,7 +406,7 @@
this.draw5.SetBackImageAutoSize = true;
this.draw5.Size = new System.Drawing.Size(750, 330);
this.draw5.TabIndex = 1074;
this.draw5.Text = "Line5";
this.draw5.Text = "Lane5";
//
// draw4
//
@ -423,7 +423,7 @@
this.draw4.SetBackImageAutoSize = true;
this.draw4.Size = new System.Drawing.Size(750, 330);
this.draw4.TabIndex = 1073;
this.draw4.Text = "Line4";
this.draw4.Text = "Lane4";
//
// draw3
//
@ -440,7 +440,7 @@
this.draw3.SetBackImageAutoSize = true;
this.draw3.Size = new System.Drawing.Size(750, 330);
this.draw3.TabIndex = 1072;
this.draw3.Text = "Line3";
this.draw3.Text = "Lane3";
//
// draw2
//
@ -457,7 +457,7 @@
this.draw2.SetBackImageAutoSize = true;
this.draw2.Size = new System.Drawing.Size(750, 330);
this.draw2.TabIndex = 1071;
this.draw2.Text = "Line2";
this.draw2.Text = "Lane2";
//
// draw1
//
@ -474,7 +474,7 @@
this.draw1.SetBackImageAutoSize = true;
this.draw1.Size = new System.Drawing.Size(750, 330);
this.draw1.TabIndex = 1070;
this.draw1.Text = "Line1";
this.draw1.Text = "Lane1";
//
// draw7
//
@ -491,7 +491,7 @@
this.draw7.SetBackImageAutoSize = true;
this.draw7.Size = new System.Drawing.Size(750, 330);
this.draw7.TabIndex = 1076;
this.draw7.Text = "Line7";
this.draw7.Text = "Lane7";
//
// ControlMainDisplayDotGraph7
//

2
INT69DB_2A/Controls/ControlMainDisplayDotGraph7.cs
View File

@ -120,7 +120,7 @@ namespace INT69DB_2A.Controls
chartchPenStyle[0].m_chColor = Color.Yellow;
chartchPenStyle[0].m_iPenWidth = 2;
draw.SetChartCfg(103, 310, 627, 290, 2, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1);
draw.SetChartCfg(103, 310, 627, 290, 16, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1);
draw.ChartChannelPenStyle = chartchPenStyle;
}

16
INT69DB_2A/Controls/ControlMainDisplayDotGraph8.Designer.cs generated
View File

@ -438,7 +438,7 @@
this.draw8.SetBackImageAutoSize = true;
this.draw8.Size = new System.Drawing.Size(750, 330);
this.draw8.TabIndex = 1107;
this.draw8.Text = "Line8";
this.draw8.Text = "Lane8";
//
// draw7
//
@ -455,7 +455,7 @@
this.draw7.SetBackImageAutoSize = true;
this.draw7.Size = new System.Drawing.Size(750, 330);
this.draw7.TabIndex = 1106;
this.draw7.Text = "Line7";
this.draw7.Text = "Lane7";
//
// draw6
//
@ -472,7 +472,7 @@
this.draw6.SetBackImageAutoSize = true;
this.draw6.Size = new System.Drawing.Size(750, 330);
this.draw6.TabIndex = 1105;
this.draw6.Text = "Line6";
this.draw6.Text = "Lane6";
//
// draw5
//
@ -489,7 +489,7 @@
this.draw5.SetBackImageAutoSize = true;
this.draw5.Size = new System.Drawing.Size(750, 330);
this.draw5.TabIndex = 1104;
this.draw5.Text = "Line5";
this.draw5.Text = "Lane5";
//
// draw4
//
@ -506,7 +506,7 @@
this.draw4.SetBackImageAutoSize = true;
this.draw4.Size = new System.Drawing.Size(750, 330);
this.draw4.TabIndex = 1103;
this.draw4.Text = "Line4";
this.draw4.Text = "Lane4";
//
// draw3
//
@ -523,7 +523,7 @@
this.draw3.SetBackImageAutoSize = true;
this.draw3.Size = new System.Drawing.Size(750, 330);
this.draw3.TabIndex = 1102;
this.draw3.Text = "Line3";
this.draw3.Text = "Lane3";
//
// draw2
//
@ -540,7 +540,7 @@
this.draw2.SetBackImageAutoSize = true;
this.draw2.Size = new System.Drawing.Size(750, 330);
this.draw2.TabIndex = 1101;
this.draw2.Text = "Line2";
this.draw2.Text = "Lane2";
//
// draw1
//
@ -557,7 +557,7 @@
this.draw1.SetBackImageAutoSize = true;
this.draw1.Size = new System.Drawing.Size(750, 330);
this.draw1.TabIndex = 1100;
this.draw1.Text = "Line1";
this.draw1.Text = "Lane1";
//
// ControlMainDisplayDotGraph8
//

2
INT69DB_2A/Controls/ControlMainDisplayDotGraph8.cs
View File

@ -123,7 +123,7 @@ namespace INT69DB_2A.Controls
chartchPenStyle[0].m_chColor = Color.Yellow;
chartchPenStyle[0].m_iPenWidth = 2;
draw.SetChartCfg(103, 310, 627, 290, 2, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1);
draw.SetChartCfg(103, 310, 627, 290, 16, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1);
draw.ChartChannelPenStyle = chartchPenStyle;
}

4
INT69DB_2A/Forms/FormConfiguration.cs
View File

@ -572,13 +572,11 @@ namespace INT69DB_2A.Forms
string before = "", after = "";
before = this.comboBoxDecimalPlaces.Items.IndexOf(this.ParentForm.SystemConfig.DecimalPlaces).ToString();
this.ParentForm.SystemConfig.DecimalPlaces = this.comboBoxDecimalPlaces.SelectedIndex;
this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig);
after = this.comboBoxDecimalPlaces.SelectedItem.ToString();
if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.EtcDecimalpoint, "", before, after);
if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig);
}
private void labelAlarmContinuousNG_Click(object sender, EventArgs e)

6
INT69DB_2A/Forms/FormInformation.cs
View File

@ -109,7 +109,7 @@ namespace INT69DB_2A.Forms
}
private void DefaultSetting()
{
this.labelDisplayVer.Text = "5.3.0";
this.labelDisplayVer.Text = "6.1.1";
this.labelUserMgerVer.Text = "";
this.labelAes128Ver.Text = "";
this.labelSerialNo.Text = this.ParentForm.SystemConfig.SerialNumber;
@ -403,7 +403,9 @@ namespace INT69DB_2A.Forms
{
this.ParentForm.SystemConfig.CurrentForm = DataStore.FormStore.FormInformation;
this.ParentForm.TransferDataStream(CommunicationCommand.Read, CommunicationID.MainBoard, CommunicationAddress._1500_ProgramVersion, "");
SerialMgrComm.serialPort_GetVersion();
if (this.ParentForm.FlagDllSerial == true)
SerialMgrComm.serialPort_GetVersion();
if (this.ParentForm.SystemConfig.IsLogin == true)
UserManager.UserManager_GetVersion();

23
INT69DB_2A/Forms/FormMain.Designer.cs generated
View File

@ -41,6 +41,7 @@
this.timerUserList = new System.Windows.Forms.Timer();
this.timerTimeOutTransmission = new System.Windows.Forms.Timer();
this.smartSerialPortCom3 = new SmartX.SmartSerialPort();
this.smartSerialPortLink = new SmartX.SmartSerialPort();
((System.ComponentModel.ISupportInitialize)(this.smartForm)).BeginInit();
this.SuspendLayout();
//
@ -123,6 +124,27 @@
this.smartSerialPortCom3.STXCodes = null;
this.smartSerialPortCom3.TailErrorCodeOffset = 0;
//
// smartSerialPortLink
//
this.smartSerialPortLink.Baud_Rate = SmartX.SmartSerialPort.BAUDRATE._115200bps;
this.smartSerialPortLink.ErrorCheckCodeType = SmartX.SmartSerialPort.ERRORCHECKCODETYPES.ASCIICODE;
this.smartSerialPortLink.ErrorCheckMode = SmartX.SmartSerialPort.ERRORCHECK.NONE;
this.smartSerialPortLink.ErrorCode_Location = SmartX.SmartSerialPort.ERRORCODELOCATION.HEADER;
this.smartSerialPortLink.ETXCode = ((byte)(3));
this.smartSerialPortLink.ETXCodes = null;
this.smartSerialPortLink.FrameBufferSize = ((uint)(4096u));
this.smartSerialPortLink.FrameSeparationType = SmartX.SmartSerialPort.FRAMESEPARATIONTYPES.STXANDETX;
this.smartSerialPortLink.HeadErrorCodeOffset = 0;
this.smartSerialPortLink.PortNo = SmartX.SmartSerialPort.COMPORTNO.COM2;
this.smartSerialPortLink.ReadTimeout = -1;
this.smartSerialPortLink.ReceiveDetect = SmartX.SmartSerialPort.RECEIVEDETECTTYPE.EVENT_QUEUE;
this.smartSerialPortLink.ReceiveFrameDebugMode = false;
this.smartSerialPortLink.RS485SoftwareDetection = false;
this.smartSerialPortLink.STXCode = ((byte)(2));
this.smartSerialPortLink.STXCodes = null;
this.smartSerialPortLink.TailErrorCodeOffset = 0;
this.smartSerialPortLink.OnReadQueueEvent += new SmartX.SmartSerialPort.ReceiveDataHandler(this.smartSerialPortLink_OnReadQueueEvent);
//
// FormMain
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@ -151,6 +173,7 @@
private System.Windows.Forms.Timer timerUserList;
public System.Windows.Forms.Timer timerTimeOutTransmission;
public SmartX.SmartSerialPort smartSerialPortCom3;
private SmartX.SmartSerialPort smartSerialPortLink;
}
}

140
INT69DB_2A/Forms/FormMain.cs
View File

@ -41,6 +41,8 @@ namespace INT69DB_2A.Forms
private bool IsTimerWaitResponseEnableTrue;
public int FlagAutomaticLogoutWarningTime; //Part11 Auto Logout
public string ComPortMainToLCD; // DllSerial Port
public bool FlagDllSerial; // DllSerial 사용여부
private string TransferNum; // 수신데이터 ID저장 (재전송 시 사용)
// Motor Download 통신용 변수
public int LineNum;
@ -437,6 +439,7 @@ namespace INT69DB_2A.Forms
this.EquipmentStatus = DataStore.EquipmentStatus.Stop;
this.ColorLogOff = Color.Red;
this.ColorLogOn = Color.Yellow;
this.TransferNum = "-";
this.PathLaunchFolder = "SD Card\\";
this.PathSystemFileFolder1 = this.PathLaunchFolder + "SystemFile1\\";
@ -546,12 +549,17 @@ namespace INT69DB_2A.Forms
this.CurrentAlarmTotalPassCnt = new Counter(this.SystemConfig.EquipmentColumns, this.SystemConfig.AlarmTotalPassCnt);
// SerialDll Initialize
this.ComPortMainToLCD = "COM2:";
SerialMgrComm.IntializeSerialManager();
SerialMgrComm.SerialPortMessageReceive += this.SerialPort_MessageReceive;
SerialMgrComm.SerialPortErrMessageReceive += this.SerialPort_ErrMessageReceive;
SerialMgrComm.SerialPortGetVersionDataEvent += this.Serialport_GetVersionDataEvent;
// DllSerial 사용여부 설정
this.FlagDllSerial = false;
if (this.FlagDllSerial == true)
{
// SerialDll Initialize
this.ComPortMainToLCD = "COM2:";
SerialMgrComm.IntializeSerialManager();
SerialMgrComm.SerialPortMessageReceive += this.SerialPort_MessageReceive;
SerialMgrComm.SerialPortErrMessageReceive += this.SerialPort_ErrMessageReceive;
SerialMgrComm.SerialPortGetVersionDataEvent += this.Serialport_GetVersionDataEvent;
}
}
private bool UI_Invoke(ThreadStart invoker)
{
@ -3607,7 +3615,13 @@ namespace INT69DB_2A.Forms
try
{
SerialMgrComm.serialPortOpen(this.ComPortMainToLCD, 115200, 0, 0, 8);
if (this.FlagDllSerial == true)
SerialMgrComm.serialPortOpen(this.ComPortMainToLCD, 115200, 0, 0, 8);
else
{
if (this.smartSerialPortLink.IsOpen == false)
this.smartSerialPortLink.Open();
}
}
catch
{
@ -3627,7 +3641,10 @@ namespace INT69DB_2A.Forms
}
public void CloseSmartUartLink()
{
SerialMgrComm.serialPortClose(this.ComPortMainToLCD);
if (this.FlagDllSerial == true)
SerialMgrComm.serialPortClose(this.ComPortMainToLCD);
else
this.smartSerialPortLink.Close();
}
private bool SizeCheck(string cmd, string strTemp)
@ -3833,7 +3850,14 @@ namespace INT69DB_2A.Forms
sb.Append(chkSum);
SerialMgrComm.serialPortMessage(this.ComPortMainToLCD, sb.ToString());
// Serial Write
if (this.FlagDllSerial == true)
SerialMgrComm.serialPortMessage(this.ComPortMainToLCD, sb.ToString());
else
{
if (this.smartSerialPortLink.IsOpen == true)
this.smartSerialPortLink.WriteFrame(sb.ToString(), SmartSerialPort.CODETYPES.ASCIICODE);
}
// 통신 확인 로그
if (this.IsCommunicationLogOpen == true)
@ -3880,7 +3904,14 @@ namespace INT69DB_2A.Forms
for (int i = 0; i < byteCollection.Count; i++)
byteData[i] = byteCollection[i];
SerialMgrComm.serialPortMessageByte(this.ComPortMainToLCD, byteData, byteData.Length);
// Serial Write
if (this.FlagDllSerial == true)
SerialMgrComm.serialPortMessageByte(this.ComPortMainToLCD, byteData, byteData.Length);
else
{
if (this.smartSerialPortLink.IsOpen == true)
this.smartSerialPortLink.WriteFrame(byteData);
}
// 통신 확인 로그
if (this.IsCommunicationLogOpen == true)
@ -3911,7 +3942,14 @@ namespace INT69DB_2A.Forms
sb.Append(chkSum);
SerialMgrComm.serialPortMessage(this.ComPortMainToLCD, sb.ToString());
// Serial Write
if (this.FlagDllSerial == true)
SerialMgrComm.serialPortMessage(this.ComPortMainToLCD, sb.ToString());
else
{
if (this.smartSerialPortLink.IsOpen == true)
this.smartSerialPortLink.WriteFrame(sb.ToString(), SmartSerialPort.CODETYPES.ASCIICODE);
}
// 통신 확인 로그
if (this.IsCommunicationLogOpen == true)
@ -3947,6 +3985,53 @@ namespace INT69DB_2A.Forms
{
}
}
private void ReceiveData()
{
int ret = 0;
string strTemp = "";
byte[] readByte;
SmartSerialPort.FRAMEDATAREADSTATUS receiveDataState = SmartSerialPort.FRAMEDATAREADSTATUS.EMPTY;
try
{
receiveDataState = this.smartSerialPortLink.ReadQueue(out readByte);
strTemp = Encoding.Default.GetString(readByte, 0, readByte.Length);
}
catch
{
return;
}
if ((receiveDataState == SmartSerialPort.FRAMEDATAREADSTATUS.EMPTY) || (receiveDataState == SmartSerialPort.FRAMEDATAREADSTATUS.FAILDATA))
{
return;
}
try
{
switch (strTemp[0])
{
case 'C':
if ((ret = this.ReceiveCommandC(strTemp)) != 0)
return;
break;
case 'P':
if ((ret = this.ReceiveCommandP(strTemp)) != 0)
return;
break;
case 'S':
if ((ret = this.ReceiveCommandS(strTemp)) != 0)
return;
break;
default:
break;
}
}
catch
{
}
}
private int ReceiveCommandC(string strTemp)
{
@ -4119,6 +4204,11 @@ namespace INT69DB_2A.Forms
return ret;
break;
case "SR0":
if (this.TransferNum != transferNum)
this.TransferNum = transferNum;
else
return ret = -1;
if ((ret = this.ReceiveCommandSR0(lane, receiveData)) != 0)
return ret;
break;
@ -5595,7 +5685,7 @@ namespace INT69DB_2A.Forms
// 판정설정 그래프
private int ReceiveCommandSG0(string lane, string receiveData)
{
int ret = 0, temp = 12;
int ret = 0, temp = 20;
switch (lane)
{
@ -8138,13 +8228,12 @@ namespace INT69DB_2A.Forms
// 폼생성
this.CreateForm();
this.SmartSplashProgramLoad.Finish();
this.smartForm.Show((int)DataStore.FormStore.FormMainDisplay);
// 통신 OPEN
this.OpenSmartUartLink();
this.SmartSplashProgramLoad.Finish();
this.smartForm.Show((int)DataStore.FormStore.FormMainDisplay);
// Serial3 통신 Open
this.UartCom3Open();
Thread.Sleep(100);
@ -8331,6 +8420,23 @@ namespace INT69DB_2A.Forms
}
}
private void smartSerialPortLink_OnReadQueueEvent()
{
this.ReceiveData();
// 통신 확인
if (this.CommunicationCheckCount / 3 == 1)
{
this.ChildFormMainDisplay.pictureBoxCommunicationStatus.Visible = true;
this.CommunicationCheckCount = 0;
}
else
{
this.ChildFormMainDisplay.pictureBoxCommunicationStatus.Visible = false;
this.CommunicationCheckCount += 1;
}
}
private void timerWaitResponse_Tick(object sender, EventArgs e)
{
// 로그

3
INT69DB_2A/Forms/FormMain.resx
View File

@ -150,6 +150,9 @@
<metadata name="smartSerialPortCom3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>370, 56</value>
</metadata>
<metadata name="smartSerialPortLink.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>539, 56</value>
</metadata>
<metadata name="$this.FormFactorShadowProperty" xml:space="preserve">
<value>WEBPAD</value>
</metadata>

2
INT69DB_2A/Forms/FormMainDisplay.Designer.cs generated
View File

@ -418,7 +418,7 @@
this.labelTitleNGCount.Name = "labelTitleNGCount";
this.labelTitleNGCount.Size = new System.Drawing.Size(70, 20);
this.labelTitleNGCount.TabIndex = 183;
this.labelTitleNGCount.Text = "EXNG";
this.labelTitleNGCount.Text = "NG";
this.labelTitleNGCount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
this.labelTitleNGCount.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.labelTitleNGCount.Wordwrap = false;

1
INT69DB_2A/Forms/FormSystemSetting.cs
View File

@ -320,7 +320,6 @@ namespace INT69DB_2A.Forms
this.buttonLine1.ButtonDown();
for (int i = 1; i < this.CollectionButtonLine.Count; i++)
this.CollectionButtonLine[i].ButtonUp();
this.ParentForm.TransferData(CommunicationCommand.ModeJudgment, CommunicationID.SubBoard1);
this.SelectedProductItem = new ProductItem();
this.SelectedJudgmentSetItem = new JudgmentSetItem();

24
INT69DB_2A/Version.txt
View File

@ -15,6 +15,30 @@
멀티형 2~6열 스틱 계량기
*/
@ Ver 6.1.1 by LSJ
- 2025.01.02
- Ver 6.1.0 Modify
- Framework : SmartX Framework V3.2.4(update: 2021.01.20)
- 시스템설정
판정 그래프 안그려지는 버그 수정
// 판정설정 그래프
private int ReceiveCommandSG0(string lane, string receiveData)
temp = 12 -> 20 수정
속도 데이터가 추가 되어있다고함(실제로는 -99990000 이거만 수신됨..)
@ Ver 6.1.0 by LSJ
- 2024.12.05
- Ver 6.0.0 Modify
- Framework : SmartX Framework V3.2.4(update: 2021.01.20)
- SerialDll 미사용
SmartSerialPort 사용
- 환경설정 소수점 저장안되는 버그 수정
- XY 그래프 화면 데이터 갯수 수정
draw.SetChartCfg(103, 310, 627, 290, 2, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1);
-> draw.SetChartCfg(103, 310, 627, 290, 16, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1);
627/2 = 313
627/16 = 39
@ Ver 6.0.0 by CJY
- 2024.11.19
- Ver 5.2.1 Modify