@enyo-energy/sunspec-sdk 0.0.64 → 0.0.66

package/dist/cjs/sunspec-devices.cjs

@@ -723,6 +723,9 @@ class SunspecBattery extends BaseSunspecDevice {
         if (batteryData?.chaGriSet !== undefined) {
             features.push(enyo_battery_appliance_js_1.EnyoBatteryFeature.GridCharging);
         }
+        if (batteryData?.wChaMax !== undefined) {
+            features.push(enyo_battery_appliance_js_1.EnyoBatteryFeature.ChargeLimitation);
+        }
         // Create or update appliance (skip if an existing appliance was provided)
         if (!this.applianceId) {
             try {
@@ -1096,7 +1099,8 @@ class SunspecBattery extends BaseSunspecDevice {
         this.dataBusListenerId = this.dataBus.listenForMessages([
             enyo_data_bus_value_js_1.EnyoDataBusMessageEnum.StartStorageGridChargeV1,
             enyo_data_bus_value_js_1.EnyoDataBusMessageEnum.StopStorageGridChargeV1,
-            enyo_data_bus_value_js_1.EnyoDataBusMessageEnum.SetStorageDischargeLimitV1
+            enyo_data_bus_value_js_1.EnyoDataBusMessageEnum.SetStorageDischargeLimitV1,
+            enyo_data_bus_value_js_1.EnyoDataBusMessageEnum.SetStorageChargeLimitV1
         ], (entry) => this.handleStorageCommand(entry));
         console.log(`Battery ${this.applianceId}: started data bus listening (listener ${this.dataBusListenerId})`);
     }
@@ -1127,6 +1131,9 @@ class SunspecBattery extends BaseSunspecDevice {
                     case enyo_data_bus_value_js_1.EnyoDataBusMessageEnum.SetStorageDischargeLimitV1:
                         await this.handleSetDischargeLimit(entry);
                         break;
+                    case enyo_data_bus_value_js_1.EnyoDataBusMessageEnum.SetStorageChargeLimitV1:
+                        await this.handleSetChargeLimit(entry);
+                        break;
                 }
             }
             catch (error) {
@@ -1219,6 +1226,30 @@ class SunspecBattery extends BaseSunspecDevice {
         }
         this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Accepted);
     }
+    async handleSetChargeLimit(msg) {
+        if (!this.isConnected() || !this.applianceId) {
+            this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.NotSupported);
+            return;
+        }
+        console.log(`Battery ${this.applianceId}: handling SetStorageChargeLimitV1 (chargeLimitW=${msg.data.chargeLimitW})`);
+        // Read current state to get wChaMax for percentage conversion
+        const controls = await this.getBatteryControls();
+        console.log(`Battery ${this.applianceId}: current state - inWRte=${controls?.inWRte}, wChaMax=${controls?.wChaMax}`);
+        if (!controls?.wChaMax) {
+            this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Rejected, 'Failed to read wChaMax for charge limit conversion');
+            return;
+        }
+        // Convert watts to percentage of WChaMax, clamped to 0-100%
+        const chargeLimitPercent = Math.min(100, Math.max(0, (msg.data.chargeLimitW / controls.wChaMax) * 100));
+        console.log(`Battery ${this.applianceId}: calculated charge limit: ${chargeLimitPercent.toFixed(1)}% (${msg.data.chargeLimitW}W / ${controls.wChaMax}W)`);
+        // Set charge limit (Register 13: inWRte)
+        const success = await this.writeBatteryControls({ inWRte: chargeLimitPercent });
+        if (!success) {
+            this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Rejected, 'Failed to set charge limit');
+            return;
+        }
+        this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Accepted);
+    }
 }
 exports.SunspecBattery = SunspecBattery;
 /**

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

@@ -265,6 +265,7 @@ export declare class SunspecBattery extends BaseSunspecDevice {
     private handleStartGridCharge;
     private handleStopGridCharge;
     private handleSetDischargeLimit;
+    private handleSetChargeLimit;
 }
 /**
  * Sunspec Meter implementation

package/dist/cjs/sunspec-interfaces.cjs

@@ -255,6 +255,7 @@ var SunspecBatteryCapability;
 (function (SunspecBatteryCapability) {
     SunspecBatteryCapability["GridCharging"] = "grid-charging";
     SunspecBatteryCapability["DischargeLimit"] = "discharge-limit";
+    SunspecBatteryCapability["ChargeLimit"] = "charge-limit";
 })(SunspecBatteryCapability || (exports.SunspecBatteryCapability = SunspecBatteryCapability = {}));
 var SunspecMeterCapability;
 (function (SunspecMeterCapability) {

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

@@ -613,7 +613,8 @@ export declare enum SunspecInverterCapability {
 }
 export declare enum SunspecBatteryCapability {
     GridCharging = "grid-charging",
-    DischargeLimit = "discharge-limit"
+    DischargeLimit = "discharge-limit",
+    ChargeLimit = "charge-limit"
 }
 export declare enum SunspecMeterCapability {
 }

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

@@ -476,10 +476,21 @@ class SunspecModbusClient {
         const maxAddress = 50000; // Safety limit
         let currentAddress = 0;
         console.log(`Starting Sunspec model discovery for unit ${unitId}...`);
+        // Probe for the SunS identifier first. A missing identifier means the unit ID isn't a
+        // SunSpec device — common during unit-ID scans — and is logged at debug level so probes
+        // don't surface as errors. Mid-scan failures below remain at error level since they
+        // indicate a partial / malformed SunSpec map.
+        let addressInfo;
+        try {
+            addressInfo = await this.detectSunspecBaseAddress(unitId, customBaseAddress);
+        }
+        catch (error) {
+            console.debug(`No SunSpec device at unit ${unitId}: ${error}`);
+            console.log(`Discovery complete for unit ${unitId}. Found 0 models: []`);
+            return models;
+        }
+        currentAddress = addressInfo.nextAddress;
         try {
-            // Detect the base address and addressing mode
-            const addressInfo = await this.detectSunspecBaseAddress(unitId, customBaseAddress);
-            currentAddress = addressInfo.nextAddress;
             while (currentAddress < maxAddress) {
                 const buffer = await instance.readHoldingRegisters(currentAddress, 2);
                 const modelData = [buffer.readUInt16BE(0), buffer.readUInt16BE(2)];
@@ -1961,7 +1972,9 @@ class SunspecModbusClient {
     async readCommonBlock(unitId) {
         const model = this.findModel(unitId, sunspec_interfaces_js_1.SunspecModelId.Common);
         if (!model) {
-            console.error(`Common block model not found on unit ${unitId}`);
+            // Common (model 1) is the SunSpec discovery anchor — its absence simply means this
+            // unit isn't SunSpec. Callers iterating unit IDs already check the null return.
+            console.debug(`Common block model not found on unit ${unitId}`);
             return null;
         }
         console.log(`Reading Common Block - Model address: ${model.address} (unit ${unitId})`);

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

package/dist/sunspec-devices.d.ts

@@ -265,6 +265,7 @@ export declare class SunspecBattery extends BaseSunspecDevice {
     private handleStartGridCharge;
     private handleStopGridCharge;
     private handleSetDischargeLimit;
+    private handleSetChargeLimit;
 }
 /**
  * Sunspec Meter implementation

package/dist/sunspec-devices.js

@@ -718,6 +718,9 @@ export class SunspecBattery extends BaseSunspecDevice {
         if (batteryData?.chaGriSet !== undefined) {
             features.push(EnyoBatteryFeature.GridCharging);
         }
+        if (batteryData?.wChaMax !== undefined) {
+            features.push(EnyoBatteryFeature.ChargeLimitation);
+        }
         // Create or update appliance (skip if an existing appliance was provided)
         if (!this.applianceId) {
             try {
@@ -1091,7 +1094,8 @@ export class SunspecBattery extends BaseSunspecDevice {
         this.dataBusListenerId = this.dataBus.listenForMessages([
             EnyoDataBusMessageEnum.StartStorageGridChargeV1,
             EnyoDataBusMessageEnum.StopStorageGridChargeV1,
-            EnyoDataBusMessageEnum.SetStorageDischargeLimitV1
+            EnyoDataBusMessageEnum.SetStorageDischargeLimitV1,
+            EnyoDataBusMessageEnum.SetStorageChargeLimitV1
         ], (entry) => this.handleStorageCommand(entry));
         console.log(`Battery ${this.applianceId}: started data bus listening (listener ${this.dataBusListenerId})`);
     }
@@ -1122,6 +1126,9 @@ export class SunspecBattery extends BaseSunspecDevice {
                     case EnyoDataBusMessageEnum.SetStorageDischargeLimitV1:
                         await this.handleSetDischargeLimit(entry);
                         break;
+                    case EnyoDataBusMessageEnum.SetStorageChargeLimitV1:
+                        await this.handleSetChargeLimit(entry);
+                        break;
                 }
             }
             catch (error) {
@@ -1214,6 +1221,30 @@ export class SunspecBattery extends BaseSunspecDevice {
         }
         this.sendCommandAcknowledge(msg.id, msg.message, EnyoCommandAcknowledgeAnswerEnum.Accepted);
     }
+    async handleSetChargeLimit(msg) {
+        if (!this.isConnected() || !this.applianceId) {
+            this.sendCommandAcknowledge(msg.id, msg.message, EnyoCommandAcknowledgeAnswerEnum.NotSupported);
+            return;
+        }
+        console.log(`Battery ${this.applianceId}: handling SetStorageChargeLimitV1 (chargeLimitW=${msg.data.chargeLimitW})`);
+        // Read current state to get wChaMax for percentage conversion
+        const controls = await this.getBatteryControls();
+        console.log(`Battery ${this.applianceId}: current state - inWRte=${controls?.inWRte}, wChaMax=${controls?.wChaMax}`);
+        if (!controls?.wChaMax) {
+            this.sendCommandAcknowledge(msg.id, msg.message, EnyoCommandAcknowledgeAnswerEnum.Rejected, 'Failed to read wChaMax for charge limit conversion');
+            return;
+        }
+        // Convert watts to percentage of WChaMax, clamped to 0-100%
+        const chargeLimitPercent = Math.min(100, Math.max(0, (msg.data.chargeLimitW / controls.wChaMax) * 100));
+        console.log(`Battery ${this.applianceId}: calculated charge limit: ${chargeLimitPercent.toFixed(1)}% (${msg.data.chargeLimitW}W / ${controls.wChaMax}W)`);
+        // Set charge limit (Register 13: inWRte)
+        const success = await this.writeBatteryControls({ inWRte: chargeLimitPercent });
+        if (!success) {
+            this.sendCommandAcknowledge(msg.id, msg.message, EnyoCommandAcknowledgeAnswerEnum.Rejected, 'Failed to set charge limit');
+            return;
+        }
+        this.sendCommandAcknowledge(msg.id, msg.message, EnyoCommandAcknowledgeAnswerEnum.Accepted);
+    }
 }
 /**
  * Sunspec Meter implementation

package/dist/sunspec-interfaces.d.ts

@@ -613,7 +613,8 @@ export declare enum SunspecInverterCapability {
 }
 export declare enum SunspecBatteryCapability {
     GridCharging = "grid-charging",
-    DischargeLimit = "discharge-limit"
+    DischargeLimit = "discharge-limit",
+    ChargeLimit = "charge-limit"
 }
 export declare enum SunspecMeterCapability {
 }

package/dist/sunspec-interfaces.js

@@ -252,6 +252,7 @@ export var SunspecBatteryCapability;
 (function (SunspecBatteryCapability) {
     SunspecBatteryCapability["GridCharging"] = "grid-charging";
     SunspecBatteryCapability["DischargeLimit"] = "discharge-limit";
+    SunspecBatteryCapability["ChargeLimit"] = "charge-limit";
 })(SunspecBatteryCapability || (SunspecBatteryCapability = {}));
 export var SunspecMeterCapability;
 (function (SunspecMeterCapability) {

package/dist/sunspec-modbus-client.js

@@ -471,10 +471,21 @@ export class SunspecModbusClient {
         const maxAddress = 50000; // Safety limit
         let currentAddress = 0;
         console.log(`Starting Sunspec model discovery for unit ${unitId}...`);
+        // Probe for the SunS identifier first. A missing identifier means the unit ID isn't a
+        // SunSpec device — common during unit-ID scans — and is logged at debug level so probes
+        // don't surface as errors. Mid-scan failures below remain at error level since they
+        // indicate a partial / malformed SunSpec map.
+        let addressInfo;
+        try {
+            addressInfo = await this.detectSunspecBaseAddress(unitId, customBaseAddress);
+        }
+        catch (error) {
+            console.debug(`No SunSpec device at unit ${unitId}: ${error}`);
+            console.log(`Discovery complete for unit ${unitId}. Found 0 models: []`);
+            return models;
+        }
+        currentAddress = addressInfo.nextAddress;
         try {
-            // Detect the base address and addressing mode
-            const addressInfo = await this.detectSunspecBaseAddress(unitId, customBaseAddress);
-            currentAddress = addressInfo.nextAddress;
             while (currentAddress < maxAddress) {
                 const buffer = await instance.readHoldingRegisters(currentAddress, 2);
                 const modelData = [buffer.readUInt16BE(0), buffer.readUInt16BE(2)];
@@ -1956,7 +1967,9 @@ export class SunspecModbusClient {
     async readCommonBlock(unitId) {
         const model = this.findModel(unitId, SunspecModelId.Common);
         if (!model) {
-            console.error(`Common block model not found on unit ${unitId}`);
+            // Common (model 1) is the SunSpec discovery anchor — its absence simply means this
+            // unit isn't SunSpec. Callers iterating unit IDs already check the null return.
+            console.debug(`Common block model not found on unit ${unitId}`);
             return null;
         }
         console.log(`Reading Common Block - Model address: ${model.address} (unit ${unitId})`);

package/dist/version.d.ts

@@ -5,7 +5,7 @@
 /**
  * Current version of the enyo Energy App SDK.
  */
-export declare const SDK_VERSION = "0.0.64";
+export declare const SDK_VERSION = "0.0.66";
 /**
  * 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.64';
+export const SDK_VERSION = '0.0.66';
 /**
  * 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.64",
+  "version": "0.0.66",
   "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.125"
+    "@enyo-energy/energy-app-sdk": "^0.0.131"
   },
   "volta": {
     "node": "22.17.0"