@enyo-energy/sunspec-sdk 0.0.74 → 0.0.76

package/dist/cjs/sunspec-devices.cjs

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SunspecMeter = exports.SunspecBattery = exports.SunspecInverter = exports.BaseSunspecDevice = void 0;
 exports.detectFeaturesFromRegisters = detectFeaturesFromRegisters;
+exports.selectLiveBatteryPowerW = selectLiveBatteryPowerW;
 exports.filterFeaturesByCalibrationResult = filterFeaturesByCalibrationResult;
 const sunspec_interfaces_js_1 = require("./sunspec-interfaces.cjs");
 const node_crypto_1 = require("node:crypto");
@@ -711,8 +712,6 @@ class SunspecInverter extends BaseSunspecDevice {
         this.dataBus = this.energyApp.useDataBus();
         this.dataBusListenerId = this.dataBus.listenForMessages([
             enyo_data_bus_value_js_1.EnyoDataBusMessageEnum.SetInverterFeedInLimitV1,
-            enyo_data_bus_value_js_1.EnyoDataBusMessageEnum.StartCalibrationV1,
-            enyo_data_bus_value_js_1.EnyoDataBusMessageEnum.StopCalibrationV1,
         ], (entry) => this.handleInverterCommand(entry));
         console.log(`Inverter ${this.applianceId}: started data bus listening (listener ${this.dataBusListenerId})`);
     }
@@ -737,12 +736,6 @@ class SunspecInverter extends BaseSunspecDevice {
                     case enyo_data_bus_value_js_1.EnyoDataBusMessageEnum.SetInverterFeedInLimitV1:
                         await this.handleSetFeedInLimit(entry);
                         break;
-                    case enyo_data_bus_value_js_1.EnyoDataBusMessageEnum.StartCalibrationV1:
-                        await this.handleStartCalibration(entry);
-                        break;
-                    case enyo_data_bus_value_js_1.EnyoDataBusMessageEnum.StopCalibrationV1:
-                        await this.handleStopCalibration(entry);
-                        break;
                 }
             }
             catch (error) {
@@ -788,51 +781,6 @@ class SunspecInverter extends BaseSunspecDevice {
         await this.snapshotService.initialize();
         console.log(`Inverter ${this.applianceId}: snapshot service initialized`);
     }
-    async handleStartCalibration(msg) {
-        if (!this.isConnected() || !this.applianceId) {
-            this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Rejected, 'Not connected');
-            return;
-        }
-        if (!this.snapshotService) {
-            await this.initSnapshotService();
-        }
-        if (!this.snapshotService) {
-            this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Rejected, 'Snapshot service unavailable');
-            return;
-        }
-        if (this.snapshotService.isCalibrating()) {
-            console.log(`Inverter ${this.applianceId}: calibration already active — ack idempotently`);
-            this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Accepted);
-            return;
-        }
-        console.log(`Inverter ${this.applianceId}: handling StartCalibrationV1`);
-        const controls = await this.sunspecClient.readInverterControls(this.unitId);
-        if (!controls) {
-            this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Rejected, 'Failed to read inverter controls for snapshot');
-            return;
-        }
-        try {
-            await this.snapshotService.startCalibration(controls);
-        }
-        catch (error) {
-            this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Rejected, `Failed to persist snapshot: ${error}`);
-            return;
-        }
-        this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Accepted);
-    }
-    async handleStopCalibration(msg) {
-        if (!this.applianceId) {
-            this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Rejected, 'Not initialized');
-            return;
-        }
-        console.log(`Inverter ${this.applianceId}: handling StopCalibrationV1`);
-        // SnapshotService.stopCalibration fires `restoreInverterSnapshot` internally with
-        // reason="stop" before returning. Any restore failure is logged by the callback
-        // (the persisted snapshot is already gone by then — see library notes) so we
-        // always ack Accepted from here.
-        await this.snapshotService?.stopCalibration();
-        this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Accepted);
-    }
     /**
      * `onRestore` callback for the inverter's {@link SnapshotService}. Writes only the
      * subset of writable inverter fields that other commands actually touched during the
@@ -905,6 +853,35 @@ function detectFeaturesFromRegisters(batteryData) {
  *   the full detected set to preserve the old all-or-nothing semantics on
  *   upgrade.
  */
+/**
+ * Pick the live battery power, in preference order:
+ *
+ *   1. Model 160 (MPPT) `StCha 3` / `StDisCha 4` — direct DC-link reading,
+ *      passed in as the already-summed `mpptBatteryPowerW`.
+ *   2. Model 802 `w` (offset 47) — surfaced as `chargePower` / `dischargePower`
+ *      by the Model 802 path of `SunspecModbusClient.readBatteryData`.
+ *   3. `undefined` — no reliable live source on this device.
+ *
+ * The Model 124 path of `readBatteryData` no longer manufactures
+ * `chargePower` / `dischargePower` from `inWRte × wChaMax` (a commanded rate
+ * cap, not a live measurement). So whenever this function sees
+ * `chargePower` / `dischargePower` defined, they came from Model 802.
+ *
+ * Exported as a free function so the preference logic can be unit-tested
+ * without the full `SunspecBattery` scaffold.
+ */
+function selectLiveBatteryPowerW(mpptBatteryPowerW, batteryData) {
+    if (mpptBatteryPowerW !== undefined) {
+        return mpptBatteryPowerW;
+    }
+    if (!batteryData) {
+        return undefined;
+    }
+    if (batteryData.chargePower === undefined && batteryData.dischargePower === undefined) {
+        return undefined;
+    }
+    return (batteryData.chargePower ?? 0) - (batteryData.dischargePower ?? 0);
+}
 function filterFeaturesByCalibrationResult(detected, result, controllable) {
     if (!result || result.state !== 'calibrated') {
         return detected.filter(f => !controllable.includes(f));
@@ -1168,17 +1145,8 @@ class SunspecBattery extends BaseSunspecDevice {
                 return messages;
             }
             if (batteryData) {
-                const advancedBatteryModel = this.sunspecClient.findModel(this.unitId, 801);
-                const batteryBaseModel = this.sunspecClient.findModel(this.unitId, sunspec_interfaces_js_1.SunspecModelId.BatteryBase);
-                // Determine battery power: prefer model 802 w field, then MPPT extraction, then undefined
-                let batteryPowerW;
-                if (batteryBaseModel && (batteryData.chargePower !== undefined || batteryData.dischargePower !== undefined)) {
-                    // Model 802 provides power directly: positive = charge, negative = discharge
-                    batteryPowerW = (batteryData.chargePower || 0) - (batteryData.dischargePower || 0);
-                }
-                else if (!advancedBatteryModel) {
-                    batteryPowerW = mpptBatteryPowerW;
-                }
+                // See `selectLiveBatteryPowerW` for the source-preference rationale.
+                const batteryPowerW = selectLiveBatteryPowerW(mpptBatteryPowerW, batteryData);
                 // Feed the calibration driver's synchronous power cache. No-op when calibration
                 // was never configured.
                 if (batteryPowerW !== undefined && this.calibrationDriver) {
@@ -1371,7 +1339,10 @@ class SunspecBattery extends BaseSunspecDevice {
             console.error('Battery not connected');
             return false;
         }
-        console.log('Writing battery controls:', controls);
+        // Redundant with the modbus client's own per-write debug trace. Keep at debug
+        // so the high-level info logs (setStorageMode / enableGridCharging / etc.) stay
+        // the only info-level signal per battery-control action.
+        console.debug('Writing battery controls:', controls);
         return this.sunspecClient.writeBatteryControls(this.unitId, controls);
     }
     mapToEnyoStorageMode(storageMode) {
@@ -1469,8 +1440,6 @@ class SunspecBattery extends BaseSunspecDevice {
         this.dataBus = this.energyApp.useDataBus();
         this.dataBusListenerId = this.dataBus.listenForMessages([
             enyo_data_bus_value_js_1.EnyoDataBusMessageEnum.SetStorageScheduleV1,
-            enyo_data_bus_value_js_1.EnyoDataBusMessageEnum.StartCalibrationV1,
-            enyo_data_bus_value_js_1.EnyoDataBusMessageEnum.StopCalibrationV1,
         ], (entry) => this.handleStorageCommand(entry));
         if (!this.applianceId) {
             throw new Error("SunspecBattery.startDataBusListening: applianceId required — call connect() first.");
@@ -1509,12 +1478,6 @@ class SunspecBattery extends BaseSunspecDevice {
                     case enyo_data_bus_value_js_1.EnyoDataBusMessageEnum.SetStorageScheduleV1:
                         this.handleSetStorageScheduleAck(entry);
                         break;
-                    case enyo_data_bus_value_js_1.EnyoDataBusMessageEnum.StartCalibrationV1:
-                        await this.handleStartCalibration(entry);
-                        break;
-                    case enyo_data_bus_value_js_1.EnyoDataBusMessageEnum.StopCalibrationV1:
-                        await this.handleStopCalibration(entry);
-                        break;
                 }
             }
             catch (error) {
@@ -1554,51 +1517,6 @@ class SunspecBattery extends BaseSunspecDevice {
         await this.snapshotService.initialize();
         console.log(`Battery ${this.applianceId}: snapshot service initialized`);
     }
-    async handleStartCalibration(msg) {
-        if (!this.isConnected() || !this.applianceId) {
-            this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Rejected, 'Not connected');
-            return;
-        }
-        if (!this.snapshotService) {
-            await this.initSnapshotService();
-        }
-        if (!this.snapshotService) {
-            this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Rejected, 'Snapshot service unavailable');
-            return;
-        }
-        if (this.snapshotService.isCalibrating()) {
-            console.log(`Battery ${this.applianceId}: calibration already active — ack idempotently`);
-            this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Accepted);
-            return;
-        }
-        console.log(`Battery ${this.applianceId}: handling StartCalibrationV1`);
-        const controls = await this.sunspecClient.readBatteryControls(this.unitId);
-        if (!controls) {
-            this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Rejected, 'Failed to read battery controls for snapshot');
-            return;
-        }
-        try {
-            await this.snapshotService.startCalibration(controls);
-        }
-        catch (error) {
-            this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Rejected, `Failed to persist snapshot: ${error}`);
-            return;
-        }
-        this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Accepted);
-    }
-    async handleStopCalibration(msg) {
-        if (!this.applianceId) {
-            this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Rejected, 'Not initialized');
-            return;
-        }
-        console.log(`Battery ${this.applianceId}: handling StopCalibrationV1`);
-        // SnapshotService.stopCalibration fires `restoreBatterySnapshot` internally
-        // with reason="stop" before returning. Failures from the restore callback are
-        // logged inside the callback (the persisted snapshot is already gone — see
-        // library notes) so we always ack Accepted here.
-        await this.snapshotService?.stopCalibration();
-        this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Accepted);
-    }
     /**
      * `onRestore` callback for the battery's {@link SnapshotService}. Writes only the
      * subset of writable battery fields touched during the calibration. Errors are
@@ -1704,13 +1622,11 @@ class SunspecMeter extends BaseSunspecDevice {
                 console.error(`Failed to update meter appliance: ${error}`);
             }
         }
-        this.startDataBusListening();
     }
     /**
      * Disconnect from the meter and update appliance state
      */
     async disconnect() {
-        this.stopDataBusListening();
         if (this.applianceId) {
             try {
                 await this.applianceManager.updateApplianceState(this.applianceId, enyo_appliance_js_1.EnyoApplianceConnectionType.Connector, enyo_appliance_js_1.EnyoApplianceStateEnum.Offline);
@@ -1722,35 +1638,6 @@ class SunspecMeter extends BaseSunspecDevice {
         // Close just this meter's unit; other devices on the same network device stay open.
         await this.sunspecClient.disconnectUnit(this.unitId);
     }
-    /**
-     * Meter does not implement calibration; it only subscribes to Start/StopCalibrationV1 to
-     * answer NotSupported (per the data-bus contract that every command must be acknowledged).
-     */
-    startDataBusListening() {
-        if (this.dataBusListenerId) {
-            return;
-        }
-        this.dataBus = this.energyApp.useDataBus();
-        this.dataBusListenerId = this.dataBus.listenForMessages([
-            enyo_data_bus_value_js_1.EnyoDataBusMessageEnum.StartCalibrationV1,
-            enyo_data_bus_value_js_1.EnyoDataBusMessageEnum.StopCalibrationV1,
-        ], (entry) => this.handleMeterCommand(entry));
-        console.log(`Meter ${this.applianceId}: started data bus listening (listener ${this.dataBusListenerId})`);
-    }
-    stopDataBusListening() {
-        if (this.dataBusListenerId && this.dataBus) {
-            this.dataBus.unsubscribe(this.dataBusListenerId);
-            console.log(`Meter ${this.applianceId}: stopped data bus listening (listener ${this.dataBusListenerId})`);
-        }
-        this.dataBusListenerId = undefined;
-        this.dataBus = undefined;
-    }
-    handleMeterCommand(entry) {
-        if (entry.applianceId !== this.applianceId) {
-            return;
-        }
-        this.sendCommandAcknowledge(entry.id, entry.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.NotSupported, 'Meter does not support calibration');
-    }
     /**
      * Update meter data and return data bus messages
      */

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

@@ -178,8 +178,6 @@ export declare class SunspecInverter extends BaseSunspecDevice {
      * process restarts. Idempotent.
      */
     private initSnapshotService;
-    private handleStartCalibration;
-    private handleStopCalibration;
     /**
      * `onRestore` callback for the inverter's {@link SnapshotService}. Writes only the
      * subset of writable inverter fields that other commands actually touched during the
@@ -217,6 +215,24 @@ export declare function detectFeaturesFromRegisters(batteryData: SunspecBatteryD
  *   the full detected set to preserve the old all-or-nothing semantics on
  *   upgrade.
  */
+/**
+ * Pick the live battery power, in preference order:
+ *
+ *   1. Model 160 (MPPT) `StCha 3` / `StDisCha 4` — direct DC-link reading,
+ *      passed in as the already-summed `mpptBatteryPowerW`.
+ *   2. Model 802 `w` (offset 47) — surfaced as `chargePower` / `dischargePower`
+ *      by the Model 802 path of `SunspecModbusClient.readBatteryData`.
+ *   3. `undefined` — no reliable live source on this device.
+ *
+ * The Model 124 path of `readBatteryData` no longer manufactures
+ * `chargePower` / `dischargePower` from `inWRte × wChaMax` (a commanded rate
+ * cap, not a live measurement). So whenever this function sees
+ * `chargePower` / `dischargePower` defined, they came from Model 802.
+ *
+ * Exported as a free function so the preference logic can be unit-tested
+ * without the full `SunspecBattery` scaffold.
+ */
+export declare function selectLiveBatteryPowerW(mpptBatteryPowerW: number | undefined, batteryData: SunspecBatteryData | null): number | undefined;
 export declare function filterFeaturesByCalibrationResult(detected: EnyoBatteryFeature[], result: CalibrationResult | undefined, controllable: readonly EnyoBatteryFeature[]): EnyoBatteryFeature[];
 /**
  * Sunspec Battery implementation
@@ -408,8 +424,6 @@ export declare class SunspecBattery extends BaseSunspecDevice {
      * process restarts. Idempotent.
      */
     private initSnapshotService;
-    private handleStartCalibration;
-    private handleStopCalibration;
     /**
      * `onRestore` callback for the battery's {@link SnapshotService}. Writes only the
      * subset of writable battery fields touched during the calibration. Errors are
@@ -432,13 +446,6 @@ export declare class SunspecMeter extends BaseSunspecDevice {
      * Disconnect from the meter and update appliance state
      */
     disconnect(): Promise<void>;
-    /**
-     * Meter does not implement calibration; it only subscribes to Start/StopCalibrationV1 to
-     * answer NotSupported (per the data-bus contract that every command must be acknowledged).
-     */
-    startDataBusListening(): void;
-    stopDataBusListening(): void;
-    private handleMeterCommand;
     /**
      * Update meter data and return data bus messages
      */

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

@@ -486,7 +486,10 @@ class SunspecModbusClient {
         }
         catch (error) {
             console.debug(`No SunSpec device at unit ${unitId}: ${error}`);
-            console.log(`Discovery complete for unit ${unitId}. Found 0 models: []`);
+            // Discovery summary at line 594 below is the info-level outcome.
+            // This 0-models branch is the same outcome as a normal "no device found",
+            // covered already by the debug above. Keep at debug.
+            console.debug(`Discovery complete for unit ${unitId}. Found 0 models: []`);
             return models;
         }
         currentAddress = addressInfo.nextAddress;
@@ -495,14 +498,14 @@ class SunspecModbusClient {
                 const buffer = await instance.readHoldingRegisters(currentAddress, 2);
                 const modelData = [buffer.readUInt16BE(0), buffer.readUInt16BE(2)];
                 if (!modelData || modelData.length < 2) {
-                    console.log(`No data at address ${currentAddress}, ending discovery`);
+                    console.debug(`No data at address ${currentAddress}, ending discovery`);
                     break;
                 }
                 const modelId = modelData[0];
                 const modelLength = modelData[1];
                 // Check for end marker
                 if (modelId === 0xFFFF || modelId === 65535) {
-                    console.log(`Found end marker at address ${currentAddress}`);
+                    console.debug(`Found end marker at address ${currentAddress}`);
                     break;
                 }
                 // Store discovered model
@@ -512,7 +515,9 @@ class SunspecModbusClient {
                     length: modelLength
                 };
                 models.set(modelId, model);
-                console.log(`Discovered Model ${modelId} at address ${currentAddress} with length ${modelLength} (unit ${unitId})`);
+                // Per-model discovery step. The end-of-discovery summary below is the
+                // info-level outcome; the per-model walk is debug-only.
+                console.debug(`Discovered Model ${modelId} at address ${currentAddress} with length ${modelLength} (unit ${unitId})`);
                 // Jump to next model: current address + 2 (header) + model length
                 currentAddress = currentAddress + 2 + modelLength;
             }
@@ -701,7 +706,9 @@ class SunspecModbusClient {
             // Write to holding registers
             await instance.writeMultipleRegisters(address, registerValues);
             this.connectionHealth.recordSuccess();
-            console.log(`Successfully wrote value ${value} to register ${address} (unit ${unitId})`);
+            // Per-register write success — fires for every parameter inside higher-level
+            // writers (writeBatteryControls / writeInverterControls). Demoted to debug.
+            console.debug(`Successfully wrote value ${value} to register ${address} (unit ${unitId})`);
             return true;
         }
         catch (error) {
@@ -1589,17 +1596,21 @@ class SunspecModbusClient {
                     voltage: this.applyScaleFactor(inBatVRaw, scaleFactors.InBatV_SF, 'uint16'),
                     status: !this.isUnimplementedValue(chaStRaw, 'enum16') ? chaStRaw : undefined
                 };
-                // Calculate charge/discharge power if rates are available
-                if (data.inWRte !== undefined && data.wChaMax !== undefined) {
-                    data.chargePower = (data.inWRte / 100) * data.wChaMax;
-                    console.debug(`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.debug(`Calculated Discharge Power (inWRte: ${data.outWRte}, wChaMax: ${data.wChaMax}): ${data.dischargePower?.toFixed(2)} W`);
-                }
-                console.debug('[Model 124] Battery Data:', data);
+                // chargePower / dischargePower used to be derived from
+                // `(inWRte  / 100) * wChaMax` and `(outWRte / 100) * wChaMax`
+                // here. That formula uses Model 124's COMMANDED RATE CAPS — not
+                // a live measurement — and produces e.g. 5000 W of "charging"
+                // for an idle battery with inWRte = 100 % and a 5 kW nameplate.
+                // Live battery power must come from a real source: Model 160
+                // StCha 3 / StDisCha 4 (see SunspecBattery.extractBatteryPower
+                // FromMPPT) or Model 802 `w` at offset 47 (the Model 802 branch
+                // of this method, just below). Model-124-only devices should
+                // publish "no signal" rather than the commanded cap.
+                // See plans/please-review-the-implementation-groovy-thacker.md.
+                // Single-line JSON debug dump — Node's default formatter would split
+                // the object across many lines; stringify keeps the whole snapshot
+                // on one log entry so it stays grep-able and round-trippable.
+                console.debug(`[Battery] unit=${unitId} model=124 data=${JSON.stringify(data)}`);
                 return data;
             }
             else if (model.id === 802) {
@@ -1636,17 +1647,18 @@ class SunspecModbusClient {
                     chargePower,
                     dischargePower,
                 };
-                console.debug('[Model 802] Battery Data:', result);
+                console.debug(`[Battery] unit=${unitId} model=802 data=${JSON.stringify(result)}`);
                 return result;
             }
             else {
-                // Handle other battery models (803) if needed
-                console.debug(`Battery Model ${model.id} reading not yet implemented`);
-                return {
+                // Handle other battery models (803) if needed.
+                const stub = {
                     blockNumber: model.id,
                     blockAddress: model.address,
-                    blockLength: model.length
+                    blockLength: model.length,
                 };
+                console.debug(`[Battery] unit=${unitId} model=${model.id} (not yet implemented) data=${JSON.stringify(stub)}`);
+                return stub;
             }
         }
         catch (error) {
@@ -1664,7 +1676,11 @@ class SunspecModbusClient {
             return false;
         }
         const baseAddr = model.address;
-        console.log(`Writing Battery Controls to Model 124 at base address: ${baseAddr} (unit ${unitId})`);
+        // Per-register write trace is high-volume (every schedule entry transition fires
+        // a writeBatteryControls). Demoted to debug; consumers that need the trail can
+        // raise their log level. High-level callers (setStorageMode, enableGridCharging,
+        // setFeedInLimit, etc.) still emit one info-level line per action.
+        console.debug(`Writing Battery Controls to Model 124 at base address: ${baseAddr} (unit ${unitId})`);
         try {
             // Write order: source pin and parameter writes land BEFORE the
             // control mode so the device only "starts acting" once every
@@ -1674,7 +1690,7 @@ class SunspecModbusClient {
             // Write charge source setting (Register 17)
             if (controls.chaGriSet !== undefined) {
                 await this.writeRegisterValue(unitId, baseAddr + 17, controls.chaGriSet, 'uint16');
-                console.log(`Set charge source to ${controls.chaGriSet === sunspec_interfaces_js_1.SunspecChargeSource.GRID ? 'GRID' : 'PV'}`);
+                console.debug(`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) {
@@ -1682,7 +1698,7 @@ class SunspecModbusClient {
                 const scaleFactor = await this.readRegisterValue(unitId, scaleFactorAddr, 1, 'int16');
                 const scaledValue = Math.round(controls.wChaMax / Math.pow(10, scaleFactor));
                 await this.writeRegisterValue(unitId, baseAddr + 2, scaledValue, 'uint16');
-                console.log(`Set max charge power to ${controls.wChaMax}W (scaled: ${scaledValue})`);
+                console.debug(`Set max charge power to ${controls.wChaMax}W (scaled: ${scaledValue})`);
             }
             // Write charge rate (Register 13) - needs scale factor
             if (controls.inWRte !== undefined) {
@@ -1690,7 +1706,7 @@ class SunspecModbusClient {
                 const scaleFactor = await this.readRegisterValue(unitId, scaleFactorAddr, 1, 'int16');
                 const scaledValue = Math.round(controls.inWRte / Math.pow(10, scaleFactor));
                 await this.writeRegisterValue(unitId, baseAddr + 13, scaledValue, 'int16');
-                console.log(`Set charge rate to ${controls.inWRte}% (scaled: ${scaledValue})`);
+                console.debug(`Set charge rate to ${controls.inWRte}% (scaled: ${scaledValue})`);
             }
             // Write discharge rate (Register 12) - needs scale factor
             if (controls.outWRte !== undefined) {
@@ -1698,7 +1714,7 @@ class SunspecModbusClient {
                 const scaleFactor = await this.readRegisterValue(unitId, scaleFactorAddr, 1, 'int16');
                 const scaledValue = Math.round(controls.outWRte / Math.pow(10, scaleFactor));
                 await this.writeRegisterValue(unitId, baseAddr + 12, scaledValue, 'int16');
-                console.log(`Set discharge rate to ${controls.outWRte}% (scaled: ${scaledValue})`);
+                console.debug(`Set discharge rate to ${controls.outWRte}% (scaled: ${scaledValue})`);
             }
             // Write minimum reserve percentage (Register 7) - needs scale factor
             if (controls.minRsvPct !== undefined) {
@@ -1706,16 +1722,16 @@ class SunspecModbusClient {
                 const scaleFactor = await this.readRegisterValue(unitId, scaleFactorAddr, 1, 'int16');
                 const scaledValue = Math.round(controls.minRsvPct / Math.pow(10, scaleFactor));
                 await this.writeRegisterValue(unitId, baseAddr + 7, scaledValue, 'uint16');
-                console.log(`Set minimum reserve to ${controls.minRsvPct}% (scaled: ${scaledValue})`);
+                console.debug(`Set minimum reserve to ${controls.minRsvPct}% (scaled: ${scaledValue})`);
             }
             // Storage control mode (Register 5) — written LAST so all
             // governing parameters are already in place when the device
             // transitions into the new mode.
             if (controls.storCtlMod !== undefined) {
                 await this.writeRegisterValue(unitId, baseAddr + 5, controls.storCtlMod, 'uint16');
-                console.log(`Set storage control mode to 0x${controls.storCtlMod.toString(16)}`);
+                console.debug(`Set storage control mode to 0x${controls.storCtlMod.toString(16)}`);
             }
-            console.log('Battery controls written successfully');
+            console.debug('Battery controls written successfully');
             return true;
         }
         catch (error) {
@@ -1766,10 +1782,12 @@ class SunspecModbusClient {
     async readBatteryControls(unitId) {
         const model = this.findModel(unitId, sunspec_interfaces_js_1.SunspecModelId.Battery);
         if (!model) {
-            console.log(`Battery model 124 not found on unit ${unitId}`);
+            // Fires per readBatteryControls attempt — noisy on non-battery units
+            // that go through the same code path. Demoted to debug.
+            console.debug(`Battery model 124 not found on unit ${unitId}`);
             return null;
         }
-        console.log(`Reading Battery Controls from Model 124 at base address: ${model.address} (unit ${unitId})`);
+        console.debug(`Reading Battery Controls from Model 124 at base address: ${model.address} (unit ${unitId})`);
         try {
             // Read entire model block in a single Modbus call
             const buffer = await this.readModelBlock(unitId, model);
@@ -1984,7 +2002,7 @@ class SunspecModbusClient {
             console.debug(`Common block model not found on unit ${unitId}`);
             return null;
         }
-        console.log(`Reading Common Block - Model address: ${model.address} (unit ${unitId})`);
+        console.debug(`Reading Common Block - Model address: ${model.address} (unit ${unitId})`);
         try {
             // Read entire model block in a single Modbus call
             const buffer = await this.readModelBlock(unitId, model);
@@ -2144,7 +2162,8 @@ class SunspecModbusClient {
     async readInverterControls(unitId) {
         const model = this.findModel(unitId, sunspec_interfaces_js_1.SunspecModelId.Controls);
         if (!model) {
-            console.log(`Controls model 123 not found on unit ${unitId}`);
+            // Same trace-only rationale as the Model 124 not-found message above.
+            console.debug(`Controls model 123 not found on unit ${unitId}`);
             return null;
         }
         try {
@@ -2253,17 +2272,17 @@ class SunspecModbusClient {
                 const scaleFactor = sfBuffer.readInt16BE(0);
                 const scaledValue = Math.round(settings.WMax / Math.pow(10, scaleFactor));
                 // Writing registers needs to be implemented in EnergyAppModbusInstance
-                // For now, log the write operation
-                console.log(`Would write value ${scaledValue} to register ${baseAddr}`);
+                // For now, log the (would-be) write operation. Dry-run trace only — debug.
+                console.debug(`Would write value ${scaledValue} to register ${baseAddr}`);
             }
             if (settings.VRef !== undefined) {
                 const sfBuffer = await instance.readHoldingRegisters(baseAddr + 23, 1);
                 const scaleFactor = sfBuffer.readInt16BE(0);
                 const scaledValue = Math.round(settings.VRef / Math.pow(10, scaleFactor));
-                console.log(`Would write value ${scaledValue} to register ${baseAddr + 1}`);
+                console.debug(`Would write value ${scaledValue} to register ${baseAddr + 1}`);
             }
             // Add more write operations for other settings as needed
-            console.log('Inverter settings written successfully');
+            console.debug('Inverter settings written successfully');
             return true;
         }
         catch (error) {
@@ -2282,36 +2301,37 @@ class SunspecModbusClient {
         }
         const baseAddr = model.address;
         try {
-            // Connection control (Register 2)
+            // Per-field inverter-control writes are debug-only; the high-level callers
+            // (`setFeedInLimit`, etc.) still log the action and outcome at info level.
             if (controls.Conn !== undefined) {
                 await this.writeRegisterValue(unitId, baseAddr + 2, controls.Conn, 'uint16');
-                console.log(`Set connection control to ${controls.Conn}`);
+                console.debug(`Set connection control to ${controls.Conn}`);
             }
             // Power limit control (Register 3) - needs scale factor
             if (controls.WMaxLimPct !== undefined) {
                 const scaleFactor = await this.readRegisterValue(unitId, baseAddr + 21, 1, 'int16');
                 const scaledValue = Math.round(controls.WMaxLimPct / Math.pow(10, scaleFactor));
                 await this.writeRegisterValue(unitId, baseAddr + 3, scaledValue, 'uint16');
-                console.log(`Set power limit to ${controls.WMaxLimPct}% (scaled: ${scaledValue})`);
+                console.debug(`Set power limit to ${controls.WMaxLimPct}% (scaled: ${scaledValue})`);
             }
             // Throttle enable/disable (Register 7)
             if (controls.WMaxLim_Ena !== undefined) {
                 await this.writeRegisterValue(unitId, baseAddr + 7, controls.WMaxLim_Ena, 'uint16');
-                console.log(`Set throttle enable to ${controls.WMaxLim_Ena}`);
+                console.debug(`Set throttle enable to ${controls.WMaxLim_Ena}`);
             }
             // Power factor control (Register 8) - needs scale factor
             if (controls.OutPFSet !== undefined) {
                 const scaleFactor = await this.readRegisterValue(unitId, baseAddr + 22, 1, 'int16');
                 const scaledValue = Math.round(controls.OutPFSet / Math.pow(10, scaleFactor));
                 await this.writeRegisterValue(unitId, baseAddr + 8, scaledValue, 'int16');
-                console.log(`Set power factor to ${controls.OutPFSet} (scaled: ${scaledValue})`);
+                console.debug(`Set power factor to ${controls.OutPFSet} (scaled: ${scaledValue})`);
             }
             // Power factor enable/disable (Register 12)
             if (controls.OutPFSet_Ena !== undefined) {
                 await this.writeRegisterValue(unitId, baseAddr + 12, controls.OutPFSet_Ena, 'uint16');
-                console.log(`Set PF enable to ${controls.OutPFSet_Ena}`);
+                console.debug(`Set PF enable to ${controls.OutPFSet_Ena}`);
             }
-            console.log('Inverter controls written successfully');
+            console.debug('Inverter controls written successfully');
             return true;
         }
         catch (error) {

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

package/dist/sunspec-devices.d.ts

@@ -178,8 +178,6 @@ export declare class SunspecInverter extends BaseSunspecDevice {
      * process restarts. Idempotent.
      */
     private initSnapshotService;
-    private handleStartCalibration;
-    private handleStopCalibration;
     /**
      * `onRestore` callback for the inverter's {@link SnapshotService}. Writes only the
      * subset of writable inverter fields that other commands actually touched during the
@@ -217,6 +215,24 @@ export declare function detectFeaturesFromRegisters(batteryData: SunspecBatteryD
  *   the full detected set to preserve the old all-or-nothing semantics on
  *   upgrade.
  */
+/**
+ * Pick the live battery power, in preference order:
+ *
+ *   1. Model 160 (MPPT) `StCha 3` / `StDisCha 4` — direct DC-link reading,
+ *      passed in as the already-summed `mpptBatteryPowerW`.
+ *   2. Model 802 `w` (offset 47) — surfaced as `chargePower` / `dischargePower`
+ *      by the Model 802 path of `SunspecModbusClient.readBatteryData`.
+ *   3. `undefined` — no reliable live source on this device.
+ *
+ * The Model 124 path of `readBatteryData` no longer manufactures
+ * `chargePower` / `dischargePower` from `inWRte × wChaMax` (a commanded rate
+ * cap, not a live measurement). So whenever this function sees
+ * `chargePower` / `dischargePower` defined, they came from Model 802.
+ *
+ * Exported as a free function so the preference logic can be unit-tested
+ * without the full `SunspecBattery` scaffold.
+ */
+export declare function selectLiveBatteryPowerW(mpptBatteryPowerW: number | undefined, batteryData: SunspecBatteryData | null): number | undefined;
 export declare function filterFeaturesByCalibrationResult(detected: EnyoBatteryFeature[], result: CalibrationResult | undefined, controllable: readonly EnyoBatteryFeature[]): EnyoBatteryFeature[];
 /**
  * Sunspec Battery implementation
@@ -408,8 +424,6 @@ export declare class SunspecBattery extends BaseSunspecDevice {
      * process restarts. Idempotent.
      */
     private initSnapshotService;
-    private handleStartCalibration;
-    private handleStopCalibration;
     /**
      * `onRestore` callback for the battery's {@link SnapshotService}. Writes only the
      * subset of writable battery fields touched during the calibration. Errors are
@@ -432,13 +446,6 @@ export declare class SunspecMeter extends BaseSunspecDevice {
      * Disconnect from the meter and update appliance state
      */
     disconnect(): Promise<void>;
-    /**
-     * Meter does not implement calibration; it only subscribes to Start/StopCalibrationV1 to
-     * answer NotSupported (per the data-bus contract that every command must be acknowledged).
-     */
-    startDataBusListening(): void;
-    stopDataBusListening(): void;
-    private handleMeterCommand;
     /**
      * Update meter data and return data bus messages
      */

package/dist/sunspec-devices.js

@@ -705,8 +705,6 @@ export class SunspecInverter extends BaseSunspecDevice {
         this.dataBus = this.energyApp.useDataBus();
         this.dataBusListenerId = this.dataBus.listenForMessages([
             EnyoDataBusMessageEnum.SetInverterFeedInLimitV1,
-            EnyoDataBusMessageEnum.StartCalibrationV1,
-            EnyoDataBusMessageEnum.StopCalibrationV1,
         ], (entry) => this.handleInverterCommand(entry));
         console.log(`Inverter ${this.applianceId}: started data bus listening (listener ${this.dataBusListenerId})`);
     }
@@ -731,12 +729,6 @@ export class SunspecInverter extends BaseSunspecDevice {
                     case EnyoDataBusMessageEnum.SetInverterFeedInLimitV1:
                         await this.handleSetFeedInLimit(entry);
                         break;
-                    case EnyoDataBusMessageEnum.StartCalibrationV1:
-                        await this.handleStartCalibration(entry);
-                        break;
-                    case EnyoDataBusMessageEnum.StopCalibrationV1:
-                        await this.handleStopCalibration(entry);
-                        break;
                 }
             }
             catch (error) {
@@ -782,51 +774,6 @@ export class SunspecInverter extends BaseSunspecDevice {
         await this.snapshotService.initialize();
         console.log(`Inverter ${this.applianceId}: snapshot service initialized`);
     }
-    async handleStartCalibration(msg) {
-        if (!this.isConnected() || !this.applianceId) {
-            this.sendCommandAcknowledge(msg.id, msg.message, EnyoCommandAcknowledgeAnswerEnum.Rejected, 'Not connected');
-            return;
-        }
-        if (!this.snapshotService) {
-            await this.initSnapshotService();
-        }
-        if (!this.snapshotService) {
-            this.sendCommandAcknowledge(msg.id, msg.message, EnyoCommandAcknowledgeAnswerEnum.Rejected, 'Snapshot service unavailable');
-            return;
-        }
-        if (this.snapshotService.isCalibrating()) {
-            console.log(`Inverter ${this.applianceId}: calibration already active — ack idempotently`);
-            this.sendCommandAcknowledge(msg.id, msg.message, EnyoCommandAcknowledgeAnswerEnum.Accepted);
-            return;
-        }
-        console.log(`Inverter ${this.applianceId}: handling StartCalibrationV1`);
-        const controls = await this.sunspecClient.readInverterControls(this.unitId);
-        if (!controls) {
-            this.sendCommandAcknowledge(msg.id, msg.message, EnyoCommandAcknowledgeAnswerEnum.Rejected, 'Failed to read inverter controls for snapshot');
-            return;
-        }
-        try {
-            await this.snapshotService.startCalibration(controls);
-        }
-        catch (error) {
-            this.sendCommandAcknowledge(msg.id, msg.message, EnyoCommandAcknowledgeAnswerEnum.Rejected, `Failed to persist snapshot: ${error}`);
-            return;
-        }
-        this.sendCommandAcknowledge(msg.id, msg.message, EnyoCommandAcknowledgeAnswerEnum.Accepted);
-    }
-    async handleStopCalibration(msg) {
-        if (!this.applianceId) {
-            this.sendCommandAcknowledge(msg.id, msg.message, EnyoCommandAcknowledgeAnswerEnum.Rejected, 'Not initialized');
-            return;
-        }
-        console.log(`Inverter ${this.applianceId}: handling StopCalibrationV1`);
-        // SnapshotService.stopCalibration fires `restoreInverterSnapshot` internally with
-        // reason="stop" before returning. Any restore failure is logged by the callback
-        // (the persisted snapshot is already gone by then — see library notes) so we
-        // always ack Accepted from here.
-        await this.snapshotService?.stopCalibration();
-        this.sendCommandAcknowledge(msg.id, msg.message, EnyoCommandAcknowledgeAnswerEnum.Accepted);
-    }
     /**
      * `onRestore` callback for the inverter's {@link SnapshotService}. Writes only the
      * subset of writable inverter fields that other commands actually touched during the
@@ -898,6 +845,35 @@ export function detectFeaturesFromRegisters(batteryData) {
  *   the full detected set to preserve the old all-or-nothing semantics on
  *   upgrade.
  */
+/**
+ * Pick the live battery power, in preference order:
+ *
+ *   1. Model 160 (MPPT) `StCha 3` / `StDisCha 4` — direct DC-link reading,
+ *      passed in as the already-summed `mpptBatteryPowerW`.
+ *   2. Model 802 `w` (offset 47) — surfaced as `chargePower` / `dischargePower`
+ *      by the Model 802 path of `SunspecModbusClient.readBatteryData`.
+ *   3. `undefined` — no reliable live source on this device.
+ *
+ * The Model 124 path of `readBatteryData` no longer manufactures
+ * `chargePower` / `dischargePower` from `inWRte × wChaMax` (a commanded rate
+ * cap, not a live measurement). So whenever this function sees
+ * `chargePower` / `dischargePower` defined, they came from Model 802.
+ *
+ * Exported as a free function so the preference logic can be unit-tested
+ * without the full `SunspecBattery` scaffold.
+ */
+export function selectLiveBatteryPowerW(mpptBatteryPowerW, batteryData) {
+    if (mpptBatteryPowerW !== undefined) {
+        return mpptBatteryPowerW;
+    }
+    if (!batteryData) {
+        return undefined;
+    }
+    if (batteryData.chargePower === undefined && batteryData.dischargePower === undefined) {
+        return undefined;
+    }
+    return (batteryData.chargePower ?? 0) - (batteryData.dischargePower ?? 0);
+}
 export function filterFeaturesByCalibrationResult(detected, result, controllable) {
     if (!result || result.state !== 'calibrated') {
         return detected.filter(f => !controllable.includes(f));
@@ -1161,17 +1137,8 @@ export class SunspecBattery extends BaseSunspecDevice {
                 return messages;
             }
             if (batteryData) {
-                const advancedBatteryModel = this.sunspecClient.findModel(this.unitId, 801);
-                const batteryBaseModel = this.sunspecClient.findModel(this.unitId, SunspecModelId.BatteryBase);
-                // Determine battery power: prefer model 802 w field, then MPPT extraction, then undefined
-                let batteryPowerW;
-                if (batteryBaseModel && (batteryData.chargePower !== undefined || batteryData.dischargePower !== undefined)) {
-                    // Model 802 provides power directly: positive = charge, negative = discharge
-                    batteryPowerW = (batteryData.chargePower || 0) - (batteryData.dischargePower || 0);
-                }
-                else if (!advancedBatteryModel) {
-                    batteryPowerW = mpptBatteryPowerW;
-                }
+                // See `selectLiveBatteryPowerW` for the source-preference rationale.
+                const batteryPowerW = selectLiveBatteryPowerW(mpptBatteryPowerW, batteryData);
                 // Feed the calibration driver's synchronous power cache. No-op when calibration
                 // was never configured.
                 if (batteryPowerW !== undefined && this.calibrationDriver) {
@@ -1364,7 +1331,10 @@ export class SunspecBattery extends BaseSunspecDevice {
             console.error('Battery not connected');
             return false;
         }
-        console.log('Writing battery controls:', controls);
+        // Redundant with the modbus client's own per-write debug trace. Keep at debug
+        // so the high-level info logs (setStorageMode / enableGridCharging / etc.) stay
+        // the only info-level signal per battery-control action.
+        console.debug('Writing battery controls:', controls);
         return this.sunspecClient.writeBatteryControls(this.unitId, controls);
     }
     mapToEnyoStorageMode(storageMode) {
@@ -1462,8 +1432,6 @@ export class SunspecBattery extends BaseSunspecDevice {
         this.dataBus = this.energyApp.useDataBus();
         this.dataBusListenerId = this.dataBus.listenForMessages([
             EnyoDataBusMessageEnum.SetStorageScheduleV1,
-            EnyoDataBusMessageEnum.StartCalibrationV1,
-            EnyoDataBusMessageEnum.StopCalibrationV1,
         ], (entry) => this.handleStorageCommand(entry));
         if (!this.applianceId) {
             throw new Error("SunspecBattery.startDataBusListening: applianceId required — call connect() first.");
@@ -1502,12 +1470,6 @@ export class SunspecBattery extends BaseSunspecDevice {
                     case EnyoDataBusMessageEnum.SetStorageScheduleV1:
                         this.handleSetStorageScheduleAck(entry);
                         break;
-                    case EnyoDataBusMessageEnum.StartCalibrationV1:
-                        await this.handleStartCalibration(entry);
-                        break;
-                    case EnyoDataBusMessageEnum.StopCalibrationV1:
-                        await this.handleStopCalibration(entry);
-                        break;
                 }
             }
             catch (error) {
@@ -1547,51 +1509,6 @@ export class SunspecBattery extends BaseSunspecDevice {
         await this.snapshotService.initialize();
         console.log(`Battery ${this.applianceId}: snapshot service initialized`);
     }
-    async handleStartCalibration(msg) {
-        if (!this.isConnected() || !this.applianceId) {
-            this.sendCommandAcknowledge(msg.id, msg.message, EnyoCommandAcknowledgeAnswerEnum.Rejected, 'Not connected');
-            return;
-        }
-        if (!this.snapshotService) {
-            await this.initSnapshotService();
-        }
-        if (!this.snapshotService) {
-            this.sendCommandAcknowledge(msg.id, msg.message, EnyoCommandAcknowledgeAnswerEnum.Rejected, 'Snapshot service unavailable');
-            return;
-        }
-        if (this.snapshotService.isCalibrating()) {
-            console.log(`Battery ${this.applianceId}: calibration already active — ack idempotently`);
-            this.sendCommandAcknowledge(msg.id, msg.message, EnyoCommandAcknowledgeAnswerEnum.Accepted);
-            return;
-        }
-        console.log(`Battery ${this.applianceId}: handling StartCalibrationV1`);
-        const controls = await this.sunspecClient.readBatteryControls(this.unitId);
-        if (!controls) {
-            this.sendCommandAcknowledge(msg.id, msg.message, EnyoCommandAcknowledgeAnswerEnum.Rejected, 'Failed to read battery controls for snapshot');
-            return;
-        }
-        try {
-            await this.snapshotService.startCalibration(controls);
-        }
-        catch (error) {
-            this.sendCommandAcknowledge(msg.id, msg.message, EnyoCommandAcknowledgeAnswerEnum.Rejected, `Failed to persist snapshot: ${error}`);
-            return;
-        }
-        this.sendCommandAcknowledge(msg.id, msg.message, EnyoCommandAcknowledgeAnswerEnum.Accepted);
-    }
-    async handleStopCalibration(msg) {
-        if (!this.applianceId) {
-            this.sendCommandAcknowledge(msg.id, msg.message, EnyoCommandAcknowledgeAnswerEnum.Rejected, 'Not initialized');
-            return;
-        }
-        console.log(`Battery ${this.applianceId}: handling StopCalibrationV1`);
-        // SnapshotService.stopCalibration fires `restoreBatterySnapshot` internally
-        // with reason="stop" before returning. Failures from the restore callback are
-        // logged inside the callback (the persisted snapshot is already gone — see
-        // library notes) so we always ack Accepted here.
-        await this.snapshotService?.stopCalibration();
-        this.sendCommandAcknowledge(msg.id, msg.message, EnyoCommandAcknowledgeAnswerEnum.Accepted);
-    }
     /**
      * `onRestore` callback for the battery's {@link SnapshotService}. Writes only the
      * subset of writable battery fields touched during the calibration. Errors are
@@ -1696,13 +1613,11 @@ export class SunspecMeter extends BaseSunspecDevice {
                 console.error(`Failed to update meter appliance: ${error}`);
             }
         }
-        this.startDataBusListening();
     }
     /**
      * Disconnect from the meter and update appliance state
      */
     async disconnect() {
-        this.stopDataBusListening();
         if (this.applianceId) {
             try {
                 await this.applianceManager.updateApplianceState(this.applianceId, EnyoApplianceConnectionType.Connector, EnyoApplianceStateEnum.Offline);
@@ -1714,35 +1629,6 @@ export class SunspecMeter extends BaseSunspecDevice {
         // Close just this meter's unit; other devices on the same network device stay open.
         await this.sunspecClient.disconnectUnit(this.unitId);
     }
-    /**
-     * Meter does not implement calibration; it only subscribes to Start/StopCalibrationV1 to
-     * answer NotSupported (per the data-bus contract that every command must be acknowledged).
-     */
-    startDataBusListening() {
-        if (this.dataBusListenerId) {
-            return;
-        }
-        this.dataBus = this.energyApp.useDataBus();
-        this.dataBusListenerId = this.dataBus.listenForMessages([
-            EnyoDataBusMessageEnum.StartCalibrationV1,
-            EnyoDataBusMessageEnum.StopCalibrationV1,
-        ], (entry) => this.handleMeterCommand(entry));
-        console.log(`Meter ${this.applianceId}: started data bus listening (listener ${this.dataBusListenerId})`);
-    }
-    stopDataBusListening() {
-        if (this.dataBusListenerId && this.dataBus) {
-            this.dataBus.unsubscribe(this.dataBusListenerId);
-            console.log(`Meter ${this.applianceId}: stopped data bus listening (listener ${this.dataBusListenerId})`);
-        }
-        this.dataBusListenerId = undefined;
-        this.dataBus = undefined;
-    }
-    handleMeterCommand(entry) {
-        if (entry.applianceId !== this.applianceId) {
-            return;
-        }
-        this.sendCommandAcknowledge(entry.id, entry.message, EnyoCommandAcknowledgeAnswerEnum.NotSupported, 'Meter does not support calibration');
-    }
     /**
      * Update meter data and return data bus messages
      */

package/dist/sunspec-modbus-client.js

@@ -481,7 +481,10 @@ export class SunspecModbusClient {
         }
         catch (error) {
             console.debug(`No SunSpec device at unit ${unitId}: ${error}`);
-            console.log(`Discovery complete for unit ${unitId}. Found 0 models: []`);
+            // Discovery summary at line 594 below is the info-level outcome.
+            // This 0-models branch is the same outcome as a normal "no device found",
+            // covered already by the debug above. Keep at debug.
+            console.debug(`Discovery complete for unit ${unitId}. Found 0 models: []`);
             return models;
         }
         currentAddress = addressInfo.nextAddress;
@@ -490,14 +493,14 @@ export class SunspecModbusClient {
                 const buffer = await instance.readHoldingRegisters(currentAddress, 2);
                 const modelData = [buffer.readUInt16BE(0), buffer.readUInt16BE(2)];
                 if (!modelData || modelData.length < 2) {
-                    console.log(`No data at address ${currentAddress}, ending discovery`);
+                    console.debug(`No data at address ${currentAddress}, ending discovery`);
                     break;
                 }
                 const modelId = modelData[0];
                 const modelLength = modelData[1];
                 // Check for end marker
                 if (modelId === 0xFFFF || modelId === 65535) {
-                    console.log(`Found end marker at address ${currentAddress}`);
+                    console.debug(`Found end marker at address ${currentAddress}`);
                     break;
                 }
                 // Store discovered model
@@ -507,7 +510,9 @@ export class SunspecModbusClient {
                     length: modelLength
                 };
                 models.set(modelId, model);
-                console.log(`Discovered Model ${modelId} at address ${currentAddress} with length ${modelLength} (unit ${unitId})`);
+                // Per-model discovery step. The end-of-discovery summary below is the
+                // info-level outcome; the per-model walk is debug-only.
+                console.debug(`Discovered Model ${modelId} at address ${currentAddress} with length ${modelLength} (unit ${unitId})`);
                 // Jump to next model: current address + 2 (header) + model length
                 currentAddress = currentAddress + 2 + modelLength;
             }
@@ -696,7 +701,9 @@ export class SunspecModbusClient {
             // Write to holding registers
             await instance.writeMultipleRegisters(address, registerValues);
             this.connectionHealth.recordSuccess();
-            console.log(`Successfully wrote value ${value} to register ${address} (unit ${unitId})`);
+            // Per-register write success — fires for every parameter inside higher-level
+            // writers (writeBatteryControls / writeInverterControls). Demoted to debug.
+            console.debug(`Successfully wrote value ${value} to register ${address} (unit ${unitId})`);
             return true;
         }
         catch (error) {
@@ -1584,17 +1591,21 @@ export class SunspecModbusClient {
                     voltage: this.applyScaleFactor(inBatVRaw, scaleFactors.InBatV_SF, 'uint16'),
                     status: !this.isUnimplementedValue(chaStRaw, 'enum16') ? chaStRaw : undefined
                 };
-                // Calculate charge/discharge power if rates are available
-                if (data.inWRte !== undefined && data.wChaMax !== undefined) {
-                    data.chargePower = (data.inWRte / 100) * data.wChaMax;
-                    console.debug(`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.debug(`Calculated Discharge Power (inWRte: ${data.outWRte}, wChaMax: ${data.wChaMax}): ${data.dischargePower?.toFixed(2)} W`);
-                }
-                console.debug('[Model 124] Battery Data:', data);
+                // chargePower / dischargePower used to be derived from
+                // `(inWRte  / 100) * wChaMax` and `(outWRte / 100) * wChaMax`
+                // here. That formula uses Model 124's COMMANDED RATE CAPS — not
+                // a live measurement — and produces e.g. 5000 W of "charging"
+                // for an idle battery with inWRte = 100 % and a 5 kW nameplate.
+                // Live battery power must come from a real source: Model 160
+                // StCha 3 / StDisCha 4 (see SunspecBattery.extractBatteryPower
+                // FromMPPT) or Model 802 `w` at offset 47 (the Model 802 branch
+                // of this method, just below). Model-124-only devices should
+                // publish "no signal" rather than the commanded cap.
+                // See plans/please-review-the-implementation-groovy-thacker.md.
+                // Single-line JSON debug dump — Node's default formatter would split
+                // the object across many lines; stringify keeps the whole snapshot
+                // on one log entry so it stays grep-able and round-trippable.
+                console.debug(`[Battery] unit=${unitId} model=124 data=${JSON.stringify(data)}`);
                 return data;
             }
             else if (model.id === 802) {
@@ -1631,17 +1642,18 @@ export class SunspecModbusClient {
                     chargePower,
                     dischargePower,
                 };
-                console.debug('[Model 802] Battery Data:', result);
+                console.debug(`[Battery] unit=${unitId} model=802 data=${JSON.stringify(result)}`);
                 return result;
             }
             else {
-                // Handle other battery models (803) if needed
-                console.debug(`Battery Model ${model.id} reading not yet implemented`);
-                return {
+                // Handle other battery models (803) if needed.
+                const stub = {
                     blockNumber: model.id,
                     blockAddress: model.address,
-                    blockLength: model.length
+                    blockLength: model.length,
                 };
+                console.debug(`[Battery] unit=${unitId} model=${model.id} (not yet implemented) data=${JSON.stringify(stub)}`);
+                return stub;
             }
         }
         catch (error) {
@@ -1659,7 +1671,11 @@ export class SunspecModbusClient {
             return false;
         }
         const baseAddr = model.address;
-        console.log(`Writing Battery Controls to Model 124 at base address: ${baseAddr} (unit ${unitId})`);
+        // Per-register write trace is high-volume (every schedule entry transition fires
+        // a writeBatteryControls). Demoted to debug; consumers that need the trail can
+        // raise their log level. High-level callers (setStorageMode, enableGridCharging,
+        // setFeedInLimit, etc.) still emit one info-level line per action.
+        console.debug(`Writing Battery Controls to Model 124 at base address: ${baseAddr} (unit ${unitId})`);
         try {
             // Write order: source pin and parameter writes land BEFORE the
             // control mode so the device only "starts acting" once every
@@ -1669,7 +1685,7 @@ export class SunspecModbusClient {
             // Write charge source setting (Register 17)
             if (controls.chaGriSet !== undefined) {
                 await this.writeRegisterValue(unitId, baseAddr + 17, controls.chaGriSet, 'uint16');
-                console.log(`Set charge source to ${controls.chaGriSet === SunspecChargeSource.GRID ? 'GRID' : 'PV'}`);
+                console.debug(`Set charge source to ${controls.chaGriSet === SunspecChargeSource.GRID ? 'GRID' : 'PV'}`);
             }
             // Write maximum charge power (Register 2) - needs scale factor
             if (controls.wChaMax !== undefined) {
@@ -1677,7 +1693,7 @@ export class SunspecModbusClient {
                 const scaleFactor = await this.readRegisterValue(unitId, scaleFactorAddr, 1, 'int16');
                 const scaledValue = Math.round(controls.wChaMax / Math.pow(10, scaleFactor));
                 await this.writeRegisterValue(unitId, baseAddr + 2, scaledValue, 'uint16');
-                console.log(`Set max charge power to ${controls.wChaMax}W (scaled: ${scaledValue})`);
+                console.debug(`Set max charge power to ${controls.wChaMax}W (scaled: ${scaledValue})`);
             }
             // Write charge rate (Register 13) - needs scale factor
             if (controls.inWRte !== undefined) {
@@ -1685,7 +1701,7 @@ export class SunspecModbusClient {
                 const scaleFactor = await this.readRegisterValue(unitId, scaleFactorAddr, 1, 'int16');
                 const scaledValue = Math.round(controls.inWRte / Math.pow(10, scaleFactor));
                 await this.writeRegisterValue(unitId, baseAddr + 13, scaledValue, 'int16');
-                console.log(`Set charge rate to ${controls.inWRte}% (scaled: ${scaledValue})`);
+                console.debug(`Set charge rate to ${controls.inWRte}% (scaled: ${scaledValue})`);
             }
             // Write discharge rate (Register 12) - needs scale factor
             if (controls.outWRte !== undefined) {
@@ -1693,7 +1709,7 @@ export class SunspecModbusClient {
                 const scaleFactor = await this.readRegisterValue(unitId, scaleFactorAddr, 1, 'int16');
                 const scaledValue = Math.round(controls.outWRte / Math.pow(10, scaleFactor));
                 await this.writeRegisterValue(unitId, baseAddr + 12, scaledValue, 'int16');
-                console.log(`Set discharge rate to ${controls.outWRte}% (scaled: ${scaledValue})`);
+                console.debug(`Set discharge rate to ${controls.outWRte}% (scaled: ${scaledValue})`);
             }
             // Write minimum reserve percentage (Register 7) - needs scale factor
             if (controls.minRsvPct !== undefined) {
@@ -1701,16 +1717,16 @@ export class SunspecModbusClient {
                 const scaleFactor = await this.readRegisterValue(unitId, scaleFactorAddr, 1, 'int16');
                 const scaledValue = Math.round(controls.minRsvPct / Math.pow(10, scaleFactor));
                 await this.writeRegisterValue(unitId, baseAddr + 7, scaledValue, 'uint16');
-                console.log(`Set minimum reserve to ${controls.minRsvPct}% (scaled: ${scaledValue})`);
+                console.debug(`Set minimum reserve to ${controls.minRsvPct}% (scaled: ${scaledValue})`);
             }
             // Storage control mode (Register 5) — written LAST so all
             // governing parameters are already in place when the device
             // transitions into the new mode.
             if (controls.storCtlMod !== undefined) {
                 await this.writeRegisterValue(unitId, baseAddr + 5, controls.storCtlMod, 'uint16');
-                console.log(`Set storage control mode to 0x${controls.storCtlMod.toString(16)}`);
+                console.debug(`Set storage control mode to 0x${controls.storCtlMod.toString(16)}`);
             }
-            console.log('Battery controls written successfully');
+            console.debug('Battery controls written successfully');
             return true;
         }
         catch (error) {
@@ -1761,10 +1777,12 @@ export class SunspecModbusClient {
     async readBatteryControls(unitId) {
         const model = this.findModel(unitId, SunspecModelId.Battery);
         if (!model) {
-            console.log(`Battery model 124 not found on unit ${unitId}`);
+            // Fires per readBatteryControls attempt — noisy on non-battery units
+            // that go through the same code path. Demoted to debug.
+            console.debug(`Battery model 124 not found on unit ${unitId}`);
             return null;
         }
-        console.log(`Reading Battery Controls from Model 124 at base address: ${model.address} (unit ${unitId})`);
+        console.debug(`Reading Battery Controls from Model 124 at base address: ${model.address} (unit ${unitId})`);
         try {
             // Read entire model block in a single Modbus call
             const buffer = await this.readModelBlock(unitId, model);
@@ -1979,7 +1997,7 @@ export class SunspecModbusClient {
             console.debug(`Common block model not found on unit ${unitId}`);
             return null;
         }
-        console.log(`Reading Common Block - Model address: ${model.address} (unit ${unitId})`);
+        console.debug(`Reading Common Block - Model address: ${model.address} (unit ${unitId})`);
         try {
             // Read entire model block in a single Modbus call
             const buffer = await this.readModelBlock(unitId, model);
@@ -2139,7 +2157,8 @@ export class SunspecModbusClient {
     async readInverterControls(unitId) {
         const model = this.findModel(unitId, SunspecModelId.Controls);
         if (!model) {
-            console.log(`Controls model 123 not found on unit ${unitId}`);
+            // Same trace-only rationale as the Model 124 not-found message above.
+            console.debug(`Controls model 123 not found on unit ${unitId}`);
             return null;
         }
         try {
@@ -2248,17 +2267,17 @@ export class SunspecModbusClient {
                 const scaleFactor = sfBuffer.readInt16BE(0);
                 const scaledValue = Math.round(settings.WMax / Math.pow(10, scaleFactor));
                 // Writing registers needs to be implemented in EnergyAppModbusInstance
-                // For now, log the write operation
-                console.log(`Would write value ${scaledValue} to register ${baseAddr}`);
+                // For now, log the (would-be) write operation. Dry-run trace only — debug.
+                console.debug(`Would write value ${scaledValue} to register ${baseAddr}`);
             }
             if (settings.VRef !== undefined) {
                 const sfBuffer = await instance.readHoldingRegisters(baseAddr + 23, 1);
                 const scaleFactor = sfBuffer.readInt16BE(0);
                 const scaledValue = Math.round(settings.VRef / Math.pow(10, scaleFactor));
-                console.log(`Would write value ${scaledValue} to register ${baseAddr + 1}`);
+                console.debug(`Would write value ${scaledValue} to register ${baseAddr + 1}`);
             }
             // Add more write operations for other settings as needed
-            console.log('Inverter settings written successfully');
+            console.debug('Inverter settings written successfully');
             return true;
         }
         catch (error) {
@@ -2277,36 +2296,37 @@ export class SunspecModbusClient {
         }
         const baseAddr = model.address;
         try {
-            // Connection control (Register 2)
+            // Per-field inverter-control writes are debug-only; the high-level callers
+            // (`setFeedInLimit`, etc.) still log the action and outcome at info level.
             if (controls.Conn !== undefined) {
                 await this.writeRegisterValue(unitId, baseAddr + 2, controls.Conn, 'uint16');
-                console.log(`Set connection control to ${controls.Conn}`);
+                console.debug(`Set connection control to ${controls.Conn}`);
             }
             // Power limit control (Register 3) - needs scale factor
             if (controls.WMaxLimPct !== undefined) {
                 const scaleFactor = await this.readRegisterValue(unitId, baseAddr + 21, 1, 'int16');
                 const scaledValue = Math.round(controls.WMaxLimPct / Math.pow(10, scaleFactor));
                 await this.writeRegisterValue(unitId, baseAddr + 3, scaledValue, 'uint16');
-                console.log(`Set power limit to ${controls.WMaxLimPct}% (scaled: ${scaledValue})`);
+                console.debug(`Set power limit to ${controls.WMaxLimPct}% (scaled: ${scaledValue})`);
             }
             // Throttle enable/disable (Register 7)
             if (controls.WMaxLim_Ena !== undefined) {
                 await this.writeRegisterValue(unitId, baseAddr + 7, controls.WMaxLim_Ena, 'uint16');
-                console.log(`Set throttle enable to ${controls.WMaxLim_Ena}`);
+                console.debug(`Set throttle enable to ${controls.WMaxLim_Ena}`);
             }
             // Power factor control (Register 8) - needs scale factor
             if (controls.OutPFSet !== undefined) {
                 const scaleFactor = await this.readRegisterValue(unitId, baseAddr + 22, 1, 'int16');
                 const scaledValue = Math.round(controls.OutPFSet / Math.pow(10, scaleFactor));
                 await this.writeRegisterValue(unitId, baseAddr + 8, scaledValue, 'int16');
-                console.log(`Set power factor to ${controls.OutPFSet} (scaled: ${scaledValue})`);
+                console.debug(`Set power factor to ${controls.OutPFSet} (scaled: ${scaledValue})`);
             }
             // Power factor enable/disable (Register 12)
             if (controls.OutPFSet_Ena !== undefined) {
                 await this.writeRegisterValue(unitId, baseAddr + 12, controls.OutPFSet_Ena, 'uint16');
-                console.log(`Set PF enable to ${controls.OutPFSet_Ena}`);
+                console.debug(`Set PF enable to ${controls.OutPFSet_Ena}`);
             }
-            console.log('Inverter controls written successfully');
+            console.debug('Inverter controls written successfully');
             return true;
         }
         catch (error) {

package/dist/version.d.ts

@@ -5,7 +5,7 @@
 /**
  * Current version of the enyo Energy App SDK.
  */
-export declare const SDK_VERSION = "0.0.74";
+export declare const SDK_VERSION = "0.0.76";
 /**
  * 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.74';
+export const SDK_VERSION = '0.0.76';
 /**
  * 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.74",
+  "version": "0.0.76",
   "description": "enyo Energy Sunspec SDK",
   "type": "module",
   "main": "dist/index.js",
@@ -41,7 +41,7 @@
   },
   "dependencies": {
     "@enyo-energy/appliance-calibration": "0.0.2",
-    "@enyo-energy/energy-app-sdk": "0.0.143"
+    "@enyo-energy/energy-app-sdk": "0.0.144"
   },
   "volta": {
     "node": "22.17.0"