Adjust clearances to new pipe schema

2026-08-07 10:30:37 +02:00
parent 06dcdd8569
commit 4f8c401cae
4 changed files with 46 additions and 43 deletions
@@ -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,
@@ -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 p2  = Int1ToFillState((f1 >>  7) & 0x1);  // 1 0
+            var p1  =                ((f1 >>  6) & 0x1) == 0;  // 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() {