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

changed to expression body solution wide

Browse Source
This commit is contained in:
Federico Barresi
2020-06-05 12:09:54 +02:00
parent 63c3e858e0
commit 906846775e
4 changed files with 30 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Sharp7.Tests/S7Server.cs
View File

@@ -345,10 +345,7 @@ namespace Sharp7.Tests
else else
return 0; return 0;
} }
set set => Srv_SetMask(server, S7Server.MkLog, value);
{
Srv_SetMask(server, S7Server.MkLog, value);
}
} }
// Property EventMask R/W // Property EventMask R/W
@@ -365,10 +362,7 @@ namespace Sharp7.Tests
else else
return 0; return 0;
} }
set set => Srv_SetMask(server, S7Server.MkEvent, value);
{
Srv_SetMask(server, S7Server.MkEvent, value);
}
} }
@@ -395,10 +389,7 @@ namespace Sharp7.Tests
else else
return -1; return -1;
} }
set set => Srv_SetCpuStatus(server, value);
{
Srv_SetCpuStatus(server, value);
}
} }
// Property Server Status Read Only // Property Server Status Read Only

39
Sharp7/MsgSocket.cs
View File

@@ -160,48 +160,23 @@ namespace Sharp7
return LastError; return LastError;
} }
public bool Connected public bool Connected => (TCPSocket != null) && (TCPSocket.Connected);
{
get
{
return (TCPSocket != null) && (TCPSocket.Connected);
}
}
public int ReadTimeout public int ReadTimeout
{ {
get get => _ReadTimeout;
{ set => _ReadTimeout = value;
return _ReadTimeout;
}
set
{
_ReadTimeout = value;
}
} }
public int WriteTimeout public int WriteTimeout
{ {
get get => _WriteTimeout;
{ set => _WriteTimeout = value;
return _WriteTimeout;
}
set
{
_WriteTimeout = value;
}
} }
public int ConnectTimeout public int ConnectTimeout
{ {
get get => _ConnectTimeout;
{ set => _ConnectTimeout = value;
return _ConnectTimeout;
}
set
{
_ConnectTimeout = value;
}
} }
} }
} }

70
Sharp7/S7Client.cs
View File

@@ -2235,28 +2235,13 @@ namespace Sharp7
return Time_ms; return Time_ms;
} }
public int ExecutionTime public int ExecutionTime => Time_ms;
{
get
{
return Time_ms;
}
}
public int PduSizeNegotiated public int PduSizeNegotiated => _PDULength;
{
get
{
return _PDULength;
}
}
public int PduSizeRequested public int PduSizeRequested
{ {
get get => _PduSizeRequested;
{
return _PduSizeRequested;
}
set set
{ {
if (value < MinPduSizeToRequest) if (value < MinPduSizeToRequest)
@@ -2269,60 +2254,29 @@ namespace Sharp7
public int PLCPort public int PLCPort
{ {
get get => _PLCPort;
{ set => _PLCPort = value;
return _PLCPort;
}
set
{
_PLCPort = value;
}
} }
public int ConnTimeout public int ConnTimeout
{ {
get get => Socket.ConnectTimeout;
{ set => Socket.ConnectTimeout = value;
return Socket.ConnectTimeout;
}
set
{
Socket.ConnectTimeout = value;
}
} }
public int RecvTimeout public int RecvTimeout
{ {
get get => Socket.ReadTimeout;
{ set => Socket.ReadTimeout = value;
return Socket.ReadTimeout;
}
set
{
Socket.ReadTimeout = value;
}
} }
public int SendTimeout public int SendTimeout
{ {
get get => Socket.WriteTimeout;
{ set => Socket.WriteTimeout = value;
return Socket.WriteTimeout;
}
set
{
Socket.WriteTimeout = value;
}
}
public bool Connected
{
get
{
return (Socket != null) && (Socket.Connected);
}
} }
public bool Connected => (Socket != null) && (Socket.Connected);
#endregion #endregion
} }

36
Sharp7/S7Timer.cs
View File

@@ -51,34 +51,14 @@ namespace Sharp7
this.q = (buff[8] & 0x02) == 0x02; this.q = (buff[8] & 0x02) == 0x02;
} }
} }
public TimeSpan PT public TimeSpan PT => pt;
{
get public TimeSpan ET => et;
{
return pt; public bool IN => input;
}
} public bool Q => q;
public TimeSpan ET
{
get
{
return et;
}
}
public bool IN
{
get
{
return input;
}
}
public bool Q
{
get
{
return q;
}
}
#endregion #endregion
} }
} }