Merge branch 'main' of https://gitea.centraal.wbd-rd.nl/woutverheijen/rotatingMachine
This commit is contained in:
@@ -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 -->
|
<!-- Load the dynamic menu & config endpoints -->
|
||||||
<script src="/rotatingMachine/menu.js"></script>
|
<script src="/rotatingMachine/menu.js"></script>
|
||||||
<script src="/rotatingMachine/configData.js"></script>
|
<script src="/rotatingMachine/configData.js"></script>
|
||||||
@@ -5,7 +15,7 @@
|
|||||||
<script>
|
<script>
|
||||||
RED.nodes.registerType("rotatingMachine", {
|
RED.nodes.registerType("rotatingMachine", {
|
||||||
category: "EVOLV",
|
category: "EVOLV",
|
||||||
color: "#4f8582",
|
color: "#86bbdd",
|
||||||
defaults: {
|
defaults: {
|
||||||
|
|
||||||
// Define specific properties
|
// Define specific properties
|
||||||
@@ -41,7 +51,7 @@
|
|||||||
outputs: 3,
|
outputs: 3,
|
||||||
inputLabels: ["Input"],
|
inputLabels: ["Input"],
|
||||||
outputLabels: ["process", "dbase", "parent"],
|
outputLabels: ["process", "dbase", "parent"],
|
||||||
icon: "font-awesome/fa-tachometer",
|
icon: "font-awesome/fa-cog",
|
||||||
|
|
||||||
label: function () {
|
label: function () {
|
||||||
return this.positionIcon + " " + this.category.slice(0, -1) || "Machine";
|
return this.positionIcon + " " + this.category.slice(0, -1) || "Machine";
|
||||||
|
|||||||
@@ -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 remainregisterChilds 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 EventEmitter = require('events');
|
||||||
const {loadCurve,logger,configUtils,configManager,state, nrmse, MeasurementContainer, predict, interpolation , childRegistrationUtils} = require('generalFunctions');
|
const {loadCurve,logger,configUtils,configManager,state, nrmse, MeasurementContainer, predict, interpolation , childRegistrationUtils} = require('generalFunctions');
|
||||||
const { name } = require('../../generalFunctions/src/convert/lodash/lodash._shimkeys');
|
const { name } = require('../../generalFunctions/src/convert/lodash/lodash._shimkeys');
|
||||||
@@ -544,13 +499,12 @@ _callMeasurementHandler(measurementType, value, position, context) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// rich context handler for pressure updates
|
// context handler for pressure updates
|
||||||
updateMeasuredPressure(value, position, context = {}) {
|
updateMeasuredPressure(value, position, context = {}) {
|
||||||
|
|
||||||
// Enhanced logging with child context
|
|
||||||
this.logger.debug(`Pressure update: ${value} at ${position} from ${context.childName || 'child'} (${context.childId || 'unknown-id'})`);
|
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);
|
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)
|
// Determine what kind of value to use as pressure (upstream , downstream or difference)
|
||||||
|
|||||||
Reference in New Issue
Block a user