-
Notifications
You must be signed in to change notification settings - Fork 1
Noser #13
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
bqstony
wants to merge
12
commits into
master
Choose a base branch
from
noser
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Noser #13
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
6fe5ba2
Support structs in PrimitiveCommandArgumentHandler with CommandInputB…
bqstony a9c05c4
Remove double write of `PrimitiveCommandArgumentHandler` in WriteInpu…
bqstony 61a2c4b
change from FluentAssertions to AwesomeAssertions
bqstony 3fb3df1
fix: fix potential deadlock in PlcAdsConnectionService
reeman94 6a33a13
Merge pull request #12 from mbc-engineering/fix-potential-deadlock-in…
reeman94 59b4684
beder handling in PlcAdsStateReader when stop is called bevore start
bqstony 7ac1cb0
Update to Beckhoff.TwinCAT.Ads version 6.2.521
bqstony 414f4a8
Add Automatic recconection behavior in PlcAdsConnectionService
bqstony 3ef7b8e
- Support for .NET 10.0.
bqstony ec0f13a
Merge pull request #16 from mbc-engineering/support_net10
bqstony 7ac696b
Replace depricated xunit v2 with v3 and align testing packages
bqstony 5188a29
BenchmarkDotNet is not compatible with xunit.v3 new hosting. So move …
bqstony File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -12,6 +12,43 @@ The following types of changes exist: | |||||
| - **Fixed** for any bug fixes. | ||||||
| - **Security** in case of vulnerabilities. | ||||||
|
|
||||||
| ## 2026 New Year, Version 5.2.0 | ||||||
| ### Removed | ||||||
| - Removed Support for .NET Framework 4.7.1 (But still .NET Standard 2.0.) | ||||||
| - Removed Dependency to Mbc.Hdf5Utils Nuget package. The code is now part of Mbc.Pcs.Net.DataRecorder. | ||||||
|
|
||||||
| ### Added | ||||||
| - Support for .NET 10.0. | ||||||
| - Add Automatic recconection behavior in PlcAdsConnectionService | ||||||
|
|
||||||
| ### Changed | ||||||
| - Update to Beckhoff.TwinCAT.Ads version 6.2.521 | ||||||
|
|
||||||
| ### Fixed | ||||||
| - fixed deadlock in PlcAdsConnectionService | ||||||
| - fixed handling PlcAdsStateReader when stop is called before start | ||||||
|
|
||||||
| ## 2025 Summer, Version 5.1.0 | ||||||
| ### Feature | ||||||
| - It is now possible to write Structs with the `CommandInputBuilder` and the `PrimitiveCommandArgumentHandler`. Actually it results in multiple write commands to the PLC. So each struct and it fields will be recursively written to the PLC also in recursive structs. The fields in the struct has to be flagged with the `{attribute 'PlcCommandInput'}`. The Struct values must in c# be of type of `CommandInputBuilder`. | ||||||
| ```C# | ||||||
| ICommandInput inputStructValues = CommandInputBuilder.FromDictionary(new Dictionary<string, object>() | ||||||
| { | ||||||
| ["StructValue1"] = 123, | ||||||
| ["StructValue1"] = 3333, | ||||||
| }); | ||||||
|
|
||||||
| ICommandInput input = CommandInputBuilder.FromDictionary(new Dictionary<string, object>() | ||||||
| { | ||||||
| ["value1"] = (byte)123, | ||||||
| ["stAbc"] = inputStructValues, | ||||||
| ["alue2"] = (byte)222, | ||||||
|
||||||
| ["alue2"] = (byte)222, | |
| ["value2"] = (byte)222, |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| using FakeItEasy; | ||
| using FluentAssertions; | ||
| using AwesomeAssertions; | ||
| using TwinCAT.Ads; | ||
| using Xunit; | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| using FluentAssertions; | ||
| using AwesomeAssertions; | ||
| using System.Linq; | ||
| using Xunit; | ||
|
|
||
|
|
||
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| using FluentAssertions; | ||
| using AwesomeAssertions; | ||
| using Mbc.Ads.Mapper.Reflection; | ||
| using Xunit; | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| using FluentAssertions; | ||
| using AwesomeAssertions; | ||
| using System; | ||
| using System.Globalization; | ||
| using Xunit; | ||
|
|
||
2 changes: 1 addition & 1 deletion
2
NET/Mbc.Ads.Utils.Test/Connection/ConnectionSynchronizationTest.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
43 changes: 43 additions & 0 deletions
43
NET/Mbc.Benchmark.Test/Ads/Mapper/MarshallingPerformanceTest.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| using BenchmarkDotNet.Attributes; | ||
| using System.Buffers.Binary; | ||
| using TwinCAT.TypeSystem; | ||
|
|
||
| namespace Mbc.Ads.Mapper; | ||
|
|
||
| /// <summary> | ||
| /// Benchmark different ways to unmarshal binary values to managed type. | ||
| /// | ||
| /// | Method | Mean | Error | StdDev | | ||
| /// |------------------------------- |-----------:|----------:|----------:| | ||
| /// | TwinCAT_PrimitiveTypeMarshaler | 177.543 ns | 0.4423 ns | 0.3693 ns | | ||
| /// | DotNet_BinaryPrimitives | 15.457 ns | 0.3524 ns | 0.7199 ns | | ||
| /// | Custom_UnsafeReader | 2.017 ns | 0.0911 ns | 0.1619 ns | | ||
| /// | ||
| /// </summary> | ||
| [SimpleJob(BenchmarkDotNet.Jobs.RuntimeMoniker.Net47)] | ||
| public class MarshallingPerformanceTest | ||
| { | ||
| private readonly byte[] _data = new byte[4]; | ||
| private int _value; | ||
|
|
||
| [Benchmark] | ||
| public void TwinCAT_PrimitiveTypeMarshaler() | ||
| { | ||
| PrimitiveTypeMarshaler.Default.Unmarshal<int>(_data, out _value); | ||
| } | ||
|
|
||
| [Benchmark] | ||
| public void DotNet_BinaryPrimitives() | ||
| { | ||
| _value = BinaryPrimitives.ReadInt32LittleEndian(_data); | ||
| } | ||
|
|
||
| [Benchmark] | ||
| public unsafe void Custom_UnsafeReader() | ||
| { | ||
| fixed (byte* p = _data) | ||
| { | ||
| _value = *(int*)p; | ||
| } | ||
| } | ||
| } |
4 changes: 3 additions & 1 deletion
4
NET/Mbc.Ads.Mapper.Test/BenchmarkMain.cs → NET/Mbc.Benchmark.Test/BenchmarkMain.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,8 @@ | ||
| using BenchmarkDotNet.Running; | ||
| using Mbc.Ads.Mapper.Test; | ||
| using Mbc.Ads.Mapper; | ||
| using Mbc.Pcs.Net.State; | ||
|
|
||
| /* Works only without debugging in release configuration. */ | ||
|
|
||
| BenchmarkRunner.Run<PlcHeartBeatTimerBenchmark>(); | ||
| BenchmarkRunner.Run<MarshallingPerformanceTest>(); |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Duplicate key in dictionary example.
"StructValue1"appears twice in the dictionary with different values (123 and 3333). This will cause a runtime error. The second occurrence should likely be"StructValue2".