Merge pull request 'dev-Rene' (#1) from dev-Rene into main

Reviewed-on: #1

pumpingStation.html

@@ -24,6 +24,12 @@
       heightInlet:    { value: 0.8 }, // m, centre of inlet pipe above floor
       heightOutlet:   { value: 0.2 }, // m, centre of outlet pipe above floor
       heightOverflow: { value: 0.9 }, // m, overflow elevation
+      timeleftToFullOrEmptyThresholdSeconds:{value:0}, // time threshold to safeguard starting or stopping pumps in seconds
+      enableDryRunProtection: { value: true },
+      enableOverfillProtection: { value: true },
+      dryRunThresholdPercent: { value: 2 },
+      overfillThresholdPercent: { value: 98 },
+      minHeightBasedOn: { value: "outlet" }, // basis for minimum height check: inlet or outlet
 
       // Advanced reference information
       refHeight:      { value: "NAP" }, // reference height
@@ -47,7 +53,16 @@
       hasDistance: { value: false },
       distance: { value: 0 },
       distanceUnit: { value: "m" },
-      distanceDescription: { value: "" }
+      distanceDescription: { value: "" },
+
+      // control strategy
+      controlMode: { value: "none" },
+      startLevel: { value: null },
+      stopLevel: { value: null },
+      minFlowLevel: { value: null },
+      maxFlowLevel: { value: null },
+      flowSetpoint: { value: null },
+      flowDeadband: { value: null }
 
     },
 
@@ -86,6 +101,68 @@
         refHeightEl.value = this.refHeight || "NAP";
       }
 
+      const minHeightBasedOnEl = document.getElementById("node-input-minHeightBasedOn");
+      if (minHeightBasedOnEl) {
+        minHeightBasedOnEl.value = this.minHeightBasedOn;
+      }
+
+      const dryRunToggle = document.getElementById("node-input-enableDryRunProtection");
+      const dryRunPercent = document.getElementById("node-input-dryRunThresholdPercent");
+      const overfillToggle = document.getElementById("node-input-enableOverfillProtection");
+      const overfillPercent = document.getElementById("node-input-overfillThresholdPercent");
+
+      const toggleInput = (toggleEl, inputEl) => {
+        if (!toggleEl || !inputEl) { return; }
+        inputEl.disabled = !toggleEl.checked;
+        inputEl.parentElement.classList.toggle('disabled', inputEl.disabled);
+      };
+
+      if (dryRunToggle && dryRunPercent) {
+        dryRunToggle.checked = !!this.enableDryRunProtection;
+        dryRunPercent.value = Number.isFinite(this.dryRunThresholdPercent) ? this.dryRunThresholdPercent : 2;
+        dryRunToggle.addEventListener('change', () => toggleInput(dryRunToggle, dryRunPercent));
+        toggleInput(dryRunToggle, dryRunPercent);
+      }
+
+      if (overfillToggle && overfillPercent) {
+        overfillToggle.checked = !!this.enableOverfillProtection;
+        overfillPercent.value = Number.isFinite(this.overfillThresholdPercent) ? this.overfillThresholdPercent : 98;
+        overfillToggle.addEventListener('change', () => toggleInput(overfillToggle, overfillPercent));
+        toggleInput(overfillToggle, overfillPercent);
+      }
+
+      const timeLeftInput = document.getElementById("node-input-timeleftToFullOrEmptyThresholdSeconds");
+      if (timeLeftInput) {
+        timeLeftInput.value = Number.isFinite(this.timeleftToFullOrEmptyThresholdSeconds)
+          ? this.timeleftToFullOrEmptyThresholdSeconds
+          : 0;
+      }
+
+      // control mode toggle UI
+      const toggleModeSections = (val) => {
+        document.querySelectorAll('.ps-mode-section').forEach((el) => el.style.display = 'none');
+        const active = document.getElementById(`ps-mode-${val}`);
+        if (active) active.style.display = '';
+      };
+
+      const modeSelect = document.getElementById('node-input-controlMode');
+      if (modeSelect) {
+        modeSelect.value = this.controlMode || 'none';
+        toggleModeSections(modeSelect.value);
+        modeSelect.addEventListener('change', (e) => toggleModeSections(e.target.value));
+      }
+
+      const setNumberField = (id, val) => {
+        const el = document.getElementById(id);
+        if (el) el.value = Number.isFinite(val) ? val : '';
+      };
+
+      setNumberField('node-input-startLevel', this.startLevel);
+      setNumberField('node-input-stopLevel', this.stopLevel);
+      setNumberField('node-input-minFlowLevel', this.minFlowLevel);
+      setNumberField('node-input-maxFlowLevel', this.maxFlowLevel);
+      setNumberField('node-input-flowSetpoint', this.flowSetpoint);
+      setNumberField('node-input-flowDeadband', this.flowDeadband);
 
         //------------------- END OF CUSTOM config UI ELEMENTS ------------------- //
     },
@@ -98,14 +175,29 @@
 
       //node specific
       node.refHeight = document.getElementById("node-input-refHeight").value || "NAP";
+      node.minHeightBasedOn = document.getElementById("node-input-minHeightBasedOn").value || "outlet";
       node.simulator = document.getElementById("node-input-simulator").checked;
 
-      ["basinVolume","basinHeight","heightInlet","heightOutlet","heightOverflow","basinBottomRef"]
+      ["basinVolume","basinHeight","heightInlet","heightOutlet","heightOverflow","basinBottomRef","timeleftToFullOrEmptyThresholdSeconds","dryRunThresholdPercent","overfillThresholdPercent"]
         .forEach(field => {
           node[field] = parseFloat(document.getElementById(`node-input-${field}`).value) || 0;
         });
 
       node.refHeight = document.getElementById("node-input-refHeight").value || "";
+      node.enableDryRunProtection = document.getElementById("node-input-enableDryRunProtection").checked;
+      node.enableOverfillProtection = document.getElementById("node-input-enableOverfillProtection").checked;
+
+      // control strategy
+      node.controlMode = document.getElementById('node-input-controlMode').value || 'none';
+
+      const parseNum = (id) => parseFloat(document.getElementById(id)?.value);
+      node.startLevel = parseNum('node-input-startLevel');
+      node.stopLevel = parseNum('node-input-stopLevel');
+      node.minFlowLevel = parseNum('node-input-minFlowLevel');
+      node.maxFlowLevel = parseNum('node-input-maxFlowLevel');
+      node.flowSetpoint = parseNum('node-input-flowSetpoint');
+      node.flowDeadband = parseNum('node-input-flowDeadband');
+
     },
 
   });
@@ -115,7 +207,7 @@
 
 <script type="text/html" data-template-name="pumpingStation">
 
-  <!-- Simulator toggle -->
+  <h4>Simulation</h4>
   <div class="form-row">
     <label for="node-input-simulator"><i class="fa fa-play-circle"></i> Simulator</label>
     <input type="checkbox" id="node-input-simulator" style="width:20px;vertical-align:baseline;" />
@@ -124,7 +216,7 @@
 
   <hr>
   
-  <!-- Basin geometry -->
+  <h4>Basin Geometry</h4>
   <div class="form-row">
     <label for="node-input-basinVolume"><i class="fa fa-cube"></i> Basin Volume (m³)</label>
     <input type="number" id="node-input-basinVolume" min="0" step="0.1" />
@@ -150,7 +242,58 @@
 
   <hr>
 
+  <h4>Control Strategy</h4>
+  <div class="form-row">
+    <label for="node-input-controlMode"><i class="fa fa-sliders"></i> Control mode</label>
+    <select id="node-input-controlMode">
+      <option value="none">None / Manual</option>
+      <option value="levelbased">Level-based</option>
+      <option value="flowbased">Flow-based</option>
+    </select>
+  </div>
+
+  <div id="ps-mode-levelbased" class="ps-mode-section">
+    <div class="form-row">
+      <label for="node-input-startLevel">startLevel</label>
+      <input type="number" id="node-input-startLevel" placeholder="m" />
+    </div>
+    <div class="form-row">
+      <label for="node-input-stopLevel">stopLevel</label>
+      <input type="number" id="node-input-stopLevel" placeholder="m" />
+    </div>
+      <div class="form-row">
+      <label for="node-input-minFlowLevel">Min flow (m)</label>
+      <input type="number" id="node-input-minFlowLevel" placeholder="m" />
+    </div>
+    <div class="form-row">
+      <label for="node-input-maxFlowLevel">Max flow (m)</label>
+      <input type="number" id="node-input-maxFlowLevel" placeholder="m" />
+    </div>
+  </div>
+
+  <div id="ps-mode-flowbased" class="ps-mode-section" style="display:none">
+    <div class="form-row">
+      <label for="node-input-flowSetpoint">Flow setpoint</label>
+      <input type="number" id="node-input-flowSetpoint" placeholder="m3/h" />
+    </div>
+    <div class="form-row">
+      <label for="node-input-flowDeadband">Deadband</label>
+      <input type="number" id="node-input-flowDeadband" placeholder="m3/h" />
+    </div>
+  </div>
+
+  <hr>
+
+  <h4>Reference</h4>
+
   <!-- Reference data -->
+  <div class="form-row">
+    <label for="node-input-minHeightBasedOn"><i class="fa fa-arrows-v"></i> Minimum Height Based On</label>
+    <select id="node-input-minHeightBasedOn" style="width:60%;">
+      <option value="inlet">Inlet Elevation</option>
+      <option value="outlet">Outlet Elevation</option>
+    </select>
+  </div>
   <div class="form-row">
     <label for="node-input-refHeight"><i class="fa fa-map-marker"></i> Reference height</label>
     <select id="node-input-refHeight" style="width:60%;">
@@ -163,6 +306,40 @@
     <input type="number" id="node-input-basinBottomRef" step="0.01" />
   </div>
 
+  <hr>
+
+  <h4>Safety</h4>
+
+  <!-- Safety settings -->
+  <div class="form-row">
+    <label for="node-input-timeleftToFullOrEmptyThresholdSeconds"><i class="fa fa-clock-o"></i> Time To Empty/Full (s)</label>
+    <input type="number" id="node-input-timeleftToFullOrEmptyThresholdSeconds" min="0" step="1" />
+  </div>
+
+  <div class="form-row">
+    <label for="node-input-enableDryRunProtection">
+      <i class="fa fa-shield"></i> Dry-run Protection
+    </label>
+    <input type="checkbox" id="node-input-enableDryRunProtection" style="width:20px;vertical-align:baseline;" />
+    <span>Prevent pumps from running on low volume</span>
+  </div>
+  <div class="form-row">
+    <label for="node-input-dryRunThresholdPercent" style="padding-left:20px;">Low Volume Threshold (%)</label>
+    <input type="number" id="node-input-dryRunThresholdPercent" min="0" max="100" step="0.1" />
+  </div>
+
+  <div class="form-row">
+    <label for="node-input-enableOverfillProtection">
+      <i class="fa fa-exclamation-triangle"></i> Overfill Protection
+    </label>
+    <input type="checkbox" id="node-input-enableOverfillProtection" style="width:20px;vertical-align:baseline;" />
+    <span>Stop filling when approaching overflow</span>
+  </div>
+  <div class="form-row">
+    <label for="node-input-overfillThresholdPercent" style="padding-left:20px;">High Volume Threshold (%)</label>
+    <input type="number" id="node-input-overfillThresholdPercent" min="0" max="100" step="0.1" />
+  </div>
+<hr>
   <!-- Shared asset/logger/position menus -->
   <div id="asset-fields-placeholder"></div>
   <div id="logger-fields-placeholder"></div>

src/nodeClass.js

@@ -63,7 +63,24 @@ class nodeClass {
       },
       hydraulics:{
         refHeight: uiConfig.refHeight,
+        minHeightBasedOn: uiConfig.minHeightBasedOn,
         basinBottomRef: uiConfig.basinBottomRef,
+      },
+      control:{
+        mode: uiConfig.controlMode,
+        levelbased:{
+          startLevel:uiConfig.startLevel,
+          stopLevel:uiConfig.stopLevel,
+          minFlowLevel:uiConfig.minFlowLevel,
+          maxFlowLevel:uiConfig.maxFlowLevel
+        }
+      },
+      safety:{
+        enableDryRunProtection: uiConfig.enableDryRunProtection,
+        dryRunThresholdPercent: uiConfig.dryRunThresholdPercent,
+        enableOverfillProtection: uiConfig.enableOverfillProtection,
+        overfillThresholdPercent: uiConfig.overfillThresholdPercent,
+        timeleftToFullOrEmptyThresholdSeconds: uiConfig.timeleftToFullOrEmptyThresholdSeconds
       }
     };
 
@@ -101,65 +118,60 @@ class nodeClass {
 
   _updateNodeStatus() {
     const ps = this.source;
-    try {
-      // --- Basin & measurements -------------------------------------------------
+
+    const pickVariant = (type, prefer = ['measured', 'predicted'], position = 'atEquipment', unit) => {
+      for (const variant of prefer) {
+        const chain = ps.measurements.type(type).variant(variant).position(position);
+        const value = unit ? chain.getCurrentValue(unit) : chain.getCurrentValue();
+        if (value != null) return { value, variant };
+      }
+      return { value: null, variant: null };
+    };
+
+    const vol = pickVariant('volume', ['measured', 'predicted'], 'atEquipment', 'm3');
+    const volPercent = pickVariant('volumePercent', ['measured','predicted'], 'atEquipment'); // already unitless
+    const level = pickVariant('level', ['measured', 'predicted'], 'atEquipment', 'm');
+    const netFlow = pickVariant('netFlowRate', ['measured', 'predicted'], 'atEquipment', 'm3/h');
+
     const maxVolBeforeOverflow = ps.basin?.maxVolOverflow ?? ps.basin?.maxVol ?? 0;
-      const volumeMeasurement = ps.measurements.type("volume").variant("measured").position("atEquipment");
-      const currentVolume = volumeMeasurement.getCurrentValue("m3") ?? 0;
-      const netFlowMeasurement = ps.measurements.type("netFlowRate").variant("predicted").position("atEquipment");
-      const netFlowM3s = netFlowMeasurement?.getCurrentValue("m3/s") ?? 0;
-      const netFlowM3h = netFlowM3s * 3600;
-      const percentFull = ps.measurements.type("volume").variant("procent").position("atEquipment").getCurrentValue() ?? 0;
+    const currentVolume = vol.value ?? 0;
+    const currentvolPercent = volPercent.value ?? 0;
+    const netFlowM3h = netFlow.value ?? 0;
 
-      // --- State information ----------------------------------------------------
-      const direction = ps.state?.direction || "unknown";
+    const direction = ps.state?.direction ?? 'unknown';
     const secondsRemaining = ps.state?.seconds ?? null;
+    const timeRemainingMinutes = secondsRemaining != null ? Math.round(secondsRemaining / 60) : null;
 
-      const timeRemaining = secondsRemaining ? `${Math.round(secondsRemaining / 60)}` : 0 + " min";
-
-      // --- Icon / colour selection ---------------------------------------------
-      let symbol = "❔";
-      let fill = "grey";
-
-      switch (direction) {
-        case "filling":
-          symbol = "⬆️";
-          fill = "blue";
-          break;
-        case "draining":
-          symbol = "⬇️";
-          fill = "orange";
-          break;
-        case "stable":
-          symbol = "⏸️";
-          fill = "green";
-          break;
-        default:
-          symbol = "❔";
-          fill = "grey";
-          break;
+    const badgePieces = [];
+    badgePieces.push(`${currentvolPercent.toFixed(1)}% `);
+    badgePieces.push(
+      `V=${currentVolume.toFixed(2)} / ${maxVolBeforeOverflow.toFixed(2)} m³`
+    );
+    badgePieces.push(`net: ${netFlowM3h.toFixed(0)} m³/h`);
+    if (timeRemainingMinutes != null) {
+      badgePieces.push(`t≈${timeRemainingMinutes} min)`);
     }
 
-      // --- Status text ----------------------------------------------------------
-      const textParts = [
-        `${symbol} ${percentFull.toFixed(1)}%`,
-        `V=${currentVolume.toFixed(2)} / ${maxVolBeforeOverflow.toFixed(2)} m³`,
-        `net=${netFlowM3h.toFixed(1)} m³/h`,
-        `t≈${timeRemaining}`
-      ];
+    const { symbol, fill } = (() => {
+      switch (direction) {
+        case 'filling': return { symbol: '⬆️', fill: 'blue' };
+        case 'draining': return { symbol: '⬇️', fill: 'orange' };
+        case 'steady': return { symbol: '⏸️', fill: 'green' };
+        default: return { symbol: '❔', fill: 'grey' };
+      }
+    })();
+
+    badgePieces[0] = `${symbol} ${badgePieces[0]}`;
 
     return {
       fill,
-        shape: "dot",
-        text: textParts.join(" | ")
+      shape: 'dot',
+      text: badgePieces.join(' | ')
     };
-    } catch (error) {
-      this.node.error("Error in updateNodeStatus: " + error.message);
-      return { fill: "red", shape: "ring", text: "Status Error" };
-    }
   }
 
 
+
   // any time based functions here
   _startTickLoop() {
     setTimeout(() => {
@@ -182,8 +194,8 @@ class nodeClass {
     //pumping station needs time based ticks to recalc level when predicted
     this.source.tick();
     const raw = this.source.getOutput();
-    const processMsg = this._output.formatMsg(raw, this.config, 'process');
-    const influxMsg  = this._output.formatMsg(raw, this.config, 'influxdb');
+    const processMsg = this._output.formatMsg(raw, this.source.config, 'process');
+    const influxMsg  = this._output.formatMsg(raw, this.source.config, 'influxdb');
 
     // Send only updated outputs on ports 0 & 1
     this.node.send([processMsg, influxMsg]);
@@ -196,19 +208,33 @@ class nodeClass {
     this.node.on('input', (msg, send, done) => {
       switch (msg.topic) {
         //example
-        /*case 'simulator':
-          this.source.toggleSimulation();      
+        case 'changemode':
+          this.source.changeMode(msg.payload);
           break;
-        default:
-          this.source.handleInput(msg);
-          break;
-          */
         case 'registerChild':
           // Register this node as a child of the parent node
           const childId = msg.payload;
           const childObj = this.RED.nodes.getNode(childId); 
           this.source.childRegistrationUtils.registerChild(childObj.source ,msg.positionVsParent);
           break;
+        case 'calibratePredictedVolume':
+          const injectedVol = parseFloat(msg.payload);
+          this.source.calibratePredictedVolume(injectedVol);
+          break;
+        case 'calibratePredictedLevel':
+          const injectedLevel = parseFloat(msg.payload);
+          this.source.calibratePredictedLevel(injectedLevel);
+          break;
+        case 'q_in': {
+          // payload can be number or { value, unit, timestamp }
+          const val = Number(msg.payload);
+          const unit = msg?.unit;
+          const ts = msg?.timestamp || Date.now();
+          this.source.setManualInflow(val, ts, unit);
+          break;
+        }
+                  
+          
       }
       done();
     });

src/specificClass.js

@@ -1,6 +1,15 @@
 const EventEmitter = require('events');
-const {logger,configUtils,configManager,childRegistrationUtils,MeasurementContainer,coolprop,interpolation} = require('generalFunctions');
-class PumpingStationV2 {
+const {
+  logger,
+  configUtils,
+  configManager,
+  childRegistrationUtils,
+  MeasurementContainer,
+  coolprop,
+  interpolation
+} = require('generalFunctions');
+
+class PumpingStation {
   constructor(config = {}) {
     this.emitter = new EventEmitter();
     this.configManager = new configManager();
@@ -10,35 +19,35 @@ class PumpingStationV2 {
     this.interpolate = new interpolation();
     this.logger = new logger(this.config.general.logging.enabled,this.config.general.logging.logLevel,this.config.general.name);
 
-    this.measurements = new MeasurementContainer({ autoConvert: true });
-    this.measurements.setPreferredUnit('flow', 'm3/s');
-    this.measurements.setPreferredUnit('level', 'm');
-    this.measurements.setPreferredUnit('volume', 'm3');
+    this.measurements = new MeasurementContainer({
+      autoConvert: true,
+      preferredUnits: { flow: 'm3/s', netFlowRate: 'm3/s', level: 'm', volume: 'm3' }
+    });
+
     this.childRegistrationUtils = new childRegistrationUtils(this);
     this.machines = {};
     this.stations = {};
+    this.machineGroups = {};
+    this.predictedFlowChildren = new Map();
 
-    //variants in determining what gets priority
     this.flowVariants = ['measured', 'predicted'];
     this.levelVariants = ['measured', 'predicted'];
+    this.volVariants = ['measured', 'predicted'];
     this.flowPositions = { inflow: ['in', 'upstream'], outflow: ['out', 'downstream'] };
 
-    this.basin = {};
-    this.state = {
-      direction: 'steady',
-      netFlow: 0,
-      flowSource: null,
-      seconds: null,
-      remainingSource: null
-    };
+    this.mode = this.config.control.mode;
+    this._levelState = { crossed: new Set(), dwellUntil: null };
+    this.state = { direction: 'steady', netFlow: 0, flowSource: null, seconds: null, remainingSource: null };
 
     const thresholdFromConfig = Number(this.config.general?.flowThreshold);
     this.flowThreshold = Number.isFinite(thresholdFromConfig) ? thresholdFromConfig : 1e-4;
 
     this.initBasinProperties();
-    this.logger.debug('PumpingStationV2 initialized');
+    this.logger.debug('PumpingStation initialized');
   }
 
+  /* --------------------------- Registration --------------------------- */
+
   registerChild(child, softwareType) {
     this.logger.debug(`Registering child (${softwareType}) "${child.config.general.name}"`);
 
@@ -47,43 +56,28 @@ class PumpingStationV2 {
       return;
     }
 
-    if (softwareType === 'machine' || softwareType === 'pumpingStation') {
+    if (softwareType === 'machine') {
+      this.machines[child.config.general.id] = child;
+    } else if (softwareType === 'pumpingstation') {
+      this.stations[child.config.general.id] = child;
+    } else if (softwareType === 'machinegroup') {
+      this.machineGroups[child.config.general.id] = child;
       this._registerPredictedFlowChild(child);
-      return;
     }
 
-    this.logger.warn(`Unsupported child software type: ${softwareType}`);
+    if (softwareType === 'machine' || softwareType === 'pumpingstation' || softwareType === 'machinegroup') {
+      this._registerPredictedFlowChild(child);
     }
-
-  tick() {
-    const snapshot = this._takeMeasurementSnapshot();
-
-    this._updatePredictedVolume(snapshot);
-
-    const netFlow = this._selectBestNetFlow(snapshot);
-    const remaining = this._computeRemainingTime(snapshot, netFlow);
-
-    this.state = {
-      direction: netFlow.direction,
-      netFlow: netFlow.value,
-      flowSource: netFlow.source,
-      seconds: remaining.seconds,
-      remainingSource: remaining.source
-    };
-
-    this.logger.debug(`netflow = ${JSON.stringify(netFlow)}`);
-    this.logger.debug(`Height : ${this.measurements.type('level').variant('predicted').position('atequipment').getCurrentValue('m') } m`);
   }
 
-
   _registerMeasurementChild(child) {
     const position = child.config.functionality.positionVsParent;
     const measurementType = child.config.asset.type;
     const eventName = `${measurementType}.measured.${position}`;
 
-    child.measurements.emitter.on(eventName, (eventData) => {
+    child.measurements.emitter.on(eventName, (eventData = {}) => {
       this.logger.debug(
-        `Measurement update ${eventName} <- ${eventData.childName}: ${eventData.value} ${eventData.unit}`
+        `Measurement update ${eventName} <- ${eventData.childName || child.config.general.name}: ${eventData.value} ${eventData.unit}`
       );
 
       this.measurements
@@ -97,31 +91,218 @@ class PumpingStationV2 {
   }
 
   _registerPredictedFlowChild(child) {
-    const position = child.config.functionality.positionVsParent;
+    const position = (child.config.functionality.positionVsParent || '').toLowerCase();
     const childName = child.config.general.name;
+    const childId = child.config.general.id ?? childName;
 
-    const listener = (eventName, posKey) => {
-      child.measurements.emitter.on(eventName, (eventData) => {
-        this.logger.debug(
-          `Predicted flow update from ${childName} (${position}) -> ${eventData.value} ${eventData.unit}`
-        );
+    let posKey;
+    let eventNames;
+    switch (position) {
+      case 'downstream':
+      case 'out':
+      case 'atequipment':
+        posKey = 'out';
+        eventNames = ['flow.predicted.downstream', 'flow.predicted.atequipment'];
+        break;
+      case 'upstream':
+      case 'in':
+        posKey = 'in';
+        eventNames = ['flow.predicted.upstream', 'flow.predicted.atequipment'];
+        break;
+      default:
+        this.logger.warn(`Unsupported predicted flow position "${position}" from ${childName}`);
+        return;
+    }
+
+    if (!this.predictedFlowChildren.has(childId)) {
+      this.predictedFlowChildren.set(childId, { in: 0, out: 0 });
+    }
+
+    const handler = (eventData = {}) => {
+      const unit = eventData.unit || child.config?.general?.unit;
+      const ts = eventData.timestamp || Date.now();
+
+      this.logger.debug(`Emitting for child ${unit} `);
       this.measurements
         .type('flow')
         .variant('predicted')
         .position(posKey)
-          .value(eventData.value, eventData.timestamp, eventData.unit);
-      });
+        .child(childId)
+        .value(eventData.value, ts, unit);
     };
 
-    if (position === 'downstream' || position === 'atequipment' || position === 'out') {
-      listener('flow.predicted.downstream', 'out');
-    } else if (position === 'upstream' || position === 'in') {
-      listener('flow.predicted.downstream', 'in');
-    } else {
-      this.logger.warn(`Unsupported predicted flow position "${position}" from ${childName}`);
+    eventNames.forEach((ev) => child.measurements.emitter.on(ev, handler));
+  }
+
+  /* --------------------------- Calibration --------------------------- */
+
+  calibratePredictedVolume(calibratedVol, timestamp = Date.now()) {
+    const volume = this.measurements.type('volume').variant('predicted').position('atequipment').get();
+    const level = this.measurements.type('level').variant('predicted').position('atequipment').get();
+
+    if (volume) {
+      volume.values = [];
+      volume.timestamps = [];
+    }
+    
+    if (level) {
+      level.values = [];
+      level.timestamps = [];
+    }
+
+    this.measurements.type('volume').variant('predicted').position('atequipment').value(calibratedVol, timestamp, 'm3').unit('m3');
+    this.measurements.type('level').variant('predicted').position('atequipment').value(this._calcLevelFromVolume(calibratedVol), timestamp, 'm');
+
+    this._predictedFlowState = { inflow: 0, outflow: 0, lastTimestamp: timestamp };
+  }
+
+  calibratePredictedLevel(val, timestamp = Date.now(), unit = 'm') {
+    const volumeChain = this.measurements.type('volume').variant('predicted').position('atequipment');
+    const levelChain = this.measurements.type('level').variant('predicted').position('atequipment');
+
+    const volumeMeasurement = volumeChain.exists() ? volumeChain.get() : null;
+    if (volumeMeasurement) {
+      volumeMeasurement.values = [];
+      volumeMeasurement.timestamps = [];
+    }
+
+    const levelMeasurement = levelChain.exists() ? levelChain.get() : null;
+    if (levelMeasurement) {
+      levelMeasurement.values = [];
+      levelMeasurement.timestamps = [];
+    }
+
+    levelChain.value(val, timestamp).unit(unit);
+    volumeChain.value(this._calcVolumeFromLevel(val), timestamp, 'm3');
+
+    this._predictedFlowState = { inflow: 0, outflow: 0, lastTimestamp: timestamp };
+  }
+
+  setManualInflow(value, timestamp = Date.now(), unit) {
+    const num = Number(value);
+    this.measurements.type('flow').variant('predicted').position('in').child('manual-qin').value(num, timestamp, unit);
+  }
+
+  /* --------------------------- Tick / Control --------------------------- */
+
+  tick() {
+    this._updatePredictedVolume();
+
+    const netFlow = this._selectBestNetFlow();
+    const remaining = this._computeRemainingTime(netFlow);
+
+    this._safetyController(remaining.seconds, netFlow.direction);
+    if (this.safetyControllerActive) return;
+
+    this._controlLogic(netFlow.direction);
+
+    this.state = {
+      direction: netFlow.direction,
+      netFlow: netFlow.value,
+      flowSource: netFlow.source,
+      seconds: remaining.seconds,
+      remainingSource: remaining.source
+    };
+
+    this.logger.debug(`netflow = ${JSON.stringify(netFlow)}`);
+    this.logger.debug(
+      `Height : ${this.measurements.type('level').variant('predicted').position('atequipment').getCurrentValue('m')} m`
+    );
+  }
+
+  changeMode(newMode){
+    if ( this.config.control.allowedModes.has(newMode) ){
+      const currentMode = this.mode;
+      this.logger.info(`Control mode changing from ${currentMode} to ${newMode}`);
+      this.mode = newMode;
+    }
+    else{
+      this.logger.warn(`Attempted to change to unsupported control mode: ${newMode}`);
+    }
+
+  }
+
+
+  _controlLogic(direction) {
+    switch (this.mode) {
+      case 'levelbased':
+        this._controlLevelBased(direction);
+        break;
+      case 'flowbased':
+        this._controlFlowBased?.();
+        break;
+      case 'manual':
+        break;
+      default:
+        this.logger.warn(`Unsupported control mode: ${this.mode}`);
     }
   }
 
+  async _controlLevelBased(direction) {
+    const { startLevel, stopLevel } = this.config.control.levelbased;
+    const flowUnit = this.measurements.getUnit('flow');
+    const levelUnit = this.measurements.getUnit('level');
+
+    const level = this._pickVariant('level', this.levelVariants, 'atequipment', levelUnit);
+    if (level == null) {
+      this.logger.warn('No valid level found');
+      return;
+    }
+
+    if (level > startLevel && direction === 'filling') {
+      const percControl = this._scaleLevelToFlowPercent(level);
+      this.logger.debug(`Controllevel based => Level ${level} control applying to pump : ${percControl}`);
+      await this._applyMachineLevelControl(percControl);
+    }
+
+    if (level < stopLevel && direction === 'draining') {
+      Object.values(this.machines).forEach((machine) => {
+        const pos = machine?.config?.functionality?.positionVsParent;
+        if ((pos === 'downstream' || pos === 'atequipment') && machine._isOperationalState()) {
+          machine.handleInput('parent', 'execSequence', 'shutdown');
+        }
+      });
+      Object.values(this.stations).forEach((station) => station.handleInput('parent', 'execSequence', 'shutdown'));
+      Object.values(this.machineGroups).forEach((group) => group.turnOffAllMachines());
+    }
+  }
+
+  _controlFlowBased() {
+    // placeholder for flow-based logic
+  }
+
+  async _applyMachineGroupLevelControl(percentControl) {
+    if (!this.machineGroups || Object.keys(this.machineGroups).length === 0) return;
+    await Promise.all(
+      Object.values(this.machineGroups).map((group) =>
+        group.handleInput('parent', percentControl).catch((err) => {
+          this.logger.error(`Failed to send level control to group "${group.config.general.name}": ${err.message}`);
+        })
+      )
+    );
+  }
+
+  async _applyMachineLevelControl(percentControl) {
+    const machines = Object.values(this.machines).filter((machine) => {
+      const pos = machine?.config?.functionality?.positionVsParent;
+      return (pos === 'downstream' || pos === 'atequipment');
+    });
+
+    if (!machines.length) return;
+
+    const perMachine = percentControl / machines.length;
+    for (const machine of machines) {
+      try {
+        await machine.handleInput('parent', 'execSequence', 'startup');
+        await machine.handleInput('parent', 'execMovement', perMachine);
+      } catch (err) {
+        this.logger.error(`Failed to start machine "${machine.config.general.name}": ${err.message}`);
+      }
+    }
+  }
+
+  /* --------------------------- Measurements --------------------------- */
+
   _handleMeasurement(measurementType, value, position, context) {
     switch (measurementType) {
       case 'level':
@@ -130,16 +311,13 @@ class PumpingStationV2 {
       case 'pressure':
         this._onPressureMeasurement(position, value, context);
         break;
-      case 'flow':
-        // Additional flow-specific logic could go here if needed
-        break;
       default:
-        this.logger.debug(`Unhandled measurement type "${measurementType}", storing only.`);
         break;
     }
   }
 
   _onLevelMeasurement(position, value, context = {}) {
+    this.measurements.type('level').variant('measured').position(position).value(value).unit(context.unit);
     const levelSeries = this.measurements.type('level').variant('measured').position(position);
     const levelMeters = levelSeries.getCurrentValue('m');
     if (levelMeters == null) return;
@@ -153,289 +331,239 @@ class PumpingStationV2 {
       100
     );
 
+    this.measurements.type('volume').variant('measured').position('atequipment').value(volume, context.timestamp, 'm3');
     this.measurements
-      .type('volume')
+      .type('volumePercent')
       .variant('measured')
       .position('atequipment')
-      .value(volume, context.timestamp, 'm3');
-
-    this.measurements
-      .type('volume')
-      .variant('percent')
-      .position('atequipment')
       .value(percent, context.timestamp, '%');
   }
 
   _onPressureMeasurement(position, value, context = {}) {
     let kelvinTemp =
-      this.measurements
-        .type('temperature')
-        .variant('measured')
-        .position('atequipment')
-        .getCurrentValue('K') ?? null;
+      this.measurements.type('temperature').variant('measured').position('atequipment').getCurrentValue('K') ?? null;
 
     if (kelvinTemp === null) {
       this.logger.warn('No temperature measurement; assuming 15C for pressure to level conversion.');
-      this.measurements
-        .type('temperature')
-        .variant('assumed')
-        .position('atequipment')
-        .value(15, Date.now(), 'C');
-      kelvinTemp = this.measurements
-        .type('temperature')
-        .variant('assumed')
-        .position('atequipment')
-        .getCurrentValue('K');
+      this.measurements.type('temperature').variant('assumed').position('atequipment').value(15, Date.now(), 'C');
+      kelvinTemp = this.measurements.type('temperature').variant('assumed').position('atequipment').getCurrentValue('K');
     }
 
     if (kelvinTemp == null) return;
 
     const density = coolprop.PropsSI('D', 'T', kelvinTemp, 'P', 101325, 'Water');
-    const pressurePa = this.measurements
-      .type('pressure')
-      .variant('measured')
-      .position(position)
-      .getCurrentValue('Pa');
-
+    const pressurePa = this.measurements.type('pressure').variant('measured').position(position).getCurrentValue('Pa');
     if (!Number.isFinite(pressurePa) || !Number.isFinite(density)) return;
 
     const g = 9.80665;
     const level = pressurePa / (density * g);
-
     this.measurements.type('level').variant('predicted').position(position).value(level, context.timestamp, 'm');
   }
 
-  _takeMeasurementSnapshot() {
-    const snapshot = {
-      flows: {},
-      levels: {},
-      levelRates: {}
-    };
+  /* --------------------------- Core Calculations --------------------------- */
 
-    for (const variant of this.flowVariants) {
-      snapshot.flows[variant] = this._snapshotFlowsForVariant(variant);
-    }
-
-    for (const variant of this.levelVariants) {
-      snapshot.levels[variant] = this._snapshotLevelForVariant(variant);
-      snapshot.levelRates[variant] = this._estimateLevelRate(snapshot.levels[variant]);
-    }
-
-    return snapshot;
-  }
-
-  _snapshotFlowsForVariant(variant) {
-    const inflowSeries = this._locateSeries('flow', variant, this.flowPositions.inflow);
-    const outflowSeries = this._locateSeries('flow', variant, this.flowPositions.outflow);
-
-    return {
-      variant,
-      inflow: this._seriesSamples(inflowSeries),
-      outflow: this._seriesSamples(outflowSeries)
-    };
-  }
-
-  _snapshotLevelForVariant(variant) {
-    const levelSeries = this._locateSeries('level', variant, ['atequipment']);
-    return {
-      variant,
-      samples: this._seriesSamples(levelSeries)
-    };
-  }
-
-  _seriesSamples(seriesInfo) {
-    if (!seriesInfo) {
-      return { exists: false, measurement: null, current: null, previous: null };
-    }
-
-    try {
-      const current = seriesInfo.measurement.getLaggedSample(0);   // newest
-      const previous = seriesInfo.measurement.getLaggedSample(1);  // previous
-      return {
-        exists: Boolean(current),
-        measurement: seriesInfo.measurement,
-        current,
-        previous
-      };
-    } catch (err) {
-      this.logger.debug(
-        `Failed to read samples for ${seriesInfo.type}.${seriesInfo.variant}.${seriesInfo.position}: ${err.message}`
-      );
-      return { exists: false, measurement: seriesInfo.measurement, current: null, previous: null };
-    }
-  }
-
-  _locateSeries(type, variant, positions) {
-    for (const position of positions) {
-      try {
-        const chain = this.measurements.type(type).variant(variant).position(position);
-        if (!chain.exists({ requireValues: true })) continue;
-
-        const measurement = chain.get();
-        if (!measurement) continue;
-
-        return { type, variant, position, measurement };
-      } catch (err) {
-        // ignore missing combinations
-      }
+  _pickVariant(type, variants, position, unit) {
+    for (const variant of variants) {
+      const val = this.measurements.type(type).variant(variant).position(position).getCurrentValue(unit);
+      if (!Number.isFinite(val)) continue;
+      return val;
     }
     return null;
   }
 
-  _estimateLevelRate(levelSnapshot) {
-    if (!levelSnapshot.samples.exists){ return null};
-    const { current, previous } = levelSnapshot.samples;
-    if (!current || !previous || previous.timestamp == null){return null};
-
-    const deltaT = (current.timestamp - previous.timestamp) / 1000;
-    if (!Number.isFinite(deltaT) || deltaT <= 0){ return null};
-
-    const deltaLevel = current.value - previous.value;
-    return deltaLevel / deltaT;
+  //scaled for robin min 2039 - 2960 max 53.04
+  _scaleLevelToFlowPercent(level) {
+    const { minFlowLevel, maxFlowLevel } = this.config.control.levelbased;
+    this.logger.debug(`Scaling minflow level : ${minFlowLevel} and maxflowLevel : ${maxFlowLevel}`);
+    return this.interpolate.interpolate_lin_single_point(level, minFlowLevel, maxFlowLevel, 0, 100);
   }
 
-  _selectBestNetFlow(snapshot) {
+  _levelRate(variant) {
+    const chain = this.measurements.type('level').variant(variant).position('atequipment');
+    if (!chain.exists({ requireValues: true })) return null;
+    const m = chain.get();
+    const current = m?.getLaggedSample?.(0);
+    const previous = m?.getLaggedSample?.(1);
+    if (!current || !previous || previous.timestamp == null) return null;
+    const dt = (current.timestamp - previous.timestamp) / 1000;
+    if (!Number.isFinite(dt) || dt <= 0) return null;
+    return (current.value - previous.value) / dt;
+  }
+
+  _updatePredictedVolume() {
+    const flowUnit = 'm3/s'; // this has to be in m3/s for the actions below
+    const now = Date.now();
+
+    const inflow = this.measurements.sum('flow', 'predicted', this.flowPositions.inflow, flowUnit) || 0;
+    const outflow = this.measurements.sum('flow', 'predicted', this.flowPositions.outflow, flowUnit) || 0;
+
+    if (!this._predictedFlowState) {
+      this._predictedFlowState = { inflow, outflow, lastTimestamp: now };
+    }
+
+    const timestampPrev = this._predictedFlowState.lastTimestamp ?? now;
+    const deltaSeconds = Math.max((now - timestampPrev) / 1000, 0);
+    const netVolumeChange = deltaSeconds > 0 ? (inflow - outflow) * deltaSeconds : 0;
+
+    const volumeSeries = this.measurements.type('volume').variant('predicted').position('atequipment');
+    const currentVolume = volumeSeries.getCurrentValue('m3');  
+  
+    const nextVolume = currentVolume + netVolumeChange;
+    const writeTimestamp = timestampPrev + deltaSeconds * 1000;
+
+    volumeSeries.value(nextVolume, writeTimestamp, 'm3').unit('m3'); //olifant
+
+    const nextLevel = this._calcLevelFromVolume(nextVolume);
+    this.measurements
+      .type('level')
+      .variant('predicted')
+      .position('atequipment')
+      .value(nextLevel, writeTimestamp, 'm')
+      .unit('m');
+
+    const percent = this.interpolate.interpolate_lin_single_point(
+      nextVolume,
+      this.basin.minVol,
+      this.basin.maxVolOverflow,
+      0,
+      100
+    );
+
+    this.measurements
+      .type('volumePercent')
+      .variant('predicted')
+      .position('atequipment')
+      .value(percent, writeTimestamp, '%');
+
+    this._predictedFlowState = { inflow, outflow, lastTimestamp: writeTimestamp };
+  }
+
+  _selectBestNetFlow() {
+    const type = 'flow';
+    const unit = this.measurements.getUnit(type) || 'm3/s';
+
     for (const variant of this.flowVariants) {
-      const flow = snapshot.flows[variant];
-      if (!flow.inflow.exists && !flow.outflow.exists) continue;
+      const bucket = this.measurements.measurements?.[type]?.[variant];
+      if (!bucket || Object.keys(bucket).length === 0) continue;
 
-      const inflow = flow.inflow.current?.value ?? 0;
-      const outflow = flow.outflow.current?.value ?? 0;
-      const net = inflow - outflow; // positive => filling
+      const inflow = this.measurements.sum(type, variant, this.flowPositions.inflow, unit) || 0;
+      const outflow = this.measurements.sum(type, variant, this.flowPositions.outflow, unit) || 0;
+      if (Math.abs(inflow) < this.flowThreshold && Math.abs(outflow) < this.flowThreshold) continue;
 
-      return { value: net,source: variant,direction: this._deriveDirection(net) };
+      const net = inflow - outflow;
+      this.measurements.type('netFlowRate').variant(variant).position('atequipment').value(net, Date.now(), unit);
+      return { value: net, source: variant, direction: this._deriveDirection(net) };
     }
 
-    // fallback using level trend
+    // Fallback: level trend
     for (const variant of this.levelVariants) {
-      const levelRate = snapshot.levelRates[variant];
-      if (!Number.isFinite(levelRate)) continue;
-
-      const netFlow = levelRate * this.basin.surfaceArea;
-      return {
-        value: netFlow,
-        source: `level:${variant}`,
-        direction: this._deriveDirection(netFlow)
-      };
+      const rate = this._levelRate(variant);
+      if (!Number.isFinite(rate)) continue;
+      const netFlow = rate * this.basin.surfaceArea;
+      return { value: netFlow, source: `level:${variant}`, direction: this._deriveDirection(netFlow) };
     }
 
     this.logger.warn('No usable measurements to compute net flow; assuming steady.');
     return { value: 0, source: null, direction: 'steady' };
   }
 
-  _computeRemainingTime(snapshot, netFlow) {
-    if (!netFlow || Math.abs(netFlow.value) < this.flowThreshold) {
-      return { seconds: null, source: null };
-    }
+  _computeRemainingTime(netFlow) {
+    if (!netFlow || Math.abs(netFlow.value) < this.flowThreshold) return { seconds: null, source: null };
 
     const { heightOverflow, heightOutlet, surfaceArea } = this.basin;
-    if (!Number.isFinite(surfaceArea) || surfaceArea <= 0) {
-      this.logger.warn('Invalid basin surface area.');
-      return { seconds: null, source: null };
-    }
+    if (!Number.isFinite(surfaceArea) || surfaceArea <= 0) return { seconds: null, source: null };
 
     for (const variant of this.levelVariants) {
-      const levelSnap = snapshot.levels[variant];
-      const current = levelSnap.samples.current?.value ?? null;
-      if (!Number.isFinite(current)) continue;
-
-      const remainingHeight =
-        netFlow.value > 0
-          ? Math.max(heightOverflow - current, 0)
-          : Math.max(current - heightOutlet, 0);
+      const lvl = this.measurements.type('level').variant(variant).position('atequipment').getCurrentValue('m');
+      if (!Number.isFinite(lvl)) continue;
 
+      const remainingHeight = netFlow.value > 0 ? Math.max(heightOverflow - lvl, 0) : Math.max(lvl - heightOutlet, 0);
       const seconds = (remainingHeight * surfaceArea) / Math.abs(netFlow.value);
       if (!Number.isFinite(seconds)) continue;
 
       return { seconds, source: `${netFlow.source}/${variant}` };
     }
 
-    this.logger.warn('No level data available to compute remaining time.');
     return { seconds: null, source: netFlow.source };
   }
 
-  _updatePredictedVolume(snapshot) {
-    const predicted = snapshot.flows.predicted;
-    if (!predicted) return;
-
-    const now = Date.now();
-    const inflowSample = predicted.inflow.current ?? predicted.inflow.previous ?? null;
-    const outflowSample = predicted.outflow.current ?? predicted.outflow.previous ?? null;
-
-    if (!this._predictedFlowState) {
-      this._predictedFlowState = {
-        inflow: inflowSample?.value ?? 0,
-        outflow: outflowSample?.value ?? 0,
-        lastTimestamp: inflowSample?.timestamp ?? outflowSample?.timestamp ?? now
-      };
-    }
-
-    if (inflowSample) this._predictedFlowState.inflow = inflowSample.value;
-    if (outflowSample) this._predictedFlowState.outflow = outflowSample.value;
-
-    const latestObservedTimestamp =
-      inflowSample?.timestamp ?? outflowSample?.timestamp ?? this._predictedFlowState.lastTimestamp;
-
-    const timestampPrev = this._predictedFlowState.lastTimestamp ?? latestObservedTimestamp;
-
-    let timestampNow = latestObservedTimestamp;
-    if (!Number.isFinite(timestampNow) || timestampNow <= timestampPrev) {
-      timestampNow = now;
-    }
-
-    let deltaSeconds = (timestampNow - timestampPrev) / 1000;
-    if (!Number.isFinite(deltaSeconds) || deltaSeconds <= 0) {
-      deltaSeconds = 0;
-    }
-
-    let netVolumeChange = 0;
-    if (deltaSeconds > 0) {
-      const avgInflow = inflowSample ? inflowSample.value : this._predictedFlowState.inflow;
-      const avgOutflow = outflowSample ? outflowSample.value : this._predictedFlowState.outflow;
-      netVolumeChange = (avgInflow - avgOutflow) * deltaSeconds;
-    }
-
-    const writeTimestamp = timestampPrev + Math.max(deltaSeconds, 0) * 1000;
-
-    const volumeSeries = this.measurements
-      .type('volume')
-      .variant('predicted')
-      .position('atEquipment');
-
-    const currentVolume = volumeSeries.getCurrentValue('m3') ?? this.basin.minVol;
-
-    const nextVolume = currentVolume + netVolumeChange;
-
-    volumeSeries.value(nextVolume, writeTimestamp, 'm3').unit('m3');
-
-    const nextLevel = this._calcLevelFromVolume(nextVolume);
-    this.measurements
-      .type('level')
-      .variant('predicted')
-      .position('atEquipment')
-      .value(nextLevel, writeTimestamp, 'm')
-      .unit('m');
-
-    this._predictedFlowState.lastTimestamp = writeTimestamp;
-  }
-
-  _averageSampleValues(sampleA, sampleB) {
-    const values = [sampleA?.value, sampleB?.value].filter((v) => Number.isFinite(v));
-    if (!values.length) return 0;
-    return values.reduce((acc, val) => acc + val, 0) / values.length;
-  }
-
   _deriveDirection(netFlow) {
     if (netFlow > this.flowThreshold) return 'filling';
     if (netFlow < -this.flowThreshold) return 'draining';
     return 'steady';
   }
 
-  /* ------------------------------------------------------------------ */
-  /* Basin Calculations                                                 */
-  /* ------------------------------------------------------------------ */
+  /* --------------------------- Safety --------------------------- */
+
+  _safetyController(remainingTime, direction) {
+    this.safetyControllerActive = false;
+
+    const volUnit = this.measurements.getUnit('volume');
+    const vol = this._pickVariant('volume', this.volVariants, 'atequipment', volUnit);
+    if (vol == null) {
+      Object.values(this.machines).forEach((machine) => machine.handleInput('parent', 'execSequence', 'shutdown'));
+      this.logger.warn('No volume data available to safe guard system; shutting down all machines.');
+      this.safetyControllerActive = true;
+      return;
+    }
+
+    const {
+      enableDryRunProtection,
+      dryRunThresholdPercent,
+      enableOverfillProtection,
+      overfillThresholdPercent,
+      timeleftToFullOrEmptyThresholdSeconds
+    } = this.config.safety || {};
+
+    const dryRunEnabled = Boolean(enableDryRunProtection);
+    const overfillEnabled = Boolean(enableOverfillProtection);
+    const timeProtectionEnabled = timeleftToFullOrEmptyThresholdSeconds > 0;
+    const triggerHighVol = this.basin.maxVolOverflow * ((Number(overfillThresholdPercent) || 0) / 100);
+    const triggerLowVol = this.basin.minVol * (1 + ((Number(dryRunThresholdPercent) || 0) / 100));
+
+    if (direction === 'draining') {
+      const timeTriggered = timeProtectionEnabled && remainingTime != null && remainingTime < timeleftToFullOrEmptyThresholdSeconds;
+      const dryRunTriggered = dryRunEnabled && vol < triggerLowVol;
+      if (timeTriggered || dryRunTriggered) {
+        Object.values(this.machines).forEach((machine) => {
+          const pos = machine?.config?.functionality?.positionVsParent;
+          if ((pos === 'downstream' || pos === 'atequipment') && machine._isOperationalState()) {
+            machine.handleInput('parent', 'execSequence', 'shutdown');
+          }
+        });
+        Object.values(this.stations).forEach((station) => station.handleInput('parent', 'execSequence', 'shutdown'));
+        Object.values(this.machineGroups).forEach((group) => group.turnOffAllMachines());
+        this.logger.warn(
+          `Safe guard triggered: vol=${vol.toFixed(2)} m3, remainingTime=${remainingTime ? remainingTime.toFixed(1) : 'N/A'} s; shutting down downstream equipment`
+        );
+        this.safetyControllerActive = true;
+      }
+    }
+
+    if (direction === 'filling') {
+      const timeTriggered = timeProtectionEnabled && remainingTime != null && remainingTime < timeleftToFullOrEmptyThresholdSeconds;
+      const overfillTriggered = overfillEnabled && vol > triggerHighVol;
+      if (timeTriggered || overfillTriggered) {
+        Object.values(this.machines).forEach((machine) => {
+          const pos = machine?.config?.functionality?.positionVsParent;
+          if (pos === 'upstream' && machine._isOperationalState()) {
+            machine.handleInput('parent', 'execSequence', 'shutdown');
+          }
+        });
+        Object.values(this.machineGroups).forEach((group) => group.turnOffAllMachines());
+        Object.values(this.stations).forEach((station) => station.handleInput('parent', 'execSequence', 'shutdown'));
+        this.logger.warn(
+          `Safe guard triggered: vol=${vol.toFixed(2)} m3, remainingTime=${remainingTime ? remainingTime.toFixed(1) : 'N/A'} s; shutting down upstream equipment`
+        );
+        this.safetyControllerActive = true;
+      }
+    }
+  }
+
+  /* --------------------------- Basin --------------------------- */
 
   initBasinProperties() {
+    const minHeightBasedOn = this.config.hydraulics.minHeightBasedOn;
     const volEmptyBasin = this.config.basin.volume;
     const heightBasin = this.config.basin.height;
     const heightInlet = this.config.basin.heightInlet;
@@ -445,8 +573,9 @@ class PumpingStationV2 {
     const surfaceArea = volEmptyBasin / heightBasin;
     const maxVol = heightBasin * surfaceArea;
     const maxVolOverflow = heightOverflow * surfaceArea;
-    const minVol = heightOutlet * surfaceArea;
-    const minVolOut = heightInlet * surfaceArea;
+    const minVolOut = heightOutlet * surfaceArea;
+    const minVolIn = heightInlet * surfaceArea;
+    const minVol = minHeightBasedOn === 'inlet' ? minVolIn : minVolOut;
 
     this.basin = {
       volEmptyBasin,
@@ -457,20 +586,13 @@ class PumpingStationV2 {
       surfaceArea,
       maxVol,
       maxVolOverflow,
+      minVolIn,
+      minVolOut,
       minVol,
-      minVolOut
+      minHeightBasedOn
     };
 
-    this.measurements
-      .type('volume')
-      .variant('predicted')
-      .position('atEquipment')
-      .value(maxVol)
-      .unit('m3');
-
-    this.logger.debug(
-      `Basin initialized | area=${surfaceArea.toFixed(2)} m2, max=${maxVol.toFixed(2)} m3, overflow=${maxVolOverflow.toFixed(2)} m3`
-    );
+    this.measurements.type('volume').variant('predicted').position('atequipment').value(minVol).unit('m3');
   }
 
   _calcVolumeFromLevel(level) {
@@ -481,28 +603,27 @@ class PumpingStationV2 {
     return Math.max(volume, 0) / this.basin.surfaceArea;
   }
 
-  /* ------------------------------------------------------------------ */
-  /* Output                                                             */
-  /* ------------------------------------------------------------------ */
+  /* --------------------------- Output --------------------------- */
 
   getOutput() {
-    const output = {};
-    Object.entries(this.measurements.measurements).forEach(([type, variants]) => {
-      Object.entries(variants).forEach(([variant, positions]) => {
-        Object.entries(positions).forEach(([position, measurement]) => {
-          output[`${type}.${variant}.${position}`] = measurement.getCurrentValue();
-        });
-      });
-    });
-
-    output.state = this.state;
-    output.basin = this.basin;
+    const output = this.measurements.getFlattenedOutput();
+    output.direction = this.state.direction;
+    output.flowSource = this.state.flowSource;
+    output.timeleft = this.state.seconds;
+    output.volEmptyBasin = this.basin.volEmptyBasin;
+    output.heightInlet = this.basin.heightInlet;
+    output.heightOverflow = this.basin.heightOverflow;
+    output.maxVol = this.basin.maxVol;
+    output.minVol = this.basin.minVol;
+    output.maxVolOverflow = this.basin.maxVolOverflow;
+    output.minVolOut = this.basin.minVolOut;
+    output.minVolIn = this.basin.minVolIn;
+    output.minHeightBasedOn = this.basin.minHeightBasedOn;
     return output;
   }
 }
 
-module.exports = PumpingStationV2;
-
+module.exports = PumpingStation;
 /* ------------------------------------------------------------------------- */
 /* Example usage                                                             */
 /* ------------------------------------------------------------------------- */
@@ -525,14 +646,18 @@ if (require.main === module) {
       },
       basin: {
         volume: 43.75,
-        height: 3.5,
-        heightInlet: 0.3,
+        height: 10,
+        heightInlet: 3,
         heightOutlet: 0.2,
-        heightOverflow: 3.0
+        heightOverflow: 3.2
       },
       hydraulics: {
         refHeight: 'NAP',
         basinBottomRef: 0
+      },
+      safety: {
+        enableDryRunProtection:false,
+        enableOverfillProtection:false
       }
     };
   }
@@ -630,41 +755,42 @@ if (require.main === module) {
   }
 
   (async function demo() {
-    const station = new PumpingStationV2(createPumpingStationConfig('PumpingStationDemo'));
+    const station = new PumpingStation(createPumpingStationConfig('PumpingStationDemo'));
     const pump1 = new RotatingMachine(createMachineConfig('Pump1','downstream'), createMachineStateConfig());
-    const pump2 = new RotatingMachine(createMachineConfig('Pump2','upstream'), createMachineStateConfig());
+    //const pump2 = new RotatingMachine(createMachineConfig('Pump2','upstream'), createMachineStateConfig());
 
-    const levelSensor = new Measurement(createLevelMeasurementConfig('WetWellLevel'));
-    const inflowSensor = new Measurement(createFlowMeasurementConfig('InfluentFlow', 'in'));
-    const outflowSensor = new Measurement(createFlowMeasurementConfig('PumpDischargeFlow', 'out'));
+    //const levelSensor = new Measurement(createLevelMeasurementConfig('WetWellLevel'));
+    //const inflowSensor = new Measurement(createFlowMeasurementConfig('InfluentFlow', 'in'));
+    //const outflowSensor = new Measurement(createFlowMeasurementConfig('PumpDischargeFlow', 'out'));
+
+    //station.childRegistrationUtils.registerChild(levelSensor, levelSensor.config.functionality.softwareType);
+    //station.childRegistrationUtils.registerChild(inflowSensor, inflowSensor.config.functionality.softwareType);
+    //station.childRegistrationUtils.registerChild(outflowSensor, outflowSensor.config.functionality.softwareType);
     
-    /*
-    station.childRegistrationUtils.registerChild(levelSensor, levelSensor.config.functionality.softwareType);
-    station.childRegistrationUtils.registerChild(inflowSensor, inflowSensor.config.functionality.softwareType);
-    station.childRegistrationUtils.registerChild(outflowSensor, outflowSensor.config.functionality.softwareType);
-    */
     station.childRegistrationUtils.registerChild(pump1, 'machine');
-    station.childRegistrationUtils.registerChild(pump2, 'machine');
+    //station.childRegistrationUtils.registerChild(pump2, 'machine');
 
     // Seed initial measurements
-    /*
-    seedSample(levelSensor, 'level', 1.8, 'm');
-    seedSample(inflowSensor, 'flow', 0.35, 'm3/s');
-    seedSample(outflowSensor, 'flow', 0.20, 'm3/s');
-*/
+    
+    //seedSample(levelSensor, 'level', 1.8, 'm');
+    //seedSample(inflowSensor, 'flow', 0.35, 'm3/s');
+    //seedSample(outflowSensor, 'flow', 0.20, 'm3/s');
+
+    
+
     setInterval(
       () => station.tick(), 1000);
 
       await new Promise((resolve) => setTimeout(resolve, 10));
 
       console.log('Initial state:', station.state);
-
-    await pump1.handleInput('parent', 'execSequence', 'startup');
-    await pump1.handleInput('parent', 'execMovement', 10);
-
-    await pump2.handleInput('parent', 'execSequence', 'startup');
-    await pump2.handleInput('parent', 'execMovement', 10);
-
+      station.setManualInflow(300,Date.now(),'l/s');
+      station.calibratePredictedVolume(3.4);
+      //await pump1.handleInput('parent', 'execSequence', 'startup');
+      //await pump1.handleInput('parent', 'execMovement', 10);
+//
+      //await pump2.handleInput('parent', 'execSequence', 'startup');
+      //await pump2.handleInput('parent', 'execMovement', 10);
 
       console.log('Station state:', station.state);
       console.log('Station output:', station.getOutput());
@@ -672,3 +798,4 @@ if (require.main === module) {
       console.error('Demo failed:', err);
     });
 }
+  //*/