node-red-contrib-s2 0.1.3 → 0.2.0

package/dist/nodes/s2-rm-config/index.html

@@ -1,14 +1,5 @@
 <script src="resources/node-red-contrib-s2/s2-common.js"></script>
 <script type="text/javascript">
-  var GRID_CONNECTIONS = {
-    '1x16A': 3680,
-    '3x16A': 11040,
-    '3x25A': 17250,
-    '3x32A': 22080,
-    '3x40A': 27600,
-    '3x63A': 43470
-  }
-
   RED.nodes.registerType('s2-rm-config', {
     category: 'config',
     defaults: {
@@ -21,10 +12,8 @@
       manufacturer: { value: 'Victron Energy' },
       model: { value: 'Virtual RM' },
       firmwareVersion: { value: '1.0.0' },
-      maxBatteryChargePower: { value: 0, validate: RED.validators.number() },
-      maxBatteryDischargePower: { value: 0, validate: RED.validators.number() },
-      gridConnection: { value: '' },
-      customMaxPowerW: { value: '' },
+      providesPowerMeasurement: { value: '3_PHASE_SYMMETRIC' },
+      providesForecast: { value: false },
       instructionPollIntervalMs: { value: 2000, validate: RED.validators.number() },
       skipInstructionStatus: { value: false }
     },
@@ -56,26 +45,20 @@
         $(this).prop('checked', savedRoles.indexOf($(this).val()) !== -1)
       })
 
-      function updateBatteryLimitsVisibility () {
-        var hasStorage = $('.s2-rm-config-role-checkbox[value="ENERGY_STORAGE"]').is(':checked')
-        $('#s2-rm-config-battery-section').toggle(hasStorage)
-      }
-
       $('.s2-rm-config-role-checkbox').on('change', function () {
         if ($('.s2-rm-config-role-checkbox:checked').length === 0) {
           $(this).prop('checked', true)
         }
-        updateBatteryLimitsVisibility()
       })
 
-      updateBatteryLimitsVisibility()
-
-      function updateCustomPowerVisibility () {
-        var val = $('#node-config-input-gridConnection').val()
-        $('#s2-rm-config-custom-power-row').toggle(val === 'custom')
+      // Migrate legacy boolean to string value
+      if (this.providesPowerMeasurement === true) {
+        this.providesPowerMeasurement = '3_PHASE_SYMMETRIC'
+        $('#node-config-input-providesPowerMeasurement').val('3_PHASE_SYMMETRIC')
+      } else if (this.providesPowerMeasurement === false) {
+        this.providesPowerMeasurement = ''
+        $('#node-config-input-providesPowerMeasurement').val('')
       }
-      $('#node-config-input-gridConnection').on('change', updateCustomPowerVisibility)
-      updateCustomPowerVisibility()
 
       $('#node-config-input-skipInstructionStatus').prop('checked', this.skipInstructionStatus === true)
 
@@ -158,22 +141,20 @@
     </div>
 
     <div class="form-row">
-      <label for="node-config-input-gridConnection"><i class="fa fa-plug"></i> Grid Fuse<i class="fa fa-info-circle tooltip-icon" data-tooltip="Fuse/breaker capacity at the grid connection point. Sets the outer PEBC power limits sent to the CEM as [-max, +max] watts."></i></label>
-      <select id="node-config-input-gridConnection">
-        <option value="">-- Not set --</option>
-        <option value="1x16A">1x16A (3.7 kW)</option>
-        <option value="3x16A">3x16A (11 kW)</option>
-        <option value="3x25A">3x25A (17.3 kW)</option>
-        <option value="3x32A">3x32A (22 kW)</option>
-        <option value="3x40A">3x40A (27.6 kW)</option>
-        <option value="3x63A">3x63A (43.5 kW)</option>
-        <option value="custom">Custom</option>
+      <label for="node-config-input-providesPowerMeasurement"><i class="fa fa-bolt"></i> Power Meas.<i class="fa fa-info-circle tooltip-icon" data-tooltip="Commodity quantities for power measurement. Advertised to the CEM in ResourceManagerDetails."></i></label>
+      <select id="node-config-input-providesPowerMeasurement" style="width: 70%;">
+        <option value="">None</option>
+        <option value="3_PHASE_SYMMETRIC">3-phase symmetric</option>
+        <option value="L1_L2_L3">Per phase (L1, L2, L3)</option>
       </select>
     </div>
 
-    <div class="form-row" id="s2-rm-config-custom-power-row" style="display:none">
-      <label for="node-config-input-customMaxPowerW"><i class="fa fa-bolt"></i> Max Power (W)<i class="fa fa-info-circle tooltip-icon" data-tooltip="Maximum power in watts for a custom grid connection. Used as both import and export limit."></i></label>
-      <input type="number" id="node-config-input-customMaxPowerW" placeholder="e.g. 15000" min="1">
+    <div class="form-row">
+      <label for="node-config-input-providesForecast">
+        <i class="fa fa-line-chart"></i> Forecast
+      </label>
+      <input type="checkbox" id="node-config-input-providesForecast" style="width: auto; margin-top: 6px;">
+      <span style="margin-left: 6px;">Provides power forecast</span>
     </div>
 
     <div class="form-row">
@@ -196,33 +177,6 @@
       <input type="text" id="node-config-input-firmwareVersion" placeholder="e.g. 1.0.0">
     </div>
 
-    <div id="s2-rm-config-battery-section">
-      <div class="form-row">
-        <label class="s2-section-label">
-          <i class="fa fa-battery-three-quarters"></i> Battery Limits
-          <i class="fa fa-info-circle tooltip-icon" data-tooltip="Hardware ceiling for battery power. CEM instructions are clamped to these values. Set to 0 for no limit."></i>
-        </label>
-      </div>
-
-      <div class="form-row s2-battery-row">
-        <label for="node-config-input-maxBatteryChargePower">
-          <i class="fa fa-arrow-circle-down"></i> Charge
-          <i class="fa fa-info-circle tooltip-icon" data-tooltip="Maximum battery charge power in Watts. Never exceeded when writing DESS limits."></i>
-        </label>
-        <input type="number" id="node-config-input-maxBatteryChargePower" placeholder="0 = no limit" min="0" step="1">
-        <span class="s2-unit-label">W</span>
-      </div>
-
-      <div class="form-row s2-battery-row">
-        <label for="node-config-input-maxBatteryDischargePower">
-          <i class="fa fa-arrow-circle-up"></i> Discharge
-          <i class="fa fa-info-circle tooltip-icon" data-tooltip="Maximum battery discharge power in Watts. Never exceeded when writing DESS limits."></i>
-        </label>
-        <input type="number" id="node-config-input-maxBatteryDischargePower" placeholder="0 = no limit" min="0" step="1">
-        <span class="s2-unit-label">W</span>
-      </div>
-    </div>
-
     <div class="form-row">
       <a href="#" class="s2-advanced-toggle" id="s2-rm-config-advanced-toggle">
         <i class="fa fa-cog"></i> Advanced
@@ -251,4 +205,18 @@
   </div>
 </script>
 
+<script type="text/html" data-help-name="s2-rm-config">
+  <p>Configuration for <b>s2-rm</b>: the Resource Manager's identity, advertised capabilities, and protocol-level behavior. Sent to the CEM in <code>ResourceManagerDetails</code> during the S2 handshake.</p>
+
+  <h3>Identity</h3>
+  <p><b>Resource ID</b> is a stable UUID identifying this RM to the CEM - it's also used to build the CEM connection URL on <b>s2-cem-config</b>. Auto-generated the first time the node is added; avoid changing it after deployment, since the CEM associates state with this id.</p>
+  <p><b>Roles</b> and <b>Control Types</b> are advertised capabilities - at least one of each must be selected. Control types beyond OMBC and PEBC (FRBC, DDBC, PPBC) have no dedicated node yet; their instructions are still forwarded on <b>s2-rm</b>'s instructions output for you to handle yourself.</p>
+
+  <h3>Power Meas. / Forecast</h3>
+  <p>Advertise whether this RM reports <code>PowerMeasurement</code> (as a single 3-phase-symmetric value, or per-phase L1/L2/L3) and/or <code>PowerForecast</code>. These affect what's advertised to the CEM and whether <b>s2-rm</b> emits its <code>PowerMeasurementStart</code> signal on output 1 - they don't gate whether a <code>PowerMeasurement</code>/<code>Forecast</code> command you send is actually forwarded, which happens regardless.</p>
+
+  <h3>Advanced</h3>
+  <p><b>Poll interval</b> controls how often <b>s2-rm</b> checks for pending instructions whose <code>execution_time</code> has now arrived (PEBC instructions bypass this queue entirely and are delivered immediately). <b>Skip instruction status updates</b> suppresses automatic <code>InstructionStatusUpdate(ACCEPTED/STARTED)</code> messages - <code>ReceptionStatus</code> and control-type status messages are still sent - useful if the CEM generates high load from frequent instructions.</p>
+</script>
+
 <link rel="stylesheet" href="resources/node-red-contrib-s2/s2-styles.css">

package/dist/nodes/s2-rm-config/index.js

@@ -10,8 +10,8 @@ module.exports = function (RED) {
         this.model = config.model;
         this.firmwareVersion = config.firmwareVersion;
         this.controlTypes = config.controlTypes;
-        this.gridConnection = config.gridConnection;
-        this.customMaxPowerW = config.customMaxPowerW != null ? Number(config.customMaxPowerW) : undefined;
+        this.providesPowerMeasurement = config.providesPowerMeasurement;
+        this.providesForecast = config.providesForecast === true;
         this.instructionPollIntervalMs = config.instructionPollIntervalMs != null ? Number(config.instructionPollIntervalMs) : 2000;
         this.skipInstructionStatus = config.skipInstructionStatus === true;
     }

package/dist/nodes/s2-rm-config/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/nodes/s2-rm-config/index.ts"],"names":[],"mappings":";AAGA,iBAAS,UAAU,GAAe;IAChC,SAAS,yBAAyB,CAAwB,MAAkB;QAC1E,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;QAClC,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,UAAoB,CAAA;QAC7C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAgB,CAAA;QACrC,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,KAAe,CAAA;QACnC,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,YAAsB,CAAA;QACjD,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,YAAsB,CAAA;QACjD,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,KAAe,CAAA;QACnC,IAAI,CAAC,eAAe,GAAG,MAAM,CAAC,eAAyB,CAAA;QACvD,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,YAAsB,CAAA;QACjD,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,cAAwB,CAAA;QACrD,IAAI,CAAC,eAAe,GAAG,MAAM,CAAC,eAAe,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;QAClG,IAAI,CAAC,yBAAyB,GAAG,MAAM,CAAC,yBAAyB,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,yBAAyB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;QAC3H,IAAI,CAAC,qBAAqB,GAAG,MAAM,CAAC,qBAAqB,KAAK,IAAI,CAAA;IACpE,CAAC;IAED,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,cAAc,EAAE,yBAAyB,CAAC,CAAA;AACnE,CAAC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/nodes/s2-rm-config/index.ts"],"names":[],"mappings":";AAGA,iBAAS,UAAU,GAAe;IAChC,SAAS,yBAAyB,CAAwB,MAAkB;QAC1E,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;QAClC,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,UAAoB,CAAA;QAC7C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAgB,CAAA;QACrC,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,KAAe,CAAA;QACnC,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,YAAsB,CAAA;QACjD,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,YAAsB,CAAA;QACjD,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,KAAe,CAAA;QACnC,IAAI,CAAC,eAAe,GAAG,MAAM,CAAC,eAAyB,CAAA;QACvD,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,YAAsB,CAAA;QACjD,IAAI,CAAC,wBAAwB,GAAG,MAAM,CAAC,wBAAkC,CAAA;QACzE,IAAI,CAAC,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,KAAK,IAAI,CAAA;QACxD,IAAI,CAAC,yBAAyB,GAAG,MAAM,CAAC,yBAAyB,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,yBAAyB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;QAC3H,IAAI,CAAC,qBAAqB,GAAG,MAAM,CAAC,qBAAqB,KAAK,IAAI,CAAA;IACpE,CAAC;IAED,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,cAAc,EAAE,yBAAyB,CAAC,CAAA;AACnE,CAAC,CAAA"}

package/dist/types/config-nodes.d.ts

@@ -12,12 +12,10 @@ export interface S2RmConfigNode extends NodeRedNode {
     model: string;
     firmwareVersion: string;
     controlTypes: string;
-    /** Hardware ceiling for battery charge power in Watts. 0 = no limit configured. */
-    maxBatteryChargePower: number;
-    /** Hardware ceiling for battery discharge power in Watts. 0 = no limit configured. */
-    maxBatteryDischargePower: number;
-    gridConnection: string;
-    customMaxPowerW: number | undefined;
+    /** Commodity quantity list for power measurement, or '' for none. */
+    providesPowerMeasurement: string;
+    /** Whether this RM provides power forecasts to the CEM. */
+    providesForecast: boolean;
     /** How often (ms) to poll for due pending instructions. Defaults to 2000 if not set. */
     instructionPollIntervalMs: number;
     /** When true, skip sending InstructionStatusUpdate(ACCEPTED/STARTED) automatically.
@@ -25,6 +23,22 @@ export interface S2RmConfigNode extends NodeRedNode {
      * acknowledgment messages and the extra D-Bus traffic causes CPU load. */
     skipInstructionStatus: boolean;
 }
+/**
+ * Server-side shape of the s2-ombc-config config node.
+ * Use RED.nodes.getNode(id) and cast to this type.
+ */
+export interface S2OmbcConfigNode extends NodeRedNode {
+    /** JSON-encoded OMBCSystemDescriptionConfig: { operationModes, transitions, timers } */
+    systemDescription: string;
+}
+/**
+ * Server-side shape of the s2-pebc-config config node.
+ * Use RED.nodes.getNode(id) and cast to this type.
+ */
+export interface S2PebcConfigNode extends NodeRedNode {
+    gridConnection: string;
+    customMaxPowerW: number | undefined;
+}
 /**
  * Server-side shape of the s2-cem-config config node.
  * Use RED.nodes.getNode(id) and cast to this type.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-s2",
-  "version": "0.1.3",
+  "version": "0.2.0",
   "description": "Node-RED nodes for S2 energy management protocol (EN 50491-12-2)",
   "author": "Victron Energy BV",
   "repository": {
@@ -21,7 +21,11 @@
       "s2-rm-config": "./dist/nodes/s2-rm-config/index.js",
       "s2-cem-config": "./dist/nodes/s2-cem-config/index.js",
       "s2-websocket": "./dist/nodes/s2-websocket/index.js",
-      "s2-rm": "./dist/nodes/s2-rm/index.js"
+      "s2-rm": "./dist/nodes/s2-rm/index.js",
+      "s2-ombc-config": "./dist/nodes/s2-ombc-config/index.js",
+      "s2-ombc": "./dist/nodes/s2-ombc/index.js",
+      "s2-pebc-config": "./dist/nodes/s2-pebc-config/index.js",
+      "s2-pebc": "./dist/nodes/s2-pebc/index.js"
     }
   },
   "scripts": {

package/resources/s2-styles.css

@@ -69,8 +69,13 @@
    CONTROL TYPES / ROLES - Checkbox Grid
    ============================================================================ */
 
-/* Section labels (Roles, Control Types) span the full row. */
-.s2-form .s2-section-label {
+/* Section labels (Roles, Control Types) span the full row.
+   Selector includes the `label` element type to match (and, combined with
+   source order, beat) .s2-form .form-row label's specificity above - a
+   class-only selector loses that tie-break despite both using !important,
+   leaving the label clipped to 120px with its text and tooltip icon
+   overlapping instead of spanning the row. */
+.s2-form label.s2-section-label {
   width: 100% !important;
   display: inline-block;
 }
@@ -162,3 +167,97 @@
   color: #333;
   text-decoration: none;
 }
+
+/* ============================================================================
+   OMBC SYSTEM DESCRIPTION - Friendly/Advanced tabs and operation-mode rows
+   ============================================================================ */
+
+.s2-form .s2-ombc-tabs {
+  display: flex;
+  gap: 4px;
+  border-bottom: 1px solid #ccc;
+  margin-bottom: 8px;
+}
+
+.s2-form .s2-ombc-tab {
+  padding: 5px 12px;
+  color: #666;
+  text-decoration: none;
+  border: 1px solid transparent;
+  border-bottom: none;
+  border-radius: 3px 3px 0 0;
+}
+
+.s2-form .s2-ombc-tab:hover {
+  color: #333;
+  text-decoration: none;
+}
+
+.s2-form .s2-ombc-tab.s2-ombc-tab-active {
+  color: #333;
+  font-weight: 600;
+  border-color: #ccc;
+  background: #fff;
+  margin-bottom: -1px;
+}
+
+.s2-form .s2-ombc-mode-row {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  flex-wrap: wrap;
+}
+
+.s2-form .s2-ombc-mode-row + .s2-ombc-mode-row {
+  margin-top: 4px;
+}
+
+.s2-form .s2-ombc-mode-row input[type="text"] {
+  flex: 1;
+  min-width: 100px;
+  width: auto !important;
+}
+
+.s2-form .s2-ombc-mode-row input[type="number"] {
+  width: 70px !important;
+}
+
+/* `label` element type included for the same specificity reason as
+   label.s2-section-label above. */
+.s2-form label.s2-ombc-mode-checkbox-label {
+  display: inline-flex;
+  align-items: center;
+  gap: 4px;
+  width: auto !important;
+  white-space: nowrap;
+  font-weight: normal;
+  cursor: pointer;
+}
+
+.s2-form .s2-ombc-mode-checkbox-label input[type="checkbox"] {
+  width: auto !important;
+}
+
+.s2-form .s2-ombc-mode-value-wrap {
+  display: inline-flex;
+  align-items: center;
+  gap: 4px;
+  white-space: nowrap;
+}
+
+.s2-form .s2-ombc-mode-protected-note {
+  color: #888;
+  font-size: 0.85em;
+  font-style: italic;
+  margin-top: 2px;
+}
+
+.s2-form .s2-ombc-advanced-warning {
+  color: #a06400;
+  background: #fff8e6;
+  border: 1px solid #f0d78c;
+  border-radius: 3px;
+  padding: 6px 10px;
+  margin-bottom: 8px;
+  font-size: 0.9em;
+}