@enyo-energy/sunspec-sdk 0.0.52 → 0.0.54

package/dist/cjs/sunspec-interfaces.cjs

@@ -20,6 +20,9 @@ var SunspecModelId;
     SunspecModelId[SunspecModelId["Common"] = 1] = "Common";
     SunspecModelId[SunspecModelId["Inverter3Phase"] = 103] = "Inverter3Phase";
     SunspecModelId[SunspecModelId["InverterSinglePhase"] = 101] = "InverterSinglePhase";
+    SunspecModelId[SunspecModelId["InverterSinglePhaseFloat"] = 111] = "InverterSinglePhaseFloat";
+    SunspecModelId[SunspecModelId["InverterSplitPhaseFloat"] = 112] = "InverterSplitPhaseFloat";
+    SunspecModelId[SunspecModelId["Inverter3PhaseFloat"] = 113] = "Inverter3PhaseFloat";
     SunspecModelId[SunspecModelId["MPPT"] = 160] = "MPPT";
     SunspecModelId[SunspecModelId["Battery"] = 124] = "Battery";
     SunspecModelId[SunspecModelId["BatteryBase"] = 802] = "BatteryBase";

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

@@ -30,6 +30,9 @@ export declare enum SunspecModelId {
     Common = 1,
     Inverter3Phase = 103,
     InverterSinglePhase = 101,
+    InverterSinglePhaseFloat = 111,
+    InverterSplitPhaseFloat = 112,
+    Inverter3PhaseFloat = 113,
     MPPT = 160,
     Battery = 124,
     BatteryBase = 802,
@@ -74,10 +77,12 @@ export interface SunspecCommonBlock extends SunspecBlock {
     deviceAddress?: number;
 }
 /**
- * Inverter data structure based on Model 103
+ * Inverter data structure. Covers SunSpec int+SF inverter models 101/103 and float variants 111/112/113.
+ * The per-field offset comments below describe the int+SF (101/103) layout; float variants 111/112/113
+ * use 32-bit IEEE 754 float values at different offsets — see the float reader implementations.
  */
 export interface SunspecInverterData extends SunspecBlock {
-    blockNumber: 103 | 101;
+    blockNumber: 103 | 101 | 113 | 112 | 111;
     acCurrent?: number;
     phaseACurrent?: number;
     phaseBCurrent?: number;

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

@@ -504,7 +504,7 @@ class SunspecModbusClient {
         catch (error) {
             console.error(`Error during model discovery at address ${currentAddress} (unit ${unitId}): ${error}`);
         }
-        console.log(`Discovery complete for unit ${unitId}. Found ${models.size} models`);
+        console.log(`Discovery complete for unit ${unitId}. Found ${models.size} models: [${[...models.keys()].sort((a, b) => a - b).join(', ')}]`);
         return models;
     }
     /**
@@ -686,28 +686,36 @@ class SunspecModbusClient {
         }
     }
     /**
-     * Read inverter data from Model 101 (Single Phase) / Model 103 (Three Phase)
+     * Read inverter data. Detects which SunSpec inverter model the device exposes —
+     * int+SF (101/103) or float (111/112/113) — by checking the discovered model directory,
+     * and dispatches to the appropriate decoder.
      */
     async readInverterData(unitId) {
-        const model = this.findModel(unitId, sunspec_interfaces_js_1.SunspecModelId.Inverter3Phase);
-        if (!model) {
-            console.debug(`Inverter model 103 not found on unit ${unitId}, trying single phase model 101`);
-            const singlePhaseModel = this.findModel(unitId, sunspec_interfaces_js_1.SunspecModelId.InverterSinglePhase);
-            if (!singlePhaseModel) {
-                console.error(`No inverter model found on unit ${unitId}`);
-                return null;
+        const tryOrder = [
+            { id: 103, reader: m => this.readThreePhaseInverterData_IntSF(unitId, m) },
+            { id: 113, reader: m => this.readFloatInverterData(unitId, m, 113) },
+            { id: 112, reader: m => this.readFloatInverterData(unitId, m, 112) },
+            { id: 101, reader: m => this.readSinglePhaseInverterData(unitId, m) },
+            { id: 111, reader: m => this.readFloatInverterData(unitId, m, 111) },
+        ];
+        for (const { id, reader } of tryOrder) {
+            const model = this.findModel(unitId, id);
+            if (model) {
+                console.debug(`Using inverter Model ${id} at address ${model.address} (length ${model.length}) on unit ${unitId}`);
+                return reader(model);
             }
-            console.warn('IMPORTANT: Working with single-phase inverter, but 3-phase is expected!');
-            return this.readSinglePhaseInverterData(unitId, singlePhaseModel);
         }
-        console.debug(`Found 3-phase inverter model 103 at address ${model.address} with length ${model.length} (unit ${unitId})`);
+        console.debug(`No inverter model (101/103/111/112/113) on unit ${unitId}`);
+        return null;
+    }
+    /**
+     * Read three-phase inverter data from Model 103 (int + scale factor encoding).
+     */
+    async readThreePhaseInverterData_IntSF(unitId, model) {
         try {
-            // Read entire model block in a single Modbus call
-            console.debug(`Reading Inverter Data from Model ${model.id} at base address: ${model.address} (unit ${unitId})`);
+            console.debug(`Reading Inverter Data from Model 103 at base address: ${model.address} (unit ${unitId})`);
             const buffer = await this.readModelBlock(unitId, model);
-            // Extract all scale factors from buffer
             const scaleFactors = this.extractInverterScaleFactors(buffer);
-            // Extract raw values from buffer
             const acCurrentRaw = this.extractValue(buffer, 2, 'uint16');
             const voltageANRaw = this.extractValue(buffer, 10, 'uint16');
             const voltageBNRaw = this.extractValue(buffer, 11, 'uint16');
@@ -759,7 +767,6 @@ class SunspecModbusClient {
                 vendorEvents3: this.extractValue(buffer, 48, 'uint32', 2),
                 vendorEvents4: this.extractValue(buffer, 50, 'uint32', 2)
             };
-            // Log non-scaled fields
             this.logRegisterRead(103, 38, 'Operating State', data.operatingState, 'enum16');
             this.logRegisterRead(103, 39, 'Vendor State', data.vendorState, 'uint16');
             this.logRegisterRead(103, 40, 'Events', data.events, 'bitfield32');
@@ -768,7 +775,6 @@ class SunspecModbusClient {
             this.logRegisterRead(103, 46, 'Vendor Events 2', data.vendorEvents2, 'bitfield32');
             this.logRegisterRead(103, 48, 'Vendor Events 3', data.vendorEvents3, 'bitfield32');
             this.logRegisterRead(103, 50, 'Vendor Events 4', data.vendorEvents4, 'bitfield32');
-            // Read AC Energy (32-bit accumulator) - Offset 24-25
             const acEnergy = this.extractValue(buffer, 24, 'uint32', 2);
             this.logRegisterRead(103, 24, 'AC Energy', acEnergy, 'acc32');
             data.acEnergy = !this.isUnimplementedValue(acEnergy, 'acc32')
@@ -790,44 +796,44 @@ class SunspecModbusClient {
             console.debug(`Reading Single-Phase Inverter Data from Model 101 at base address: ${model.address} (unit ${unitId})`);
             // Read entire model block in a single Modbus call
             const buffer = await this.readModelBlock(unitId, model);
-            // Extract scale factors from buffer
+            // Extract scale factors from buffer (offsets aligned with Model 103 reader, which works on real
+            // hardware; differs from the published SunSpec Model 101 spec for DC fields).
             const scaleFactors = {
                 A_SF: this.extractValue(buffer, 6, 'int16'),
                 V_SF: this.extractValue(buffer, 13, 'int16'),
-                W_SF: this.extractValue(buffer, 10, 'int16'),
-                Hz_SF: this.extractValue(buffer, 12, 'int16'),
+                W_SF: this.extractValue(buffer, 15, 'int16'),
+                Hz_SF: this.extractValue(buffer, 17, 'int16'),
                 WH_SF: this.extractValue(buffer, 26, 'int16'),
-                DCA_SF: this.extractValue(buffer, 18, 'int16'),
-                DCV_SF: this.extractValue(buffer, 19, 'int16'),
-                DCW_SF: this.extractValue(buffer, 21, 'int16')
+                DCA_SF: this.extractValue(buffer, 28, 'int16'),
+                DCV_SF: this.extractValue(buffer, 29, 'int16'),
+                DCW_SF: this.extractValue(buffer, 31, 'int16')
             };
             this.logRegisterRead(101, 6, 'A_SF', scaleFactors.A_SF, 'int16');
             this.logRegisterRead(101, 13, 'V_SF', scaleFactors.V_SF, 'int16');
-            this.logRegisterRead(101, 10, 'W_SF', scaleFactors.W_SF, 'int16');
-            this.logRegisterRead(101, 12, 'Hz_SF', scaleFactors.Hz_SF, 'int16');
+            this.logRegisterRead(101, 15, 'W_SF', scaleFactors.W_SF, 'int16');
+            this.logRegisterRead(101, 17, 'Hz_SF', scaleFactors.Hz_SF, 'int16');
             this.logRegisterRead(101, 26, 'WH_SF', scaleFactors.WH_SF, 'int16');
-            this.logRegisterRead(101, 18, 'DCA_SF', scaleFactors.DCA_SF, 'int16');
-            this.logRegisterRead(101, 19, 'DCV_SF', scaleFactors.DCV_SF, 'int16');
-            this.logRegisterRead(101, 21, 'DCW_SF', scaleFactors.DCW_SF, 'int16');
-            // Extract raw values from buffer
+            this.logRegisterRead(101, 28, 'DCA_SF', scaleFactors.DCA_SF, 'int16');
+            this.logRegisterRead(101, 29, 'DCV_SF', scaleFactors.DCV_SF, 'int16');
+            this.logRegisterRead(101, 31, 'DCW_SF', scaleFactors.DCW_SF, 'int16');
             const acCurrentRaw = this.extractValue(buffer, 2, 'uint16');
-            const voltageRaw = this.extractValue(buffer, 7, 'uint16');
-            const acPowerRaw = this.extractValue(buffer, 9, 'int16');
-            const freqRaw = this.extractValue(buffer, 11, 'uint16');
-            const dcCurrentRaw = this.extractValue(buffer, 14, 'uint16');
-            const dcVoltageRaw = this.extractValue(buffer, 15, 'uint16');
-            const dcPowerRaw = this.extractValue(buffer, 20, 'int16');
-            const stateRaw = this.extractValue(buffer, 24, 'uint16');
-            this.logRegisterRead(101, 24, 'Operating State', stateRaw, 'enum16');
+            const voltageRaw = this.extractValue(buffer, 10, 'uint16');
+            const acPowerRaw = this.extractValue(buffer, 14, 'int16');
+            const freqRaw = this.extractValue(buffer, 16, 'uint16');
+            const dcCurrentRaw = this.extractValue(buffer, 27, 'uint16');
+            const dcVoltageRaw = this.extractValue(buffer, 28, 'uint16');
+            const dcPowerRaw = this.extractValue(buffer, 30, 'int16');
+            const stateRaw = this.extractValue(buffer, 38, 'uint16');
+            this.logRegisterRead(101, 38, 'Operating State', stateRaw, 'enum16');
             const data = {
                 blockNumber: 101,
-                voltageAN: this.applyScaleFactor(voltageRaw, scaleFactors.V_SF, 'uint16', 'Voltage AN', 7, 101),
+                voltageAN: this.applyScaleFactor(voltageRaw, scaleFactors.V_SF, 'uint16', 'Voltage AN', 10, 101),
                 acCurrent: this.applyScaleFactor(acCurrentRaw, scaleFactors.A_SF, 'uint16', 'AC Current', 2, 101),
-                acPower: this.applyScaleFactor(acPowerRaw, scaleFactors.W_SF, 'int16', 'AC Power', 9, 101),
-                frequency: this.applyScaleFactor(freqRaw, scaleFactors.Hz_SF, 'uint16', 'Frequency', 11, 101),
-                dcCurrent: this.applyScaleFactor(dcCurrentRaw, scaleFactors.DCA_SF, 'uint16', 'DC Current', 14, 101),
-                dcVoltage: this.applyScaleFactor(dcVoltageRaw, scaleFactors.DCV_SF, 'uint16', 'DC Voltage', 15, 101),
-                dcPower: this.applyScaleFactor(dcPowerRaw, scaleFactors.DCW_SF, 'int16', 'DC Power', 20, 101),
+                acPower: this.applyScaleFactor(acPowerRaw, scaleFactors.W_SF, 'int16', 'AC Power', 14, 101),
+                frequency: this.applyScaleFactor(freqRaw, scaleFactors.Hz_SF, 'uint16', 'Frequency', 16, 101),
+                dcCurrent: this.applyScaleFactor(dcCurrentRaw, scaleFactors.DCA_SF, 'uint16', 'DC Current', 27, 101),
+                dcVoltage: this.applyScaleFactor(dcVoltageRaw, scaleFactors.DCV_SF, 'uint16', 'DC Voltage', 28, 101),
+                dcPower: this.applyScaleFactor(dcPowerRaw, scaleFactors.DCW_SF, 'int16', 'DC Power', 30, 101),
                 operatingState: stateRaw
             };
             // Read AC Energy (32-bit accumulator) - Offset 24-25
@@ -844,6 +850,70 @@ class SunspecModbusClient {
             return null;
         }
     }
+    /**
+     * Read inverter data from a float-variant model: 111 (single-phase), 112 (split-phase), or 113 (three-phase).
+     *
+     * All three models share the same SunSpec register layout — measurement fields are 32-bit IEEE 754 floats
+     * (no scale factors), status registers stay enum16, event registers stay bitfield32. Phase scope differs
+     * by model: 111 populates phase A only; 112 phases A+B; 113 all three. Unpopulated phase fields read NaN
+     * and are returned as undefined.
+     */
+    async readFloatInverterData(unitId, model, blockNumber) {
+        try {
+            console.debug(`Reading Float Inverter Data from Model ${blockNumber} at base address: ${model.address} (unit ${unitId})`);
+            const buffer = await this.readModelBlock(unitId, model);
+            const data = {
+                blockNumber,
+                blockAddress: model.address,
+                blockLength: model.length,
+                acCurrent: this.extractFloat32OrUndefined(buffer, 2, blockNumber, 'AC Current'),
+                phaseACurrent: this.extractFloat32OrUndefined(buffer, 4, blockNumber, 'Phase A Current'),
+                phaseBCurrent: this.extractFloat32OrUndefined(buffer, 6, blockNumber, 'Phase B Current'),
+                phaseCCurrent: this.extractFloat32OrUndefined(buffer, 8, blockNumber, 'Phase C Current'),
+                voltageAB: this.extractFloat32OrUndefined(buffer, 10, blockNumber, 'Voltage AB'),
+                voltageBC: this.extractFloat32OrUndefined(buffer, 12, blockNumber, 'Voltage BC'),
+                voltageCA: this.extractFloat32OrUndefined(buffer, 14, blockNumber, 'Voltage CA'),
+                voltageAN: this.extractFloat32OrUndefined(buffer, 16, blockNumber, 'Voltage AN'),
+                voltageBN: this.extractFloat32OrUndefined(buffer, 18, blockNumber, 'Voltage BN'),
+                voltageCN: this.extractFloat32OrUndefined(buffer, 20, blockNumber, 'Voltage CN'),
+                acPower: this.extractFloat32OrUndefined(buffer, 22, blockNumber, 'AC Power'),
+                frequency: this.extractFloat32OrUndefined(buffer, 24, blockNumber, 'Frequency'),
+                apparentPower: this.extractFloat32OrUndefined(buffer, 26, blockNumber, 'Apparent Power'),
+                reactivePower: this.extractFloat32OrUndefined(buffer, 28, blockNumber, 'Reactive Power'),
+                powerFactor: this.extractFloat32OrUndefined(buffer, 30, blockNumber, 'Power Factor'),
+                acEnergy: this.extractFloat32OrUndefined(buffer, 32, blockNumber, 'AC Energy'),
+                dcCurrent: this.extractFloat32OrUndefined(buffer, 34, blockNumber, 'DC Current'),
+                dcVoltage: this.extractFloat32OrUndefined(buffer, 36, blockNumber, 'DC Voltage'),
+                dcPower: this.extractFloat32OrUndefined(buffer, 38, blockNumber, 'DC Power'),
+                cabinetTemperature: this.extractFloat32OrUndefined(buffer, 40, blockNumber, 'Cabinet Temperature'),
+                heatSinkTemperature: this.extractFloat32OrUndefined(buffer, 42, blockNumber, 'Heat Sink Temperature'),
+                transformerTemperature: this.extractFloat32OrUndefined(buffer, 44, blockNumber, 'Transformer Temperature'),
+                otherTemperature: this.extractFloat32OrUndefined(buffer, 46, blockNumber, 'Other Temperature'),
+                operatingState: this.extractValue(buffer, 48, 'uint16'),
+                vendorState: this.extractValue(buffer, 49, 'uint16'),
+                events: this.extractValue(buffer, 50, 'uint32', 2),
+                events2: this.extractValue(buffer, 52, 'uint32', 2),
+                vendorEvents1: this.extractValue(buffer, 54, 'uint32', 2),
+                vendorEvents2: this.extractValue(buffer, 56, 'uint32', 2),
+                vendorEvents3: this.extractValue(buffer, 58, 'uint32', 2),
+                vendorEvents4: this.extractValue(buffer, 60, 'uint32', 2),
+            };
+            this.logRegisterRead(blockNumber, 48, 'Operating State', data.operatingState, 'enum16');
+            this.logRegisterRead(blockNumber, 49, 'Vendor State', data.vendorState, 'enum16');
+            this.logRegisterRead(blockNumber, 50, 'Events', data.events, 'bitfield32');
+            this.logRegisterRead(blockNumber, 52, 'Events2', data.events2, 'bitfield32');
+            this.logRegisterRead(blockNumber, 54, 'Vendor Events 1', data.vendorEvents1, 'bitfield32');
+            this.logRegisterRead(blockNumber, 56, 'Vendor Events 2', data.vendorEvents2, 'bitfield32');
+            this.logRegisterRead(blockNumber, 58, 'Vendor Events 3', data.vendorEvents3, 'bitfield32');
+            this.logRegisterRead(blockNumber, 60, 'Vendor Events 4', data.vendorEvents4, 'bitfield32');
+            console.debug(`[Model ${blockNumber}] Float Inverter Data:`, data);
+            return data;
+        }
+        catch (error) {
+            console.error(`Error reading float inverter data (Model ${blockNumber}): ${error}`);
+            return null;
+        }
+    }
     /**
      * Extract inverter scale factors from a pre-read model buffer
      */
@@ -911,6 +981,16 @@ class SunspecModbusClient {
             console.debug(`[Model ${modelId}] offset ${offset}: ${fieldName} = "${rawValue}"${typeInfo}`);
         }
     }
+    /**
+     * Read a float32 (IEEE 754, big-endian, 2 registers) from a model buffer.
+     * SunSpec uses NaN as the "unimplemented" sentinel for floats; returns undefined in that case.
+     */
+    extractFloat32OrUndefined(buffer, offset, modelId, fieldName) {
+        const value = this.extractValue(buffer, offset, 'float32', 2);
+        const display = Number.isNaN(value) ? 'NaN' : value;
+        console.debug(`[Model ${modelId}] offset ${offset}: ${fieldName} = ${display} (float32)`);
+        return Number.isNaN(value) ? undefined : value;
+    }
     /**
      * Read scale factors from Model 160 (MPPT)
      *

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

@@ -201,13 +201,28 @@ export declare class SunspecModbusClient {
      */
     writeRegisterValue(unitId: number, address: number, value: number | number[], dataType?: EnergyAppModbusDataType): Promise<boolean>;
     /**
-     * Read inverter data from Model 101 (Single Phase) / Model 103 (Three Phase)
+     * Read inverter data. Detects which SunSpec inverter model the device exposes —
+     * int+SF (101/103) or float (111/112/113) — by checking the discovered model directory,
+     * and dispatches to the appropriate decoder.
      */
     readInverterData(unitId: number): Promise<SunspecInverterData | null>;
+    /**
+     * Read three-phase inverter data from Model 103 (int + scale factor encoding).
+     */
+    private readThreePhaseInverterData_IntSF;
     /**
      * Read single phase inverter data (Model 101)
      */
     private readSinglePhaseInverterData;
+    /**
+     * Read inverter data from a float-variant model: 111 (single-phase), 112 (split-phase), or 113 (three-phase).
+     *
+     * All three models share the same SunSpec register layout — measurement fields are 32-bit IEEE 754 floats
+     * (no scale factors), status registers stay enum16, event registers stay bitfield32. Phase scope differs
+     * by model: 111 populates phase A only; 112 phases A+B; 113 all three. Unpopulated phase fields read NaN
+     * and are returned as undefined.
+     */
+    private readFloatInverterData;
     /**
      * Extract inverter scale factors from a pre-read model buffer
      */
@@ -218,6 +233,11 @@ export declare class SunspecModbusClient {
      */
     applyScaleFactor(value: number, scaleFactor: number, dataType?: 'uint16' | 'int16' | 'acc32', fieldName?: string, offset?: number, modelId?: number): number | undefined;
     logRegisterRead(modelId: number, offset: number, fieldName: string, rawValue: number | string | undefined, dataType?: string): void;
+    /**
+     * Read a float32 (IEEE 754, big-endian, 2 registers) from a model buffer.
+     * SunSpec uses NaN as the "unimplemented" sentinel for floats; returns undefined in that case.
+     */
+    private extractFloat32OrUndefined;
     /**
      * Read scale factors from Model 160 (MPPT)
      *

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

package/dist/sunspec-interfaces.d.ts

@@ -30,6 +30,9 @@ export declare enum SunspecModelId {
     Common = 1,
     Inverter3Phase = 103,
     InverterSinglePhase = 101,
+    InverterSinglePhaseFloat = 111,
+    InverterSplitPhaseFloat = 112,
+    Inverter3PhaseFloat = 113,
     MPPT = 160,
     Battery = 124,
     BatteryBase = 802,
@@ -74,10 +77,12 @@ export interface SunspecCommonBlock extends SunspecBlock {
     deviceAddress?: number;
 }
 /**
- * Inverter data structure based on Model 103
+ * Inverter data structure. Covers SunSpec int+SF inverter models 101/103 and float variants 111/112/113.
+ * The per-field offset comments below describe the int+SF (101/103) layout; float variants 111/112/113
+ * use 32-bit IEEE 754 float values at different offsets — see the float reader implementations.
  */
 export interface SunspecInverterData extends SunspecBlock {
-    blockNumber: 103 | 101;
+    blockNumber: 103 | 101 | 113 | 112 | 111;
     acCurrent?: number;
     phaseACurrent?: number;
     phaseBCurrent?: number;

package/dist/sunspec-interfaces.js

@@ -17,6 +17,9 @@ export var SunspecModelId;
     SunspecModelId[SunspecModelId["Common"] = 1] = "Common";
     SunspecModelId[SunspecModelId["Inverter3Phase"] = 103] = "Inverter3Phase";
     SunspecModelId[SunspecModelId["InverterSinglePhase"] = 101] = "InverterSinglePhase";
+    SunspecModelId[SunspecModelId["InverterSinglePhaseFloat"] = 111] = "InverterSinglePhaseFloat";
+    SunspecModelId[SunspecModelId["InverterSplitPhaseFloat"] = 112] = "InverterSplitPhaseFloat";
+    SunspecModelId[SunspecModelId["Inverter3PhaseFloat"] = 113] = "Inverter3PhaseFloat";
     SunspecModelId[SunspecModelId["MPPT"] = 160] = "MPPT";
     SunspecModelId[SunspecModelId["Battery"] = 124] = "Battery";
     SunspecModelId[SunspecModelId["BatteryBase"] = 802] = "BatteryBase";

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

@@ -201,13 +201,28 @@ export declare class SunspecModbusClient {
      */
     writeRegisterValue(unitId: number, address: number, value: number | number[], dataType?: EnergyAppModbusDataType): Promise<boolean>;
     /**
-     * Read inverter data from Model 101 (Single Phase) / Model 103 (Three Phase)
+     * Read inverter data. Detects which SunSpec inverter model the device exposes —
+     * int+SF (101/103) or float (111/112/113) — by checking the discovered model directory,
+     * and dispatches to the appropriate decoder.
      */
     readInverterData(unitId: number): Promise<SunspecInverterData | null>;
+    /**
+     * Read three-phase inverter data from Model 103 (int + scale factor encoding).
+     */
+    private readThreePhaseInverterData_IntSF;
     /**
      * Read single phase inverter data (Model 101)
      */
     private readSinglePhaseInverterData;
+    /**
+     * Read inverter data from a float-variant model: 111 (single-phase), 112 (split-phase), or 113 (three-phase).
+     *
+     * All three models share the same SunSpec register layout — measurement fields are 32-bit IEEE 754 floats
+     * (no scale factors), status registers stay enum16, event registers stay bitfield32. Phase scope differs
+     * by model: 111 populates phase A only; 112 phases A+B; 113 all three. Unpopulated phase fields read NaN
+     * and are returned as undefined.
+     */
+    private readFloatInverterData;
     /**
      * Extract inverter scale factors from a pre-read model buffer
      */
@@ -218,6 +233,11 @@ export declare class SunspecModbusClient {
      */
     applyScaleFactor(value: number, scaleFactor: number, dataType?: 'uint16' | 'int16' | 'acc32', fieldName?: string, offset?: number, modelId?: number): number | undefined;
     logRegisterRead(modelId: number, offset: number, fieldName: string, rawValue: number | string | undefined, dataType?: string): void;
+    /**
+     * Read a float32 (IEEE 754, big-endian, 2 registers) from a model buffer.
+     * SunSpec uses NaN as the "unimplemented" sentinel for floats; returns undefined in that case.
+     */
+    private extractFloat32OrUndefined;
     /**
      * Read scale factors from Model 160 (MPPT)
      *

package/dist/sunspec-modbus-client.js

@@ -499,7 +499,7 @@ export class SunspecModbusClient {
         catch (error) {
             console.error(`Error during model discovery at address ${currentAddress} (unit ${unitId}): ${error}`);
         }
-        console.log(`Discovery complete for unit ${unitId}. Found ${models.size} models`);
+        console.log(`Discovery complete for unit ${unitId}. Found ${models.size} models: [${[...models.keys()].sort((a, b) => a - b).join(', ')}]`);
         return models;
     }
     /**
@@ -681,28 +681,36 @@ export class SunspecModbusClient {
         }
     }
     /**
-     * Read inverter data from Model 101 (Single Phase) / Model 103 (Three Phase)
+     * Read inverter data. Detects which SunSpec inverter model the device exposes —
+     * int+SF (101/103) or float (111/112/113) — by checking the discovered model directory,
+     * and dispatches to the appropriate decoder.
      */
     async readInverterData(unitId) {
-        const model = this.findModel(unitId, SunspecModelId.Inverter3Phase);
-        if (!model) {
-            console.debug(`Inverter model 103 not found on unit ${unitId}, trying single phase model 101`);
-            const singlePhaseModel = this.findModel(unitId, SunspecModelId.InverterSinglePhase);
-            if (!singlePhaseModel) {
-                console.error(`No inverter model found on unit ${unitId}`);
-                return null;
+        const tryOrder = [
+            { id: 103, reader: m => this.readThreePhaseInverterData_IntSF(unitId, m) },
+            { id: 113, reader: m => this.readFloatInverterData(unitId, m, 113) },
+            { id: 112, reader: m => this.readFloatInverterData(unitId, m, 112) },
+            { id: 101, reader: m => this.readSinglePhaseInverterData(unitId, m) },
+            { id: 111, reader: m => this.readFloatInverterData(unitId, m, 111) },
+        ];
+        for (const { id, reader } of tryOrder) {
+            const model = this.findModel(unitId, id);
+            if (model) {
+                console.debug(`Using inverter Model ${id} at address ${model.address} (length ${model.length}) on unit ${unitId}`);
+                return reader(model);
             }
-            console.warn('IMPORTANT: Working with single-phase inverter, but 3-phase is expected!');
-            return this.readSinglePhaseInverterData(unitId, singlePhaseModel);
         }
-        console.debug(`Found 3-phase inverter model 103 at address ${model.address} with length ${model.length} (unit ${unitId})`);
+        console.debug(`No inverter model (101/103/111/112/113) on unit ${unitId}`);
+        return null;
+    }
+    /**
+     * Read three-phase inverter data from Model 103 (int + scale factor encoding).
+     */
+    async readThreePhaseInverterData_IntSF(unitId, model) {
         try {
-            // Read entire model block in a single Modbus call
-            console.debug(`Reading Inverter Data from Model ${model.id} at base address: ${model.address} (unit ${unitId})`);
+            console.debug(`Reading Inverter Data from Model 103 at base address: ${model.address} (unit ${unitId})`);
             const buffer = await this.readModelBlock(unitId, model);
-            // Extract all scale factors from buffer
             const scaleFactors = this.extractInverterScaleFactors(buffer);
-            // Extract raw values from buffer
             const acCurrentRaw = this.extractValue(buffer, 2, 'uint16');
             const voltageANRaw = this.extractValue(buffer, 10, 'uint16');
             const voltageBNRaw = this.extractValue(buffer, 11, 'uint16');
@@ -754,7 +762,6 @@ export class SunspecModbusClient {
                 vendorEvents3: this.extractValue(buffer, 48, 'uint32', 2),
                 vendorEvents4: this.extractValue(buffer, 50, 'uint32', 2)
             };
-            // Log non-scaled fields
             this.logRegisterRead(103, 38, 'Operating State', data.operatingState, 'enum16');
             this.logRegisterRead(103, 39, 'Vendor State', data.vendorState, 'uint16');
             this.logRegisterRead(103, 40, 'Events', data.events, 'bitfield32');
@@ -763,7 +770,6 @@ export class SunspecModbusClient {
             this.logRegisterRead(103, 46, 'Vendor Events 2', data.vendorEvents2, 'bitfield32');
             this.logRegisterRead(103, 48, 'Vendor Events 3', data.vendorEvents3, 'bitfield32');
             this.logRegisterRead(103, 50, 'Vendor Events 4', data.vendorEvents4, 'bitfield32');
-            // Read AC Energy (32-bit accumulator) - Offset 24-25
             const acEnergy = this.extractValue(buffer, 24, 'uint32', 2);
             this.logRegisterRead(103, 24, 'AC Energy', acEnergy, 'acc32');
             data.acEnergy = !this.isUnimplementedValue(acEnergy, 'acc32')
@@ -785,44 +791,44 @@ export class SunspecModbusClient {
             console.debug(`Reading Single-Phase Inverter Data from Model 101 at base address: ${model.address} (unit ${unitId})`);
             // Read entire model block in a single Modbus call
             const buffer = await this.readModelBlock(unitId, model);
-            // Extract scale factors from buffer
+            // Extract scale factors from buffer (offsets aligned with Model 103 reader, which works on real
+            // hardware; differs from the published SunSpec Model 101 spec for DC fields).
             const scaleFactors = {
                 A_SF: this.extractValue(buffer, 6, 'int16'),
                 V_SF: this.extractValue(buffer, 13, 'int16'),
-                W_SF: this.extractValue(buffer, 10, 'int16'),
-                Hz_SF: this.extractValue(buffer, 12, 'int16'),
+                W_SF: this.extractValue(buffer, 15, 'int16'),
+                Hz_SF: this.extractValue(buffer, 17, 'int16'),
                 WH_SF: this.extractValue(buffer, 26, 'int16'),
-                DCA_SF: this.extractValue(buffer, 18, 'int16'),
-                DCV_SF: this.extractValue(buffer, 19, 'int16'),
-                DCW_SF: this.extractValue(buffer, 21, 'int16')
+                DCA_SF: this.extractValue(buffer, 28, 'int16'),
+                DCV_SF: this.extractValue(buffer, 29, 'int16'),
+                DCW_SF: this.extractValue(buffer, 31, 'int16')
             };
             this.logRegisterRead(101, 6, 'A_SF', scaleFactors.A_SF, 'int16');
             this.logRegisterRead(101, 13, 'V_SF', scaleFactors.V_SF, 'int16');
-            this.logRegisterRead(101, 10, 'W_SF', scaleFactors.W_SF, 'int16');
-            this.logRegisterRead(101, 12, 'Hz_SF', scaleFactors.Hz_SF, 'int16');
+            this.logRegisterRead(101, 15, 'W_SF', scaleFactors.W_SF, 'int16');
+            this.logRegisterRead(101, 17, 'Hz_SF', scaleFactors.Hz_SF, 'int16');
             this.logRegisterRead(101, 26, 'WH_SF', scaleFactors.WH_SF, 'int16');
-            this.logRegisterRead(101, 18, 'DCA_SF', scaleFactors.DCA_SF, 'int16');
-            this.logRegisterRead(101, 19, 'DCV_SF', scaleFactors.DCV_SF, 'int16');
-            this.logRegisterRead(101, 21, 'DCW_SF', scaleFactors.DCW_SF, 'int16');
-            // Extract raw values from buffer
+            this.logRegisterRead(101, 28, 'DCA_SF', scaleFactors.DCA_SF, 'int16');
+            this.logRegisterRead(101, 29, 'DCV_SF', scaleFactors.DCV_SF, 'int16');
+            this.logRegisterRead(101, 31, 'DCW_SF', scaleFactors.DCW_SF, 'int16');
             const acCurrentRaw = this.extractValue(buffer, 2, 'uint16');
-            const voltageRaw = this.extractValue(buffer, 7, 'uint16');
-            const acPowerRaw = this.extractValue(buffer, 9, 'int16');
-            const freqRaw = this.extractValue(buffer, 11, 'uint16');
-            const dcCurrentRaw = this.extractValue(buffer, 14, 'uint16');
-            const dcVoltageRaw = this.extractValue(buffer, 15, 'uint16');
-            const dcPowerRaw = this.extractValue(buffer, 20, 'int16');
-            const stateRaw = this.extractValue(buffer, 24, 'uint16');
-            this.logRegisterRead(101, 24, 'Operating State', stateRaw, 'enum16');
+            const voltageRaw = this.extractValue(buffer, 10, 'uint16');
+            const acPowerRaw = this.extractValue(buffer, 14, 'int16');
+            const freqRaw = this.extractValue(buffer, 16, 'uint16');
+            const dcCurrentRaw = this.extractValue(buffer, 27, 'uint16');
+            const dcVoltageRaw = this.extractValue(buffer, 28, 'uint16');
+            const dcPowerRaw = this.extractValue(buffer, 30, 'int16');
+            const stateRaw = this.extractValue(buffer, 38, 'uint16');
+            this.logRegisterRead(101, 38, 'Operating State', stateRaw, 'enum16');
             const data = {
                 blockNumber: 101,
-                voltageAN: this.applyScaleFactor(voltageRaw, scaleFactors.V_SF, 'uint16', 'Voltage AN', 7, 101),
+                voltageAN: this.applyScaleFactor(voltageRaw, scaleFactors.V_SF, 'uint16', 'Voltage AN', 10, 101),
                 acCurrent: this.applyScaleFactor(acCurrentRaw, scaleFactors.A_SF, 'uint16', 'AC Current', 2, 101),
-                acPower: this.applyScaleFactor(acPowerRaw, scaleFactors.W_SF, 'int16', 'AC Power', 9, 101),
-                frequency: this.applyScaleFactor(freqRaw, scaleFactors.Hz_SF, 'uint16', 'Frequency', 11, 101),
-                dcCurrent: this.applyScaleFactor(dcCurrentRaw, scaleFactors.DCA_SF, 'uint16', 'DC Current', 14, 101),
-                dcVoltage: this.applyScaleFactor(dcVoltageRaw, scaleFactors.DCV_SF, 'uint16', 'DC Voltage', 15, 101),
-                dcPower: this.applyScaleFactor(dcPowerRaw, scaleFactors.DCW_SF, 'int16', 'DC Power', 20, 101),
+                acPower: this.applyScaleFactor(acPowerRaw, scaleFactors.W_SF, 'int16', 'AC Power', 14, 101),
+                frequency: this.applyScaleFactor(freqRaw, scaleFactors.Hz_SF, 'uint16', 'Frequency', 16, 101),
+                dcCurrent: this.applyScaleFactor(dcCurrentRaw, scaleFactors.DCA_SF, 'uint16', 'DC Current', 27, 101),
+                dcVoltage: this.applyScaleFactor(dcVoltageRaw, scaleFactors.DCV_SF, 'uint16', 'DC Voltage', 28, 101),
+                dcPower: this.applyScaleFactor(dcPowerRaw, scaleFactors.DCW_SF, 'int16', 'DC Power', 30, 101),
                 operatingState: stateRaw
             };
             // Read AC Energy (32-bit accumulator) - Offset 24-25
@@ -839,6 +845,70 @@ export class SunspecModbusClient {
             return null;
         }
     }
+    /**
+     * Read inverter data from a float-variant model: 111 (single-phase), 112 (split-phase), or 113 (three-phase).
+     *
+     * All three models share the same SunSpec register layout — measurement fields are 32-bit IEEE 754 floats
+     * (no scale factors), status registers stay enum16, event registers stay bitfield32. Phase scope differs
+     * by model: 111 populates phase A only; 112 phases A+B; 113 all three. Unpopulated phase fields read NaN
+     * and are returned as undefined.
+     */
+    async readFloatInverterData(unitId, model, blockNumber) {
+        try {
+            console.debug(`Reading Float Inverter Data from Model ${blockNumber} at base address: ${model.address} (unit ${unitId})`);
+            const buffer = await this.readModelBlock(unitId, model);
+            const data = {
+                blockNumber,
+                blockAddress: model.address,
+                blockLength: model.length,
+                acCurrent: this.extractFloat32OrUndefined(buffer, 2, blockNumber, 'AC Current'),
+                phaseACurrent: this.extractFloat32OrUndefined(buffer, 4, blockNumber, 'Phase A Current'),
+                phaseBCurrent: this.extractFloat32OrUndefined(buffer, 6, blockNumber, 'Phase B Current'),
+                phaseCCurrent: this.extractFloat32OrUndefined(buffer, 8, blockNumber, 'Phase C Current'),
+                voltageAB: this.extractFloat32OrUndefined(buffer, 10, blockNumber, 'Voltage AB'),
+                voltageBC: this.extractFloat32OrUndefined(buffer, 12, blockNumber, 'Voltage BC'),
+                voltageCA: this.extractFloat32OrUndefined(buffer, 14, blockNumber, 'Voltage CA'),
+                voltageAN: this.extractFloat32OrUndefined(buffer, 16, blockNumber, 'Voltage AN'),
+                voltageBN: this.extractFloat32OrUndefined(buffer, 18, blockNumber, 'Voltage BN'),
+                voltageCN: this.extractFloat32OrUndefined(buffer, 20, blockNumber, 'Voltage CN'),
+                acPower: this.extractFloat32OrUndefined(buffer, 22, blockNumber, 'AC Power'),
+                frequency: this.extractFloat32OrUndefined(buffer, 24, blockNumber, 'Frequency'),
+                apparentPower: this.extractFloat32OrUndefined(buffer, 26, blockNumber, 'Apparent Power'),
+                reactivePower: this.extractFloat32OrUndefined(buffer, 28, blockNumber, 'Reactive Power'),
+                powerFactor: this.extractFloat32OrUndefined(buffer, 30, blockNumber, 'Power Factor'),
+                acEnergy: this.extractFloat32OrUndefined(buffer, 32, blockNumber, 'AC Energy'),
+                dcCurrent: this.extractFloat32OrUndefined(buffer, 34, blockNumber, 'DC Current'),
+                dcVoltage: this.extractFloat32OrUndefined(buffer, 36, blockNumber, 'DC Voltage'),
+                dcPower: this.extractFloat32OrUndefined(buffer, 38, blockNumber, 'DC Power'),
+                cabinetTemperature: this.extractFloat32OrUndefined(buffer, 40, blockNumber, 'Cabinet Temperature'),
+                heatSinkTemperature: this.extractFloat32OrUndefined(buffer, 42, blockNumber, 'Heat Sink Temperature'),
+                transformerTemperature: this.extractFloat32OrUndefined(buffer, 44, blockNumber, 'Transformer Temperature'),
+                otherTemperature: this.extractFloat32OrUndefined(buffer, 46, blockNumber, 'Other Temperature'),
+                operatingState: this.extractValue(buffer, 48, 'uint16'),
+                vendorState: this.extractValue(buffer, 49, 'uint16'),
+                events: this.extractValue(buffer, 50, 'uint32', 2),
+                events2: this.extractValue(buffer, 52, 'uint32', 2),
+                vendorEvents1: this.extractValue(buffer, 54, 'uint32', 2),
+                vendorEvents2: this.extractValue(buffer, 56, 'uint32', 2),
+                vendorEvents3: this.extractValue(buffer, 58, 'uint32', 2),
+                vendorEvents4: this.extractValue(buffer, 60, 'uint32', 2),
+            };
+            this.logRegisterRead(blockNumber, 48, 'Operating State', data.operatingState, 'enum16');
+            this.logRegisterRead(blockNumber, 49, 'Vendor State', data.vendorState, 'enum16');
+            this.logRegisterRead(blockNumber, 50, 'Events', data.events, 'bitfield32');
+            this.logRegisterRead(blockNumber, 52, 'Events2', data.events2, 'bitfield32');
+            this.logRegisterRead(blockNumber, 54, 'Vendor Events 1', data.vendorEvents1, 'bitfield32');
+            this.logRegisterRead(blockNumber, 56, 'Vendor Events 2', data.vendorEvents2, 'bitfield32');
+            this.logRegisterRead(blockNumber, 58, 'Vendor Events 3', data.vendorEvents3, 'bitfield32');
+            this.logRegisterRead(blockNumber, 60, 'Vendor Events 4', data.vendorEvents4, 'bitfield32');
+            console.debug(`[Model ${blockNumber}] Float Inverter Data:`, data);
+            return data;
+        }
+        catch (error) {
+            console.error(`Error reading float inverter data (Model ${blockNumber}): ${error}`);
+            return null;
+        }
+    }
     /**
      * Extract inverter scale factors from a pre-read model buffer
      */
@@ -906,6 +976,16 @@ export class SunspecModbusClient {
             console.debug(`[Model ${modelId}] offset ${offset}: ${fieldName} = "${rawValue}"${typeInfo}`);
         }
     }
+    /**
+     * Read a float32 (IEEE 754, big-endian, 2 registers) from a model buffer.
+     * SunSpec uses NaN as the "unimplemented" sentinel for floats; returns undefined in that case.
+     */
+    extractFloat32OrUndefined(buffer, offset, modelId, fieldName) {
+        const value = this.extractValue(buffer, offset, 'float32', 2);
+        const display = Number.isNaN(value) ? 'NaN' : value;
+        console.debug(`[Model ${modelId}] offset ${offset}: ${fieldName} = ${display} (float32)`);
+        return Number.isNaN(value) ? undefined : value;
+    }
     /**
      * Read scale factors from Model 160 (MPPT)
      *

package/dist/version.d.ts

@@ -5,7 +5,7 @@
 /**
  * Current version of the enyo Energy App SDK.
  */
-export declare const SDK_VERSION = "0.0.52";
+export declare const SDK_VERSION = "0.0.54";
 /**
  * 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.52';
+export const SDK_VERSION = '0.0.54';
 /**
  * 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.52",
+  "version": "0.0.54",
   "description": "enyo Energy Sunspec SDK",
   "type": "module",
   "main": "dist/index.js",