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

Reviewed-on: #2

rotatingMachine.html

@@ -1,3 +1,13 @@
+<!--
+| S88-niveau             | Primair (blokkleur) | Tekstkleur |
+| ---------------------- | ------------------- | ---------- |
+| **Area**               | `#0f52a5`           | wit        |
+| **Process Cell**       | `#0c99d9`           | wit        |
+| **Unit**               | `#50a8d9`           | zwart      |
+| **Equipment (Module)** | `#86bbdd`           | zwart      |
+| **Control Module**     | `#a9daee`           | zwart      |
+
+-->
 <!-- Load the dynamic menu & config endpoints -->
 <script src="/rotatingMachine/menu.js"></script>
 <script src="/rotatingMachine/configData.js"></script>
@@ -5,7 +15,7 @@
 <script>
   RED.nodes.registerType("rotatingMachine", {
     category: "EVOLV",
-    color: "#4f8582",
+    color: "#86bbdd",
         defaults: {
 
           // Define specific properties
@@ -41,7 +51,7 @@
     outputs: 3,
     inputLabels: ["Input"],
     outputLabels: ["process", "dbase", "parent"],
-    icon: "font-awesome/fa-tachometer",
+    icon: "font-awesome/fa-cog",
 
     label: function () {
       return this.positionIcon + " " + this.category.slice(0, -1) || "Machine";
@@ -68,6 +78,7 @@
     },
     oneditsave: function() {
       const node = this;
+
       // save asset fields
       if (window.EVOLV?.nodes?.rotatingMachine?.assetMenu?.saveEditor) {
         window.EVOLV.nodes.rotatingMachine.assetMenu.saveEditor(this);

src/nodeClass.js

@@ -62,7 +62,7 @@ class nodeClass {
         unit: uiConfig.unit
       },
       functionality: {
-        positionVsParent: uiConfig.positionVsParent || 'atEquipment', // Default to 'atEquipment' if not specified
+        positionVsParent: uiConfig.positionVsParent
       }
     };
 

src/specificClass.js

@@ -1,48 +1,3 @@
-/**
- * @file machine.js
- *
- * Permission is hereby granted to any person obtaining a copy of this software 
- * and associated documentation files (the "Software"), to use it for personal 
- * or non-commercial purposes, with the following restrictions:
- *
- * 1. **No Copying or Redistribution**: The Software or any of its parts may not 
- *    be copied, merged, distributed, sublicensed, or sold without explicit 
- *    prior written permission from the author.
- * 
- * 2. **Commercial Use**: Any use of the Software for commercial purposes requires 
- *    a valid license, obtainable only with the explicit consent of the author.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
- * FITNESS FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES, OR OTHER 
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT, OR OTHERWISE, ARISING FROM, 
- * OUT OF, OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
- * SOFTWARE.
- *
- * Ownership of this code remains solely with the original author. Unauthorized 
- * use of this Software is strictly prohibited.
- *
- * @summary A class to interact and manipulate machines with a non-euclidian curve
- * @description A class to interact and manipulate machines with a non-euclidian curve
- * @module machine
- * @exports machine
- * @version 0.1.0
- * @since 0.1.0
- * 
- * Author:
- * - Rene De Ren
- * Email:
- * - r.de.ren@brabantsedelta.nl
- * 
- *  Add functionality later
-  // -------- Operational Metrics -------- //
-maintenanceAlert: this.state.checkMaintenanceStatus()
-
-
-*/
-
-//load local dependencies
 const EventEmitter = require('events');
 const {loadCurve,logger,configUtils,configManager,state, nrmse, MeasurementContainer, predict, interpolation , childRegistrationUtils} = require('generalFunctions');
 const { name } = require('../../generalFunctions/src/convert/lodash/lodash._shimkeys');
@@ -71,7 +26,7 @@ class Machine {
     this.config = this.configUtils.updateConfig(this.config, {general:{name: this.config.functionality?.softwareType + "_" + machineConfig.general.id}}); // add unique name if not present
 
     if (!this.model || !this.curve) {
-      this.logger.warn(`${!this.model ? 'Model not specified' : 'Curve not found for model ' + this.model} in machineConfig. Cannot make predictions.`);
+      this.logger.error(`${!this.model ? 'Model not specified' : 'Curve not found for model ' + this.model} in machineConfig. Cannot make predictions.`);
       // Set prediction objects to null to prevent method calls
       this.predictFlow = null;
       this.predictPower = null;
@@ -120,18 +75,23 @@ class Machine {
 
   /*-------------------               Register child events               -------------------*/
   registerChild(child, softwareType) {
-    this.logger.debug('Setting up child event listeners');
+    this.logger.debug('Setting up child event for softwaretype ' + softwareType);
 
     if(softwareType === "measurement"){
           const position = child.config.functionality.positionVsParent;
+          const distance = child.config.functionality.distanceVsParent || 0;
           const measurementType = child.config.asset.type;
           const key = `${measurementType}_${position}`;
+          //rebuild to measurementype.variant no position and then switch based on values not strings or names.
           const eventName = `${measurementType}.measured.${position}`;
 
+          this.logger.debug(`Setting up listener for ${eventName} from child ${child.config.general.name}`);
           // Register event listener for measurement updates
           child.measurements.emitter.on(eventName, (eventData) => {
           this.logger.debug(`🔄 ${position} ${measurementType} from ${eventData.childName}: ${eventData.value} ${eventData.unit}`);
       
+
+          console.log(` Emitting... ${eventName} with data:`);
           // Store directly in parent's measurement container
           this.measurements
             .type(measurementType)
@@ -156,10 +116,6 @@ _callMeasurementHandler(measurementType, value, position, context) {
       this.updateMeasuredFlow(value, position, context);
       break;
       
-    case 'temperature':
-      this.updateMeasuredTemperature(value, position, context);
-      break;
-      
     default:
       this.logger.warn(`No handler for measurement type: ${measurementType}`);
       // Generic handler - just update position
@@ -214,37 +170,37 @@ _callMeasurementHandler(measurementType, value, position, context) {
   }
 
   async handleInput(source, action, parameter) {
+
     if (!this.isValidSourceForMode(source, this.currentMode)) {
       let warningTxt = `Source '${source}' is not valid for mode '${this.currentMode}'.`;
       this.logger.warn(warningTxt);
       return {status : false , feedback: warningTxt};
     }
     
-
     this.logger.info(`Handling input from source '${source}' with action '${action}' in mode '${this.currentMode}'.`);
+    
     try {
       switch (action) {
         case "execSequence":
-          await this.executeSequence(parameter);
-          //recalc flow and power
-          this.updatePosition();
-          break;
+          return await this.executeSequence(parameter);
+
         case "execMovement":
-          await this.setpoint(parameter);
-          break;
+          return await this.setpoint(parameter);
+
         case "flowMovement":
           // Calculate the control value for a desired flow
           const pos = this.calcCtrl(parameter);
           // Move to the desired setpoint
-          await this.setpoint(pos);
-          break;
+          return await this.setpoint(pos);
+
         case "emergencyStop":
           this.logger.warn(`Emergency stop activated by '${source}'.`);
-          await this.executeSequence("emergencyStop");
-          break;
+          return await this.executeSequence("emergencyStop");
+
         case "statusCheck":
           this.logger.info(`Status Check: Mode = '${this.currentMode}', Source = '${source}'.`);
           break;
+
         default:
           this.logger.warn(`Action '${action}' is not implemented.`);
           break;
@@ -254,6 +210,13 @@ _callMeasurementHandler(measurementType, value, position, context) {
     } catch (error) {
       this.logger.error(`Error handling input: ${error}`);
     }
+
+  }
+
+  abortMovement(reason = "group override") {
+    if (this.state?.abortCurrentMovement) {
+      this.state.abortCurrentMovement(reason);
+    }
   }
 
   setMode(newMode) {
@@ -294,6 +257,9 @@ _callMeasurementHandler(measurementType, value, position, context) {
         break; // Exit sequence execution on error
       }
     }
+
+    //recalc flow and power
+    this.updatePosition();
   }
 
   async setpoint(setpoint) {
@@ -341,20 +307,20 @@ _callMeasurementHandler(measurementType, value, position, context) {
   calcPower(x) {
     if(this.hasCurve) {
       if (!this._isOperationalState()) {
-        this.measurements.type("power").variant("predicted").position('upstream').value(0);
+        this.measurements.type("power").variant("predicted").position('atEquipment').value(0);
         this.logger.debug(`Machine is not operational. Setting predicted power to 0.`);
         return 0;
       }
     
       //this.predictPower.currentX = x; Decrepated
       const cPower = this.predictPower.y(x);
-      this.measurements.type("power").variant("predicted").position('upstream').value(cPower);
+      this.measurements.type("power").variant("predicted").position('atEquipment').value(cPower);
       //this.logger.debug(`Calculated power: ${cPower} for pressure: ${this.getMeasuredPressure()} and position: ${x}`);
       return cPower;
     }
     // If no curve data is available, log a warning and return 0
     this.logger.warn(`No curve data available for power calculation. Returning 0.`);
-    this.measurements.type("power").variant("predicted").position('upstream').value(0);
+    this.measurements.type("power").variant("predicted").position('atEquipment').value(0);
     return 0;
 
   }
@@ -372,7 +338,7 @@ _callMeasurementHandler(measurementType, value, position, context) {
     
     // If no curve data is available, log a warning and return 0
     this.logger.warn(`No curve data available for power calculation. Returning 0.`);
-    this.measurements.type("power").variant("predicted").position('upstream').value(0);
+    this.measurements.type("power").variant("predicted").position('atEquipment').value(0);
     return 0;
 
   }
@@ -382,14 +348,14 @@ _callMeasurementHandler(measurementType, value, position, context) {
     if(this.hasCurve) {
       this.predictCtrl.currentX = x;
       const cCtrl = this.predictCtrl.y(x);
-      this.measurements.type("ctrl").variant("predicted").position('upstream').value(cCtrl);
+      this.measurements.type("ctrl").variant("predicted").position('atEquipment').value(cCtrl);
       //this.logger.debug(`Calculated ctrl: ${cCtrl} for pressure: ${this.getMeasuredPressure()} and position: ${x}`);
       return cCtrl;
     }
     
     // If no curve data is available, log a warning and return 0
     this.logger.warn(`No curve data available for control calculation. Returning 0.`);
-    this.measurements.type("ctrl").variant("predicted").position('upstream').value(0);
+    this.measurements.type("ctrl").variant("predicted").position('atEquipment').value(0);
     return 0;
 
   }
@@ -398,9 +364,9 @@ _callMeasurementHandler(measurementType, value, position, context) {
   // this will be either the differential pressure, downstream or upstream pressure
   getMeasuredPressure() {
     const pressureDiff = this.measurements.type('pressure').variant('measured').difference();
-    
+
     // Both upstream & downstream => differential
-    if (pressureDiff != null) {
+    if (pressureDiff) {
       this.logger.debug(`Pressure differential: ${pressureDiff.value}`);
       this.predictFlow.fDimension = pressureDiff.value;
       this.predictPower.fDimension = pressureDiff.value;
@@ -420,7 +386,7 @@ _callMeasurementHandler(measurementType, value, position, context) {
 
     // Only downstream => use it, warn that it's partial
     if (downstreamPressure != null) {
-      this.logger.warn(`Using downstream pressure only for prediction: ${downstreamPressure} `);
+      this.logger.warn(`Using downstream pressure only for prediction: ${downstreamPressure} This is less acurate!!`);
       this.predictFlow.fDimension = downstreamPressure;
       this.predictPower.fDimension = downstreamPressure;
       this.predictCtrl.fDimension = downstreamPressure;
@@ -502,18 +468,12 @@ _callMeasurementHandler(measurementType, value, position, context) {
     }
   }
 
-  //  ENHANCED: Your existing handler but with rich context
+  // context handler for pressure updates
   updateMeasuredPressure(value, position, context = {}) {
-    //  Your existing operational check
-    if (!this._isOperationalState()) {
-      this.logger.warn(`Machine not operational, skipping pressure update from ${context.childName || 'unknown'}`);
-      return;
-    }
-
-    //  Enhanced logging with child context
+   
     this.logger.debug(`Pressure update: ${value} at ${position} from ${context.childName || 'child'} (${context.childId || 'unknown-id'})`);
     
-    //  Store in parent's measurement container (your existing logic)
+    //  Store in parent's measurement container 
     this.measurements.type("pressure").variant("measured").position(position).value(value, context.timestamp, context.unit);
 
     // Determine what kind of value to use as pressure (upstream , downstream or difference)
@@ -523,7 +483,7 @@ _callMeasurementHandler(measurementType, value, position, context) {
     this.logger.debug(`Using pressure: ${pressure} for calculations`);
   }
 
-  // NEW: Flow handler (following your pattern)
+  // NEW: Flow handler
   updateMeasuredFlow(value, position, context = {}) {
     if (!this._isOperationalState()) {
       this.logger.warn(`Machine not operational, skipping flow update from ${context.childName || 'unknown'}`);
@@ -549,6 +509,7 @@ _callMeasurementHandler(measurementType, value, position, context) {
 
   //what is the internal functions that need updating when something changes that has influence on this.
   updatePosition() {
+    
     if (this._isOperationalState()) {
 
       const currentPosition = this.state.getCurrentPosition();
@@ -660,12 +621,12 @@ _callMeasurementHandler(measurementType, value, position, context) {
 
     if (power != 0 && flow != 0) {
       // Calculate efficiency after measurements update
-      this.measurements.type("efficiency").variant(variant).position('downstream').value((flow / power));
+      this.measurements.type("efficiency").variant(variant).position('atEquipment').value((flow / power));
     } else {
-      this.measurements.type("efficiency").variant(variant).position('downstream').value(null);
+      this.measurements.type("efficiency").variant(variant).position('atEquipment').value(null);
     }
 
-    return this.measurements.type("efficiency").variant(variant).position('downstream').getCurrentValue();
+    return this.measurements.type("efficiency").variant(variant).position('atEquipment').getCurrentValue();
 
   }