From cbf33cbd17b39ab8ff3e6d2e9050b7733b4a9cf5 Mon Sep 17 00:00:00 2001 From: Lorenz Stechauner Date: Wed, 5 Aug 2026 16:47:25 +0200 Subject: [PATCH] Small bugfixes --- .gitea/workflows/deploy.yaml | 8 ++++---- PamhagenSysCtrl/Helpers/Pipeline/Graph.cs | 2 +- PamhagenSysCtrl/Helpers/T1.cs | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 846d7b3..336aa39 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -30,24 +30,24 @@ jobs: uses: nuget/setup-nuget@v1 - name: Restore NuGet packages shell: powershell - run: $(& nuget restore PamhagenSysCtrl.sln; $a=$lastexitcode) | findstr x*; exit $a + run: $(& nuget restore PamhagenSysCtrl.slnx; $a=$lastexitcode) | findstr x*; exit $a - name: Build Installer shell: powershell run: $(& msbuild -verbosity:quiet Installer/Installer.wixproj -property:Configuration=Release -property:Platform=x64; $a=$lastexitcode) | findstr x*; exit $a - name: Rename artifact shell: powershell - run: Move-Item Installer/bin/x64/Release/PamhagenSysCtrl.msi Installer/bin/x64/Release/PamhagenSysCtrl-${{ env.APP_VERSION }}.msi + run: Move-Item Installer/bin/Release/de-AT/PamhagenSysCtrl.msi Installer/bin/Release/de-AT/PamhagenSysCtrl-${{ env.APP_VERSION }}.msi - name: Create release uses: akkuman/gitea-release-action@v1 with: name: Anlagensteuerung Pamhagen ${{ env.APP_VERSION }} body: "**[Changelog](src/branch/main/CHANGELOG.md#v${{ env.APP_VERSION }})**" files: |- - Installer/bin/x64/Release/PamhagenSysCtrl-${{ env.APP_VERSION }}.msi + Installer/bin/Release/de-AT/PamhagenSysCtrl-${{ env.APP_VERSION }}.msi - name: Upload to website shell: powershell run: | - $content = [System.IO.File]::ReadAllBytes("Installer/bin/x64/Release/PamhagenSysCtrl-${{ env.APP_VERSION }}.msi") + $content = [System.IO.File]::ReadAllBytes("Installer/bin/Release/de-AT/PamhagenSysCtrl-${{ env.APP_VERSION }}.msi") Invoke-WebRequest ` -Uri "https://elwig.at/files/PamhagenSysCtrl-${{ env.APP_VERSION }}.msi" ` -Method PUT ` diff --git a/PamhagenSysCtrl/Helpers/Pipeline/Graph.cs b/PamhagenSysCtrl/Helpers/Pipeline/Graph.cs index 570168d..9df71cc 100644 --- a/PamhagenSysCtrl/Helpers/Pipeline/Graph.cs +++ b/PamhagenSysCtrl/Helpers/Pipeline/Graph.cs @@ -59,7 +59,7 @@ namespace PamhagenSysCtrl.Helpers.Pipeline { var start = points.First(); var path = new Path(start, []); foreach (var end in points.Skip(1)) { - if (valid != null && !valid(start)) { + if (valid != null && start != points.First() && !valid(start)) { return null; } else if (GetPath(start, end, valid, visited: [.. path.Hops.Select(h => h.Node)]) is not Path p) { return null; diff --git a/PamhagenSysCtrl/Helpers/T1.cs b/PamhagenSysCtrl/Helpers/T1.cs index 88aaf3c..e7c5b5d 100644 --- a/PamhagenSysCtrl/Helpers/T1.cs +++ b/PamhagenSysCtrl/Helpers/T1.cs @@ -123,7 +123,7 @@ namespace PamhagenSysCtrl.Helpers { } public async Task DataWrite(params (string Register, ushort[] Values)[] registers) { - await SendCommand("DW", string.Join(',', registers.Select(r => $"{r.Register},{r.Values.Length}," + string.Join(',', r.Values.Select(v => $"{v:X}"))))); + await SendCommand("DW", string.Join(',', registers.Select(r => $"{r.Register},{r.Values.Length}," + string.Join(',', r.Values.Select(v => $"{v:X4}"))))); var (_, res) = await ReceiveResponse("ST"); return new Status((Mode)(res[3] - '0'), ((res[0] - '0') << 4) | (res[1] - '0')); }