marekf/laatzen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FM2014: - prepared for multiple FM2014s - 1.Step

Browse Source
This commit is contained in:
Thomas Wiedebusch 2026-01-28 13:49:54 +01:00
parent f40a6b2bae
commit f613a9cdb4
2 changed files with 657 additions and 570 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1204
Common/Hardware/WaterMeter/MechanicalMeter/FM2014/FM2014Core/FM2014.cs
View File

File diff suppressed because it is too large Load Diff

23
MiniPrf/Ui/FrmMainMiniPrf.cs
View File

@ -66,11 +66,12 @@ namespace Sensus.MiniPrf.Ui
/// <summary>
/// The single FM2014 for this program
/// </summary>
private FM2014 Fm2014
{
get;
set;
}
private FM2014 Fm2014 { get; set; }
/// <summary>
/// The single FM2014 for this program
/// </summary>
private FM2014 Fm2014_TEST { get; set; }
/// <summary>
/// The start time is going to be used for time measurements of processes. It has to be set to
@ -444,6 +445,12 @@ namespace Sensus.MiniPrf.Ui
//assign new meter
Fm2014 = new FM2014();
//TODO THW TEST FM2014 multiple objects
Fm2014_TEST = new FM2014();
Fm2014_TEST.Address = 2;
Fm2014_TEST.OnRawRecordReceived += DataReceived_Handler;
Fm2014.OnRawRecordReceived += DataReceived_Handler;
ResetCancellationToken();
FM2014.SharedCancellationToken = _cancellationToken;
@ -470,10 +477,16 @@ namespace Sensus.MiniPrf.Ui
lblActualProcess.Text = Resources.StrMsgConnecting;
Fm2014.Connect(cbxFM2014ComPort.SelectedItem.ToString());
//TODO THW TEST FM2014 multiple objects
Fm2014_TEST.Connect(cbxFM2014ComPort.SelectedItem.ToString());
Task.Factory.StartNew(() =>
{
Fm2014.Login();
//TODO THW TEST FM2014 multiple objects
Fm2014_TEST.Login();
if (!Fm2014.IsLoggedOn)
{
LogErrorText(Resources.StrErrorMsgFM2014AccessDenied);