Update manual control invocation

.gitea/workflows/deploy.yaml

@@ -40,7 +40,7 @@ jobs:
       - name: Create release
         uses: akkuman/gitea-release-action@v1
         with:
-          name: Anlagensteuerung Pamhagen ${{ env.APP_VERSION }}
+          name: Anl.-Strg. Pamhagen ${{ env.APP_VERSION }}
           body: "**[Changelog](src/branch/main/CHANGELOG.md#v${{ env.APP_VERSION }})**"
           files: |-
             Installer/bin/Release/de-AT/PamhagenSysCtrl-${{ env.APP_VERSION }}.msi

PamhagenSysCtrl/Helpers/Config.cs

@@ -21,7 +21,7 @@ namespace PamhagenSysCtrl.Helpers {
                 PlcPort = config["plc:port"] ?? "COM1";
             } catch (Exception exc) {
                 MessageBox.Show($"Die Konfigurationsdatei konnte nicht gelesen werden:\n\n{exc.Message}", "Konfigurationsdatei lesen", MessageBoxButton.OK, MessageBoxImage.Error);
-                App.Current.Shutdown();
+                Application.Current.Shutdown();
             }
         }
     }

PamhagenSysCtrl/Helpers/PamhagenGraph.cs

@@ -17,7 +17,7 @@ namespace PamhagenSysCtrl.Helpers {
         public readonly Pump P5;
         public readonly Pump P6;
         public readonly EncasedAuger Auger1;
-        public readonly EncasedAuger Auger2;
+        public readonly EncasedAuger Auger3;
 
         public PamhagenGraph() {
             double mw2X = 180;
@@ -34,6 +34,7 @@ namespace PamhagenSysCtrl.Helpers {
             double wtX = ltg1X - 180;
             double wt2Y = 225;
             double wt1Y = wt2Y + 135;
+            double x1X = wtX + 40;
             double t1X = 735;
             double t2X = t1X + 80;
             double t3X = t2X + 80;
@@ -43,21 +44,21 @@ namespace PamhagenSysCtrl.Helpers {
             double t7X = t6X + 80;
             double t8X = t7X + 80;
             double t9X = t8X + 80;
-            var prY = 780;
+            var prY = 720;
-            var pr1X = 750;
+            var pr1X = 730;
-            var pr2X = 900;
+            var pr2X = 920;
 
             var trough = new EntryTrough("Auffangwanne", mw1X + 70, 100, () => App.Plant?.IsTroughAugerActive ?? false);
             Nodes.Add(trough);
 
             Auger1 = new EncasedAuger("", (mw1X + mw2X) / 2 - 100, 200, () => App.Plant?.IsAuger1Active ?? false);
-            var auger3 = new EncasedAuger("Pressen-\nQuerschnecke", 40, 200, () => App.Plant?.IsPresseQuerSchneckeActive ?? false, 180, clickable: false);
+            var auger0 = new EncasedAuger("Pressen-\nQuerschnecke", 40, 200, () => App.Plant?.IsPresseQuerSchneckeActive ?? false, 180, clickable: false);
-            Auger2 = new EncasedAuger("", 120, 80, () => App.Plant?.IsAuger2Active ?? false, 135);
+            Auger3 = new EncasedAuger("", 120, 80, () => App.Plant?.IsAuger3Active ?? false, 135);
-            var belt = new ConveyorBelt("", 90, 160, () => App.Plant?.IsBeltActive ?? false);
+            var belt = new ConveyorBelt("", 90, 160, () => App.Plant?.IsAuger2Active ?? false);
             Nodes.Add(belt);
             Nodes.Add(Auger1);
-            Nodes.Add(auger3);
+            Nodes.Add(auger0);
-            Nodes.Add(Auger2);
+            Nodes.Add(Auger3);
             var rebler = new Rebler("Rebler", (mw1X + mw2X) / 2, 200, () => App.Plant?.IsReblerActive ?? false);
             Nodes.Add(rebler);
             var switcher = new Switcher("", (mw1X + mw2X) / 2, 260, () => App.Plant?.TroughSelector ?? 0, () => App.Plant == null ? 0 : App.Plant.WantMW1Selected ? 1 : 2);
@@ -86,9 +87,9 @@ namespace PamhagenSysCtrl.Helpers {
             CreatePipe(x2, v3);
 
             var x3 = new PipeJoin(mw1X, mpY + 100);
-            var x4 = new PipeJoin(mw1X, ltg1Y);
+            var x4 = new PipeJoin(x1X, ltg1Y);
             var x5 = new PipeJoin(mw2X, mpY + 130);
-            var x6 = new PipeJoin(mw2X, ltg2Y);
+            var x6 = new PipeJoin(x1X - 30, ltg2Y);
 
             CreatePipe(v1, x3, true);
             CreatePipe(v3, x3, true);
@@ -97,23 +98,23 @@ namespace PamhagenSysCtrl.Helpers {
             CreatePipe(v4, x5, true);
             CreatePipe(x5, x6, true);
 
-            var v5 = CreateValve(5, mw1X + 50, ltg1Y);
+            var v5 = CreateValve(5, x1X + 30, ltg1Y);
-            var v6 = CreateValve(6, mw1X, ltg2Y + 40);
+            var v6 = CreateValve(6, x1X + 30, ltg2Y + 40);
-            var v7 = CreateValve(7, (mw2X + mw1X) / 2, ltg2Y);
+            var v7 = CreateValve(7, x1X + 30, ltg2Y);
-            var v8 = CreateValve(8, mw2X, ltg2Y + 40);
+            var v8 = CreateValve(8, x1X - 30, ltg2Y + 40);
             var v9 = CreateValve(9, ltg2X, 500);
 
             CreatePipe(x4, v5);
-            CreatePipe(x4, v6);
+            CreatePipe(x4, v6, true);
             CreatePipe(x6, v7);
             CreatePipe(x6, v8);
-            CreatePipe(v7, v9);
+            CreatePipe(v7, v9, label: "Ltg. 2", labelOffsetX: 30);
 
             var xv15 = new PipeJoin(ltg1X, wt1Y + 40);
             var xv11 = new PipeJoin(ltg2X, wt1Y + 70);
             var x7 = new PipeJoin(ltg2X, 460);
 
-            CreatePipe(v5, xv15);
+            CreatePipe(v5, xv15, label: "Ltg. 1", labelOffsetX: 30);
             CreatePipe(v9, x7);
             CreatePipe(x7, xv11);
 
@@ -179,9 +180,9 @@ namespace PamhagenSysCtrl.Helpers {
             var xv23 = new PipeJoin(t1X + 15, ltg6Y);
             var v22 = CreateValve(22, t1X - 15, tValveY);
             var v23 = CreateValve(23, t1X + 15, tValveY);
-            var t1 = CreateTank(1, t1X, tanksY, 100000);
+            var t1 = CreateTank(1, t1X, tanksY, 35000);
-            CreatePipe(xv20, xv22, true);
+            CreatePipe(xv20, xv22, true, label: "Ltg. 7", labelOffsetX: 50);
-            CreatePipe(xv21, xv23, true);
+            CreatePipe(xv21, xv23, true, label: "Ltg. 6", labelOffsetX: 20);
             CreatePipe(xv22, v22);
             CreatePipe(xv23, v23);
             CreateInlet(v22, t1);
@@ -191,7 +192,7 @@ namespace PamhagenSysCtrl.Helpers {
             var xv25 = new PipeJoin(t2X + 15, ltg6Y);
             var v24 = CreateValve(24, t2X - 15, tValveY);
             var v25 = CreateValve(25, t2X + 15, tValveY);
-            var t2 = CreateTank(2, t2X, tanksY, 100000);
+            var t2 = CreateTank(2, t2X, tanksY, 35000);
             CreatePipe(xv22, xv24);
             CreatePipe(xv23, xv25);
             CreatePipe(xv24, v24);
@@ -203,7 +204,7 @@ namespace PamhagenSysCtrl.Helpers {
             var xv27 = new PipeJoin(t3X + 15, ltg6Y);
             var v26 = CreateValve(26, t3X - 15, tValveY);
             var v27 = CreateValve(27, t3X + 15, tValveY);
-            var t3 = CreateTank(3, t3X, tanksY, 100000);
+            var t3 = CreateTank(3, t3X, tanksY, 35000);
             CreatePipe(xv24, xv26);
             CreatePipe(xv25, xv27);
             CreatePipe(xv26, v26);
@@ -220,7 +221,7 @@ namespace PamhagenSysCtrl.Helpers {
             var xv31 = new PipeJoin(t4X + 15, ltg6Y);
             var v30 = CreateValve(30, t4X - 15, tValveY);
             var v31 = CreateValve(31, t4X + 15, tValveY);
-            var t4 = CreateTank(4, t4X, tanksY, 100000);
+            var t4 = CreateTank(4, t4X, tanksY, 35000);
             CreatePipe(v28, xv30);
             CreatePipe(v29, xv31);
             CreatePipe(xv30, v30);
@@ -232,9 +233,9 @@ namespace PamhagenSysCtrl.Helpers {
             var xv33 = new PipeJoin(t5X + 15, ltg6Y);
             var v32 = CreateValve(32, t5X - 15, tValveY);
             var v33 = CreateValve(33, t5X + 15, tValveY);
-            var t5 = CreateTank(5, t5X, tanksY, 100000);
+            var t5 = CreateTank(5, t5X, tanksY, 35000);
-            CreatePipe(xv30, xv32);
+            CreatePipe(xv30, xv32, label: "Ltg. 7", labelOffsetX: 30);
-            CreatePipe(xv31, xv33);
+            CreatePipe(xv31, xv33, label: "Ltg. 6", labelOffsetX: 0);
             CreatePipe(xv32, v32);
             CreatePipe(xv33, v33);
             CreateInlet(v32, t5);
@@ -249,7 +250,7 @@ namespace PamhagenSysCtrl.Helpers {
             var xv37 = new PipeJoin(t6X - 15, ltg7Y);
             var v36 = CreateValve(36, t6X + 15, tValveY);
             var v37 = CreateValve(37, t6X - 15, tValveY);
-            var t6 = CreateTank(6, t6X, tanksY, 100000);
+            var t6 = CreateTank(6, t6X, tanksY, 35000);
             CreatePipe(v34, xv37);
             CreatePipe(v35, xv36);
             CreatePipe(xv37, v37);
@@ -261,7 +262,7 @@ namespace PamhagenSysCtrl.Helpers {
             var xv39 = new PipeJoin(t7X - 15, ltg7Y);
             var v38 = CreateValve(38, t7X + 15, tValveY);
             var v39 = CreateValve(39, t7X - 15, tValveY);
-            var t7 = CreateTank(7, t7X, tanksY, 100000);
+            var t7 = CreateTank(7, t7X, tanksY, 35000);
             CreatePipe(xv37, xv39);
             CreatePipe(xv36, xv38);
             CreatePipe(xv38, v38);
@@ -273,9 +274,9 @@ namespace PamhagenSysCtrl.Helpers {
             var xv41 = new PipeJoin(t8X - 15, ltg7Y);
             var v40 = CreateValve(40, t8X + 15, tValveY);
             var v41 = CreateValve(41, t8X - 15, tValveY);
-            var t8 = CreateTank(8, t8X, tanksY, 100000);
+            var t8 = CreateTank(8, t8X, tanksY, 35000);
-            CreatePipe(xv38, xv40);
+            CreatePipe(xv38, xv40, label: "Ltg. 6", labelOffsetX: 0);
-            CreatePipe(xv39, xv41);
+            CreatePipe(xv39, xv41, label: "Ltg. 7", labelOffsetX: 30);
             CreatePipe(xv40, v40);
             CreatePipe(xv41, v41);
             CreateInlet(v40, t8);
@@ -283,7 +284,7 @@ namespace PamhagenSysCtrl.Helpers {
 
             var v42 = CreateValve(42, t9X + 15, tValveY);
             var v43 = CreateValve(43, t9X - 15, tValveY);
-            var t9 = CreateTank(9, t9X, tanksY, 100000);
+            var t9 = CreateTank(9, t9X, tanksY, 35000);
             CreatePipe(xv40, v42);
             CreatePipe(xv41, v43);
             CreateInlet(v42, t9);
@@ -318,7 +319,7 @@ namespace PamhagenSysCtrl.Helpers {
             CreatePipe(v45, xv45);
             CreatePipe(v47, xv47);
 
-            CreatePipe(xv44, v10);
+            CreatePipe(xv44, v10, label: "Ltg. 5");
             CreatePipe(v48, xv47, true);
             CreateTwoWayPipe(xv47, v46);
             CreateTwoWayPipe(v46, xv45);
@@ -339,46 +340,62 @@ namespace PamhagenSysCtrl.Helpers {
             var v49 = CreateValve(49, t4X, tanksY + 220);
             CreatePipe(xv47, v49);
 
-            var press1 = new Press("Presse 1", pr1X, prY, 200000, () => App.Plant?.FillLevelPress1 ?? FillState.Unknown);
+            var prX = (pr1X + pr2X) / 2;
-            var press2 = new Press("Presse 2", pr2X, prY, 150000, () => App.Plant?.FillLevelPress2 ?? FillState.Unknown);
+            var pr1cX = prX - 15;
-            var v50 = CreateValve(50, pr1X - 45, prY - 100);
+            var pr2cX = prX + 15;
-            var v51 = CreateValve(51, pr1X - 15, prY - 100);
+            var press1 = new Press("Presse 1", pr1X, prY, 20000, () => FillState.Unknown);
-            var v52 = CreateValve(52, pr1X + 15, prY - 100);
+            var press2 = new Press("Presse 2", pr2X, prY, 15000, () => FillState.Unknown);
-            var v53 = CreateValve(53, pr1X + 45, prY - 100);
+            var v50 = CreateValve(50, pr2cX + 30, 580);
-            var v54 = CreateValve(54, pr2X - 45, prY - 100);
+            var v51 = CreateValve(51, pr1cX - 30, 580);
-            var v55 = CreateValve(55, pr2X - 15, prY - 100);
+            var v52 = CreateValve(52, pr1cX - 30, 610);
-            var v56 = CreateValve(56, pr2X + 15, prY - 100);
+            var v53 = CreateValve(53, pr2cX + 30, 610);
-            var v57 = CreateValve(57, pr2X + 45, prY - 100);
+            var v54 = CreateValve(54, pr2cX + 30, 550);
-            var xp1 = new PipeJoin(pr1X - 15, 610);
+            var v55 = CreateValve(55, pr1cX - 30, 550);
-            var xp2 = new PipeJoin(pr1X + 15, 640);
+            var v56 = CreateValve(56, pr1cX - 30, 640);
-            var xp3 = new PipeJoin(pr2X - 45, 550);
+            var v57 = CreateValve(57, pr2cX + 30, 640);
-            var xp4 = new PipeJoin(pr2X + 45, 580);
+            var xp1 = new PipeJoin(pr1cX - 70, 580);
+            var xp2 = new PipeJoin(pr1cX - 70, 610);
+            var xp3 = new PipeJoin(pr2cX + 70, 550);
+            var xp4 = new PipeJoin(pr2cX + 70, 640);
+            var xp5 = new PipeJoin(pr1cX, 580);
+            var xp6 = new PipeJoin(pr1cX, 610);
+            var xp7 = new PipeJoin(pr2cX, 550);
+            var xp8 = new PipeJoin(pr2cX, 640);
 
-            CreatePipe(v6, xp1, true);
+            CreatePipe(v6, xp1, true, label: "Ltg. 3", labelOffsetX: 30);
-            CreatePipe(v8, xp2, true);
+            CreatePipe(v8, xp2, true, label: "Ltg. 4", labelOffsetX: 90);
-            CreatePipe(v49, xp3, true);
+            CreatePipe(v49, xp3, true, label: "Ltg. 8");
-            CreatePipe(P6, xp4, true);
+            CreatePipe(P6, xp4, true, label: "Ltg. 9");
-            CreatePipe(xp1, v51);
+            CreatePipe(xp1, v51, true);
-            CreatePipe(xp1, v55);
+            CreatePipe(xp1, v55, true);
-            CreatePipe(xp2, v52);
+            CreatePipe(xp2, v52, true);
-            CreatePipe(xp2, v56);
+            CreatePipe(xp2, v56, true);
-            CreatePipe(xp3, v50);
+            CreatePipe(xp3, v50, true);
-            CreatePipe(xp3, v54);
+            CreatePipe(xp3, v54, true);
-            CreatePipe(xp4, v53);
+            CreatePipe(xp4, v53, true);
-            CreatePipe(xp4, v57);
+            CreatePipe(xp4, v57, true);
 
-            CreateInlet(v50, press1);
+            CreatePipe(v50, xp5);
-            CreateInlet(v51, press1);
+            CreatePipe(v51, xp5);
-            CreateInlet(v52, press1);
+            CreatePipe(v52, xp6);
-            CreateInlet(v53, press1);
+            CreatePipe(v53, xp6);
-            CreateInlet(v54, press2);
+            CreatePipe(v54, xp7);
-            CreateInlet(v55, press2);
+            CreatePipe(v55, xp7);
-            CreateInlet(v56, press2);
+            CreatePipe(v56, xp8);
-            CreateInlet(v57, press2);
+            CreatePipe(v57, xp8);
+            CreatePipe(xp5, xp6);
+            CreatePipe(xp7, xp8);
+
+            var zv1 = new CenterValve("ZV1", pr1cX, prY - 40, () => App.Plant?.Press1HasClearance ?? false);
+            var zv2 = new CenterValve("ZV2", pr2cX, prY - 40, () => App.Plant?.Press2HasClearance ?? false);
+            CreatePipe(xp6, zv1, true);
+            CreatePipe(xp8, zv2, true);
+            CreateInlet(zv1, press1, true);
+            CreateInlet(zv2, press2, true);
         }
 
-        protected static Valve CreateValve(int n, double x, double y) {
+        protected Valve CreateValve(int n, double x, double y) {
-            return new(n, x, y, () => App.Plant?.IsValveOpen(n) ?? false, () => App.Plant?.WantValveOpen(n) ?? false);
+            return new(n, x, y, () => App.Plant?.IsValveOpen(n) ?? false, (v) => SelectedPaths.Any(p => p.Hops.Any(h => h.Node == v)));
         }
 
         protected static Tank CreateTank(int n, double x, double y, int capacity) {

PamhagenSysCtrl/Helpers/PamhagenPlant.cs

@@ -9,11 +9,14 @@ namespace PamhagenSysCtrl.Helpers {
         protected bool IsRunning = true;
         protected Thread? BackgroundThread;
 
+        public bool OverridePathClearances { get; set; }
+        public bool OverrideDryRunClearances { get; set; }
+
         public event EventHandler<PlantEventArgs>? Update;
 
         protected bool ActuatorsChanged = false;
         protected PamhagenPlc.ActuatorStates Actuators;
-        protected PamhagenPlc.SensorStates Sensors = new(default, default, default, default, [
+        protected PamhagenPlc.SensorStates Sensors = new(default, default, default, default, default, default, default, [
             FillState.Unknown, FillState.Unknown, FillState.Unknown, FillState.Unknown, FillState.Unknown, FillState.Unknown, FillState.Unknown, FillState.Unknown, FillState.Unknown
             ], default);
 
@@ -28,10 +31,10 @@ namespace PamhagenSysCtrl.Helpers {
         public int TroughSelector => Sensors.TroughSelector;
         public bool IsMWSelected => Sensors.TroughSelector == 1;
         public bool IsMW2Selected => Sensors.TroughSelector == 2;
-        public FillState FillLevelMW1 => Sensors.FillingLevels.MW1;
+        public FillState FillLevelMW1 => Sensors.FillingLevelMW1;
-        public FillState FillLevelMW2 => Sensors.FillingLevels.MW2;
+        public FillState FillLevelMW2 => Sensors.FillingLevelMW2;
-        public FillState FillLevelPress1 => Sensors.FillingLevels.Press1;
+        public bool Press1HasClearance => Sensors.ClearancePress1;
-        public FillState FillLevelPress2 => Sensors.FillingLevels.Press2;
+        public bool Press2HasClearance => Sensors.ClearancePress2;
         public FillState FillLevelT1 => Sensors.FillingLevelTanks[0];
         public FillState FillLevelT2 => Sensors.FillingLevelTanks[1];
         public FillState FillLevelT3 => Sensors.FillingLevelTanks[2];
@@ -53,10 +56,10 @@ namespace PamhagenSysCtrl.Helpers {
         public bool IsReblerActive => Actuators.Rebler;
         public bool IsStirrerMW1Active => Actuators.StirrerMW1;
         public bool IsStirrerMW2Active => Actuators.StirrerMW2;
-        public bool IsBeltActive => Actuators.Belt;
         public bool IsAuger1Active => Actuators.Auger1;
         public bool IsAuger2Active => Actuators.Auger2;
-        public bool IsWasteDisposalActive => IsBeltActive || IsAuger1Active || IsAuger2Active;
+        public bool IsAuger3Active => Actuators.Auger3;
+        public bool IsWasteDisposalActive => IsAuger1Active || IsAuger2Active || IsAuger3Active;
         public bool IsGradationPumpActive => Actuators.GradationPump;
 
         public bool IsMP1Active => Actuators.MP1 == MotorState.Forward || Actuators.MP1 == MotorState.Backward;
@@ -78,10 +81,10 @@ namespace PamhagenSysCtrl.Helpers {
 
         protected static void OnUpdate(object? sender, PlantEventArgs evt) {
             if (sender is not PamhagenPlant p) return;
-            if (p.IsPresseQuerSchneckeActive && !p.IsBeltActive) p.StartBelt();
+            if (p.IsPresseQuerSchneckeActive && !p.IsAuger2Active) p.StartAuger2();
             if (p.IsReblerActive && !p.IsAuger1Active) p.StartAuger1();
-            if (p.IsAuger1Active && !p.IsBeltActive) p.StartBelt();
+            if (p.IsAuger1Active && !p.IsAuger2Active) p.StartAuger2();
-            if (p.IsBeltActive && !p.IsAuger2Active) p.StartAuger2();
+            if (p.IsAuger2Active && !p.IsAuger3Active) p.StartAuger3();
             if (p.IsTroughAugerActive && (!p.IsReblerActive || (p.IsMWSelected && p.FillLevelMW1 == FillState.Full) || (p.IsMW2Selected && p.FillLevelMW2 == FillState.Full)))
                 p.StopTroughAuger();
             if (p.IsMP1Active && !p.MP1HasClearance) p.StopMP1();
@@ -210,25 +213,26 @@ namespace PamhagenSysCtrl.Helpers {
             (a && ((HasWTClearanceAA && HasT9ClearanceA) || (HasWTClearanceAB && HasT9ClearanceB))) ||
             (b && ((HasWTClearanceBA && HasT9ClearanceA) || (HasWTClearanceBB && HasT9ClearanceB)));
 
-        public bool MP1HasClearance => FillLevelMW1 != FillState.Empty && (
+        public bool MP1HasClearance => (OverrideDryRunClearances || FillLevelMW1 != FillState.Empty) && (
-            (MP1HasClearancePress1 && FillLevelPress1 != FillState.Full) ||
+              OverridePathClearances ||
-            (MP1HasClearancePress2 && FillLevelPress2 != FillState.Full) ||
+              (MP1HasClearancePress1 && Press1HasClearance) ||
-            (HasClearanceTank1(MP1HasClearanceTanksA, MP1HasClearanceTanksB) && FillLevelT1 != FillState.Full) ||
+              (MP1HasClearancePress2 && Press2HasClearance) ||
-            (HasClearanceTank2(MP1HasClearanceTanksA, MP1HasClearanceTanksB) && FillLevelT2 != FillState.Full) ||
+              (HasClearanceTank1(MP1HasClearanceTanksA, MP1HasClearanceTanksB) && FillLevelT1 != FillState.Full) ||
-            (HasClearanceTank3(MP1HasClearanceTanksA, MP1HasClearanceTanksB) && FillLevelT3 != FillState.Full) ||
+              (HasClearanceTank2(MP1HasClearanceTanksA, MP1HasClearanceTanksB) && FillLevelT2 != FillState.Full) ||
-            (HasClearanceTank4(MP1HasClearanceTanksA, MP1HasClearanceTanksB) && FillLevelT4 != FillState.Full) ||
+              (HasClearanceTank3(MP1HasClearanceTanksA, MP1HasClearanceTanksB) && FillLevelT3 != FillState.Full) ||
-            (HasClearanceTank5(MP1HasClearanceTanksA, MP1HasClearanceTanksB) && FillLevelT5 != FillState.Full) ||
+              (HasClearanceTank4(MP1HasClearanceTanksA, MP1HasClearanceTanksB) && FillLevelT4 != FillState.Full) ||
-            (HasClearanceTank6(MP1HasClearanceTanksA, MP1HasClearanceTanksB) && FillLevelT6 != FillState.Full) ||
+              (HasClearanceTank5(MP1HasClearanceTanksA, MP1HasClearanceTanksB) && FillLevelT5 != FillState.Full) ||
-            (HasClearanceTank7(MP1HasClearanceTanksA, MP1HasClearanceTanksB) && FillLevelT7 != FillState.Full) ||
+              (HasClearanceTank6(MP1HasClearanceTanksA, MP1HasClearanceTanksB) && FillLevelT6 != FillState.Full) ||
-            (HasClearanceTank8(MP1HasClearanceTanksA, MP1HasClearanceTanksB) && FillLevelT8 != FillState.Full) ||
+              (HasClearanceTank7(MP1HasClearanceTanksA, MP1HasClearanceTanksB) && FillLevelT7 != FillState.Full) ||
-            (HasClearanceTank9(MP1HasClearanceTanksA, MP1HasClearanceTanksB) && FillLevelT9 != FillState.Full) ||
+              (HasClearanceTank8(MP1HasClearanceTanksA, MP1HasClearanceTanksB) && FillLevelT8 != FillState.Full) ||
-            false);
+              (HasClearanceTank9(MP1HasClearanceTanksA, MP1HasClearanceTanksB) && FillLevelT9 != FillState.Full) ||
+              false);
         protected bool MP1HasClearancePress1 =>
-            (AreValvesOpen(1, 6, 51) && AreValvesClosed(3, 4, 5, 55)) ||
+            (AreValvesOpen(1, 6, 51) && AreValvesClosed(3, 4, 5, 50, 52, 53, 55)) ||
-            (AreValvesOpen(4, 8, 52) && AreValvesClosed(1, 2, 7, 56));
+            (AreValvesOpen(4, 8, 52) && AreValvesClosed(1, 2, 7, 50, 51, 53, 56));
         protected bool MP1HasClearancePress2 =>
-            (AreValvesOpen(1, 6, 55) && AreValvesClosed(3, 4, 5, 51)) ||
+            (AreValvesOpen(1, 6, 55) && AreValvesClosed(3, 4, 5, 51, 54, 56, 57)) ||
-            (AreValvesOpen(4, 8, 56) && AreValvesClosed(1, 2, 7, 52));
+            (AreValvesOpen(4, 8, 56) && AreValvesClosed(1, 2, 7, 52, 54, 55, 57));
         protected bool MP1HasClearanceTanksA => AreValvesOpen(1, 5) && AreValvesClosed(3, 4, 6);
         protected bool MP1HasClearanceTanksB => AreValvesOpen(4, 7, 9) && AreValvesClosed(1, 2, 8, 10);
 
@@ -237,9 +241,10 @@ namespace PamhagenSysCtrl.Helpers {
             set => Actuators.MP1 = (value != MotorState.Halt && value != MotorState.Forward && value != MotorState.Backward) ? throw new ArgumentException("Invalid state for MP1") : value;
         }
 
-        public bool MP2HasClearance => FillLevelMW2 != FillState.Empty && (
+        public bool MP2HasClearance => (OverrideDryRunClearances || FillLevelMW2 != FillState.Empty) && (
-              (MP2HasClearancePress1 && FillLevelPress1 != FillState.Full) ||
+              OverridePathClearances ||
-              (MP2HasClearancePress2 && FillLevelPress2 != FillState.Full) ||
+              (MP2HasClearancePress1 && Press1HasClearance) ||
+              (MP2HasClearancePress2 && Press2HasClearance) ||
               (HasClearanceTank1(MP2HasClearanceTanksA, MP2HasClearanceTanksB) && FillLevelT1 != FillState.Full) ||
               (HasClearanceTank2(MP2HasClearanceTanksA, MP2HasClearanceTanksB) && FillLevelT2 != FillState.Full) ||
               (HasClearanceTank3(MP2HasClearanceTanksA, MP2HasClearanceTanksB) && FillLevelT3 != FillState.Full) ||
@@ -251,11 +256,11 @@ namespace PamhagenSysCtrl.Helpers {
               (HasClearanceTank9(MP2HasClearanceTanksA, MP2HasClearanceTanksB) && FillLevelT9 != FillState.Full) ||
               false);
         protected bool MP2HasClearancePress1 =>
-            (AreValvesOpen(2, 8, 52) && AreValvesClosed(3, 4, 7, 56)) ||
+            (AreValvesOpen(2, 8, 52) && AreValvesClosed(3, 4, 7, 50, 51, 53, 56)) ||
-            (AreValvesOpen(3, 6, 51) && AreValvesClosed(1, 2, 5, 55));
+            (AreValvesOpen(3, 6, 51) && AreValvesClosed(1, 2, 5, 50, 52, 53, 55));
         protected bool MP2HasClearancePress2 =>
-            (AreValvesOpen(2, 8, 56) && AreValvesClosed(3, 4, 7, 52)) ||
+            (AreValvesOpen(2, 8, 56) && AreValvesClosed(3, 4, 7, 52, 54, 55, 57)) ||
-            (AreValvesOpen(3, 6, 55) && AreValvesClosed(2, 1, 5, 51));
+            (AreValvesOpen(3, 6, 55) && AreValvesClosed(2, 1, 5, 51, 54, 56, 57));
         protected bool MP2HasClearanceTanksA => AreValvesOpen(3, 5) && AreValvesClosed(1, 2, 6);
         protected bool MP2HasClearanceTanksB => AreValvesOpen(2, 7, 9) && AreValvesClosed(3, 4, 8, 10);
 
@@ -264,9 +269,10 @@ namespace PamhagenSysCtrl.Helpers {
             set => Actuators.MP2 = (value != MotorState.Halt && value != MotorState.Forward && value != MotorState.Backward) ? throw new ArgumentException("Invalid state for MP2") : value;
         }
 
-        public bool P12HasClearance => (FillLevelT1 != FillState.Empty || FillLevelT2 != FillState.Empty) && (
+        public bool P12HasClearance => (OverrideDryRunClearances || FillLevelT1 != FillState.Empty || FillLevelT2 != FillState.Empty) && (
-              (P12HasClearancePress1 && FillLevelPress1 != FillState.Full) ||
+              OverridePathClearances ||
-              (P12HasClearancePress2 && FillLevelPress2 != FillState.Full) ||
+              (P12HasClearancePress1 && Press1HasClearance) ||
+              (P12HasClearancePress2 && Press2HasClearance) ||
               (HasClearanceTank1(false, P12HasClearanceTanksB) && FillLevelT1 != FillState.Full) ||
               (HasClearanceTank2(false, P12HasClearanceTanksB) && FillLevelT2 != FillState.Full) ||
               (HasClearanceTank3(false, P12HasClearanceTanksB) && FillLevelT3 != FillState.Full) ||
@@ -277,8 +283,8 @@ namespace PamhagenSysCtrl.Helpers {
               (HasClearanceTank8(false, P12HasClearanceTanksB) && FillLevelT8 != FillState.Full) ||
               (HasClearanceTank9(false, P12HasClearanceTanksB) && FillLevelT9 != FillState.Full) ||
               false);
-        protected bool P12HasClearancePress1 => AreValvesOpen(44, 46, 49, 50) && AreValvesClosed(10, 45, 47, 48, 54);
+        protected bool P12HasClearancePress1 => AreValvesOpen(44, 46, 49, 50) && AreValvesClosed(10, 45, 47, 48, 54, 51, 52, 53);
-        protected bool P12HasClearancePress2 => AreValvesOpen(44, 46, 49, 54) && AreValvesClosed(10, 45, 47, 48, 50);
+        protected bool P12HasClearancePress2 => AreValvesOpen(44, 46, 49, 54) && AreValvesClosed(10, 45, 47, 48, 50, 55, 56, 57);
         protected bool P12HasClearanceTanksB => AreValvesOpen(44, 10) && AreValvesClosed(9, 45, 46);
 
         public MotorState P12 {
@@ -286,9 +292,10 @@ namespace PamhagenSysCtrl.Helpers {
             set => Actuators.P12 = (value != MotorState.Halt && value != MotorState.Forward) ? throw new ArgumentException("Invalid state for P12") : value;
         }
 
-        public bool P3HasClearance => FillLevelT3 != FillState.Empty && (
+        public bool P3HasClearance => (OverrideDryRunClearances || FillLevelT3 != FillState.Empty) && (
-              (P3HasClearancePress1 && FillLevelPress1 != FillState.Full) ||
+              OverridePathClearances ||
-              (P3HasClearancePress2 && FillLevelPress2 != FillState.Full) ||
+              (P3HasClearancePress1 && Press1HasClearance) ||
+              (P3HasClearancePress2 && Press2HasClearance) ||
               (HasClearanceTank1(false, P3HasClearanceTanksB) && FillLevelT1 != FillState.Full) ||
               (HasClearanceTank2(false, P3HasClearanceTanksB) && FillLevelT2 != FillState.Full) ||
               (HasClearanceTank3(false, P3HasClearanceTanksB) && FillLevelT3 != FillState.Full) ||
@@ -299,8 +306,8 @@ namespace PamhagenSysCtrl.Helpers {
               (HasClearanceTank8(false, P3HasClearanceTanksB) && FillLevelT8 != FillState.Full) ||
               (HasClearanceTank9(false, P3HasClearanceTanksB) && FillLevelT9 != FillState.Full) ||
               false);
-        protected bool P3HasClearancePress1 => AreValvesOpen(45, 46, 49, 50) && AreValvesClosed(10, 44, 47, 48, 54);
+        protected bool P3HasClearancePress1 => AreValvesOpen(45, 46, 49, 50) && AreValvesClosed(10, 44, 47, 48, 51, 52, 53, 54);
-        protected bool P3HasClearancePress2 => AreValvesOpen(45, 46, 49, 54) && AreValvesClosed(10, 44, 47, 48, 50);
+        protected bool P3HasClearancePress2 => AreValvesOpen(45, 46, 49, 54) && AreValvesClosed(10, 44, 47, 48, 50, 55, 56, 57);
         protected bool P3HasClearanceTanksB => AreValvesOpen(45, 10) && AreValvesClosed(9, 44, 46);
 
         public MotorState P3 {
@@ -308,9 +315,10 @@ namespace PamhagenSysCtrl.Helpers {
             set => Actuators.P3 = (value != MotorState.Halt && value != MotorState.Forward) ? throw new ArgumentException("Invalid state for P3") : value;
         }
 
-        public bool P4HasClearance => FillLevelT4 != FillState.Empty && (
+        public bool P4HasClearance => (OverrideDryRunClearances || FillLevelT4 != FillState.Empty) && (
-              (P4HasClearancePress1 && FillLevelPress1 != FillState.Full) ||
+              OverridePathClearances ||
-              (P4HasClearancePress2 && FillLevelPress2 != FillState.Full) ||
+              (P4HasClearancePress1 && Press1HasClearance) ||
+              (P4HasClearancePress2 && Press2HasClearance) ||
               (HasClearanceTank1(false, P4HasClearanceTanksB) && FillLevelT1 != FillState.Full) ||
               (HasClearanceTank2(false, P4HasClearanceTanksB) && FillLevelT2 != FillState.Full) ||
               (HasClearanceTank3(false, P4HasClearanceTanksB) && FillLevelT3 != FillState.Full) ||
@@ -321,8 +329,8 @@ namespace PamhagenSysCtrl.Helpers {
               (HasClearanceTank8(false, P4HasClearanceTanksB) && FillLevelT8 != FillState.Full) ||
               (HasClearanceTank9(false, P4HasClearanceTanksB) && FillLevelT9 != FillState.Full) ||
               false);
-        protected bool P4HasClearancePress1 => AreValvesOpen(47, 49, 50) && AreValvesClosed(46, 48, 54);
+        protected bool P4HasClearancePress1 => AreValvesOpen(47, 49, 50) && AreValvesClosed(46, 48, 51, 52, 53, 54);
-        protected bool P4HasClearancePress2 => AreValvesOpen(47, 49, 54) && AreValvesClosed(46, 48, 50);
+        protected bool P4HasClearancePress2 => AreValvesOpen(47, 49, 54) && AreValvesClosed(46, 48, 50, 55, 56, 57);
         protected bool P4HasClearanceTanksB => AreValvesOpen(47, 46, 10) && AreValvesClosed(9, 44, 45, 48, 49);
 
         public MotorState P4 {
@@ -330,9 +338,10 @@ namespace PamhagenSysCtrl.Helpers {
             set => Actuators.P4 = (value != MotorState.Halt && value != MotorState.Forward) ? throw new ArgumentException("Invalid state for P4") : value;
         }
 
-        public bool P5HasClearance => FillLevelT5 != FillState.Empty && (
+        public bool P5HasClearance => (OverrideDryRunClearances || FillLevelT5 != FillState.Empty) && (
-              (P5HasClearancePress1 && FillLevelPress1 != FillState.Full) ||
+              OverridePathClearances ||
-              (P5HasClearancePress2 && FillLevelPress2 != FillState.Full) ||
+              (P5HasClearancePress1 && Press1HasClearance) ||
+              (P5HasClearancePress2 && Press2HasClearance) ||
               (HasClearanceTank1(false, P5HasClearanceTanksB) && FillLevelT1 != FillState.Full) ||
               (HasClearanceTank2(false, P5HasClearanceTanksB) && FillLevelT2 != FillState.Full) ||
               (HasClearanceTank3(false, P5HasClearanceTanksB) && FillLevelT3 != FillState.Full) ||
@@ -343,8 +352,8 @@ namespace PamhagenSysCtrl.Helpers {
               (HasClearanceTank8(false, P5HasClearanceTanksB) && FillLevelT8 != FillState.Full) ||
               (HasClearanceTank9(false, P5HasClearanceTanksB) && FillLevelT9 != FillState.Full) ||
               false);
-        protected bool P5HasClearancePress1 => AreValvesOpen(48, 49, 50) && AreValvesClosed(46, 47, 54);
+        protected bool P5HasClearancePress1 => AreValvesOpen(48, 49, 50) && AreValvesClosed(46, 47, 51, 52, 53, 54);
-        protected bool P5HasClearancePress2 => AreValvesOpen(48, 49, 54) && AreValvesClosed(46, 47, 50);
+        protected bool P5HasClearancePress2 => AreValvesOpen(48, 49, 54) && AreValvesClosed(46, 47, 50, 55, 56, 57);
         protected bool P5HasClearanceTanksB => AreValvesOpen(48, 46, 10) && AreValvesClosed(9, 44, 45, 47, 49);
 
         public MotorState P5 {
@@ -352,9 +361,9 @@ namespace PamhagenSysCtrl.Helpers {
             set => Actuators.P5 = (value != MotorState.Halt && value != MotorState.Forward) ? throw new ArgumentException("Invalid state for P5") : value;
         }
 
-        public bool P6HasClearance =>
+        public bool P6HasClearance => OverridePathClearances ||
-            (IsValveOpen(53) && IsValveClosed(57) && FillLevelPress1 != FillState.Full) ||
+            (AreValvesOpen(53) && AreValvesClosed(50, 51, 52, 57) && Press1HasClearance) ||
-            (IsValveOpen(57) && IsValveClosed(53) && FillLevelPress2 != FillState.Full);
+            (AreValvesOpen(57) && AreValvesClosed(53, 54, 55, 56) && Press2HasClearance);
 
         public MotorState P6 {
             get => Actuators.P6;
@@ -427,22 +436,9 @@ namespace PamhagenSysCtrl.Helpers {
             ActuatorsChanged = true;
         }
 
-        public void StartBelt() {
-            Actuators.Belt = true;
-            StartAuger2();
-            ActuatorsChanged = true;
-        }
-
-        public void StopBelt() {
-            if (IsPresseQuerSchneckeActive) throw new NoClearanceException("Presse-Querschnecke aktiv");
-            if (IsAuger1Active) throw new NoClearanceException("Förderschnecke 1 aktiv");
-            Actuators.Belt = false;
-            ActuatorsChanged = true;
-        }
-
         public void StartAuger1() {
             Actuators.Auger1 = true;
-            StartBelt();
+            StartAuger2();
             ActuatorsChanged = true;
         }
 
@@ -454,15 +450,28 @@ namespace PamhagenSysCtrl.Helpers {
 
         public void StartAuger2() {
             Actuators.Auger2 = true;
+            StartAuger3();
             ActuatorsChanged = true;
         }
 
         public void StopAuger2() {
-            if (IsBeltActive) throw new NoClearanceException("Förderband aktiv");
+            if (IsPresseQuerSchneckeActive) throw new NoClearanceException("Presse-Querschnecke aktiv");
+            if (IsAuger1Active) throw new NoClearanceException("Förderschnecke 1 aktiv");
             Actuators.Auger2 = false;
             ActuatorsChanged = true;
         }
 
+        public void StartAuger3() {
+            Actuators.Auger3 = true;
+            ActuatorsChanged = true;
+        }
+
+        public void StopAuger3() {
+            if (IsAuger2Active) throw new NoClearanceException("Förderschnecke 2 aktiv");
+            Actuators.Auger3 = false;
+            ActuatorsChanged = true;
+        }
+
         public void StartGradationPump() {
             Actuators.GradationPump = true;
             ActuatorsChanged = true;

PamhagenSysCtrl/Helpers/PamhagenPlc.cs

@@ -5,7 +5,10 @@ namespace PamhagenSysCtrl.Helpers {
 
         public record struct SensorStates(
             long PressureSensors,
-            (FillState MW1, FillState MW2, FillState Press1, FillState Press2) FillingLevels,
+            FillState FillingLevelMW1,
+            FillState FillingLevelMW2,
+            bool ClearancePress1,
+            bool ClearancePress2,
             int TroughSelector,
             double GradationOe,
             FillState[] FillingLevelTanks,
@@ -17,7 +20,7 @@ namespace PamhagenSysCtrl.Helpers {
         public record struct ActuatorStates(
             long Valves,
             MotorState MP1, MotorState MP2, MotorState P12, MotorState P3, MotorState P4, MotorState P5, MotorState P6,
-            bool TroughAuger, bool Rebler, bool StirrerMW1, bool StirrerMW2, bool Belt, bool Auger1, bool Auger2, bool GradationPump
+            bool TroughAuger, bool Rebler, bool StirrerMW1, bool StirrerMW2, bool Auger2, bool Auger3, bool Auger1, bool GradationPump
         ) {
             public readonly bool GetV(int n) => (Valves & (1L << (n - 1))) != 0;
             public void SetV(int n, bool val) {
@@ -109,8 +112,8 @@ namespace PamhagenSysCtrl.Helpers {
 
             var mw1 = Int3ToFillState((f1      ) & 0x7);  // 111 011 001 000
             var mw2 = Int3ToFillState((f1 >>  3) & 0x7);  // 111 011 001 000
-            var p1  = Int1ToFillState((f1 >>  6) & 0x1);  // 1 0
+            var p1  =                ((f1 >>  6) & 0x1) == 0;  // 1 0
-            var p2  = Int1ToFillState((f1 >>  7) & 0x1);  // 1 0
+            var p2  =                ((f1 >>  7) & 0x1) == 0;  // 1 0
             var wp  =                ((f1 >>  8) & 0x3);  // 10 01
 
             // Masseligerät :    4mA => 50 Oe
@@ -137,7 +140,7 @@ namespace PamhagenSysCtrl.Helpers {
             var t9 = Int1ToFillState((f2 >> 13) & 0x1);  // 1 0
             var q1 = Int1ToPumpState((f2 >> 15) & 0x1);  // 1 0
 
-            return new SensorStates(pressure, (mw1, mw2, p1, p2), wp == 3 ? -1 : wp == 1 ? 2 : wp == 2 ? 1 : 0, oe, [t1, t2, t3, t4, t5, t6, t7, t8, t9], q1);
+            return new SensorStates(pressure, mw1, mw2, p1, p2, wp == 3 ? -1 : wp == 1 ? 2 : wp == 2 ? 1 : 0, oe, [t1, t2, t3, t4, t5, t6, t7, t8, t9], q1);
         }
 
         protected async Task<(ushort RW000, ushort RW001, ushort RW002, ushort RW003, ushort RW004, ushort RW005, ushort RW006)> ReadOutputRegisters() {
@@ -212,9 +215,9 @@ namespace PamhagenSysCtrl.Helpers {
                 (state.GetV(58)       ? 0x04 : 0x00) |
                 (state.StirrerMW1     ? 0x08 : 0x00) |
                 (state.StirrerMW2     ? 0x10 : 0x00) |
-                (state.Belt           ? 0x20 : 0x00) |
+                (state.Auger2         ? 0x20 : 0x00) |
-                (state.Auger1         ? 0x40 : 0x00) |
+                (state.Auger3         ? 0x40 : 0x00) |
-                (state.Auger2         ? 0x80 : 0x00);
+                (state.Auger1         ? 0x80 : 0x00);
 
             int measuring =
                 (state.GetV(59)      ? 0x01 : 0x00) |

PamhagenSysCtrl/Helpers/Pipeline/CenterValve.cs

@@ -0,0 +1,70 @@
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+using System.Windows.Shapes;
+
+namespace PamhagenSysCtrl.Helpers.Pipeline {
+    public class CenterValve : INode {
+
+        public const double DIAMETER = 24;
+
+        public double CenterX { get; set; }
+        public double CenterY { get; set; }
+        public string Label { get; set; }
+        public Brush? Highlight { get; set; }
+
+        public bool IsOpen => CallbackIsOpen();
+        public ISet<IEdge> Inputs { get; init; }
+        public ISet<IEdge> Outputs { get; init; }
+
+        protected Func<bool> CallbackIsOpen;
+
+        private Shape? _circle;
+        private TextBlock? _text;
+
+        public CenterValve(string label, double x, double y, Func<bool> cbOpen) {
+            CenterX = x;
+            CenterY = y;
+            Label = label;
+            CallbackIsOpen = cbOpen;
+            Inputs = new HashSet<IEdge>();
+            Outputs = new HashSet<IEdge>();
+        }
+
+        public void Draw(Canvas canvas) {
+            _circle = new Ellipse() {
+                Height = DIAMETER,
+                Width = DIAMETER,
+                Fill = Brushes.DarkGray,
+                Stroke = Brushes.Black,
+                StrokeThickness = 2,
+            };
+            _circle.SetValue(Canvas.LeftProperty, CenterX - DIAMETER / 2);
+            _circle.SetValue(Canvas.TopProperty, CenterY - DIAMETER / 2);
+            _text = new() {
+                Text = Label,
+                FontSize = 10,
+                Width = DIAMETER,
+                Height = DIAMETER,
+                TextAlignment = TextAlignment.Center,
+                VerticalAlignment = VerticalAlignment.Center,
+                SnapsToDevicePixels = true,
+            };
+            _text.SetValue(Canvas.LeftProperty, CenterX - DIAMETER / 2 + 0.5);
+            _text.SetValue(Canvas.TopProperty, CenterY - DIAMETER / 2 + 5.5);
+            canvas.Children.Add(_circle);
+            canvas.Children.Add(_text);
+        }
+
+        public bool IsInside(double x, double y) {
+            return Math.Sqrt(Math.Pow(CenterX - x, 2) + Math.Pow(CenterY - y, 2)) <= DIAMETER / 2;
+        }
+
+        public void Update(bool isHovering, bool isPressed) {
+            _circle?.Fill =
+              !IsOpen ? PamhagenBrushes.Red :
+              IsOpen ? PamhagenBrushes.Green :
+              Highlight ?? Brushes.DarkGray;
+        }
+    }
+}

PamhagenSysCtrl/Helpers/Pipeline/Graph.cs

@@ -12,10 +12,10 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
 
         }
 
-        public Pipe CreatePipe(INode start, INode end, bool verticalFirst = false) {
+        public Pipe CreatePipe(INode start, INode end, bool verticalFirst = false, string? label = null, double? labelOffsetX = null) {
             Nodes.Add(start);
             Nodes.Add(end);
-            var p = new Pipe(start, end, verticalFirst);
+            var p = new Pipe(start, end, label, verticalFirst, default, labelOffsetX);
             start.Outputs.Add(p);
             end.Inputs.Add(p);
             Edges.Add(p);
@@ -25,7 +25,7 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
         public Pipe CreateTwoWayPipe(INode n1, INode n2, bool verticalFirst = false) {
             Nodes.Add(n1);
             Nodes.Add(n2);
-            var p = new Pipe(n1, n2, verticalFirst, twoWay: true);
+            var p = new Pipe(n1, n2, default, verticalFirst, twoWay: true);
             n1.Inputs.Add(p);
             n1.Outputs.Add(p);
             n2.Inputs.Add(p);
@@ -34,10 +34,10 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
             return p;
         }
 
-        public Inlet CreateInlet(INode start, ISink end) {
+        public Inlet CreateInlet(INode start, ISink end, bool sideways = false) {
             Nodes.Add(start);
             Nodes.Add(end);
-            var p = new Inlet(start, end, start.CenterX > end.CenterX);
+            var p = new Inlet(start, end, sideways);
             start.Outputs.Add(p);
             end.Inputs.Add(p);
             Edges.Add(p);

PamhagenSysCtrl/Helpers/Pipeline/HeatExchanger.cs

@@ -41,6 +41,7 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
                 TextAlignment = TextAlignment.Center,
                 VerticalAlignment = VerticalAlignment.Center,
                 RenderTransform = new RotateTransform(270),
+                SnapsToDevicePixels = true,
             };
             _rect.SetValue(Canvas.LeftProperty, CenterX - WIDTH / 2);
             _rect.SetValue(Canvas.TopProperty, CenterY - HEIGHT / 2);

PamhagenSysCtrl/Helpers/Pipeline/IEdge.cs

@@ -6,6 +6,7 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
 
         public INode Start { get; }
         public INode End { get; }
+        public string? Label { get; }
         public bool IsTwoWay { get; }
         public bool Orientation { get; }
         public Brush? Highlight { get; set; }

PamhagenSysCtrl/Helpers/Pipeline/Inlet.cs

@@ -8,6 +8,7 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
         public INode Start { get; set; }
         public INode End => Sink;
         public ISink Sink { get; set; }
+        public string? Label => null;
         public bool IsTwoWay => false;
         public bool Orientation { get; set; }
         public Brush? Highlight { get; set; }
@@ -30,9 +31,9 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
             var x1 = Start.CenterX;
             var y1 = Start.CenterY;
             var x2 = Start.CenterX;
-            var y2 = Sink.TopY - 10;
+            var y2 = Orientation ? Sink.CenterY - 10 : Sink.TopY - 10;
-            var x3 = Start.CenterX + (Orientation ? -20 : 20);
+            var x3 = Orientation ? Sink.CenterX : Start.CenterX + (Start.CenterX == End.CenterX ? 0 : Start.CenterX > End.CenterX ? -20 : 20);
-            var y3 = Sink.TopY + 20;
+            var y3 = Orientation ? Sink.CenterY - 10 : Sink.TopY + 20;
             _outer1 = new Line() {
                 X1 = x1,
                 Y1 = y1,

PamhagenSysCtrl/Helpers/Pipeline/Outlet.cs

@@ -10,6 +10,7 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
         public INode Start => Source;
         public INode End { get; set; }
         public ISource Source { get; set; }
+        public string? Label => null;
         public bool IsTwoWay => false;
         public bool Orientation { get; set; }
         public Brush? Highlight { get; set; }

PamhagenSysCtrl/Helpers/Pipeline/Pipe.cs

@@ -1,3 +1,4 @@
+using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
 using System.Windows.Shapes;
@@ -7,6 +8,7 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
 
         public INode Start { get; set; }
         public INode End { get; set; }
+        public string? Label { get; set; }
         public bool IsTwoWay { get; set; }
         public bool Orientation { get; set; }
         public Brush? Highlight { get; set; }
@@ -15,11 +17,15 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
 
         private Polyline? _outer;
         private Polyline? _inner;
+        private TextBlock? _text;
         private FlowArrows? _flowArrows;
+        private double? _textOffsetX;
 
-        public Pipe(INode start, INode end, bool orientation = false, bool twoWay = false) {
+        public Pipe(INode start, INode end, string? label = null, bool orientation = false, bool twoWay = false, double? textOffsetX = null) {
             Start = start;
             End = end;
+            Label = label;
+            _textOffsetX = textOffsetX;
             Orientation = orientation;
             IsTwoWay = twoWay;
         }
@@ -49,6 +55,20 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
             };
             canvas.Children.Add(_outer);
             canvas.Children.Add(_inner);
+            if (Label != null) {
+                _text = new() {
+                    Text = Label,
+                    FontSize = 12,
+                    Width = 50,
+                    TextAlignment = TextAlignment.Center,
+                    VerticalAlignment = VerticalAlignment.Bottom,
+                    HorizontalAlignment = HorizontalAlignment.Center,
+                    SnapsToDevicePixels = true,
+                };
+                _text.SetValue(Canvas.LeftProperty, _textOffsetX != null ? (Orientation ? x2 : x1) + _textOffsetX : (Orientation ? (x2 + x3) / 2 : (x1 + x2) / 2) - 25);
+                _text.SetValue(Canvas.TopProperty, y2 - 22);
+                canvas.Children.Add(_text);
+            }
             _flowArrows = FlowArrows.Create(canvas, _inner);
         }
 

PamhagenSysCtrl/Helpers/Pipeline/Valve.cs

@@ -16,17 +16,17 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
 
         public bool IsLocked { get; set; }
         public bool IsOpen => CallbackIsOpen();
-        public bool WantOpen => CallbackWantOpen();
+        public bool WantOpen => CallbackWantOpen(this);
         public ISet<IEdge> Inputs { get; init; }
         public ISet<IEdge> Outputs { get; init; }
 
         protected Func<bool> CallbackIsOpen;
-        protected Func<bool> CallbackWantOpen;
+        protected Func<Valve, bool> CallbackWantOpen;
 
         private Shape? _circle;
         private TextBlock? _text;
 
-        public Valve(int nr, double x, double y, Func<bool> cbOpen, Func<bool> cbWant) {
+        public Valve(int nr, double x, double y, Func<bool> cbOpen, Func<Valve, bool> cbWant) {
             CenterX = x;
             CenterY = y;
             Nr = nr;
@@ -53,8 +53,9 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
                 Height = DIAMETER,
                 TextAlignment = TextAlignment.Center,
                 VerticalAlignment = VerticalAlignment.Center,
+                SnapsToDevicePixels = true,
             };
-            _text.SetValue(Canvas.LeftProperty, CenterX - DIAMETER / 2);
+            _text.SetValue(Canvas.LeftProperty, CenterX - DIAMETER / 2 + 0.5);
             _text.SetValue(Canvas.TopProperty, CenterY - DIAMETER / 2 + 5.5);
             canvas.Children.Add(_circle);
             canvas.Children.Add(_text);

PamhagenSysCtrl/PamhagenSysCtrl.csproj

@@ -5,6 +5,8 @@
     <TargetFramework>net10.0-windows</TargetFramework>
     <Version>0.0.1</Version>
     <Product>Anlagensteuerung Pamhagen</Product>
+    <AssemblyTitle>Anlagensteuerung Pamhagen</AssemblyTitle>
+    <AssemblyName>PamhagenSysCtrl</AssemblyName>
     <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
@@ -14,8 +16,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-	  <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="10.0.10" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="10.0.10" />
-	  <PackageReference Include="System.IO.Ports" Version="10.0.10" />
+    <PackageReference Include="System.IO.Ports" Version="10.0.10" />
   </ItemGroup>
 
 </Project>

PamhagenSysCtrl/Windows/ManualControlWindow.xaml

@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:PamhagenSysCtrl"
         mc:Ignorable="d"
-        Title="Manuelle Steuerung - Anlagensteuerung Pamhagen" Height="550" Width="860">
+        Title="Handbetrieb - Anlagensteuerung Pamhagen" Height="550" Width="860">
     <Grid>
         <Grid x:Name="ValvePanel" Margin="5,5,5,5">
         </Grid>
@@ -39,14 +39,14 @@
                     FontSize="14" BorderThickness="2" FontWeight="Bold"
                     Margin="135,10,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
                     Click="Auger1Button_Click"/>
-            <Button x:Name="BeltButton" Content="Förderband" Padding="2" Height="30" Width="150"
-                    FontSize="14" BorderThickness="2" FontWeight="Bold"
-                    Margin="135,45,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
-                    Click="BeltButton_Click"/>
             <Button x:Name="Auger2Button" Content="Förderschnecke 2" Padding="2" Height="30" Width="150"
                     FontSize="14" BorderThickness="2" FontWeight="Bold"
-                    Margin="135,80,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
+                    Margin="135,45,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
                     Click="Auger2Button_Click"/>
+            <Button x:Name="Auger3Button" Content="Förderschnecke 3" Padding="2" Height="30" Width="150"
+                    FontSize="14" BorderThickness="2" FontWeight="Bold"
+                    Margin="135,80,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
+                    Click="Auger3Button_Click"/>
 
             <Button x:Name="P6Button" Content="Pumpe 6" Padding="2" Height="30" Width="150"
                     FontSize="14" BorderThickness="2" FontWeight="Bold"

PamhagenSysCtrl/Windows/ManualControlWindow.xaml.cs

@@ -76,10 +76,6 @@ namespace PamhagenSysCtrl {
             StirrerMW2Button.Foreground = plant.IsStirrerMW2Active ? Brushes.DarkGreen : Brushes.DarkRed;
             StirrerMW2Button.Background = plant.IsStirrerMW2Active ? Brushes.MintCream : Brushes.MistyRose;
 
-            BeltButton.BorderBrush = plant.IsBeltActive ? Brushes.DarkGreen : Brushes.DarkRed;
-            BeltButton.Foreground = plant.IsBeltActive ? Brushes.DarkGreen : Brushes.DarkRed;
-            BeltButton.Background = plant.IsBeltActive ? Brushes.MintCream : Brushes.MistyRose;
-
             Auger1Button.BorderBrush = plant.IsAuger1Active ? Brushes.DarkGreen : Brushes.DarkRed;
             Auger1Button.Foreground = plant.IsAuger1Active ? Brushes.DarkGreen : Brushes.DarkRed;
             Auger1Button.Background = plant.IsAuger1Active ? Brushes.MintCream : Brushes.MistyRose;
@@ -88,6 +84,10 @@ namespace PamhagenSysCtrl {
             Auger2Button.Foreground = plant.IsAuger2Active ? Brushes.DarkGreen : Brushes.DarkRed;
             Auger2Button.Background = plant.IsAuger2Active ? Brushes.MintCream : Brushes.MistyRose;
 
+            Auger3Button.BorderBrush = plant.IsAuger3Active ? Brushes.DarkGreen : Brushes.DarkRed;
+            Auger3Button.Foreground = plant.IsAuger3Active ? Brushes.DarkGreen : Brushes.DarkRed;
+            Auger3Button.Background = plant.IsAuger3Active ? Brushes.MintCream : Brushes.MistyRose;
+
             MP1BackwardButton.BorderBrush = plant.MP1 == MotorState.Backward ? Brushes.DarkGreen : Brushes.SlateGray;
             MP1BackwardButton.Foreground = plant.MP1 == MotorState.Backward ? Brushes.DarkGreen : Brushes.SlateGray;
             MP1BackwardButton.Background = plant.MP1 == MotorState.Backward ? Brushes.MintCream : Brushes.WhiteSmoke;
@@ -134,8 +134,8 @@ namespace PamhagenSysCtrl {
             Füllstände:
               Maischewanne 1: {plant.FillLevelMW1} (ausgewählt: {plant.WantMW1Selected}, Status: {plant.IsMWSelected})
               Maischewanne 2: {plant.FillLevelMW2} (ausgewählt: {plant.WantMW2Selected}, Status: {plant.IsMW2Selected})
-              Presse 1: {plant.FillLevelPress1}
+              Presse 1: {plant.Press1HasClearance}
-              Presse 2: {plant.FillLevelPress2}
+              Presse 2: {plant.Press2HasClearance}
               Tank 1: {plant.FillLevelT1}
               Tank 2: {plant.FillLevelT2}
               Tank 3: {plant.FillLevelT3}
@@ -200,19 +200,6 @@ namespace PamhagenSysCtrl {
             }
         }
 
-        private void BeltButton_Click(object? sender, RoutedEventArgs? evt) {
-            if (App.Plant == null) return;
-            try {
-                if (App.Plant.IsBeltActive) {
-                    App.Plant.StopBelt();
-                } else {
-                    App.Plant.StartBelt();
-                }
-            } catch (NoClearanceException exc) {
-                MessageBox.Show($"{exc.Message}", "Keine Freigabe", MessageBoxButton.OK, MessageBoxImage.Error);
-            }
-        }
-
         private void Auger1Button_Click(object? sender, RoutedEventArgs? evt) {
             if (App.Plant == null) return;
             try {
@@ -239,6 +226,19 @@ namespace PamhagenSysCtrl {
             }
         }
 
+        private void Auger3Button_Click(object? sender, RoutedEventArgs? evt) {
+            if (App.Plant == null) return;
+            try {
+                if (App.Plant.IsAuger3Active) {
+                    App.Plant.StopAuger3();
+                } else {
+                    App.Plant.StartAuger3();
+                }
+            } catch (NoClearanceException exc) {
+                MessageBox.Show($"{exc.Message}", "Keine Freigabe", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+
         private void MP1BackwardButton_Click(object? sender, RoutedEventArgs? evt) {
             if (App.Plant == null) return;
             try {

PamhagenSysCtrl/Windows/PlantSchemeWindow.xaml

@@ -14,11 +14,20 @@
 
         <Menu Grid.Row="0" BorderThickness="0,0,0,1" BorderBrush="LightGray" Background="White">
             <MenuItem Header="Einstellungen">
-                <MenuItem x:Name="Menu_Settings_ManualControl" Header="Manuelle Steuerung" Click="Menu_Settings_ManualControl_Click">
+                <MenuItem x:Name="Menu_Settings_ManualControl" Header="Handbetrieb"
+                          Click="Menu_Settings_ManualControl_Click" IsCheckable="True">
                     <MenuItem.Icon>
                         <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xF271;"/>
                     </MenuItem.Icon>
                 </MenuItem>
+                <MenuItem x:Name="Menu_Settings_OverridePathClearances" Header="Pfad-Freigaben überbrücken"
+                          Click="Menu_Settings_OverridePathClearances_Click" IsCheckable="True">
+                    <MenuItem.Icon>
+                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE785;"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem x:Name="Menu_Settings_OverrideDryRunClearances" Header="Trockenlauf-Freigaben überbrücken"
+                          Click="Menu_Settings_OverrideDryRunClearances_Click" IsCheckable="True"/>
                 <Separator/>
                 <MenuItem x:Name="Menu_Settings_Config" Header="Konfigurationsdatei öffnen..." Click="Menu_Settings_Config_Click">
                     <MenuItem.Icon>

PamhagenSysCtrl/Windows/PlantSchemeWindow.xaml.cs

@@ -22,8 +22,32 @@ namespace PamhagenSysCtrl.Windows {
         }
 
         private void Menu_Settings_ManualControl_Click(object sender, RoutedEventArgs evt) {
-            var w = new ManualControlWindow();
+            if (Menu_Settings_ManualControl.IsChecked) {
-            w.Show();
+                foreach (var win in Application.Current.Windows) {
+                    if (win is ManualControlWindow w) {
+                        w.Focus();
+                        return;
+                    }
+                }
+                var ctrl = new ManualControlWindow();
+                ctrl.Show();
+            } else {
+                foreach (var win in Application.Current.Windows) {
+                    if (win is ManualControlWindow w) {
+                        w.Close();
+                    }
+                }
+            }
+        }
+
+        private void Menu_Settings_OverridePathClearances_Click(object sender, RoutedEventArgs evt) {
+            App.Plant?.OverridePathClearances = Menu_Settings_OverridePathClearances.IsChecked;
+            OnUpdate(null, null);
+        }
+
+        private void Menu_Settings_OverrideDryRunClearances_Click(object sender, RoutedEventArgs evt) {
+            App.Plant?.OverrideDryRunClearances = Menu_Settings_OverrideDryRunClearances.IsChecked;
+            OnUpdate(null, null);
         }
 
         private void Menu_Settings_Directory_Click(object sender, RoutedEventArgs evt) {
@@ -109,18 +133,18 @@ namespace PamhagenSysCtrl.Windows {
                             } else {
                                 App.Plant?.StartAuger1();
                             }
-                        } else if (auger == Graph.Auger2) {
+                        } else if (auger == Graph.Auger3) {
                             if (auger.IsActive) {
-                                App.Plant?.StopAuger2();
+                                App.Plant?.StopAuger3();
                             } else {
-                                App.Plant?.StartAuger2();
+                                App.Plant?.StartAuger3();
                             }
                         }
                     } else if (c is ConveyorBelt belt) {
                         if (belt.IsActive) {
-                            App.Plant?.StopBelt();
+                            App.Plant?.StopAuger2();
                         } else {
-                            App.Plant?.StartBelt();
+                            App.Plant?.StartAuger2();
                         }
                     } else if (c is Pump pump) {
                         if (pump == Graph.MP1) {
@@ -219,7 +243,7 @@ namespace PamhagenSysCtrl.Windows {
             return _hover;
         }
 
-        public void OnUpdate(object? sender, PlantEventArgs evt) {
+        public void OnUpdate(object? sender, PlantEventArgs? evt) {
             if (sender is not PamhagenPlant plant) return;
             UpdateScheme(Mouse.GetPosition(SchemeCanvas), Mouse.LeftButton == MouseButtonState.Pressed);
         }