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

latest changes

Browse Source
This commit is contained in:
Stoyan Zlatev 2026-01-23 11:16:38 +01:00
parent 4f78313b43
commit 2b14a9589d
10 changed files with 136 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Common/Common.Services.LaserImport/Common.Services.LaserImport.csproj
View File

@ -12,6 +12,21 @@
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
<TargetFrameworkProfile />
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled>
<UpdateMode>Foreground</UpdateMode>
<UpdateInterval>7</UpdateInterval>
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
@ -50,5 +65,12 @@
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>false</Install>
</BootstrapperPackage>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

15
Common/Common.Services.LaserImport/Program.cs
View File

@ -31,6 +31,11 @@
clientWhatcher.IncludeSubdirectories = false;
clientWhatcher.EnableRaisingEvents = true;
WaithLaserReady();
}
private static void WaithLaserReady()
{
var fg = ConsoleColor.DarkGray;
Console.ForegroundColor = fg;
@ -40,7 +45,7 @@
awaiter.Wait();
Console.ForegroundColor = ConsoleColor.White;
Console.Write($"FERTIGMELDEN");
Console.Write($"LASERUNG BESTÄTIGEN");
Console.ReadLine();
Console.ForegroundColor = fg;
@ -59,6 +64,8 @@
Thread.Sleep(100);
}
}
Console.Clear();
}
}
@ -73,9 +80,9 @@
if (!File.Exists(fileToDelete))
{
fileToDelete = string.Empty;
Console.WriteLine($"{fileToDelete} - dose not exists!");
fileToDelete = string.Empty;
}
else
{
@ -93,6 +100,8 @@
var sourceFilePath = args.FullPath;
var destinationFilePath = Path.Combine(localFolder, args.Name);
Thread.Sleep(1000);
if (File.Exists(sourceFilePath))
{
while (true)

82
Common/CommonConsole/Program.cs
View File

@ -5,86 +5,64 @@
using Common.Hardware.WaterMeter.eRegister.Features;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
// { 4291923131, "6182ACF7E60266965951BBFB160C1707" },
// { 4291922821, "B9CC9CCD2CDCB285100B44995497071E" },
// { 4291868627, "4BC9FEBE927ADA57AE9EE699BBBAC4DC" },
// { 4291134308, "B9CC9CCD2CDCB285100B44995497071E" },
public static class Program
{
static int frequency = 868;
static int timeout = 15_000;
static string defaultEncryptionKey = "E6C88800DEB868C0D6A84880CE982840";
static Dictionary<uint, string> testAddresses868 = new Dictionary<uint, string>
{
// { 4291923131, "6182ACF7E60266965951BBFB160C1707" },
// { 4291922821, "B9CC9CCD2CDCB285100B44995497071E" },
// { 4291868627, "4BC9FEBE927ADA57AE9EE699BBBAC4DC" },
{ 4291808024, "4BC9FEBE927ADA57AE9EE699BBBAC4DC" },
{ 4291759578, "4BC9FEBE927ADA57AE9EE699BBBAC4DC" },
{ 4291709169, "4BC9FEBE927ADA57AE9EE699BBBAC4DC" },
{ 4291657730, "B9CC9CCD2CDCB285100B44995497071E" },
{ 4291535650, "E6C88800DEB868C0D6A84880CE982840" },
{ 4291535650, "5DD3EF5233B4DAA6836721F2866182DA" },
{ 4291377834, "E6C88800DEB868C0D6A84880CE982840" },
{ 4291377829, "E6C88800DEB868C0D6A84880CE982840" },
// { 4291134308, "B9CC9CCD2CDCB285100B44995497071E" },
{ 4291094212, "B9CC9CCD2CDCB285100B44995497071E" },
};
static void Main()
static void Main_ER()
{
var sirt868 = new SIRTBroadcaster("COM7");
SIRTLogger.Message += Console.WriteLine;
sirt868.Open();
var etasks = new ConcurrentQueue<WritePamTask>();
foreach (var kvp in testAddresses868)
var CSD_38102_BU_Key = "5DD3EF5233B4DAA6836721F2866182DA";
var task = new WritePamTask
{
etasks.Enqueue(new WritePamTask
{
Timeout = timeout,
DelPamSemi = true,
WakeUpCmd = true,
WakeUpModul = true,
RequireLAT = true,
RequireDEBUG = true,
Frequency = frequency,
RequestAddress = kvp.Key,
ResponseAddress = kvp.Key,
EncryptionKeyI = kvp.Value.GetEncryptionKey(),
Data = new OpticalTelegram(1).Append(new ProvidePin(AuthLevel.III))
});
}
var pendingAddresses = new Queue<uint>();
while (etasks.TryDequeue(out var etask))
{
for (var i = 0; i < 2 && etask.State != SIRTTaskState.Completed && etask.State != SIRTTaskState.Cancelled; i++)
{
etask.SetPending();
if (sirt868.Start(etask))
{
etask.Wait();
}
}
if (etask.State != SIRTTaskState.Completed)
{
pendingAddresses.Enqueue(etask.RequestAddress);
}
Timeout = timeout,
DelPamSemi = true,
WakeUpCmd = true,
WakeUpModul = true,
RequireLAT = true,
RequireDEBUG = true,
Frequency = frequency,
RequestAddress = 4291535650,
ResponseAddress = 4291535650,
EncryptionKeyI = CSD_38102_BU_Key.GetEncryptionKey(),
Data = new OpticalTelegram(1).Append(new ProvidePin(AuthLevel.III))
};
for (var i = 0; i < 3 || task.State == SIRTTaskState.Completed || task.State == SIRTTaskState.Cancelled; i++)
{
sirt868.Start(task);
task.Wait();
}
Console.ReadKey();
sirt868.Close();
Console.WriteLine();
foreach (var address in pendingAddresses)
{
Console.WriteLine(address);
}
}
static void Main_CSD_Alarms()
static void Main()
{
var alarmMask = 0 << AlarmMask.ALARM_REBOOT
| 1 << AlarmMask.ALARM_LOW_BATTERY

59
Common/Hardware/Common.Hardware.SIRT/Tasks/WritePamTask.cs
View File

@ -3,6 +3,7 @@
using Common.Hardware.SIRT.Parameters;
using System;
using System.Collections.Generic;
public class WritePamTask : SIRTTask
{
@ -29,6 +30,9 @@
this.SEMIReceived += this.OnSEMIReceived;
this.UnknownReceived += this.OnUnknownReceived;
this.RequireLAT = true;
this.PamStatusIX = 11;
this.DebugLength = 52;
this.SemiLength = 91;
}
public event Action<SIRTMessage> MessageSent;
@ -42,7 +46,16 @@
public byte[] EncryptionKeyI { get; set; }
public byte[] EncryptionKeyII { get; set; }
private byte[] encryptionKeyII;
public byte[] EncryptionKeyII
{
get => this.encryptionKeyII;
set
{
this.encryptionKeyII = value;
this.IsEncrypted = true;
}
}
public bool WakeUpModul
{
@ -92,24 +105,33 @@
set => this.request.Payload = value;
}
public byte DebugLength { get; set; }
public byte SemiLength { get; set; }
public byte PamStatusIX { get; set; }
public bool AnyTelegramReceived { get; set; }
public Queue<SIRTMessage> MessageQueue { get; set; } = new Queue<SIRTMessage>();
public override void Receive(SIRTMessage response)
{
if (response.Command == SIRTConstants.ACKN_ANSW)
if (this.UseEncryption(response))
{
this.DecriptResponse(response);
}
this.MessageQueue.Enqueue(response);
if (response.Command == SIRTConstants.ACKN_ANSW)
{
this.AKNReceived?.Invoke(response);
}
else if (response.Command == SIRTConstants.FROM_AIR)
{
var payload = response?.Payload;
if (this.UseEncryption(response))
{
this.DecriptResponse(response);
}
if (payload != null && payload.Length > 0)
{
var type = payload[0];
@ -208,7 +230,7 @@
protected virtual void OnSEMIReceived(SIRTMessage semi)
{
if ((this.RequireLAT && !this.latReceived) || (this.RequireDEBUG && !this.debugReceived) || semi.Payload[11] != 0)
if ((this.RequireLAT && !this.latReceived) || (this.RequireDEBUG && !this.debugReceived) || semi.Payload[this.PamStatusIX] != 0)
{
this.SetPending();
}
@ -225,7 +247,7 @@
protected virtual bool UseEncryption(SIRTMessage response)
{
if (response is null)
if (response is null || this.EncryptionKeyI is null)
{
return false;
}
@ -239,7 +261,7 @@
var payloadLength = payload.Length;
if (payloadLength == 0)
if (payloadLength == 0 || payloadLength == this.DebugLength || payloadLength == this.SemiLength)
{
return false;
}
@ -270,9 +292,22 @@
private void DecriptResponse(SIRTMessage response)
{
this.IsEncrypted = true;
var payload = new byte[response.Length];
Array.Copy(response.Payload, 0, payload, 0, payload.Length);
response.Payload = response.Payload.DecryptResponse(this.EncryptionKeyI);
response.Payload = payload.DecryptResponse(this.EncryptionKeyI);
if (response.Payload[this.PamStatusIX] != 0 && this.EncryptionKeyII != null)
{
response.Payload = payload.DecryptResponse(this.EncryptionKeyII);
if (response.Payload[this.PamStatusIX] == 0)
{
var oldEncryptionKey = this.EncryptionKeyI;
this.EncryptionKeyI = this.EncryptionKeyII;
this.EncryptionKeyII = oldEncryptionKey;
}
}
}
private void SetP811(Action<P811> p811Setter)

11
Common/Hardware/WaterMeter/eRegister/Common.Hardware.WaterMeter.eRegister/Eregister.cs
View File

@ -139,12 +139,15 @@
{
task.MessageReceived += this.history.Push;
while (task.State != SIRTTaskState.Completed && task.State != SIRTTaskState.Cancelled && !cancellationToken.IsCancellationRequested)
var next = 0;
while (task.State != SIRTTaskState.Completed && task.State != SIRTTaskState.Cancelled && !cancellationToken.IsCancellationRequested && next < 5)
{
if (this.sirtHub.Start(task))
{
this.history.Push(task);
task.Wait();
next++;
}
else
{
@ -196,6 +199,11 @@
break;
}
if (next >= 5)
{
break;
}
}
if (stopProgramming)
@ -275,6 +283,7 @@
.Append(new ChangeNumberOfLatWindows(this.parameters.LatWindowsInitialization))
.Append(new ChangeTransmissionInterval(this.parameters.TransmissionIntervalInitialization))
.Append(new ProvidePin(AuthLevel.II)),
Timeout = 10_000
});
this.runningTasks.Enqueue(new EregisterCheckInitializationTask(this.parameters, frequency)

4
Common/Hardware/WaterMeter/eRegister/Common.Hardware.WaterMeter.eRegister/EregisterTask.cs
View File

@ -46,10 +46,6 @@
}
}
public bool ChangeRadioAddress { get; set; }
public bool ChangeEncryptionKey { get; set; }
public string RSSI { get; private set; }
public P11 P11 { get; private set; }

1
Common/Hardware/WaterMeter/eRegister/Common.Hardware.WaterMeter.eRegister/Models/EregisterProgrammingParameters.cs
View File

@ -270,7 +270,6 @@
// return features;
//}
/////////////////////////////////////////////////////
features.Debug = new EregisterDebugFeatures();
features.ChangeMeterReading = this.DisplayVolume;

2
Common/Ui/Common.UI/App.config
View File

@ -7,7 +7,7 @@
<!--<add key="ConnectionString" value="Server=SLASQL01.emea.sensus.net; Database=Testreplikation; User ID=sa; Password=sqlserver;" />-->
<add key="ConnectionString" value="Server=DELAZ1SQL01.world.fluidtechnology.net; Database=Auftrag; User ID=sa; Password=sqlserver;" />
<add key="EncryptionKeisUrl" value="http://sla12iis01.emea.sensus.net/LaaProductionWeb/api/eregister/radiokey/byserialno/{0}" />
<add key="SIRTComPorts" value="COM6,COM8" />
<add key="SIRTComPorts" value="COM6,COM7" />
<add key="PSNR" value="1000" />
<add key="SIRT_433" value=""/>
<add key="SIRT_868" value=""/>

3
Common/Ui/Common.UI/Models/AuftragDbContext.cs
View File

@ -36,7 +36,7 @@
, SemiDebugDatum = ISNULL(@{nameof(state.SemiDebugDatum)}, er.SemiDebugDatum)
, GeschlossenDatum = ISNULL(@{nameof(state.GeschlossenDatum)}, er.GeschlossenDatum)
, FunkadresseDatum = ISNULL(@{nameof(state.FunkadresseDatum)}, er.FunkadresseDatum)
, TempAdresse = ISNULL(@{nameof(state.TempAdresse)}, er.TempAdresse)
-- , TempAdresse = ISNULL(@{nameof(state.TempAdresse)}, er.TempAdresse)
FROM eRegister AS er
JOIN AuftragPositionSerienNr AS aps
ON er.Seriennummer = aps.SerienNr
@ -101,6 +101,7 @@
SELECT CAST((SELECT DISTINCT *
FROM VieweRegisterProgrammingParameters
WHERE SharedId = @{nameof(sharedId)}
AND SerienNr IN (SELECT Serialno FROM eRegister_Shared WHERE P2000_Shared_Id = @{nameof(sharedId)} AND Completed = 0)
-- AND Completed = @{nameof(completed)}
-- AND SlotNr > 0
FOR XML PATH('{nameof(EregisterProgrammingParameters)}')

12
Common/Ui/Common.UI/Models/SQLiteKeyStore.cs
View File

@ -25,6 +25,18 @@
public bool TryGetKey(uint address1, uint address2, out string encryptionKey)
{
//var existing = this.connection
// .Table<RadioKey>()
// .Where(x => x.Address == 4291535650)
// .FirstOrDefault();
//if (existing != null)
//{
// existing.EncryptionKey = "5DD3EF5233B4DAA6836721F2866182DA";
// this.connection.Update(existing);
//}
encryptionKey = this.connection
.Table<RadioKey>()
.FirstOrDefault(x => x.Address == address1 || x.Address == address2)