winzer/pamhagen-sysctrl
2
0
Fork 0
Code Issues Pull Requests Actions Releases 1 Activity

Small bugfixes
Deploy / Build and Deploy (push) Successful in 2m8s
Details

Browse Source
This commit is contained in:
lorenz.stechauner
2026-08-05 16:59:29 +02:00
parent fd8bd7215a
commit cbf33cbd17
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitea/workflows/deploy.yaml
+4 -4
View File
@@ -30,24 +30,24 @@ jobs:
uses: nuget/setup-nuget@v1 uses: nuget/setup-nuget@v1
- name: Restore NuGet packages - name: Restore NuGet packages
shell: powershell 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 - name: Build Installer
shell: powershell shell: powershell
run: $(& msbuild -verbosity:quiet Installer/Installer.wixproj -property:Configuration=Release -property:Platform=x64; $a=$lastexitcode) | findstr x*; exit $a run: $(& msbuild -verbosity:quiet Installer/Installer.wixproj -property:Configuration=Release -property:Platform=x64; $a=$lastexitcode) | findstr x*; exit $a
- name: Rename artifact - name: Rename artifact
shell: powershell 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 - name: Create release
uses: akkuman/gitea-release-action@v1 uses: akkuman/gitea-release-action@v1
with: with:
name: Anlagensteuerung Pamhagen ${{ env.APP_VERSION }} name: Anlagensteuerung Pamhagen ${{ env.APP_VERSION }}
body: "**[Changelog](src/branch/main/CHANGELOG.md#v${{ env.APP_VERSION }})**" body: "**[Changelog](src/branch/main/CHANGELOG.md#v${{ env.APP_VERSION }})**"
files: |- files: |-
Installer/bin/x64/Release/PamhagenSysCtrl-${{ env.APP_VERSION }}.msi Installer/bin/Release/de-AT/PamhagenSysCtrl-${{ env.APP_VERSION }}.msi
- name: Upload to website - name: Upload to website
shell: powershell shell: powershell
run: | 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 ` Invoke-WebRequest `
-Uri "https://elwig.at/files/PamhagenSysCtrl-${{ env.APP_VERSION }}.msi" ` -Uri "https://elwig.at/files/PamhagenSysCtrl-${{ env.APP_VERSION }}.msi" `
-Method PUT ` -Method PUT `
PamhagenSysCtrl/Helpers/Pipeline/Graph.cs
+1 -1
View File
@@ -59,7 +59,7 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
var start = points.First(); var start = points.First();
var path = new Path(start, []); var path = new Path(start, []);
foreach (var end in points.Skip(1)) { foreach (var end in points.Skip(1)) {
if (valid != null && !valid(start)) { if (valid != null && start != points.First() && !valid(start)) {
return null; return null;
} else if (GetPath(start, end, valid, visited: [.. path.Hops.Select(h => h.Node)]) is not Path p) { } else if (GetPath(start, end, valid, visited: [.. path.Hops.Select(h => h.Node)]) is not Path p) {
return null; return null;
PamhagenSysCtrl/Helpers/T1.cs
+1 -1
View File
@@ -123,7 +123,7 @@ namespace PamhagenSysCtrl.Helpers {
} }
public async Task<Status> DataWrite(params (string Register, ushort[] Values)[] registers) { public async Task<Status> 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"); var (_, res) = await ReceiveResponse("ST");
return new Status((Mode)(res[3] - '0'), ((res[0] - '0') << 4) | (res[1] - '0')); return new Status((Mode)(res[3] - '0'), ((res[0] - '0') << 4) | (res[1] - '0'));
} }