maier_st/Sharp7Reactive
1
0
Fork 0
mirror of https://github.com/evopro-ag/Sharp7Reactive.git synced 2025-12-16 03:42:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compare commits

base: maier_st:1.1.3
Branches Tags
maier_st:master maier_st:prerelease
maier_st:1.1.8 maier_st:1.1.5 maier_st:1.1.4 maier_st:1.1.3
...
compare: maier_st:1.1.8
Branches Tags
maier_st:prerelease maier_st:master
maier_st:1.1.8 maier_st:1.1.5 maier_st:1.1.4 maier_st:1.1.3

5 Commits
1.1.3 ... 1.1.8

Author SHA1 Message Date
Alexander Seminjakiw
e524d82784 Merge pull request #4 from fbarresi/master 
Fixed variable length for double types
 2022-08-21 09:14:44 +02:00
Federico Barresi
21f9b32863 fixed tests 2022-08-05 22:26:58 +02:00
Federico Barresi
f9f0a99672 Fixed variable length for double types 
- added default value for variables of type double (float in PLCs)
this error avoid getting notification from type float or double.
 2022-08-05 22:21:59 +02:00
Jürgen Holzer
5835fed96f Change to NUnit-console runner 2022-05-06 09:16:19 +02:00
Jürgen Holzer
7893d019af Change build order 2022-05-06 09:08:08 +02:00
5 changed files with 11 additions and 5 deletions
Expand all files Collapse all files

6
.github/workflows/dotnet-core.yml vendored
View File

@@ -18,14 +18,16 @@ jobs:
uses: actions/setup-dotnet@v1 uses: actions/setup-dotnet@v1
with: with:
dotnet-version: 5.0.x dotnet-version: 5.0.x
- name: Install NUnit.ConsoleRunner
run: nuget install NUnit.ConsoleRunner -Version 3.13.0 -DirectDownload -OutputDirectory .
- name: Install dependencies - name: Install dependencies
run: dotnet restore run: dotnet restore
- name: Build - name: Build
run: dotnet build --configuration Release --no-restore /p:version=1.1.${{ github.run_number }} run: dotnet build --configuration Release --no-restore /p:version=1.1.${{ github.run_number }}
- name: Tests
run: ./NUnit.ConsoleRunner.3.13.0/tools/nunit3-console.exe "Sharp7.Rx.Tests\bin\Release\net461\Sharp7.Rx.Tests.dll"
- name: NugetPublish - name: NugetPublish
run: dotnet nuget push Sharp7.Rx\bin\Release\Sharp7.Rx.1.1.${{ github.run_number }}.nupkg -s https://api.nuget.org/v3/index.json -k ${{ secrets.NUGET_DEPLOY_KEY }} run: dotnet nuget push Sharp7.Rx\bin\Release\Sharp7.Rx.1.1.${{ github.run_number }}.nupkg -s https://api.nuget.org/v3/index.json -k ${{ secrets.NUGET_DEPLOY_KEY }}
- name: Test
run: dotnet test --no-restore --verbosity normal
- name: Create Release - name: Create Release
id: create_release id: create_release
uses: actions/create-release@v1 uses: actions/create-release@v1

2
README.md
View File

@@ -1,6 +1,6 @@
# Sharp7Reactive # Sharp7Reactive
[![Build status](https://ci.appveyor.com/api/projects/status/91sbafe4y6c53fgi?svg=true)](https://ci.appveyor.com/project/fbarresi/sharp7reactive) [![.NET Core Build](https://github.com/evopro-ag/Sharp7Reactive/actions/workflows/dotnet-core.yml/badge.svg)](https://github.com/evopro-ag/Sharp7Reactive/actions/workflows/dotnet-core.yml)
![Licence](https://img.shields.io/github/license/evopro-ag/Sharp7Reactive.svg) ![Licence](https://img.shields.io/github/license/evopro-ag/Sharp7Reactive.svg)
[![Nuget Version](https://img.shields.io/nuget/v/Sharp7.Rx.svg)](https://www.nuget.org/packages/Sharp7.Rx/) [![Nuget Version](https://img.shields.io/nuget/v/Sharp7.Rx.svg)](https://www.nuget.org/packages/Sharp7.Rx/)

2
Sharp7.Rx.Tests/ParsingS7VariableName.feature
View File

@@ -31,7 +31,7 @@ Scenario: Parsing variable name for bool
| Db | 5 | 887 | 20 | 0 | String | | Db | 5 | 887 | 20 | 0 | String |
| Db | 506 | 216 | 1 | 0 | Byte | | Db | 506 | 216 | 1 | 0 | Byte |
| Db | 506 | 216 | 5 | 0 | Byte | | Db | 506 | 216 | 5 | 0 | Byte |
| Db | 506 | 216 | 0 | 0 | Double | | Db | 506 | 216 | 4 | 0 | Double |
| Db | 506 | 216 | 4 | 0 | DInteger | | Db | 506 | 216 | 4 | 0 | DInteger |
| Db | 506 | 216 | 2 | 0 | Integer | | Db | 506 | 216 | 2 | 0 | Integer |
| Db | 506 | 216 | 2 | 0 | Integer | | Db | 506 | 216 | 2 | 0 | Integer |

2
Sharp7.Rx.Tests/ParsingS7VariableName.feature.cs generated
View File

@@ -186,7 +186,7 @@ this.ScenarioInitialize(scenarioInfo);
"Db", "Db",
"506", "506",
"216", "216",
"0", "4",
"0", "0",
"Double"}); "Double"});
table2.AddRow(new string[] { table2.AddRow(new string[] {

4
Sharp7.Rx/S7VariableNameParser.cs
View File

@@ -74,6 +74,10 @@ namespace Sharp7.Rx
{ {
s7VariableAddress.Length = 8; s7VariableAddress.Length = 8;
} }
else if (type == DbType.Double)
{
s7VariableAddress.Length = 4;
}
return s7VariableAddress; return s7VariableAddress;
} }