@enyo-energy/sunspec-sdk 0.0.56 → 0.0.57

package/dist/cjs/sunspec-devices.cjs

@@ -1206,10 +1206,14 @@ class SunspecMeter extends BaseSunspecDevice {
     async connect() {
         // Connect with specific unit ID for meter
         await this.ensureConnected();
-        // Check if meter models exist
+        // Check if meter models exist (int+SF: 201/203/204, float: 211/212/213/214)
         const hasMeter = this.sunspecClient.findModel(this.unitId, sunspec_interfaces_js_1.SunspecModelId.Meter3Phase) !== undefined ||
             this.sunspecClient.findModel(this.unitId, sunspec_interfaces_js_1.SunspecModelId.MeterWye) !== undefined ||
-            this.sunspecClient.findModel(this.unitId, sunspec_interfaces_js_1.SunspecModelId.MeterSinglePhase) !== undefined;
+            this.sunspecClient.findModel(this.unitId, sunspec_interfaces_js_1.SunspecModelId.MeterSinglePhase) !== undefined ||
+            this.sunspecClient.findModel(this.unitId, sunspec_interfaces_js_1.SunspecModelId.Meter3PhaseWyeFloat) !== undefined ||
+            this.sunspecClient.findModel(this.unitId, sunspec_interfaces_js_1.SunspecModelId.Meter3PhaseDeltaFloat) !== undefined ||
+            this.sunspecClient.findModel(this.unitId, sunspec_interfaces_js_1.SunspecModelId.MeterSplitPhaseFloat) !== undefined ||
+            this.sunspecClient.findModel(this.unitId, sunspec_interfaces_js_1.SunspecModelId.MeterSinglePhaseFloat) !== undefined;
         if (!hasMeter) {
             throw new Error('No meter model found in device');
         }

package/dist/cjs/sunspec-interfaces.cjs

@@ -30,6 +30,10 @@ var SunspecModelId;
     SunspecModelId[SunspecModelId["MeterSinglePhase"] = 201] = "MeterSinglePhase";
     SunspecModelId[SunspecModelId["Meter3Phase"] = 203] = "Meter3Phase";
     SunspecModelId[SunspecModelId["MeterWye"] = 204] = "MeterWye";
+    SunspecModelId[SunspecModelId["MeterSinglePhaseFloat"] = 211] = "MeterSinglePhaseFloat";
+    SunspecModelId[SunspecModelId["MeterSplitPhaseFloat"] = 212] = "MeterSplitPhaseFloat";
+    SunspecModelId[SunspecModelId["Meter3PhaseWyeFloat"] = 213] = "Meter3PhaseWyeFloat";
+    SunspecModelId[SunspecModelId["Meter3PhaseDeltaFloat"] = 214] = "Meter3PhaseDeltaFloat";
     SunspecModelId[SunspecModelId["Nameplate"] = 120] = "Nameplate";
     SunspecModelId[SunspecModelId["Settings"] = 121] = "Settings";
     SunspecModelId[SunspecModelId["Status"] = 122] = "Status";

package/dist/cjs/sunspec-interfaces.d.cts

@@ -40,6 +40,10 @@ export declare enum SunspecModelId {
     MeterSinglePhase = 201,
     Meter3Phase = 203,
     MeterWye = 204,
+    MeterSinglePhaseFloat = 211,
+    MeterSplitPhaseFloat = 212,
+    Meter3PhaseWyeFloat = 213,
+    Meter3PhaseDeltaFloat = 214,
     Nameplate = 120,
     Settings = 121,
     Status = 122,
@@ -472,10 +476,12 @@ export interface SunspecBatteryBaseData extends SunspecBlock {
     setInvState?: number;
 }
 /**
- * Meter data structure
+ * Meter data structure. Covers SunSpec int+SF meter models 201/203/204 and float variants 211/212/213/214.
+ * The per-field offset comments below describe the int+SF (201/203/204) layout; float variants use
+ * 32-bit IEEE 754 floats (no scale factors) at different offsets — see the float reader implementation.
  */
 export interface SunspecMeterData extends SunspecBlock {
-    blockNumber: 201 | 203 | 204;
+    blockNumber: 201 | 203 | 204 | 211 | 212 | 213 | 214;
     totalPower?: number;
     phaseAPower?: number;
     phaseBPower?: number;

package/dist/cjs/sunspec-modbus-client.cjs

@@ -1736,9 +1736,19 @@ class SunspecModbusClient {
         }
     }
     /**
-     * Read meter data from Model 201 (Single Phase) / Model 203 (Three Phase) / Model 204 (Split Phase)
+     * Read meter data. Detects which SunSpec meter model the device exposes —
+     * int+SF (201/203/204) or float (211/212/213/214) — by checking the discovered
+     * model directory, and dispatches to the appropriate decoder.
      */
     async readMeterData(unitId) {
+        const floatIds = [213, 214, 212, 211];
+        for (const id of floatIds) {
+            const model = this.findModel(unitId, id);
+            if (model) {
+                console.debug(`Using meter Model ${id} at address ${model.address} (length ${model.length}) on unit ${unitId}`);
+                return this.readFloatMeterData(unitId, model, id);
+            }
+        }
         let model = this.findModel(unitId, sunspec_interfaces_js_1.SunspecModelId.Meter3Phase);
         if (!model) {
             model = this.findModel(unitId, sunspec_interfaces_js_1.SunspecModelId.MeterWye);
@@ -1829,6 +1839,48 @@ class SunspecModbusClient {
             return null;
         }
     }
+    /**
+     * Read meter data from a float-variant model: 211 (single-phase), 212 (split-phase),
+     * 213 (3-phase Wye), or 214 (3-phase Delta).
+     *
+     * All four models share the same SunSpec register layout — measurement fields are 32-bit IEEE 754
+     * floats (no scale factors). Phase scope differs by model: 211 populates phase A only;
+     * 212 phases A+B; 213/214 all three. Unpopulated phase fields read NaN and are returned as undefined.
+     *
+     * Per SunSpec spec, with Length = 124 registers:
+     *   2-3   A (total current),  4-5 AphA,  6-7 AphB,   8-9 AphC
+     *   10-11 PhV (L-N avg),     12-13 PhVphA, 14-15 PhVphB, 16-17 PhVphC
+     *   18-19 PPV (L-L avg),     20-21 PPVphAB, 22-23 PPVphBC, 24-25 PPVphCA
+     *   26-27 Hz
+     *   28-29 W (total real power), 30-31 WphA, 32-33 WphB, 34-35 WphC
+     *   60-61 TotWhExp,           68-69 TotWhImp
+     */
+    async readFloatMeterData(unitId, model, blockNumber) {
+        try {
+            console.debug(`Reading Float Meter Data from Model ${blockNumber} at base address: ${model.address} (unit ${unitId})`);
+            const buffer = await this.readModelBlock(unitId, model);
+            const data = {
+                blockNumber,
+                blockAddress: model.address,
+                blockLength: model.length,
+                current: this.extractFloat32OrUndefined(buffer, 2, blockNumber, 'AC Current'),
+                voltage: this.extractFloat32OrUndefined(buffer, 10, blockNumber, 'Phase Voltage (L-N avg)'),
+                frequency: this.extractFloat32OrUndefined(buffer, 26, blockNumber, 'Frequency'),
+                totalPower: this.extractFloat32OrUndefined(buffer, 28, blockNumber, 'Total Real Power'),
+                phaseAPower: this.extractFloat32OrUndefined(buffer, 30, blockNumber, 'Phase A Real Power'),
+                phaseBPower: this.extractFloat32OrUndefined(buffer, 32, blockNumber, 'Phase B Real Power'),
+                phaseCPower: this.extractFloat32OrUndefined(buffer, 34, blockNumber, 'Phase C Real Power'),
+                exportedEnergy: this.extractFloat32OrUndefined(buffer, 60, blockNumber, 'Total Wh Exported'),
+                importedEnergy: this.extractFloat32OrUndefined(buffer, 68, blockNumber, 'Total Wh Imported'),
+            };
+            console.debug(`[Model ${blockNumber}] Float Meter Data:`, data);
+            return data;
+        }
+        catch (error) {
+            console.error(`Error reading float meter data (Model ${blockNumber}): ${error}`);
+            return null;
+        }
+    }
     /**
      * Read common block data (Model 1)
      */

package/dist/cjs/sunspec-modbus-client.d.cts

@@ -314,9 +314,28 @@ export declare class SunspecModbusClient {
      */
     readBatteryControls(unitId: number): Promise<SunspecBatteryControls | null>;
     /**
-     * Read meter data from Model 201 (Single Phase) / Model 203 (Three Phase) / Model 204 (Split Phase)
+     * Read meter data. Detects which SunSpec meter model the device exposes —
+     * int+SF (201/203/204) or float (211/212/213/214) — by checking the discovered
+     * model directory, and dispatches to the appropriate decoder.
      */
     readMeterData(unitId: number): Promise<SunspecMeterData | null>;
+    /**
+     * Read meter data from a float-variant model: 211 (single-phase), 212 (split-phase),
+     * 213 (3-phase Wye), or 214 (3-phase Delta).
+     *
+     * All four models share the same SunSpec register layout — measurement fields are 32-bit IEEE 754
+     * floats (no scale factors). Phase scope differs by model: 211 populates phase A only;
+     * 212 phases A+B; 213/214 all three. Unpopulated phase fields read NaN and are returned as undefined.
+     *
+     * Per SunSpec spec, with Length = 124 registers:
+     *   2-3   A (total current),  4-5 AphA,  6-7 AphB,   8-9 AphC
+     *   10-11 PhV (L-N avg),     12-13 PhVphA, 14-15 PhVphB, 16-17 PhVphC
+     *   18-19 PPV (L-L avg),     20-21 PPVphAB, 22-23 PPVphBC, 24-25 PPVphCA
+     *   26-27 Hz
+     *   28-29 W (total real power), 30-31 WphA, 32-33 WphB, 34-35 WphC
+     *   60-61 TotWhExp,           68-69 TotWhImp
+     */
+    private readFloatMeterData;
     /**
      * Read common block data (Model 1)
      */

package/dist/cjs/version.cjs

@@ -9,7 +9,7 @@ exports.getSdkVersion = getSdkVersion;
 /**
  * Current version of the enyo Energy App SDK.
  */
-exports.SDK_VERSION = '0.0.56';
+exports.SDK_VERSION = '0.0.57';
 /**
  * Gets the current SDK version.
  * @returns The semantic version string of the SDK

package/dist/cjs/version.d.cts

@@ -5,7 +5,7 @@
 /**
  * Current version of the enyo Energy App SDK.
  */
-export declare const SDK_VERSION = "0.0.56";
+export declare const SDK_VERSION = "0.0.57";
 /**
  * Gets the current SDK version.
  * @returns The semantic version string of the SDK

package/dist/sunspec-devices.js

@@ -1200,10 +1200,14 @@ export class SunspecMeter extends BaseSunspecDevice {
     async connect() {
         // Connect with specific unit ID for meter
         await this.ensureConnected();
-        // Check if meter models exist
+        // Check if meter models exist (int+SF: 201/203/204, float: 211/212/213/214)
         const hasMeter = this.sunspecClient.findModel(this.unitId, SunspecModelId.Meter3Phase) !== undefined ||
             this.sunspecClient.findModel(this.unitId, SunspecModelId.MeterWye) !== undefined ||
-            this.sunspecClient.findModel(this.unitId, SunspecModelId.MeterSinglePhase) !== undefined;
+            this.sunspecClient.findModel(this.unitId, SunspecModelId.MeterSinglePhase) !== undefined ||
+            this.sunspecClient.findModel(this.unitId, SunspecModelId.Meter3PhaseWyeFloat) !== undefined ||
+            this.sunspecClient.findModel(this.unitId, SunspecModelId.Meter3PhaseDeltaFloat) !== undefined ||
+            this.sunspecClient.findModel(this.unitId, SunspecModelId.MeterSplitPhaseFloat) !== undefined ||
+            this.sunspecClient.findModel(this.unitId, SunspecModelId.MeterSinglePhaseFloat) !== undefined;
         if (!hasMeter) {
             throw new Error('No meter model found in device');
         }

package/dist/sunspec-interfaces.d.ts

@@ -40,6 +40,10 @@ export declare enum SunspecModelId {
     MeterSinglePhase = 201,
     Meter3Phase = 203,
     MeterWye = 204,
+    MeterSinglePhaseFloat = 211,
+    MeterSplitPhaseFloat = 212,
+    Meter3PhaseWyeFloat = 213,
+    Meter3PhaseDeltaFloat = 214,
     Nameplate = 120,
     Settings = 121,
     Status = 122,
@@ -472,10 +476,12 @@ export interface SunspecBatteryBaseData extends SunspecBlock {
     setInvState?: number;
 }
 /**
- * Meter data structure
+ * Meter data structure. Covers SunSpec int+SF meter models 201/203/204 and float variants 211/212/213/214.
+ * The per-field offset comments below describe the int+SF (201/203/204) layout; float variants use
+ * 32-bit IEEE 754 floats (no scale factors) at different offsets — see the float reader implementation.
  */
 export interface SunspecMeterData extends SunspecBlock {
-    blockNumber: 201 | 203 | 204;
+    blockNumber: 201 | 203 | 204 | 211 | 212 | 213 | 214;
     totalPower?: number;
     phaseAPower?: number;
     phaseBPower?: number;

package/dist/sunspec-interfaces.js

@@ -27,6 +27,10 @@ export var SunspecModelId;
     SunspecModelId[SunspecModelId["MeterSinglePhase"] = 201] = "MeterSinglePhase";
     SunspecModelId[SunspecModelId["Meter3Phase"] = 203] = "Meter3Phase";
     SunspecModelId[SunspecModelId["MeterWye"] = 204] = "MeterWye";
+    SunspecModelId[SunspecModelId["MeterSinglePhaseFloat"] = 211] = "MeterSinglePhaseFloat";
+    SunspecModelId[SunspecModelId["MeterSplitPhaseFloat"] = 212] = "MeterSplitPhaseFloat";
+    SunspecModelId[SunspecModelId["Meter3PhaseWyeFloat"] = 213] = "Meter3PhaseWyeFloat";
+    SunspecModelId[SunspecModelId["Meter3PhaseDeltaFloat"] = 214] = "Meter3PhaseDeltaFloat";
     SunspecModelId[SunspecModelId["Nameplate"] = 120] = "Nameplate";
     SunspecModelId[SunspecModelId["Settings"] = 121] = "Settings";
     SunspecModelId[SunspecModelId["Status"] = 122] = "Status";

package/dist/sunspec-modbus-client.d.ts

@@ -314,9 +314,28 @@ export declare class SunspecModbusClient {
      */
     readBatteryControls(unitId: number): Promise<SunspecBatteryControls | null>;
     /**
-     * Read meter data from Model 201 (Single Phase) / Model 203 (Three Phase) / Model 204 (Split Phase)
+     * Read meter data. Detects which SunSpec meter model the device exposes —
+     * int+SF (201/203/204) or float (211/212/213/214) — by checking the discovered
+     * model directory, and dispatches to the appropriate decoder.
      */
     readMeterData(unitId: number): Promise<SunspecMeterData | null>;
+    /**
+     * Read meter data from a float-variant model: 211 (single-phase), 212 (split-phase),
+     * 213 (3-phase Wye), or 214 (3-phase Delta).
+     *
+     * All four models share the same SunSpec register layout — measurement fields are 32-bit IEEE 754
+     * floats (no scale factors). Phase scope differs by model: 211 populates phase A only;
+     * 212 phases A+B; 213/214 all three. Unpopulated phase fields read NaN and are returned as undefined.
+     *
+     * Per SunSpec spec, with Length = 124 registers:
+     *   2-3   A (total current),  4-5 AphA,  6-7 AphB,   8-9 AphC
+     *   10-11 PhV (L-N avg),     12-13 PhVphA, 14-15 PhVphB, 16-17 PhVphC
+     *   18-19 PPV (L-L avg),     20-21 PPVphAB, 22-23 PPVphBC, 24-25 PPVphCA
+     *   26-27 Hz
+     *   28-29 W (total real power), 30-31 WphA, 32-33 WphB, 34-35 WphC
+     *   60-61 TotWhExp,           68-69 TotWhImp
+     */
+    private readFloatMeterData;
     /**
      * Read common block data (Model 1)
      */

package/dist/sunspec-modbus-client.js

@@ -1731,9 +1731,19 @@ export class SunspecModbusClient {
         }
     }
     /**
-     * Read meter data from Model 201 (Single Phase) / Model 203 (Three Phase) / Model 204 (Split Phase)
+     * Read meter data. Detects which SunSpec meter model the device exposes —
+     * int+SF (201/203/204) or float (211/212/213/214) — by checking the discovered
+     * model directory, and dispatches to the appropriate decoder.
      */
     async readMeterData(unitId) {
+        const floatIds = [213, 214, 212, 211];
+        for (const id of floatIds) {
+            const model = this.findModel(unitId, id);
+            if (model) {
+                console.debug(`Using meter Model ${id} at address ${model.address} (length ${model.length}) on unit ${unitId}`);
+                return this.readFloatMeterData(unitId, model, id);
+            }
+        }
         let model = this.findModel(unitId, SunspecModelId.Meter3Phase);
         if (!model) {
             model = this.findModel(unitId, SunspecModelId.MeterWye);
@@ -1824,6 +1834,48 @@ export class SunspecModbusClient {
             return null;
         }
     }
+    /**
+     * Read meter data from a float-variant model: 211 (single-phase), 212 (split-phase),
+     * 213 (3-phase Wye), or 214 (3-phase Delta).
+     *
+     * All four models share the same SunSpec register layout — measurement fields are 32-bit IEEE 754
+     * floats (no scale factors). Phase scope differs by model: 211 populates phase A only;
+     * 212 phases A+B; 213/214 all three. Unpopulated phase fields read NaN and are returned as undefined.
+     *
+     * Per SunSpec spec, with Length = 124 registers:
+     *   2-3   A (total current),  4-5 AphA,  6-7 AphB,   8-9 AphC
+     *   10-11 PhV (L-N avg),     12-13 PhVphA, 14-15 PhVphB, 16-17 PhVphC
+     *   18-19 PPV (L-L avg),     20-21 PPVphAB, 22-23 PPVphBC, 24-25 PPVphCA
+     *   26-27 Hz
+     *   28-29 W (total real power), 30-31 WphA, 32-33 WphB, 34-35 WphC
+     *   60-61 TotWhExp,           68-69 TotWhImp
+     */
+    async readFloatMeterData(unitId, model, blockNumber) {
+        try {
+            console.debug(`Reading Float Meter Data from Model ${blockNumber} at base address: ${model.address} (unit ${unitId})`);
+            const buffer = await this.readModelBlock(unitId, model);
+            const data = {
+                blockNumber,
+                blockAddress: model.address,
+                blockLength: model.length,
+                current: this.extractFloat32OrUndefined(buffer, 2, blockNumber, 'AC Current'),
+                voltage: this.extractFloat32OrUndefined(buffer, 10, blockNumber, 'Phase Voltage (L-N avg)'),
+                frequency: this.extractFloat32OrUndefined(buffer, 26, blockNumber, 'Frequency'),
+                totalPower: this.extractFloat32OrUndefined(buffer, 28, blockNumber, 'Total Real Power'),
+                phaseAPower: this.extractFloat32OrUndefined(buffer, 30, blockNumber, 'Phase A Real Power'),
+                phaseBPower: this.extractFloat32OrUndefined(buffer, 32, blockNumber, 'Phase B Real Power'),
+                phaseCPower: this.extractFloat32OrUndefined(buffer, 34, blockNumber, 'Phase C Real Power'),
+                exportedEnergy: this.extractFloat32OrUndefined(buffer, 60, blockNumber, 'Total Wh Exported'),
+                importedEnergy: this.extractFloat32OrUndefined(buffer, 68, blockNumber, 'Total Wh Imported'),
+            };
+            console.debug(`[Model ${blockNumber}] Float Meter Data:`, data);
+            return data;
+        }
+        catch (error) {
+            console.error(`Error reading float meter data (Model ${blockNumber}): ${error}`);
+            return null;
+        }
+    }
     /**
      * Read common block data (Model 1)
      */

package/dist/version.d.ts

@@ -5,7 +5,7 @@
 /**
  * Current version of the enyo Energy App SDK.
  */
-export declare const SDK_VERSION = "0.0.56";
+export declare const SDK_VERSION = "0.0.57";
 /**
  * Gets the current SDK version.
  * @returns The semantic version string of the SDK

package/dist/version.js

@@ -5,7 +5,7 @@
 /**
  * Current version of the enyo Energy App SDK.
  */
-export const SDK_VERSION = '0.0.56';
+export const SDK_VERSION = '0.0.57';
 /**
  * Gets the current SDK version.
  * @returns The semantic version string of the SDK

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@enyo-energy/sunspec-sdk",
-  "version": "0.0.56",
+  "version": "0.0.57",
   "description": "enyo Energy Sunspec SDK",
   "type": "module",
   "main": "dist/index.js",