Michael Croes
f47918946d
ci: Run test on ubuntu-20.04 due to lack of snap7 on newer ubuntu
2022-12-10 20:51:44 +01:00
Michael Croes
ce9f9f9e08
Merge pull request #423 from gfoidl/openasync_cancellation
...
Flowed cancellation token to TcpClient.ConnectAsync in .NET 5.0 target
2022-11-08 11:19:37 +01:00
Michael Croes
ea1140314b
Merge branch 'develop' into openasync_cancellation
2022-11-08 11:13:25 +01:00
Michael Croes
7f76d4fc5a
Merge pull request #435 from ismdiego/develop
...
Allow changing the default Encoding used in S7String
2022-06-17 23:12:43 +02:00
diego
ec554ddb59
Better stringEncoding initialization, as per code review comments
2022-06-17 11:23:58 +02:00
diego
2ecd2c6b49
Changes following code review
2022-06-17 11:08:09 +02:00
diego
d808ea5eb6
Give the option of changing the Encoding used to serialize and deserialize S7String, instead of always using Encoding.ASCII
2022-06-16 17:21:23 +02:00
Günther Foidl
5d3f01e59e
Updated AppVeyor image to VS 2022 to allow better conditional compilation
2021-12-26 19:26:44 +01:00
Günther Foidl
9c3f95ce73
Flowed cancellation token to TcpClient.ConnectAsync in .NET 5.0 target
2021-12-26 19:26:04 +01:00
Michael Croes
b475aee2e7
Merge pull request #401 from scamille/test-ConnectionClose
...
Add unit test to ensure a connection has been properly closed
2021-06-10 17:04:42 +02:00
Serge Camille
82a745c972
Merge branch 'develop' into test-ConnectionClose
2021-06-08 22:53:30 +02:00
Serge Camille
74fecad48d
Remove cancel timeouts.
2021-06-08 22:47:12 +02:00
Michael Croes
37c63cea8e
Merge pull request #402 from mycroes/default-timeout
...
Default ReadTimeout and WriteTimeout to 10 seconds
2021-06-07 22:23:57 +02:00
Michael Croes
36c4564f5e
Default ReadTimeout and WriteTimeout to 10 seconds
2021-06-07 22:19:23 +02:00
Michael Croes
0c0200d12d
Merge pull request #400 from scamille/tests-taskCanceled
...
Fix Cancellation test.
2021-06-07 22:03:02 +02:00
Michael Croes
6e861d2f00
Merge branch 'develop' into tests-taskCanceled
2021-06-07 22:00:52 +02:00
Michael Croes
372f4a5dcb
Merge pull request #398 from mycroes/cleanup-sync
...
Cleanup sync
2021-06-07 21:26:41 +02:00
Serge Camille
0d87dbf3c6
Add unit test to ensure a connection has been properly closed
...
If cancelled during data transmission, #349 adds code to ensure that the connection automatically gets cancelled.
Add inerted test to ensure that cancellation before sending data does not result in a cancellation.
2021-06-07 14:49:06 +02:00
Serge Camille
15f94cd7bf
Fix Cancellation test.
2021-06-07 14:13:04 +02:00
Michael Croes
36b59a2926
Cleanup whitespace, usings
2021-06-06 23:20:19 +02:00
Michael Croes
8d081859da
Remove unused sync methods
2021-06-06 23:19:56 +02:00
Michael Croes
2302819650
Merge pull request #349 from scamille/closeConnectionIOException
...
Close connection on IOExceptions.
2021-06-06 22:58:27 +02:00
Michael Croes
d65b83660f
Merge branch 'develop' into closeConnectionIOException
2021-06-06 22:56:17 +02:00
Michael Croes
77b2ecfd45
Merge pull request #397 from scamille/multipleVarsAlignment
...
Fix ReadMultipleVars alignment bug
2021-06-06 22:51:03 +02:00
Michael Croes
b0a6a2375f
Merge branch 'develop' into multipleVarsAlignment
2021-06-06 22:49:33 +02:00
Michael Croes
14823bca96
Merge pull request #395 from mycroes/s7-200-cr
...
Change S7 200 remote TSAP to 10.01
2021-06-06 22:45:53 +02:00
Serge Camille
53045c5952
Close connection on IOExceptions.
...
The idea behind this is that if we receive a response which does not conform to the underlying protocol specification (with all the TCP checks in place!), we are in a weird/corrupt state and it is better to just close the connection.
2021-06-06 22:40:04 +02:00
Michael Croes
677d2941e1
Apply S7 200 TSAP change to relocated code
2021-06-06 22:33:12 +02:00
Michael Croes
66b693676c
Merge branch 'develop' into s7-200-cr
2021-06-06 22:32:41 +02:00
Michael Croes
4542bbedb2
Merge pull request #396 from mycroes/tsap
...
Refactor TSAP related code
2021-06-06 22:24:29 +02:00
Serge Camille
a4b6a360fe
ParseDataIntoDataItems needs to always align the response address to a even value after each data item.
2021-06-06 22:16:59 +02:00
Serge Camille
0bef6bc9ff
Add unit test for the problem.
2021-06-06 21:59:39 +02:00
Michael Croes
cbe04fbfb4
Merge branch 'develop' into tsap
2021-06-06 21:19:17 +02:00
Michael Croes
0b4c79cb08
Merge pull request #319 from scamille/githubActions2
...
GitHub actions
2021-06-06 21:14:26 +02:00
Serge Camille
5c24e801fd
Add Actions Nuget Cache ( #2 )
...
* Try out action cache
* fix syntax error
* Now lets see what happens if it hits the cache
2021-06-05 18:50:28 +02:00
Serge Camille
bcde65120c
Github Actions Net5.0 ( #1 )
...
* Try integrating dotnet setup version into build matrix.
* Another attempt
* change matrix.
* don't add dotnet-sdk as main matrix variable
* remove test framework as well.
* or maybe not
* Fix copy paste mixup
2021-06-05 18:37:35 +02:00
Serge Camille
4541a7ebb7
Try adjusting the dotnet setup version.
2021-06-05 18:11:06 +02:00
Serge Camille
fc9c33fdaf
Add Net5.0 to test project as well.
2021-06-05 17:59:18 +02:00
Serge Camille
a23408d67e
Add Net5.0 to test matrix
2021-06-05 17:58:05 +02:00
Serge Camille
adb55dc80f
Merge branch 'develop' into githubActions2
2021-06-05 17:52:59 +02:00
Michael Croes
2fae2c01d5
Add TsapPair support to PLC
...
Add support for custom addressing by supplying a TsapPair to the PLC.
CPU, Rack and Slot properties are still present to preserve backwards
compatibility and to support alternate functionality based on the PLC
type.
2021-06-04 22:25:05 +02:00
Michael Croes
6465e3c8c7
Move GetDefaultTsapPair to TsapPair class
2021-06-04 22:01:40 +02:00
Michael Croes
fcd61c1236
Add CpuType.S7200Smart
2021-06-04 21:46:42 +02:00
Michael Croes
616dc1094c
Refactor TSAP related code
2021-06-04 21:45:51 +02:00
Michael Croes
70bc1499ef
ConnectionRequestTest: Cleanup trailing whitespace
2021-06-02 23:03:23 +02:00
Michael Croes
fd9aeb5b3b
Fix unit test for S7 200
2021-06-02 23:03:06 +02:00
Michael Croes
0750ee006f
Change S7 200 remote TSAP to 10.01
2021-06-02 22:06:00 +02:00
Michael Croes
ea3beff481
Merge pull request #394 from mycroes/sync
...
Add synchronization
2021-06-02 21:25:51 +02:00
Michael Croes
f67b1e773f
Add missing ConfigureAwait in OpenAsync
2021-06-01 20:59:20 +02:00
Michael Croes
e93a656312
Fix locking for OpenAsync
2021-06-01 20:28:34 +02:00
