SW/CPXV2
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[성현모] Svn 업데이트 받기

Browse Source
This commit is contained in:
SHM
2025-07-11 09:21:30 +09:00
parent 6e462ca991
commit f0c63da29d
22 changed files with 364 additions and 847 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
SystemX.Net.CP.Platform/SystemX.Net.Platform/Properties/AssemblyInfo.cs
View File

@ -6,12 +6,12 @@ using System.Runtime.InteropServices;
// 제어됩니다. 어셈블리와 관련된 정보를 수정하려면
// 이러한 특성 값을 변경하세요.
[assembly: AssemblyTitle("SystemX.Net.Platform")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyDescription("CPX Platform")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyCompany("SystemX")]
[assembly: AssemblyProduct("SystemX.Net.Platform")]
[assembly: AssemblyCopyright("Copyright © 2020")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCopyright("© 2025 SystemX Co., Ltd. All rights reserved.")]
[assembly: AssemblyTrademark("CPX Platform")]
[assembly: AssemblyCulture("")]
// ComVisible을 false로 설정하면 이 어셈블리의 형식이 COM 구성 요소에
@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를
// 기본값으로 할 수 있습니다.
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("2025.05.15.0001")]
[assembly: AssemblyFileVersion("2025.05.15.0001")]

90
SystemX.Net.CP.Platform/SystemX.Net.Platform/SystemX.Net.Comm/AsyncClientSocket.cs
View File

@ -679,23 +679,13 @@ namespace SystemX.Net.Comm
if (nReadSize != 0)
{
byte[] ucFindData = new byte[1];
//byte[] ucSetClearArray;
int iFindDataCnt = 0;
//bool bSegmentFind = false;
bool bDataFind = false;
byte ucGetLabel = 0;
try
{
/*
Array.Copy(recvBuffer, 0, recvStoreBuffer, iStoreCnt, nReadSize);
iStoreCnt += nReadSize;
*/
if (bQueuePacketClearOn)
{
bQueuePacketClearOn = false;
@ -795,90 +785,10 @@ namespace SystemX.Net.Comm
}
QPacketRemainData.Clear();
//recvText += Encoding.Unicode.GetString(recvBuffer, 0, nReadSize);
/*
for (int i = 0; i < iStoreCnt; i++)
{
if (recvStoreBuffer[i] == 0x0D &&
recvStoreBuffer[i + 1] == 0x02 &&
recvStoreBuffer[i + 6] == 0x08 &&
recvStoreBuffer[i + 7] == 0x0A)
{
ucGetLabel = recvStoreBuffer[i - 1];
uint uiGetPacketSize = 0x0;
uiGetPacketSize |= (uint)(recvStoreBuffer[i + 2] << 24);
uiGetPacketSize |= (uint)(recvStoreBuffer[i + 3] << 16);
uiGetPacketSize |= (uint)(recvStoreBuffer[i + 4] << 8);
uiGetPacketSize |= (uint)(recvStoreBuffer[i + 5] << 0);
int iGetSize = (int)uiGetPacketSize;
iGetSize += XCommons.PAD_SIZE;
if (recvStoreBuffer[i + iGetSize - 4] == 0x0D &&
recvStoreBuffer[i + iGetSize - 3] == 0x02 &&
recvStoreBuffer[i + iGetSize - 2] == 0x08 &&
recvStoreBuffer[i + iGetSize - 1] == 0x0A)
{
iFindDataCnt = iGetSize;
bSegmentFind = true;
}
if (bSegmentFind)
{
iCheckRetryCnt = 0;
ucFindData = new byte[iFindDataCnt];
ucSetClearArray = new byte[(iFindDataCnt + 1)];
Array.Clear(ucSetClearArray, 0, (iFindDataCnt + 1));
Array.Copy(recvStoreBuffer, i, ucFindData, 0, iFindDataCnt);
iStoreCnt -= (iFindDataCnt + 1);
Buffer.BlockCopy(ucSetClearArray, 0, recvStoreBuffer, 0, (iFindDataCnt + 1));
Buffer.BlockCopy(recvStoreBuffer, iStoreCnt, recvStoreBuffer, 0, USER_MAX_SIZE - iStoreCnt);
bDataFind = true;
break;
}
else
{
iCheckRetryCnt++;
if (iCheckRetryCnt > MAX_CHECK_COUNT)
{
iCheckRetryCnt = 0;
ucSetClearArray = new byte[iFindDataCnt];
Array.Clear(ucSetClearArray, 0, iFindDataCnt);
iStoreCnt -= iFindDataCnt;
Buffer.BlockCopy(ucSetClearArray, 0, recvStoreBuffer, 0, iFindDataCnt);
Buffer.BlockCopy(recvStoreBuffer, iStoreCnt, recvStoreBuffer, 0, USER_MAX_SIZE - iStoreCnt);
}
break;
}
}
}
*/
}
catch (Exception e)
{
bDataFind = false;
/*
iStoreCnt = 0;
if(recvStoreBuffer != null) Array.Clear(recvStoreBuffer, 0, recvStoreBuffer.Count());
*/
}
if (bDataFind)

90
SystemX.Net.CP.Platform/SystemX.Net.Platform/SystemX.Net.Comm/AsyncComClientSocket.cs
View File

@ -610,23 +610,13 @@ namespace SystemX.Net.Comm
if (nReadSize != 0)
{
byte[] ucFindData = new byte[1];
//byte[] ucSetClearArray;
int iFindDataCnt = 0;
//bool bSegmentFind = false;
bool bDataFind = false;
byte ucGetLabel = 0;
try
{
/*
Array.Copy(recvBuffer, 0, recvStoreBuffer, iStoreCnt, nReadSize);
iStoreCnt += nReadSize;
*/
if (bQueuePacketClearOn)
{
bQueuePacketClearOn = false;
@ -726,90 +716,10 @@ namespace SystemX.Net.Comm
}
QPacketRemainData.Clear();
//recvText += Encoding.Unicode.GetString(recvBuffer, 0, nReadSize);
/*
for (int i = 0; i < iStoreCnt; i++)
{
if (recvStoreBuffer[i] == 0x0D &&
recvStoreBuffer[i + 1] == 0x02 &&
recvStoreBuffer[i + 6] == 0x08 &&
recvStoreBuffer[i + 7] == 0x0A)
{
ucGetLabel = recvStoreBuffer[i - 1];
uint uiGetPacketSize = 0x0;
uiGetPacketSize |= (uint)(recvStoreBuffer[i + 2] << 24);
uiGetPacketSize |= (uint)(recvStoreBuffer[i + 3] << 16);
uiGetPacketSize |= (uint)(recvStoreBuffer[i + 4] << 8);
uiGetPacketSize |= (uint)(recvStoreBuffer[i + 5] << 0);
int iGetSize = (int)uiGetPacketSize;
iGetSize += XCommons.PAD_SIZE;
if (recvStoreBuffer[i + iGetSize - 4] == 0x0D &&
recvStoreBuffer[i + iGetSize - 3] == 0x02 &&
recvStoreBuffer[i + iGetSize - 2] == 0x08 &&
recvStoreBuffer[i + iGetSize - 1] == 0x0A)
{
iFindDataCnt = iGetSize;
bSegmentFind = true;
}
if (bSegmentFind)
{
iCheckRetryCnt = 0;
ucFindData = new byte[iFindDataCnt];
ucSetClearArray = new byte[(iFindDataCnt + 1)];
Array.Clear(ucSetClearArray, 0, (iFindDataCnt + 1));
Array.Copy(recvStoreBuffer, i, ucFindData, 0, iFindDataCnt);
iStoreCnt -= (iFindDataCnt + 1);
Buffer.BlockCopy(ucSetClearArray, 0, recvStoreBuffer, 0, (iFindDataCnt + 1));
Buffer.BlockCopy(recvStoreBuffer, iStoreCnt, recvStoreBuffer, 0, USER_MAX_SIZE - iStoreCnt);
bDataFind = true;
break;
}
else
{
iCheckRetryCnt++;
if (iCheckRetryCnt > MAX_CHECK_COUNT)
{
iCheckRetryCnt = 0;
ucSetClearArray = new byte[iFindDataCnt];
Array.Clear(ucSetClearArray, 0, iFindDataCnt);
iStoreCnt -= iFindDataCnt;
Buffer.BlockCopy(ucSetClearArray, 0, recvStoreBuffer, 0, iFindDataCnt);
Buffer.BlockCopy(recvStoreBuffer, iStoreCnt, recvStoreBuffer, 0, USER_MAX_SIZE - iStoreCnt);
}
break;
}
}
}
*/
}
catch (Exception e)
{
bDataFind = false;
/*
iStoreCnt = 0;
if (recvStoreBuffer != null) Array.Clear(recvStoreBuffer, 0, recvStoreBuffer.Count());
*/
}
if (bDataFind)

88
SystemX.Net.CP.Platform/SystemX.Net.Platform/SystemX.Net.Comm/AsyncServerSocket.cs
View File

@ -721,20 +721,12 @@ namespace SystemX.Net.Comm
byte[] ucSetClearArray;
int iFindDataCnt = 0;
bool bSegmentFind = false;
bool bDataFind = false;
byte ucGetLabel = 0;
try
{
/*
Array.Copy(recvBuffer, 0, recvStoreBuffer, iStoreCnt, nReadSize);
iStoreCnt += nReadSize;
*/
if(bQueuePacketClearOn)
{
bQueuePacketClearOn = false;
@ -834,90 +826,10 @@ namespace SystemX.Net.Comm
}
QPacketRemainData.Clear();
//recvText += Encoding.Unicode.GetString(recvBuffer, 0, nReadSize);
/*
for (int i = 0; i < iStoreCnt; i++)
{
if (recvStoreBuffer[i] == 0x0D &&
recvStoreBuffer[i + 1] == 0x02 &&
recvStoreBuffer[i + 6] == 0x08 &&
recvStoreBuffer[i + 7] == 0x0A)
{
ucGetLabel = recvStoreBuffer[i - 1];
uint uiGetPacketSize = 0x0;
uiGetPacketSize |= (uint)(recvStoreBuffer[i + 2] << 24);
uiGetPacketSize |= (uint)(recvStoreBuffer[i + 3] << 16);
uiGetPacketSize |= (uint)(recvStoreBuffer[i + 4] << 8);
uiGetPacketSize |= (uint)(recvStoreBuffer[i + 5] << 0);
int iGetSize = (int)uiGetPacketSize;
iGetSize += XCommons.PAD_SIZE;
if (recvStoreBuffer[i + iGetSize - 4] == 0x0D &&
recvStoreBuffer[i + iGetSize - 3] == 0x02 &&
recvStoreBuffer[i + iGetSize - 2] == 0x08 &&
recvStoreBuffer[i + iGetSize - 1] == 0x0A)
{
iFindDataCnt = iGetSize;
bSegmentFind = true;
}
if (bSegmentFind)
{
iCheckRetryCnt = 0;
ucFindData = new byte[iFindDataCnt];
ucSetClearArray = new byte[(iFindDataCnt + 1)];
Array.Clear(ucSetClearArray, 0, (iFindDataCnt + 1));
Array.Copy(recvStoreBuffer, i, ucFindData, 0, iFindDataCnt);
iStoreCnt -= (iFindDataCnt + 1);
Buffer.BlockCopy(ucSetClearArray, 0, recvStoreBuffer, 0, (iFindDataCnt + 1));
Buffer.BlockCopy(recvStoreBuffer, iStoreCnt, recvStoreBuffer, 0, USER_MAX_SIZE - iStoreCnt);
bDataFind = true;
break;
}
else
{
iCheckRetryCnt++;
if (iCheckRetryCnt > MAX_CHECK_COUNT)
{
iCheckRetryCnt = 0;
ucSetClearArray = new byte[iFindDataCnt];
Array.Clear(ucSetClearArray, 0, iFindDataCnt);
iStoreCnt -= iFindDataCnt;
Buffer.BlockCopy(ucSetClearArray, 0, recvStoreBuffer, 0, iFindDataCnt);
Buffer.BlockCopy(recvStoreBuffer, iStoreCnt, recvStoreBuffer, 0, USER_MAX_SIZE - iStoreCnt);
}
break;
}
}
}
*/
}
catch (Exception e)
{
bDataFind = false;
/*
iStoreCnt = 0;
if (recvStoreBuffer != null) Array.Clear(recvStoreBuffer, 0, recvStoreBuffer.Count());
*/
}
//
if (bDataFind)

12
SystemX.Net.CP.Platform/SystemX.PLC/Properties/AssemblyInfo.cs
View File

@ -6,12 +6,12 @@ using System.Runtime.InteropServices;
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("SystemX.PLC")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyDescription("CPX PLC")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyCompany("SystemX")]
[assembly: AssemblyProduct("SystemX.PLC")]
[assembly: AssemblyCopyright("Copyright © 2020")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCopyright("© 2025 SystemX Co., Ltd. All rights reserved.")]
[assembly: AssemblyTrademark("CPX PLC")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("2025.05.15.0001")]
[assembly: AssemblyFileVersion("2025.05.15.0001")]

12
SystemX.Net.CP.Platform/SystemX.XEFCore/Properties/AssemblyInfo.cs
View File

@ -6,12 +6,12 @@ using System.Runtime.InteropServices;
// 제어됩니다. 어셈블리와 관련된 정보를 수정하려면
// 이러한 특성 값을 변경하세요.
[assembly: AssemblyTitle("SystemX.XEFCore")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyDescription("CPX XEFCore")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyCompany("SystemX")]
[assembly: AssemblyProduct("SystemX.XEFCore")]
[assembly: AssemblyCopyright("Copyright © 2024")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCopyright("© 2025 SystemX Co., Ltd. All rights reserved.")]
[assembly: AssemblyTrademark("CPX XEFCore")]
[assembly: AssemblyCulture("")]
// ComVisible을 false로 설정하면 이 어셈블리의 형식이 COM 구성 요소에
@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를
// 기본값으로 할 수 있습니다.
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("2025.05.15.0001")]
[assembly: AssemblyFileVersion("2025.05.15.0001")]