From 946614b86c40a989ba7ae67d0eb6ba8ca9f13ab4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sat, 9 Mar 2024 23:38:56 +0100 Subject: [PATCH] Trying to stabilize the CI build as the last build had only 20% coverage due to wrong detection --- .gitlab-ci.yml | 8 +++++++- AMWD.Protocols.Modbus.Common/README.md | 7 ++++++- .../Tcp/Utils/ModbusTcpConnectionTest.cs | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index acc7d98..583938d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,6 +16,7 @@ build-debug: tags: - docker - lnx + - 64bit rules: - if: $CI_COMMIT_TAG == null script: @@ -32,7 +33,7 @@ build-debug: paths: - artifacts/*.nupkg - artifacts/*.snupkg - expire_in: 3 days + expire_in: 1 days test-debug: stage: test @@ -41,6 +42,7 @@ test-debug: tags: - docker - lnx + - 64bit rules: - if: $CI_COMMIT_TAG == null coverage: '/Total[^|]*\|[^|]*\|\s*([0-9.%]+)/' @@ -56,6 +58,7 @@ deploy-debug: tags: - docker - lnx + - 64bit rules: - if: $CI_COMMIT_TAG == null script: @@ -68,6 +71,7 @@ build-release: tags: - docker - lnx + - amd64 rules: - if: $CI_COMMIT_TAG != null script: @@ -93,6 +97,7 @@ test-release: tags: - docker - lnx + - amd64 rules: - if: $CI_COMMIT_TAG != null coverage: '/Total[^|]*\|[^|]*\|\s*([0-9.%]+)/' @@ -108,6 +113,7 @@ deploy-release: tags: - docker - lnx + - 64bit rules: - if: $CI_COMMIT_TAG != null script: diff --git a/AMWD.Protocols.Modbus.Common/README.md b/AMWD.Protocols.Modbus.Common/README.md index 6e24772..0c4d662 100644 --- a/AMWD.Protocols.Modbus.Common/README.md +++ b/AMWD.Protocols.Modbus.Common/README.md @@ -13,7 +13,7 @@ If you want to speak a custom type of protocol with the clients, you can impleme **ModbusBaseClient** This abstract base client contains all the basic methods and handlings required to communicate via Modbus Protocol. -The packages `AMWD.Protocols.Modbus.Serial` _(in progress)_ and `AMWD.Protocols.Modbus.Tcp` have specific derived implementations to match the communication types. +The packages `AMWD.Protocols.Modbus.Serial` _(in progress)_ and `AMWD.Protocols.Modbus.Tcp` _(in progress)_ have specific derived implementations to match the communication types. ### Enums @@ -40,6 +40,11 @@ The different types handled by the Modbus Protocol. - Holding Register - Input Register +In addition, you'll find the `DeviceIdentification` there. +It is used for a "special" function called "Read Device Identification" (0x2B / 43) not supported by all devices. + +The `ModbusDevice` is used for the server implementations in the derived packages. + ### Protocols diff --git a/AMWD.Protocols.Modbus.Tests/Tcp/Utils/ModbusTcpConnectionTest.cs b/AMWD.Protocols.Modbus.Tests/Tcp/Utils/ModbusTcpConnectionTest.cs index 4736944..690205f 100644 --- a/AMWD.Protocols.Modbus.Tests/Tcp/Utils/ModbusTcpConnectionTest.cs +++ b/AMWD.Protocols.Modbus.Tests/Tcp/Utils/ModbusTcpConnectionTest.cs @@ -161,7 +161,7 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp.Utils public async Task ShouldThrowApplicationExceptionHostnameNotResolvable() { // Arrange - _hostname = "device.internal"; + _hostname = "123.321.123.321"; var connection = GetConnection(); // Act