@enyo-energy/sunspec-sdk 0.0.21 → 0.0.22

package/dist/cjs/sunspec-devices.cjs

@@ -7,6 +7,7 @@ const enyo_appliance_js_1 = require("@enyo-energy/energy-app-sdk/dist/types/enyo
 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");
+const enyo_battery_appliance_js_1 = require("@enyo-energy/energy-app-sdk/dist/types/enyo-battery-appliance.js");
 /**
  * Base abstract class for all Sunspec devices
  */
@@ -60,6 +61,7 @@ class SunspecInverter extends BaseSunspecDevice {
         // Get device info from common block
         const commonData = await this.sunspecClient.readCommonBlock();
         const inverterSettings = await this.sunspecClient.readInverterSettings();
+        const mpptDataList = await this.sunspecClient.readAllMPPTData();
         // Create or update appliance
         try {
             this.applianceId = await this.applianceManager.createOrUpdateAppliance({
@@ -74,6 +76,7 @@ class SunspecInverter extends BaseSunspecDevice {
                     vendorName: commonData?.manufacturer,
                 },
                 inverter: {
+                    dcStrings: this.mapDcStringToApplianceMetadata(this.mapMPPTToStrings(mpptDataList)),
                     maxPvProductionW: inverterSettings?.WMax
                 }
             });
@@ -108,6 +111,7 @@ class SunspecInverter extends BaseSunspecDevice {
             const inverterData = await this.sunspecClient.readInverterData();
             const mpptDataList = await this.sunspecClient.readAllMPPTData();
             const inverterSettings = await this.sunspecClient.readInverterSettings();
+            const dcStrings = this.mapMPPTToStrings(mpptDataList);
             if (inverterData) {
                 const inverterMessage = {
                     id: (0, node_crypto_1.randomUUID)(),
@@ -125,11 +129,20 @@ class SunspecInverter extends BaseSunspecDevice {
                         voltageL1: inverterData.voltageAN || 0,
                         voltageL2: inverterData.voltageBN ?? undefined,
                         voltageL3: inverterData.voltageCN ?? undefined,
-                        strings: this.mapMPPTToStrings(mpptDataList)
+                        strings: dcStrings
                     }
                 };
                 messages.push(inverterMessage);
             }
+            if (this.applianceId) {
+                const appliance = await this.applianceManager.findApplianceById(this.applianceId);
+                await this.applianceManager.updateAppliance(this.applianceId, {
+                    inverter: {
+                        ...appliance?.inverter,
+                        dcStrings: this.mapDcStringToApplianceMetadata(dcStrings)
+                    }
+                });
+            }
             this.lastUpdateTime = timestamp.getTime();
         }
         catch (error) {
@@ -201,6 +214,9 @@ class SunspecInverter extends BaseSunspecDevice {
                 return undefined;
         }
     }
+    mapDcStringToApplianceMetadata(mpptDataList) {
+        return mpptDataList.map(s => ({ index: s.index, name: s.name }));
+    }
 }
 exports.SunspecInverter = SunspecInverter;
 /**
@@ -210,7 +226,7 @@ class SunspecBattery extends BaseSunspecDevice {
     /**
      * Connect to the battery and create/update the appliance
      */
-    async connect() {
+    async connect(inverterApplianceId) {
         // Ensure Sunspec client is connected
         await this.ensureConnected();
         // Check if battery models exist
@@ -222,7 +238,12 @@ class SunspecBattery extends BaseSunspecDevice {
         // Get device info
         const commonData = await this.sunspecClient.readCommonBlock();
         const batteryData = await this.sunspecClient.readBatteryData();
+        const storageMode = this.determineStorageMode(batteryData);
+        const features = [];
         // Create or update appliance
+        if (batteryData?.chaGriSet !== undefined) {
+            features.push(enyo_battery_appliance_js_1.EnyoBatteryFeature.GridCharging);
+        }
         try {
             this.applianceId = await this.applianceManager.createOrUpdateAppliance({
                 name: this.name,
@@ -234,6 +255,14 @@ class SunspecBattery extends BaseSunspecDevice {
                     serialNumber: commonData?.serialNumber,
                     modelName: commonData?.model,
                     vendorName: commonData?.manufacturer,
+                },
+                battery: {
+                    connectedToApplianceId: inverterApplianceId,
+                    storageMode: this.mapToEnyoStorageMode(storageMode),
+                    maxChargingPowerW: batteryData && batteryData.wChaMax !== undefined && batteryData.inWRte !== undefined ? batteryData.wChaMax * batteryData.inWRte : undefined,
+                    maxDischargePowerW: batteryData && batteryData.wChaMax !== undefined && batteryData.outWRte !== undefined ? batteryData.wChaMax * batteryData.outWRte : undefined,
+                    features,
+                    gridChargingEnabled: batteryData?.chaGriSet === 1
                 }
             });
             console.log(`Sunspec Battery connected: ${this.networkDevice.hostname} (${this.applianceId})`);
@@ -309,6 +338,19 @@ class SunspecBattery extends BaseSunspecDevice {
             else {
                 console.warn('No battery data available from device');
             }
+            if (this.applianceId) {
+                const appliance = await this.applianceManager.findApplianceById(this.applianceId);
+                const storageMode = this.determineStorageMode(batteryData);
+                await this.applianceManager.updateAppliance(this.applianceId, {
+                    battery: {
+                        ...appliance?.battery,
+                        storageMode: this.mapToEnyoStorageMode(storageMode),
+                        maxChargingPowerW: batteryData && batteryData.wChaMax !== undefined && batteryData.inWRte !== undefined ? batteryData.wChaMax * batteryData.inWRte : undefined,
+                        maxDischargePowerW: batteryData && batteryData.wChaMax !== undefined && batteryData.outWRte !== undefined ? batteryData.wChaMax * batteryData.outWRte : undefined,
+                        gridChargingEnabled: batteryData?.chaGriSet === 1
+                    }
+                });
+            }
             this.lastUpdateTime = timestamp.getTime();
         }
         catch (error) {
@@ -359,6 +401,145 @@ class SunspecBattery extends BaseSunspecDevice {
             return undefined;
         }
     }
+    /**
+     * Set the battery storage mode
+     *
+     * @param mode - The storage mode to set:
+     *   - 'charge': Allow charging only
+     *   - 'discharge': Allow discharging only
+     *   - 'holding': Prevent both charging and discharging (to avoid battery drain)
+     *   - 'auto': Allow both charging and discharging (normal operation)
+     * @returns Promise<boolean> - true if successful, false otherwise
+     */
+    async setStorageMode(mode) {
+        if (!this.isConnected()) {
+            console.error('Battery not connected');
+            return false;
+        }
+        console.log(`Setting battery storage mode to: ${mode}`);
+        return this.sunspecClient.setStorageMode(mode);
+    }
+    /**
+     * Enable or disable grid charging
+     *
+     * When enabled, the battery can charge from the grid.
+     * When disabled, the battery only charges from PV.
+     *
+     * Note: When grid charging is enabled, you should also set WChaMax
+     * to control the charging power from the grid.
+     *
+     * @param enable - true to enable grid charging, false to disable
+     * @returns Promise<boolean> - true if successful, false otherwise
+     */
+    async enableGridCharging(enable) {
+        if (!this.isConnected()) {
+            console.error('Battery not connected');
+            return false;
+        }
+        console.log(`${enable ? 'Enabling' : 'Disabling'} grid charging for battery`);
+        return this.sunspecClient.enableGridCharging(enable);
+    }
+    /**
+     * Set battery charging power from grid
+     *
+     * This sets the maximum charging power (WChaMax) that the battery
+     * will draw when charging from the grid. Should be used together
+     * with enableGridCharging(true).
+     *
+     * @param powerW - Maximum charging power in Watts
+     * @returns Promise<boolean> - true if successful, false otherwise
+     */
+    async setChargingPower(powerW) {
+        if (!this.isConnected()) {
+            console.error('Battery not connected');
+            return false;
+        }
+        console.log(`Setting battery charging power to: ${powerW}W`);
+        return this.sunspecClient.writeBatteryControls({ wChaMax: powerW });
+    }
+    /**
+     * Get current battery control settings
+     *
+     * @returns Promise<SunspecBatteryControls | null> - Current control settings or null if error
+     */
+    async getBatteryControls() {
+        if (!this.isConnected()) {
+            console.error('Battery not connected');
+            return null;
+        }
+        return this.sunspecClient.readBatteryControls();
+    }
+    /**
+     * Write custom battery control settings
+     *
+     * Advanced method for direct control of battery parameters.
+     * Use the simplified methods (setStorageMode, enableGridCharging) for common operations.
+     *
+     * @param controls - Partial battery control settings to write
+     * @returns Promise<boolean> - true if successful, false otherwise
+     */
+    async writeBatteryControls(controls) {
+        if (!this.isConnected()) {
+            console.error('Battery not connected');
+            return false;
+        }
+        console.log('Writing battery controls:', controls);
+        return this.sunspecClient.writeBatteryControls(controls);
+    }
+    mapToEnyoStorageMode(storageMode) {
+        switch (storageMode) {
+            case sunspec_interfaces_js_1.SunspecStorageMode.AUTO:
+                return enyo_battery_appliance_js_1.EnyoBatteryStorageMode.AUTO;
+            case sunspec_interfaces_js_1.SunspecStorageMode.CHARGE:
+                return enyo_battery_appliance_js_1.EnyoBatteryStorageMode.CHARGE;
+            case sunspec_interfaces_js_1.SunspecStorageMode.DISCHARGE:
+                return enyo_battery_appliance_js_1.EnyoBatteryStorageMode.DISCHARGE;
+            case sunspec_interfaces_js_1.SunspecStorageMode.HOLDING:
+                return enyo_battery_appliance_js_1.EnyoBatteryStorageMode.HOLDING;
+            default:
+                return undefined;
+        }
+    }
+    /**
+     * Get the current storage mode based on StorCtl_Mod register
+     *
+     * @returns Promise<SunspecStorageMode | null> - Current mode or null if error
+     */
+    async getStorageMode() {
+        const controls = await this.getBatteryControls();
+        return this.determineStorageMode(controls);
+    }
+    determineStorageMode(controls) {
+        if (!controls || controls.storCtlMod === undefined) {
+            return null;
+        }
+        const chargeEnabled = (controls.storCtlMod & 0x0001) !== 0;
+        const dischargeEnabled = (controls.storCtlMod & 0x0002) !== 0;
+        if (chargeEnabled && dischargeEnabled) {
+            return sunspec_interfaces_js_1.SunspecStorageMode.AUTO;
+        }
+        else if (chargeEnabled && !dischargeEnabled) {
+            return sunspec_interfaces_js_1.SunspecStorageMode.CHARGE;
+        }
+        else if (!chargeEnabled && dischargeEnabled) {
+            return sunspec_interfaces_js_1.SunspecStorageMode.DISCHARGE;
+        }
+        else {
+            return sunspec_interfaces_js_1.SunspecStorageMode.HOLDING;
+        }
+    }
+    /**
+     * Check if grid charging is enabled
+     *
+     * @returns Promise<boolean | null> - true if enabled, false if disabled, null if error
+     */
+    async isGridChargingEnabled() {
+        const controls = await this.getBatteryControls();
+        if (!controls || controls.chaGriSet === undefined) {
+            return null;
+        }
+        return controls.chaGriSet === 1; // 1 = GRID, 0 = PV
+    }
 }
 exports.SunspecBattery = SunspecBattery;
 /**

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

@@ -1,3 +1,4 @@
+import { type SunspecBatteryControls, SunspecStorageMode } from "./sunspec-interfaces.cjs";
 import { ApplianceManager, EnergyApp } from "@enyo-energy/energy-app-sdk";
 import { EnyoApplianceName } from "@enyo-energy/energy-app-sdk/dist/types/enyo-appliance.js";
 import { EnyoNetworkDevice } from "@enyo-energy/energy-app-sdk/dist/types/enyo-network-device.js";
@@ -55,6 +56,7 @@ export declare class SunspecInverter extends BaseSunspecDevice {
      */
     private mapMPPTToStrings;
     private mapMPPTOperatingState;
+    private mapDcStringToApplianceMetadata;
 }
 /**
  * Sunspec Battery implementation
@@ -63,7 +65,7 @@ export declare class SunspecBattery extends BaseSunspecDevice {
     /**
      * Connect to the battery and create/update the appliance
      */
-    connect(): Promise<void>;
+    connect(inverterApplianceId?: string): Promise<void>;
     disconnect(): Promise<void>;
     /**
      * Map SunSpec battery charge state to Enyo battery state
@@ -83,6 +85,71 @@ export declare class SunspecBattery extends BaseSunspecDevice {
      * Determine battery state from MPPT strings
      */
     private determineBatteryStateFromMPPT;
+    /**
+     * Set the battery storage mode
+     *
+     * @param mode - The storage mode to set:
+     *   - 'charge': Allow charging only
+     *   - 'discharge': Allow discharging only
+     *   - 'holding': Prevent both charging and discharging (to avoid battery drain)
+     *   - 'auto': Allow both charging and discharging (normal operation)
+     * @returns Promise<boolean> - true if successful, false otherwise
+     */
+    setStorageMode(mode: SunspecStorageMode): Promise<boolean>;
+    /**
+     * Enable or disable grid charging
+     *
+     * When enabled, the battery can charge from the grid.
+     * When disabled, the battery only charges from PV.
+     *
+     * Note: When grid charging is enabled, you should also set WChaMax
+     * to control the charging power from the grid.
+     *
+     * @param enable - true to enable grid charging, false to disable
+     * @returns Promise<boolean> - true if successful, false otherwise
+     */
+    enableGridCharging(enable: boolean): Promise<boolean>;
+    /**
+     * Set battery charging power from grid
+     *
+     * This sets the maximum charging power (WChaMax) that the battery
+     * will draw when charging from the grid. Should be used together
+     * with enableGridCharging(true).
+     *
+     * @param powerW - Maximum charging power in Watts
+     * @returns Promise<boolean> - true if successful, false otherwise
+     */
+    setChargingPower(powerW: number): Promise<boolean>;
+    /**
+     * Get current battery control settings
+     *
+     * @returns Promise<SunspecBatteryControls | null> - Current control settings or null if error
+     */
+    getBatteryControls(): Promise<SunspecBatteryControls | null>;
+    /**
+     * Write custom battery control settings
+     *
+     * Advanced method for direct control of battery parameters.
+     * Use the simplified methods (setStorageMode, enableGridCharging) for common operations.
+     *
+     * @param controls - Partial battery control settings to write
+     * @returns Promise<boolean> - true if successful, false otherwise
+     */
+    writeBatteryControls(controls: Partial<SunspecBatteryControls>): Promise<boolean>;
+    private mapToEnyoStorageMode;
+    /**
+     * Get the current storage mode based on StorCtl_Mod register
+     *
+     * @returns Promise<SunspecStorageMode | null> - Current mode or null if error
+     */
+    getStorageMode(): Promise<SunspecStorageMode | null>;
+    private determineStorageMode;
+    /**
+     * Check if grid charging is enabled
+     *
+     * @returns Promise<boolean | null> - true if enabled, false if disabled, null if error
+     */
+    isGridChargingEnabled(): Promise<boolean | null>;
 }
 /**
  * Sunspec Meter implementation

package/dist/cjs/sunspec-interfaces.cjs

@@ -3,7 +3,7 @@
  * SunSpec block interfaces with block numbers
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SunspecVArPctMode = exports.SunspecEnableControl = exports.SunspecConnectionControl = exports.SunspecStorageControlMode = exports.SunspecBatteryChargeState = exports.SunspecMPPTOperatingState = exports.SunspecModelId = void 0;
+exports.SunspecStorageMode = exports.SunspecChargeSource = exports.SunspecVArPctMode = exports.SunspecEnableControl = exports.SunspecConnectionControl = exports.SunspecStorageControlMode = exports.SunspecBatteryChargeState = exports.SunspecMPPTOperatingState = exports.SunspecModelId = void 0;
 /**
  * Common Sunspec Model IDs
  */
@@ -57,11 +57,18 @@ var SunspecBatteryChargeState;
 })(SunspecBatteryChargeState || (exports.SunspecBatteryChargeState = SunspecBatteryChargeState = {}));
 /**
  * Storage Control Mode bitfield values for Model 124
+ *
+ * The StorCtl_Mod register controls who has control over the battery:
+ * - When bits are set, external control is enabled for that function
+ * - When bits are clear, the battery may be in autonomous/self-consumption mode
+ * - To ensure external control works properly, the appropriate bits must be set
  */
 var SunspecStorageControlMode;
 (function (SunspecStorageControlMode) {
     SunspecStorageControlMode[SunspecStorageControlMode["CHARGE"] = 1] = "CHARGE";
-    SunspecStorageControlMode[SunspecStorageControlMode["DISCHARGE"] = 2] = "DISCHARGE"; // Bit 1 - Enable discharge mode
+    SunspecStorageControlMode[SunspecStorageControlMode["DISCHARGE"] = 2] = "DISCHARGE"; // Bit 1 - Enable discharge mode (allow external discharge control)
+    // Note: Higher bits may control other modes like autonomous/self-consumption
+    // but these are device-specific and not standardized in SunSpec
 })(SunspecStorageControlMode || (exports.SunspecStorageControlMode = SunspecStorageControlMode = {}));
 /**
  * Enum values for connection control
@@ -88,3 +95,21 @@ var SunspecVArPctMode;
     SunspecVArPctMode[SunspecVArPctMode["WMAX"] = 1] = "WMAX";
     SunspecVArPctMode[SunspecVArPctMode["VARMAX"] = 2] = "VARMAX";
 })(SunspecVArPctMode || (exports.SunspecVArPctMode = SunspecVArPctMode = {}));
+/**
+ * Enum values for battery charge source (Model 124, Register 17)
+ */
+var SunspecChargeSource;
+(function (SunspecChargeSource) {
+    SunspecChargeSource[SunspecChargeSource["PV"] = 0] = "PV";
+    SunspecChargeSource[SunspecChargeSource["GRID"] = 1] = "GRID"; // Charge from Grid
+})(SunspecChargeSource || (exports.SunspecChargeSource = SunspecChargeSource = {}));
+/**
+ * Storage modes for simplified battery control
+ */
+var SunspecStorageMode;
+(function (SunspecStorageMode) {
+    SunspecStorageMode["CHARGE"] = "charge";
+    SunspecStorageMode["DISCHARGE"] = "discharge";
+    SunspecStorageMode["HOLDING"] = "holding";
+    SunspecStorageMode["AUTO"] = "auto"; // Both charge and discharge allowed
+})(SunspecStorageMode || (exports.SunspecStorageMode = SunspecStorageMode = {}));

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

@@ -170,9 +170,14 @@ export declare enum SunspecBatteryChargeState {
 }
 /**
  * Storage Control Mode bitfield values for Model 124
+ *
+ * The StorCtl_Mod register controls who has control over the battery:
+ * - When bits are set, external control is enabled for that function
+ * - When bits are clear, the battery may be in autonomous/self-consumption mode
+ * - To ensure external control works properly, the appropriate bits must be set
  */
 export declare enum SunspecStorageControlMode {
-    CHARGE = 1,// Bit 0 - Enable charge mode
+    CHARGE = 1,// Bit 0 - Enable charge mode (allow external charge control)
     DISCHARGE = 2
 }
 /**
@@ -338,3 +343,36 @@ export declare enum SunspecVArPctMode {
     WMAX = 1,
     VARMAX = 2
 }
+/**
+ * Enum values for battery charge source (Model 124, Register 17)
+ */
+export declare enum SunspecChargeSource {
+    PV = 0,// Charge from PV only
+    GRID = 1
+}
+/**
+ * Storage modes for simplified battery control
+ */
+export declare enum SunspecStorageMode {
+    CHARGE = "charge",// Allow charging only
+    DISCHARGE = "discharge",// Allow discharging only
+    HOLDING = "holding",// No charge or discharge (holding mode)
+    AUTO = "auto"
+}
+/**
+ * Battery control structure for writing to Model 124
+ * Used for controlling battery charge/discharge behavior
+ *
+ * IMPORTANT: To enable grid charging with specific power:
+ * 1. Set storCtlMod with appropriate bits to enable external control
+ * 2. Set chaGriSet = 1 to allow grid charging
+ * 3. Set wChaMax to the desired charging power in Watts
+ */
+export interface SunspecBatteryControls {
+    storCtlMod?: number;
+    chaGriSet?: number;
+    wChaMax?: number;
+    inWRte?: number;
+    outWRte?: number;
+    minRsvPct?: number;
+}

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

@@ -265,6 +265,52 @@ class SunspecModbusClient {
             throw error;
         }
     }
+    /**
+     * Helper to write register value(s)
+     */
+    async writeRegisterValue(address, value, dataType = 'uint16') {
+        if (!this.modbusClient) {
+            throw new Error('Modbus client not initialized');
+        }
+        try {
+            // Convert value to array of register values
+            let registerValues;
+            if (Array.isArray(value)) {
+                // For arrays, use directly
+                registerValues = value;
+            }
+            else {
+                // For single values, convert based on data type
+                switch (dataType) {
+                    case 'uint32':
+                    case 'int32':
+                        // Split 32-bit value into two 16-bit registers
+                        const high = (value >>> 16) & 0xFFFF;
+                        const low = value & 0xFFFF;
+                        registerValues = [high, low];
+                        break;
+                    case 'int16':
+                        // For signed 16-bit, ensure proper representation
+                        registerValues = [value & 0xFFFF];
+                        break;
+                    case 'uint16':
+                    default:
+                        registerValues = [value & 0xFFFF];
+                        break;
+                }
+            }
+            // Write to holding registers
+            await this.modbusClient.writeMultipleRegisters(address, registerValues);
+            this.connectionHealth.recordSuccess();
+            console.log(`Successfully wrote value ${value} to register ${address}`);
+            return true;
+        }
+        catch (error) {
+            this.connectionHealth.recordFailure(error);
+            console.error(`Error writing register at address ${address}: ${error}`);
+            throw error;
+        }
+    }
     /**
      * Read inverter data from Model 103 (Three Phase)
      */
@@ -797,6 +843,145 @@ class SunspecModbusClient {
             return null;
         }
     }
+    /**
+     * Write battery control settings to Model 124
+     */
+    async writeBatteryControls(controls) {
+        const model = this.findModel(sunspec_interfaces_js_1.SunspecModelId.Battery);
+        if (!model) {
+            console.error('Battery model 124 not found');
+            return false;
+        }
+        const baseAddr = model.address;
+        console.log(`Writing Battery Controls to Model 124 at base address: ${baseAddr}`);
+        try {
+            // Write storage control mode (Register 5)
+            if (controls.storCtlMod !== undefined) {
+                await this.writeRegisterValue(baseAddr + 5, controls.storCtlMod, 'uint16');
+                console.log(`Set storage control mode to 0x${controls.storCtlMod.toString(16)}`);
+            }
+            // Write charge source setting (Register 17)
+            if (controls.chaGriSet !== undefined) {
+                await this.writeRegisterValue(baseAddr + 17, controls.chaGriSet, 'uint16');
+                console.log(`Set charge source to ${controls.chaGriSet === sunspec_interfaces_js_1.SunspecChargeSource.GRID ? 'GRID' : 'PV'}`);
+            }
+            // Write maximum charge power (Register 2) - needs scale factor
+            if (controls.wChaMax !== undefined) {
+                const scaleFactorAddr = baseAddr + 18;
+                const scaleFactor = await this.readRegisterValue(scaleFactorAddr, 1, 'int16');
+                const scaledValue = Math.round(controls.wChaMax / Math.pow(10, scaleFactor));
+                await this.writeRegisterValue(baseAddr + 2, scaledValue, 'uint16');
+                console.log(`Set max charge power to ${controls.wChaMax}W (scaled: ${scaledValue})`);
+            }
+            // Write charge rate (Register 13) - needs scale factor
+            if (controls.inWRte !== undefined) {
+                const scaleFactorAddr = baseAddr + 25;
+                const scaleFactor = await this.readRegisterValue(scaleFactorAddr, 1, 'int16');
+                const scaledValue = Math.round(controls.inWRte / Math.pow(10, scaleFactor));
+                await this.writeRegisterValue(baseAddr + 13, scaledValue, 'int16');
+                console.log(`Set charge rate to ${controls.inWRte}% (scaled: ${scaledValue})`);
+            }
+            // Write discharge rate (Register 12) - needs scale factor
+            if (controls.outWRte !== undefined) {
+                const scaleFactorAddr = baseAddr + 25;
+                const scaleFactor = await this.readRegisterValue(scaleFactorAddr, 1, 'int16');
+                const scaledValue = Math.round(controls.outWRte / Math.pow(10, scaleFactor));
+                await this.writeRegisterValue(baseAddr + 12, scaledValue, 'int16');
+                console.log(`Set discharge rate to ${controls.outWRte}% (scaled: ${scaledValue})`);
+            }
+            // Write minimum reserve percentage (Register 7) - needs scale factor
+            if (controls.minRsvPct !== undefined) {
+                const scaleFactorAddr = baseAddr + 21;
+                const scaleFactor = await this.readRegisterValue(scaleFactorAddr, 1, 'int16');
+                const scaledValue = Math.round(controls.minRsvPct / Math.pow(10, scaleFactor));
+                await this.writeRegisterValue(baseAddr + 7, scaledValue, 'uint16');
+                console.log(`Set minimum reserve to ${controls.minRsvPct}% (scaled: ${scaledValue})`);
+            }
+            console.log('Battery controls written successfully');
+            return true;
+        }
+        catch (error) {
+            console.error(`Error writing battery controls: ${error}`);
+            return false;
+        }
+    }
+    /**
+     * Set battery storage mode (simplified interface)
+     */
+    async setStorageMode(mode) {
+        let storCtlMod;
+        switch (mode) {
+            case sunspec_interfaces_js_1.SunspecStorageMode.CHARGE:
+                // Enable charge only (bit 0 = 1, bit 1 = 0)
+                storCtlMod = sunspec_interfaces_js_1.SunspecStorageControlMode.CHARGE;
+                break;
+            case sunspec_interfaces_js_1.SunspecStorageMode.DISCHARGE:
+                // Enable discharge only (bit 0 = 0, bit 1 = 1)
+                storCtlMod = sunspec_interfaces_js_1.SunspecStorageControlMode.DISCHARGE;
+                break;
+            case sunspec_interfaces_js_1.SunspecStorageMode.HOLDING:
+                // Disable both charge and discharge (bits 0 and 1 = 0)
+                storCtlMod = 0;
+                break;
+            case sunspec_interfaces_js_1.SunspecStorageMode.AUTO:
+                // Enable both charge and discharge (bits 0 and 1 = 1)
+                storCtlMod = sunspec_interfaces_js_1.SunspecStorageControlMode.CHARGE | sunspec_interfaces_js_1.SunspecStorageControlMode.DISCHARGE;
+                break;
+            default:
+                console.error(`Invalid storage mode: ${mode}`);
+                return false;
+        }
+        console.log(`Setting storage mode to ${mode} (control bits: 0x${storCtlMod.toString(16)})`);
+        return this.writeBatteryControls({ storCtlMod });
+    }
+    /**
+     * Enable or disable grid charging
+     */
+    async enableGridCharging(enable) {
+        const chaGriSet = enable ? sunspec_interfaces_js_1.SunspecChargeSource.GRID : sunspec_interfaces_js_1.SunspecChargeSource.PV;
+        console.log(`${enable ? 'Enabling' : 'Disabling'} grid charging`);
+        return this.writeBatteryControls({ chaGriSet });
+    }
+    /**
+     * Read current battery control settings
+     */
+    async readBatteryControls() {
+        const model = this.findModel(sunspec_interfaces_js_1.SunspecModelId.Battery);
+        if (!model) {
+            console.log('Battery model 124 not found');
+            return null;
+        }
+        const baseAddr = model.address;
+        console.log(`Reading Battery Controls from Model 124 at base address: ${baseAddr}`);
+        try {
+            // Read scale factors
+            const scaleFactors = {
+                WChaMax_SF: await this.readRegisterValue(baseAddr + 18, 1, 'int16'),
+                MinRsvPct_SF: await this.readRegisterValue(baseAddr + 21, 1, 'int16'),
+                InOutWRte_SF: await this.readRegisterValue(baseAddr + 25, 1, 'int16')
+            };
+            // Read raw values
+            const wChaMaxRaw = await this.readRegisterValue(baseAddr + 2, 1, 'uint16');
+            const storCtlModRaw = await this.readRegisterValue(baseAddr + 5, 1, 'uint16');
+            const minRsvPctRaw = await this.readRegisterValue(baseAddr + 7, 1, 'uint16');
+            const outWRteRaw = await this.readRegisterValue(baseAddr + 12, 1, 'int16');
+            const inWRteRaw = await this.readRegisterValue(baseAddr + 13, 1, 'int16');
+            const chaGriSetRaw = await this.readRegisterValue(baseAddr + 17, 1, 'uint16');
+            // Apply scale factors and return control settings
+            return {
+                storCtlMod: !this.isUnimplementedValue(storCtlModRaw, 'bitfield16') ? storCtlModRaw : undefined,
+                chaGriSet: !this.isUnimplementedValue(chaGriSetRaw, 'enum16') ? chaGriSetRaw : undefined,
+                wChaMax: this.applyScaleFactor(wChaMaxRaw, scaleFactors.WChaMax_SF, 'uint16'),
+                inWRte: this.applyScaleFactor(inWRteRaw, scaleFactors.InOutWRte_SF, 'int16'),
+                outWRte: this.applyScaleFactor(outWRteRaw, scaleFactors.InOutWRte_SF, 'int16'),
+                minRsvPct: this.applyScaleFactor(minRsvPctRaw, scaleFactors.MinRsvPct_SF, 'uint16')
+            };
+        }
+        catch (error) {
+            console.error(`Error reading battery controls: ${error}`);
+            return null;
+        }
+    }
     /**
      * Read meter data (Model 203 for 3-phase)
      */