@enyo-energy/sunspec-sdk 0.0.16 → 0.0.18

package/dist/cjs/sunspec-devices.cjs

@@ -6,6 +6,7 @@ const node_crypto_1 = require("node:crypto");
 const enyo_appliance_js_1 = require("@enyo-energy/energy-app-sdk/dist/types/enyo-appliance.js");
 const enyo_data_bus_value_js_1 = require("@enyo-energy/energy-app-sdk/dist/types/enyo-data-bus-value.js");
 const enyo_source_enum_js_1 = require("@enyo-energy/energy-app-sdk/dist/types/enyo-source.enum.js");
+const enyo_meter_appliance_js_1 = require("@enyo-energy/energy-app-sdk/dist/types/enyo-meter-appliance.js");
 /**
  * Base abstract class for all Sunspec devices
  */
@@ -58,6 +59,7 @@ class SunspecInverter extends BaseSunspecDevice {
         }
         // Get device info from common block
         const commonData = await this.sunspecClient.readCommonBlock();
+        const inverterSettings = await this.sunspecClient.readInverterSettings();
         // Create or update appliance
         try {
             this.applianceId = await this.applianceManager.createOrUpdateAppliance({
@@ -70,6 +72,9 @@ class SunspecInverter extends BaseSunspecDevice {
                     serialNumber: commonData?.serialNumber,
                     modelName: commonData?.model,
                     vendorName: commonData?.manufacturer,
+                },
+                inverter: {
+                    maxPvProductionW: inverterSettings?.WMax
                 }
             });
             console.log(`Sunspec Inverter connected: ${this.networkDevice.hostname} (${this.applianceId})`);
@@ -210,6 +215,7 @@ class SunspecBattery extends BaseSunspecDevice {
         }
         // Get device info
         const commonData = await this.sunspecClient.readCommonBlock();
+        const batteryData = await this.sunspecClient.readBatteryData();
         // Create or update appliance
         try {
             this.applianceId = await this.applianceManager.createOrUpdateAppliance({
@@ -219,8 +225,8 @@ class SunspecBattery extends BaseSunspecDevice {
                 metadata: {
                     connectionType: enyo_appliance_js_1.EnyoApplianceConnectionType.Connector,
                     state: enyo_appliance_js_1.EnyoApplianceStateEnum.Connected,
-                    serialNumber: commonData?.serialNumber ? `${commonData.serialNumber}-BAT` : undefined,
-                    modelName: commonData?.model ? `${commonData.model} Battery` : 'Battery',
+                    serialNumber: commonData?.serialNumber,
+                    modelName: commonData?.model,
                     vendorName: commonData?.manufacturer,
                 }
             });
@@ -282,6 +288,7 @@ class SunspecBattery extends BaseSunspecDevice {
                 else if (batteryData.dischargePower !== undefined && batteryData.dischargePower > 0) {
                     batteryPowerW = -batteryData.dischargePower; // Negative for discharging
                 }
+                const advancedBatteryModel = this.sunspecClient.findModel(801);
                 const batteryMessage = {
                     id: (0, node_crypto_1.randomUUID)(),
                     message: enyo_data_bus_value_js_1.EnyoDataBusMessageEnum.BatteryValuesUpdateV1,
@@ -293,8 +300,8 @@ class SunspecBattery extends BaseSunspecDevice {
                     resolution,
                     data: {
                         batterySoC: batteryData.soc || batteryData.chaState || 0,
-                        batteryPowerW: batteryPowerW,
-                        state: this.mapToEnyoBatteryState(batteryData.chaSt)
+                        batteryPowerW: advancedBatteryModel ? batteryPowerW : undefined,
+                        state: this.mapToEnyoBatteryState(batteryData.chaSt),
                     }
                 };
                 messages.push(batteryMessage);
@@ -359,9 +366,15 @@ class SunspecMeter extends BaseSunspecDevice {
                 metadata: {
                     connectionType: enyo_appliance_js_1.EnyoApplianceConnectionType.Connector,
                     state: enyo_appliance_js_1.EnyoApplianceStateEnum.Connected,
-                    serialNumber: commonData?.serialNumber ? `${commonData.serialNumber}-MTR` : undefined,
-                    modelName: commonData?.model ? `${commonData.model} Meter` : 'Meter',
+                    serialNumber: commonData?.serialNumber,
+                    modelName: commonData?.model,
                     vendorName: commonData?.manufacturer,
+                },
+                topology: {
+                    features: [enyo_appliance_js_1.EnyoApplianceTopologyFeatureEnum.PrimaryMeter]
+                },
+                meter: {
+                    availableFeatures: [enyo_meter_appliance_js_1.EnyoMeterApplianceAvailableFeaturesEnum.LivePowerConsumption]
                 }
             });
             console.log(`Sunspec Meter connected: ${this.networkDevice.hostname} unit ${this.unitId} (${this.applianceId})`);

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

@@ -363,18 +363,9 @@ class SunspecModbusClient {
             // Read AC Energy (32-bit accumulator) - Offset 24-25
             const acEnergyAddr = baseAddr + 24;
             const acEnergy = await this.readRegisterValue(acEnergyAddr, 2, 'uint32');
-            console.log(`AC Energy: address=${acEnergyAddr}, raw=0x${acEnergy.toString(16).toUpperCase()} (${acEnergy}), SF=${scaleFactors.WH_SF}`);
             data.acEnergy = !this.isUnimplementedValue(acEnergy, 'acc32')
                 ? acEnergy * Math.pow(10, scaleFactors.WH_SF) // Regular number with scale factor
                 : undefined;
-            // Log final calculated values
-            console.log('Inverter Final Values:', {
-                acPower: data.acPower,
-                voltageAN: data.voltageAN,
-                voltageBN: data.voltageBN,
-                voltageCN: data.voltageCN,
-                acCurrent: data.acCurrent
-            });
             return data;
         }
         catch (error) {
@@ -610,6 +601,7 @@ class SunspecModbusClient {
         for (let i = 1; i <= 4; i++) {
             try {
                 const data = await this.readMPPTData(i);
+                console.log(`MPPT ${i} has id ${data?.id} (${data?.stringId}) with ${data?.dcPower}W`);
                 // Only include if we got valid data (not null) and it has actual values
                 if (data &&
                     (data.dcCurrent !== undefined ||
@@ -757,19 +749,13 @@ class SunspecModbusClient {
                 // Calculate charge/discharge power if rates are available
                 if (data.inWRte !== undefined && data.wChaMax !== undefined) {
                     data.chargePower = (data.inWRte / 100) * data.wChaMax;
-                    console.log(`Calculated Charge Power: ${data.chargePower?.toFixed(2)} W`);
+                    console.log(`Calculated Charge Power: (inWRte: ${data.inWRte}, wChaMax: ${data.wChaMax}) ${data.chargePower?.toFixed(2)} W`);
                 }
                 if (data.outWRte !== undefined && data.wChaMax !== undefined) {
                     // Assuming WDisChaMax is similar to WChaMax for simplicity
                     data.dischargePower = Math.abs((data.outWRte / 100) * data.wChaMax);
-                    console.log(`Calculated Discharge Power: ${data.dischargePower?.toFixed(2)} W`);
+                    console.log(`Calculated Discharge Power (inWRte: ${data.outWRte}, wChaMax: ${data.wChaMax}): ${data.dischargePower?.toFixed(2)} W`);
                 }
-                console.log('Battery Status:', {
-                    soc: data.soc !== undefined ? `${data.soc.toFixed(1)}%` : 'N/A',
-                    voltage: data.voltage !== undefined ? `${data.voltage.toFixed(2)} V` : 'N/A',
-                    chargeState: chaStName,
-                    availableStorage: data.storAval !== undefined ? `${data.storAval.toFixed(2)} AH` : 'N/A'
-                });
                 return data;
             }
             else {

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.16';
+exports.SDK_VERSION = '0.0.18';
 /**
  * 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.16";
+export declare const SDK_VERSION = "0.0.18";
 /**
  * Gets the current SDK version.
  * @returns The semantic version string of the SDK

package/dist/sunspec-devices.js

@@ -1,8 +1,9 @@
-import { SunspecModelId, SunspecMPPTOperatingState, SunspecBatteryChargeState } from "./sunspec-interfaces.js";
+import { SunspecBatteryChargeState, SunspecModelId, SunspecMPPTOperatingState } from "./sunspec-interfaces.js";
 import { randomUUID } from "node:crypto";
-import { EnyoApplianceConnectionType, EnyoApplianceStateEnum, EnyoApplianceTypeEnum } from "@enyo-energy/energy-app-sdk/dist/types/enyo-appliance.js";
+import { EnyoApplianceConnectionType, EnyoApplianceStateEnum, EnyoApplianceTopologyFeatureEnum, EnyoApplianceTypeEnum } from "@enyo-energy/energy-app-sdk/dist/types/enyo-appliance.js";
 import { EnyoBatteryStateEnum, EnyoDataBusMessageEnum, EnyoInverterStateEnum } from "@enyo-energy/energy-app-sdk/dist/types/enyo-data-bus-value.js";
 import { EnyoSourceEnum } from "@enyo-energy/energy-app-sdk/dist/types/enyo-source.enum.js";
+import { EnyoMeterApplianceAvailableFeaturesEnum } from "@enyo-energy/energy-app-sdk/dist/types/enyo-meter-appliance.js";
 /**
  * Base abstract class for all Sunspec devices
  */
@@ -54,6 +55,7 @@ export class SunspecInverter extends BaseSunspecDevice {
         }
         // Get device info from common block
         const commonData = await this.sunspecClient.readCommonBlock();
+        const inverterSettings = await this.sunspecClient.readInverterSettings();
         // Create or update appliance
         try {
             this.applianceId = await this.applianceManager.createOrUpdateAppliance({
@@ -66,6 +68,9 @@ export class SunspecInverter extends BaseSunspecDevice {
                     serialNumber: commonData?.serialNumber,
                     modelName: commonData?.model,
                     vendorName: commonData?.manufacturer,
+                },
+                inverter: {
+                    maxPvProductionW: inverterSettings?.WMax
                 }
             });
             console.log(`Sunspec Inverter connected: ${this.networkDevice.hostname} (${this.applianceId})`);
@@ -205,6 +210,7 @@ export class SunspecBattery extends BaseSunspecDevice {
         }
         // Get device info
         const commonData = await this.sunspecClient.readCommonBlock();
+        const batteryData = await this.sunspecClient.readBatteryData();
         // Create or update appliance
         try {
             this.applianceId = await this.applianceManager.createOrUpdateAppliance({
@@ -214,8 +220,8 @@ export class SunspecBattery extends BaseSunspecDevice {
                 metadata: {
                     connectionType: EnyoApplianceConnectionType.Connector,
                     state: EnyoApplianceStateEnum.Connected,
-                    serialNumber: commonData?.serialNumber ? `${commonData.serialNumber}-BAT` : undefined,
-                    modelName: commonData?.model ? `${commonData.model} Battery` : 'Battery',
+                    serialNumber: commonData?.serialNumber,
+                    modelName: commonData?.model,
                     vendorName: commonData?.manufacturer,
                 }
             });
@@ -277,6 +283,7 @@ export class SunspecBattery extends BaseSunspecDevice {
                 else if (batteryData.dischargePower !== undefined && batteryData.dischargePower > 0) {
                     batteryPowerW = -batteryData.dischargePower; // Negative for discharging
                 }
+                const advancedBatteryModel = this.sunspecClient.findModel(801);
                 const batteryMessage = {
                     id: randomUUID(),
                     message: EnyoDataBusMessageEnum.BatteryValuesUpdateV1,
@@ -288,8 +295,8 @@ export class SunspecBattery extends BaseSunspecDevice {
                     resolution,
                     data: {
                         batterySoC: batteryData.soc || batteryData.chaState || 0,
-                        batteryPowerW: batteryPowerW,
-                        state: this.mapToEnyoBatteryState(batteryData.chaSt)
+                        batteryPowerW: advancedBatteryModel ? batteryPowerW : undefined,
+                        state: this.mapToEnyoBatteryState(batteryData.chaSt),
                     }
                 };
                 messages.push(batteryMessage);
@@ -353,9 +360,15 @@ export class SunspecMeter extends BaseSunspecDevice {
                 metadata: {
                     connectionType: EnyoApplianceConnectionType.Connector,
                     state: EnyoApplianceStateEnum.Connected,
-                    serialNumber: commonData?.serialNumber ? `${commonData.serialNumber}-MTR` : undefined,
-                    modelName: commonData?.model ? `${commonData.model} Meter` : 'Meter',
+                    serialNumber: commonData?.serialNumber,
+                    modelName: commonData?.model,
                     vendorName: commonData?.manufacturer,
+                },
+                topology: {
+                    features: [EnyoApplianceTopologyFeatureEnum.PrimaryMeter]
+                },
+                meter: {
+                    availableFeatures: [EnyoMeterApplianceAvailableFeaturesEnum.LivePowerConsumption]
                 }
             });
             console.log(`Sunspec Meter connected: ${this.networkDevice.hostname} unit ${this.unitId} (${this.applianceId})`);

package/dist/sunspec-modbus-client.js

@@ -360,18 +360,9 @@ export class SunspecModbusClient {
             // Read AC Energy (32-bit accumulator) - Offset 24-25
             const acEnergyAddr = baseAddr + 24;
             const acEnergy = await this.readRegisterValue(acEnergyAddr, 2, 'uint32');
-            console.log(`AC Energy: address=${acEnergyAddr}, raw=0x${acEnergy.toString(16).toUpperCase()} (${acEnergy}), SF=${scaleFactors.WH_SF}`);
             data.acEnergy = !this.isUnimplementedValue(acEnergy, 'acc32')
                 ? acEnergy * Math.pow(10, scaleFactors.WH_SF) // Regular number with scale factor
                 : undefined;
-            // Log final calculated values
-            console.log('Inverter Final Values:', {
-                acPower: data.acPower,
-                voltageAN: data.voltageAN,
-                voltageBN: data.voltageBN,
-                voltageCN: data.voltageCN,
-                acCurrent: data.acCurrent
-            });
             return data;
         }
         catch (error) {
@@ -607,6 +598,7 @@ export class SunspecModbusClient {
         for (let i = 1; i <= 4; i++) {
             try {
                 const data = await this.readMPPTData(i);
+                console.log(`MPPT ${i} has id ${data?.id} (${data?.stringId}) with ${data?.dcPower}W`);
                 // Only include if we got valid data (not null) and it has actual values
                 if (data &&
                     (data.dcCurrent !== undefined ||
@@ -754,19 +746,13 @@ export class SunspecModbusClient {
                 // Calculate charge/discharge power if rates are available
                 if (data.inWRte !== undefined && data.wChaMax !== undefined) {
                     data.chargePower = (data.inWRte / 100) * data.wChaMax;
-                    console.log(`Calculated Charge Power: ${data.chargePower?.toFixed(2)} W`);
+                    console.log(`Calculated Charge Power: (inWRte: ${data.inWRte}, wChaMax: ${data.wChaMax}) ${data.chargePower?.toFixed(2)} W`);
                 }
                 if (data.outWRte !== undefined && data.wChaMax !== undefined) {
                     // Assuming WDisChaMax is similar to WChaMax for simplicity
                     data.dischargePower = Math.abs((data.outWRte / 100) * data.wChaMax);
-                    console.log(`Calculated Discharge Power: ${data.dischargePower?.toFixed(2)} W`);
+                    console.log(`Calculated Discharge Power (inWRte: ${data.outWRte}, wChaMax: ${data.wChaMax}): ${data.dischargePower?.toFixed(2)} W`);
                 }
-                console.log('Battery Status:', {
-                    soc: data.soc !== undefined ? `${data.soc.toFixed(1)}%` : 'N/A',
-                    voltage: data.voltage !== undefined ? `${data.voltage.toFixed(2)} V` : 'N/A',
-                    chargeState: chaStName,
-                    availableStorage: data.storAval !== undefined ? `${data.storAval.toFixed(2)} AH` : 'N/A'
-                });
                 return data;
             }
             else {

package/dist/version.d.ts

@@ -5,7 +5,7 @@
 /**
  * Current version of the enyo Energy App SDK.
  */
-export declare const SDK_VERSION = "0.0.16";
+export declare const SDK_VERSION = "0.0.18";
 /**
  * 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.16';
+export const SDK_VERSION = '0.0.18';
 /**
  * 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.16",
+  "version": "0.0.18",
   "description": "enyo Energy Sunspec SDK",
   "type": "module",
   "main": "dist/index.js",
@@ -37,7 +37,7 @@
     "typescript": "^5.8.3"
   },
   "dependencies": {
-    "@enyo-energy/energy-app-sdk": "^0.0.39"
+    "@enyo-energy/energy-app-sdk": "^0.0.40"
   },
   "volta": {
     "node": "22.17.0"