maier_st/Sharp7
1
0
Fork 0
mirror of https://github.com/fbarresi/Sharp7.git synced 2026-02-04 08:42:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

style and security enhancement from codacy

Browse Source
This commit is contained in:
Federico Barresi
2020-05-07 00:42:10 +02:00
parent a073997211
commit e1486d646e
4 changed files with 650 additions and 566 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Sharp7/MsgSocket.cs
View File

@@ -11,8 +11,7 @@ namespace Sharp7
private int _ReadTimeout = 2000;
private int _WriteTimeout = 2000;
private int _ConnectTimeout = 1000;
public int LastError = 0;
private int LastError;
public MsgSocket()
{
}
@@ -49,7 +48,7 @@ namespace Sharp7
IAsyncResult result = PingSocket.BeginConnect(Host, Port, null, null);
bool success = result.AsyncWaitHandle.WaitOne(_ConnectTimeout, true);
if (!success)
if (!success)
{
LastError = S7Consts.errTCPConnectionFailed;
}
@@ -57,7 +56,8 @@ namespace Sharp7
catch
{
LastError = S7Consts.errTCPConnectionFailed;
};
}
PingSocket.Close();
}
@@ -150,7 +150,7 @@ namespace Sharp7
LastError = 0;
try
{
int BytesSent = TCPSocket.Send(Buffer, Size, SocketFlags.None);
TCPSocket.Send(Buffer, Size, SocketFlags.None);
}
catch
{

1165
Sharp7/S7.cs
View File

File diff suppressed because it is too large Load Diff

31
Sharp7/S7MultiVar.cs
View File

@@ -9,11 +9,11 @@ namespace Sharp7
#region [MultiRead/Write Helper]
private S7Client FClient;
private GCHandle[] Handles = new GCHandle[S7Client.MaxVars];
private int Count = 0;
private int Count;
private S7Client.S7DataItem[] Items = new S7Client.S7DataItem[S7Client.MaxVars];
public int[] Results = new int[S7Client.MaxVars];
public int[] Results { get; } = new int[S7Client.MaxVars];
private bool AdjustWordLength(int Area, ref int WordLen, ref int Amount, ref int Start)
{
@@ -45,7 +45,7 @@ namespace Sharp7
{
FClient = Client;
for (int c = 0; c < S7Client.MaxVars; c++)
Results[c] = (int)S7Consts.errCliItemNotAvailable;
Results[c] = S7Consts.errCliItemNotAvailable;
}
~S7MultiVar()
{
@@ -80,32 +80,27 @@ namespace Sharp7
Items[Count].Start = Start;
Items[Count].Amount = Amount;
GCHandle handle = GCHandle.Alloc(Buffer, GCHandleType.Pinned);
#if WINDOWS_UWP || NETFX_CORE
if (IntPtr.Size == 4)
Items[Count].pData = (IntPtr)(handle.AddrOfPinnedObject().ToInt32() + Offset * Marshal.SizeOf<T>());
else
Items[Count].pData = (IntPtr)(handle.AddrOfPinnedObject().ToInt64() + Offset * Marshal.SizeOf<T>());
#else
if (IntPtr.Size == 4)
Items[Count].pData = (IntPtr)(handle.AddrOfPinnedObject().ToInt32() + Offset * Marshal.SizeOf(typeof(T)));
else
Items[Count].pData = (IntPtr)(handle.AddrOfPinnedObject().ToInt64() + Offset * Marshal.SizeOf(typeof(T)));
#endif
Handles[Count] = handle;
Count++;
return true;
}
else
return false;
}
else
return false;
}
return false;
}
public int Read()
{
int FunctionResult;
int GlobalResult = (int)S7Consts.errCliFunctionRefused;
int GlobalResult;
try
{
if (Count > 0)
@@ -117,7 +112,7 @@ namespace Sharp7
GlobalResult = FunctionResult;
}
else
GlobalResult = (int)S7Consts.errCliFunctionRefused;
GlobalResult = S7Consts.errCliFunctionRefused;
}
finally
{
@@ -129,7 +124,7 @@ namespace Sharp7
public int Write()
{
int FunctionResult;
int GlobalResult = (int)S7Consts.errCliFunctionRefused;
int GlobalResult;
try
{
if (Count > 0)
@@ -141,7 +136,7 @@ namespace Sharp7
GlobalResult = FunctionResult;
}
else
GlobalResult = (int)S7Consts.errCliFunctionRefused;
GlobalResult = S7Consts.errCliFunctionRefused;
}
finally
{

10
Sharp7/S7Timer.cs
View File

@@ -9,17 +9,13 @@ namespace Sharp7
#region S7Timer
TimeSpan pt;
TimeSpan et;
bool input = false;
bool q = false;
bool input ;
bool q;
public S7Timer(byte[] buff, int position)
{
if (position + 12 < buff.Length)
{
return;
}
else
{
SetTimer(new List<byte>(buff).GetRange(position, 16).ToArray());
SetTimer(new List<byte>(buff).GetRange(position, 12).ToArray());
}
}