@enyo-energy/sunspec-sdk 0.0.4 → 0.0.6

package/dist/cjs/sunspec-devices.cjs

@@ -113,12 +113,12 @@ class SunspecInverter extends BaseSunspecDevice {
                     timestampIso: timestamp.toISOString(),
                     resolution,
                     data: {
-                        pvPowerW: inverterData.acPower || 0,
-                        activePowerLimitationW: inverterData.acPower || 0, // Using AC power as default
+                        pvPowerW: inverterData.dcPower || 0, // Use DC power for PV power
+                        activePowerLimitationW: inverterData.acPower || 0,
                         state: this.mapOperatingState(inverterData.operatingState),
                         voltageL1: inverterData.voltageAN || 0,
-                        voltageL2: inverterData.voltageBN,
-                        voltageL3: inverterData.voltageCN,
+                        voltageL2: inverterData.voltageBN ?? undefined, // Use null if undefined (unimplemented phase)
+                        voltageL3: inverterData.voltageCN ?? undefined, // Use null if undefined (unimplemented phase)
                         strings: this.mapMPPTToStrings(mpptDataList)
                     }
                 };
@@ -152,11 +152,14 @@ class SunspecInverter extends BaseSunspecDevice {
     mapMPPTToStrings(mpptDataList) {
         const result = [];
         mpptDataList.forEach((mppt, index) => {
-            result.push({
-                index: index + 1,
-                voltage: mppt.dcVoltage,
-                powerW: mppt.dcPower
-            });
+            // Only include strings with valid data
+            if (mppt.dcVoltage !== undefined || mppt.dcPower !== undefined) {
+                result.push({
+                    index: index + 1,
+                    voltage: mppt.dcVoltage ?? undefined, // Use null if undefined
+                    powerW: mppt.dcPower ?? 0 // Default to 0 if undefined
+                });
+            }
         });
         return result;
     }

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

@@ -2,7 +2,7 @@ import { ApplianceManager, EnergyApp } from "@enyo-energy/energy-app-sdk";
 import { EnyoApplianceName } from "@enyo-energy/energy-app-sdk/dist/types/enyo-appliance.js";
 import { EnyoNetworkDevice } from "@enyo-energy/energy-app-sdk/dist/types/enyo-network-device.js";
 import { SunspecModbusClient } from "./sunspec-modbus-client.cjs";
-import { EnyoDataBusMessage } from "@enyo-energy/energy-app-sdk/dist/types/enyo-data-bus-value.js";
+import { EnyoDataBusMessage, EnyoDataBusMessageResolution } from "@enyo-energy/energy-app-sdk/dist/types/enyo-data-bus-value.js";
 /**
  * Base abstract class for all Sunspec devices
  */
@@ -27,7 +27,7 @@ export declare abstract class BaseSunspecDevice {
     /**
      * Update device data and return data bus messages
      */
-    abstract readData(clockId: string, resolution: '10s' | '30s' | '1m' | '15m'): Promise<EnyoDataBusMessage[]>;
+    abstract readData(clockId: string, resolution: EnyoDataBusMessageResolution): Promise<EnyoDataBusMessage[]>;
     /**
      * Check if the device is connected
      */
@@ -83,5 +83,5 @@ export declare class SunspecMeter extends BaseSunspecDevice {
     /**
      * Update meter data and return data bus messages
      */
-    readData(clockId: string, resolution: '10s' | '30s' | '1m' | '15m'): Promise<EnyoDataBusMessage[]>;
+    readData(clockId: string, resolution: EnyoDataBusMessageResolution): Promise<EnyoDataBusMessage[]>;
 }

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

@@ -51,29 +51,63 @@ class SunspecModbusClient {
             this.scaleFactors = {};
         }
     }
+    /**
+     * Detect the base address and addressing mode (0-based or 1-based) for SunSpec
+     */
+    async detectSunspecBaseAddress() {
+        if (!this.modbusClient) {
+            throw new Error('Modbus client not initialized');
+        }
+        // Try 1-based addressing first (most common)
+        try {
+            const sunspecId = await this.modbusClient.readRegisterStringValue(40001, 2);
+            if (sunspecId.includes('SunS')) {
+                console.log('Detected 1-based addressing mode (base address: 40001)');
+                this.baseAddress = 40001;
+                return {
+                    baseAddress: 40001,
+                    isZeroBased: false,
+                    nextAddress: 40003
+                };
+            }
+        }
+        catch (error) {
+            console.debug('Could not read SunS at 40001:', error);
+        }
+        // Try 0-based addressing
+        try {
+            const sunspecId = await this.modbusClient.readRegisterStringValue(40000, 2);
+            if (sunspecId.includes('SunS')) {
+                console.log('Detected 0-based addressing mode (base address: 40000)');
+                this.baseAddress = 40000;
+                return {
+                    baseAddress: 40000,
+                    isZeroBased: true,
+                    nextAddress: 40002
+                };
+            }
+        }
+        catch (error) {
+            console.debug('Could not read SunS at 40000:', error);
+        }
+        throw new Error('Device is not SunSpec compliant - "SunS" identifier not found at addresses 40000 or 40001');
+    }
     /**
      * Discover all available Sunspec models
-     * Scans through the address space starting at 40001
+     * Automatically detects base address (40000 or 40001) and scans from there
      */
     async discoverModels() {
         if (!this.connected) {
             throw new Error('Not connected to Modbus device');
         }
         this.discoveredModels.clear();
-        let currentAddress = this.baseAddress;
         const maxAddress = 50000; // Safety limit
+        let currentAddress = 0;
         console.log('Starting Sunspec model discovery...');
         try {
-            // First, check for Sunspec identifier "SunS" at 40001
-            if (!this.modbusClient) {
-                throw new Error('Modbus client not initialized');
-            }
-            const sunspecId = await this.modbusClient.readRegisterStringValue(40001, 2);
-            if (!sunspecId.includes('SunS')) {
-                console.warn('Device may not be Sunspec compliant - missing SunS identifier');
-            }
-            // Start scanning after the SunS identifier
-            currentAddress = 40003;
+            // Detect the base address and addressing mode
+            const addressInfo = await this.detectSunspecBaseAddress();
+            currentAddress = addressInfo.nextAddress;
             while (currentAddress < maxAddress) {
                 // Read model ID and length
                 if (!this.modbusClient) {
@@ -155,6 +189,24 @@ class SunspecModbusClient {
         }
         return value;
     }
+    /**
+     * Check if a value is "unimplemented" according to Sunspec
+     * Returns true if the value represents an unimplemented/not applicable register
+     */
+    isUnimplementedValue(value, dataType = 'uint16') {
+        switch (dataType) {
+            case 'uint16':
+                return value === 0xFFFF || value === 65535;
+            case 'int16':
+                return value === 0x7FFF || value === 32767;
+            case 'uint32':
+                return value === 0xFFFFFFFF;
+            case 'int32':
+                return value === 0x7FFFFFFF;
+            default:
+                return false;
+        }
+    }
     /**
      * Helper to clean string values by removing null characters
      */
@@ -234,6 +286,15 @@ class SunspecModbusClient {
             // Read all scale factors first using fault-tolerant reader
             const scaleFactors = await this.readInverterScaleFactors(baseAddr);
             // Read values using fault-tolerant reader with proper data types
+            // Read raw voltage values to check for unimplemented phases
+            const voltageANRaw = await this.readRegisterValue(baseAddr + 10, 1, 'uint16');
+            const voltageBNRaw = await this.readRegisterValue(baseAddr + 11, 1, 'uint16');
+            const voltageCNRaw = await this.readRegisterValue(baseAddr + 12, 1, 'uint16');
+            console.log('Inverter Raw Voltage Values:', {
+                voltageANRaw: `0x${voltageANRaw.toString(16).toUpperCase()} (${voltageANRaw})`,
+                voltageBNRaw: `0x${voltageBNRaw.toString(16).toUpperCase()} (${voltageBNRaw})`,
+                voltageCNRaw: `0x${voltageCNRaw.toString(16).toUpperCase()} (${voltageCNRaw})`
+            });
             const data = {
                 blockNumber: 103,
                 blockAddress: model.address,
@@ -247,9 +308,10 @@ class SunspecModbusClient {
                 voltageAB: this.applyScaleFactor(await this.readRegisterValue(baseAddr + 7, 1, 'uint16'), scaleFactors.V_SF),
                 voltageBC: this.applyScaleFactor(await this.readRegisterValue(baseAddr + 8, 1, 'uint16'), scaleFactors.V_SF),
                 voltageCA: this.applyScaleFactor(await this.readRegisterValue(baseAddr + 9, 1, 'uint16'), scaleFactors.V_SF),
-                voltageAN: this.applyScaleFactor(await this.readRegisterValue(baseAddr + 10, 1, 'uint16'), scaleFactors.V_SF),
-                voltageBN: this.applyScaleFactor(await this.readRegisterValue(baseAddr + 11, 1, 'uint16'), scaleFactors.V_SF),
-                voltageCN: this.applyScaleFactor(await this.readRegisterValue(baseAddr + 12, 1, 'uint16'), scaleFactors.V_SF),
+                // Apply scale factor with unimplemented value checking
+                voltageAN: this.applyScaleFactor(voltageANRaw, scaleFactors.V_SF),
+                voltageBN: this.applyScaleFactor(voltageBNRaw, scaleFactors.V_SF),
+                voltageCN: this.applyScaleFactor(voltageCNRaw, scaleFactors.V_SF),
                 // Power values - Offsets 14, 18, 20, 22
                 acPower: this.applyScaleFactor(await this.readRegisterValue(baseAddr + 14, 1, 'int16'), scaleFactors.W_SF),
                 apparentPower: this.applyScaleFactor(await this.readRegisterValue(baseAddr + 18, 1, 'uint16'), scaleFactors.VA_SF),
@@ -315,7 +377,7 @@ class SunspecModbusClient {
      * Read inverter scale factors
      */
     async readInverterScaleFactors(baseAddr) {
-        return {
+        const scaleFactors = {
             A_SF: await this.readRegisterValue(baseAddr + 6, 1, 'int16'), // Offset 6
             V_SF: await this.readRegisterValue(baseAddr + 13, 1, 'int16'), // Offset 13
             W_SF: await this.readRegisterValue(baseAddr + 15, 1, 'int16'), // Offset 15
@@ -329,11 +391,23 @@ class SunspecModbusClient {
             DCW_SF: await this.readRegisterValue(baseAddr + 31, 1, 'int16'), // Offset 31
             Tmp_SF: await this.readRegisterValue(baseAddr + 36, 1, 'int16') // Offset 36
         };
+        console.log('Inverter Scale Factors:', JSON.stringify(scaleFactors, null, 2));
+        return scaleFactors;
     }
     /**
      * Apply scale factor to a value
+     * Returns undefined if the value is unimplemented or scale factor is out of range
      */
-    applyScaleFactor(value, scaleFactor) {
+    applyScaleFactor(value, scaleFactor, dataType = 'uint16') {
+        // Check for unimplemented values
+        if (this.isUnimplementedValue(value, dataType)) {
+            return undefined;
+        }
+        // Validate scale factor is within reasonable range (-10 to +10)
+        if (Math.abs(scaleFactor) > 10) {
+            console.warn(`Scale factor ${scaleFactor} is outside reasonable range, clamping to ±10`);
+            scaleFactor = Math.max(-10, Math.min(10, scaleFactor));
+        }
         return value * Math.pow(10, scaleFactor);
     }
     /**
@@ -359,6 +433,28 @@ class SunspecModbusClient {
                 DCWH_SF: await this.readRegisterValue(moduleAddr + 17, 1, 'int16'),
                 Tmp_SF: await this.readRegisterValue(moduleAddr + 21, 1, 'int16')
             };
+            console.log(`MPPT Module ${moduleId} Scale Factors:`, JSON.stringify(scaleFactors, null, 2));
+            // Read raw values first
+            const dcCurrentRaw = await this.readRegisterValue(moduleAddr + 9, 1, 'uint16');
+            const dcVoltageRaw = await this.readRegisterValue(moduleAddr + 11, 1, 'uint16');
+            const dcPowerRaw = await this.readRegisterValue(moduleAddr + 13, 1, 'uint16');
+            const dcEnergyRaw = await this.readRegisterValue(moduleAddr + 15, 2, 'acc32');
+            const temperatureRaw = await this.readRegisterValue(moduleAddr + 20, 1, 'int16');
+            console.log(`MPPT Module ${moduleId} Raw Values:`, {
+                dcCurrentRaw: `0x${dcCurrentRaw.toString(16).toUpperCase()} (${dcCurrentRaw})`,
+                dcVoltageRaw: `0x${dcVoltageRaw.toString(16).toUpperCase()} (${dcVoltageRaw})`,
+                dcPowerRaw: `0x${dcPowerRaw.toString(16).toUpperCase()} (${dcPowerRaw})`,
+                dcEnergyRaw: `0x${dcEnergyRaw.toString(16).toUpperCase()} (${dcEnergyRaw})`,
+                temperatureRaw: `0x${temperatureRaw.toString(16).toUpperCase()} (${temperatureRaw})`
+            });
+            // Check if this module is actually implemented/connected
+            // If all key values are unimplemented, this module doesn't exist
+            if (this.isUnimplementedValue(dcCurrentRaw, 'uint16') &&
+                this.isUnimplementedValue(dcVoltageRaw, 'uint16') &&
+                this.isUnimplementedValue(dcPowerRaw, 'uint16')) {
+                console.log(`MPPT module ${moduleId} appears to be unconnected (all values are 0xFFFF)`);
+                return null;
+            }
             const data = {
                 blockNumber: 160,
                 blockAddress: model.address,
@@ -367,22 +463,24 @@ class SunspecModbusClient {
                 // String ID - Offset 1 (8 registers for string)
                 stringId: await this.readRegisterValue(moduleAddr + 1, 8, 'string'),
                 // DC Current - Offset 9
-                dcCurrent: this.applyScaleFactor(await this.readRegisterValue(moduleAddr + 9, 1, 'uint16'), scaleFactors.DCA_SF),
+                dcCurrent: this.applyScaleFactor(dcCurrentRaw, scaleFactors.DCA_SF),
                 dcCurrentSF: scaleFactors.DCA_SF,
                 // DC Voltage - Offset 11
-                dcVoltage: this.applyScaleFactor(await this.readRegisterValue(moduleAddr + 11, 1, 'uint16'), scaleFactors.DCV_SF),
+                dcVoltage: this.applyScaleFactor(dcVoltageRaw, scaleFactors.DCV_SF),
                 dcVoltageSF: scaleFactors.DCV_SF,
                 // DC Power - Offset 13
-                dcPower: this.applyScaleFactor(await this.readRegisterValue(moduleAddr + 13, 1, 'uint16'), scaleFactors.DCW_SF),
+                dcPower: this.applyScaleFactor(dcPowerRaw, scaleFactors.DCW_SF),
                 dcPowerSF: scaleFactors.DCW_SF,
                 // DC Energy - Offset 15-16 (32-bit accumulator)
-                dcEnergy: BigInt(await this.readRegisterValue(moduleAddr + 15, 2, 'acc32')) *
-                    BigInt(Math.pow(10, scaleFactors.DCWH_SF)),
+                // Only calculate if value is not unimplemented
+                dcEnergy: !this.isUnimplementedValue(dcEnergyRaw, 'uint32')
+                    ? BigInt(dcEnergyRaw) * BigInt(Math.pow(10, scaleFactors.DCWH_SF))
+                    : undefined,
                 dcEnergySF: scaleFactors.DCWH_SF,
                 // Timestamp - Offset 18-19 (32-bit)
                 timestamp: await this.readRegisterValue(moduleAddr + 18, 2, 'uint32'),
                 // Temperature - Offset 20
-                temperature: this.applyScaleFactor(await this.readRegisterValue(moduleAddr + 20, 1, 'int16'), scaleFactors.Tmp_SF),
+                temperature: this.applyScaleFactor(temperatureRaw, scaleFactors.Tmp_SF, 'int16'),
                 temperatureSF: scaleFactors.Tmp_SF,
                 // Operating State - Offset 22
                 operatingState: await this.readRegisterValue(moduleAddr + 22, 1, 'uint16'),
@@ -405,9 +503,19 @@ class SunspecModbusClient {
         const mpptData = [];
         // Try to read up to 4 MPPT strings (typical maximum)
         for (let i = 1; i <= 4; i++) {
-            const data = await this.readMPPTData(i);
-            if (data && data.dcCurrent !== undefined && data.dcCurrent > 0) {
-                mpptData.push(data);
+            try {
+                const data = await this.readMPPTData(i);
+                // Only include if we got valid data (not null) and it has actual values
+                if (data &&
+                    (data.dcCurrent !== undefined ||
+                        data.dcVoltage !== undefined ||
+                        data.dcPower !== undefined)) {
+                    mpptData.push(data);
+                }
+            }
+            catch (error) {
+                console.debug(`Could not read MPPT module ${i}: ${error}`);
+                // Continue to try other modules
             }
         }
         return mpptData;
@@ -452,15 +560,31 @@ class SunspecModbusClient {
             return null;
         }
         const baseAddr = model.address + 2; // Skip ID and Length
+        console.log(`Reading Common Block - Model address: ${model.address}, Base address for data: ${baseAddr}`);
         try {
             // Read all strings using fault-tolerant reader with proper data type conversion
-            const manufacturer = await this.readRegisterValue(baseAddr + 2, 16, 'string'); // Offset 2-17
-            const modelName = await this.readRegisterValue(baseAddr + 18, 16, 'string'); // Offset 18-33
-            const options = await this.readRegisterValue(baseAddr + 34, 8, 'string'); // Offset 34-41
-            const version = await this.readRegisterValue(baseAddr + 42, 8, 'string'); // Offset 42-49
-            const serialNumber = await this.readRegisterValue(baseAddr + 50, 16, 'string'); // Offset 50-65
-            const deviceAddress = await this.readRegisterValue(baseAddr + 66, 1, 'uint16'); // Offset 66
-            return {
+            // Common block offsets are relative to the start of the data (after ID and Length)
+            const manufacturerAddr = baseAddr; // Offset 0-15 (16 registers) from data start
+            const modelAddr = baseAddr + 16; // Offset 16-31 (16 registers) from data start
+            const optionsAddr = baseAddr + 32; // Offset 32-39 (8 registers) from data start
+            const versionAddr = baseAddr + 40; // Offset 40-47 (8 registers) from data start
+            const serialAddr = baseAddr + 48; // Offset 48-63 (16 registers) from data start
+            const deviceAddrAddr = baseAddr + 64; // Offset 64 from data start
+            console.log(`Reading manufacturer from address ${manufacturerAddr} (16 registers)`);
+            const manufacturer = await this.readRegisterValue(manufacturerAddr, 16, 'string');
+            console.log(`Manufacturer raw value: "${manufacturer}"`);
+            console.log(`Reading model from address ${modelAddr} (16 registers)`);
+            const modelName = await this.readRegisterValue(modelAddr, 16, 'string');
+            console.log(`Model raw value: "${modelName}"`);
+            console.log(`Reading options from address ${optionsAddr} (8 registers)`);
+            const options = await this.readRegisterValue(optionsAddr, 8, 'string');
+            console.log(`Reading version from address ${versionAddr} (8 registers)`);
+            const version = await this.readRegisterValue(versionAddr, 8, 'string');
+            console.log(`Reading serial from address ${serialAddr} (16 registers)`);
+            const serialNumber = await this.readRegisterValue(serialAddr, 16, 'string');
+            console.log(`Reading device address from address ${deviceAddrAddr}`);
+            const deviceAddress = await this.readRegisterValue(deviceAddrAddr, 1, 'uint16');
+            const result = {
                 manufacturer: manufacturer,
                 model: modelName,
                 options: options,
@@ -468,6 +592,8 @@ class SunspecModbusClient {
                 serialNumber: serialNumber,
                 deviceAddress: deviceAddress
             };
+            console.log('Common Block Data:', JSON.stringify(result, null, 2));
+            return result;
         }
         catch (error) {
             console.error(`Error reading common block: ${error}`);

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

@@ -19,9 +19,17 @@ export declare class SunspecModbusClient {
      * Disconnect from Modbus device
      */
     disconnect(): Promise<void>;
+    /**
+     * Detect the base address and addressing mode (0-based or 1-based) for SunSpec
+     */
+    detectSunspecBaseAddress(): Promise<{
+        baseAddress: number;
+        isZeroBased: boolean;
+        nextAddress: number;
+    }>;
     /**
      * Discover all available Sunspec models
-     * Scans through the address space starting at 40001
+     * Automatically detects base address (40000 or 40001) and scans from there
      */
     discoverModels(): Promise<Map<number, SunspecModel>>;
     /**
@@ -36,6 +44,11 @@ export declare class SunspecModbusClient {
      * Convert unsigned 16-bit value to signed
      */
     private convertToSigned16;
+    /**
+     * Check if a value is "unimplemented" according to Sunspec
+     * Returns true if the value represents an unimplemented/not applicable register
+     */
+    private isUnimplementedValue;
     /**
      * Helper to clean string values by removing null characters
      */
@@ -58,6 +71,7 @@ export declare class SunspecModbusClient {
     private readInverterScaleFactors;
     /**
      * Apply scale factor to a value
+     * Returns undefined if the value is unimplemented or scale factor is out of range
      */
     private applyScaleFactor;
     /**

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

package/dist/sunspec-devices.d.ts

@@ -2,7 +2,7 @@ import { ApplianceManager, EnergyApp } from "@enyo-energy/energy-app-sdk";
 import { EnyoApplianceName } from "@enyo-energy/energy-app-sdk/dist/types/enyo-appliance.js";
 import { EnyoNetworkDevice } from "@enyo-energy/energy-app-sdk/dist/types/enyo-network-device.js";
 import { SunspecModbusClient } from "./sunspec-modbus-client.js";
-import { EnyoDataBusMessage } from "@enyo-energy/energy-app-sdk/dist/types/enyo-data-bus-value.js";
+import { EnyoDataBusMessage, EnyoDataBusMessageResolution } from "@enyo-energy/energy-app-sdk/dist/types/enyo-data-bus-value.js";
 /**
  * Base abstract class for all Sunspec devices
  */
@@ -27,7 +27,7 @@ export declare abstract class BaseSunspecDevice {
     /**
      * Update device data and return data bus messages
      */
-    abstract readData(clockId: string, resolution: '10s' | '30s' | '1m' | '15m'): Promise<EnyoDataBusMessage[]>;
+    abstract readData(clockId: string, resolution: EnyoDataBusMessageResolution): Promise<EnyoDataBusMessage[]>;
     /**
      * Check if the device is connected
      */
@@ -83,5 +83,5 @@ export declare class SunspecMeter extends BaseSunspecDevice {
     /**
      * Update meter data and return data bus messages
      */
-    readData(clockId: string, resolution: '10s' | '30s' | '1m' | '15m'): Promise<EnyoDataBusMessage[]>;
+    readData(clockId: string, resolution: EnyoDataBusMessageResolution): Promise<EnyoDataBusMessage[]>;
 }

package/dist/sunspec-devices.js

@@ -109,12 +109,12 @@ export class SunspecInverter extends BaseSunspecDevice {
                     timestampIso: timestamp.toISOString(),
                     resolution,
                     data: {
-                        pvPowerW: inverterData.acPower || 0,
-                        activePowerLimitationW: inverterData.acPower || 0, // Using AC power as default
+                        pvPowerW: inverterData.dcPower || 0, // Use DC power for PV power
+                        activePowerLimitationW: inverterData.acPower || 0,
                         state: this.mapOperatingState(inverterData.operatingState),
                         voltageL1: inverterData.voltageAN || 0,
-                        voltageL2: inverterData.voltageBN,
-                        voltageL3: inverterData.voltageCN,
+                        voltageL2: inverterData.voltageBN ?? undefined, // Use null if undefined (unimplemented phase)
+                        voltageL3: inverterData.voltageCN ?? undefined, // Use null if undefined (unimplemented phase)
                         strings: this.mapMPPTToStrings(mpptDataList)
                     }
                 };
@@ -148,11 +148,14 @@ export class SunspecInverter extends BaseSunspecDevice {
     mapMPPTToStrings(mpptDataList) {
         const result = [];
         mpptDataList.forEach((mppt, index) => {
-            result.push({
-                index: index + 1,
-                voltage: mppt.dcVoltage,
-                powerW: mppt.dcPower
-            });
+            // Only include strings with valid data
+            if (mppt.dcVoltage !== undefined || mppt.dcPower !== undefined) {
+                result.push({
+                    index: index + 1,
+                    voltage: mppt.dcVoltage ?? undefined, // Use null if undefined
+                    powerW: mppt.dcPower ?? 0 // Default to 0 if undefined
+                });
+            }
         });
         return result;
     }

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

@@ -19,9 +19,17 @@ export declare class SunspecModbusClient {
      * Disconnect from Modbus device
      */
     disconnect(): Promise<void>;
+    /**
+     * Detect the base address and addressing mode (0-based or 1-based) for SunSpec
+     */
+    detectSunspecBaseAddress(): Promise<{
+        baseAddress: number;
+        isZeroBased: boolean;
+        nextAddress: number;
+    }>;
     /**
      * Discover all available Sunspec models
-     * Scans through the address space starting at 40001
+     * Automatically detects base address (40000 or 40001) and scans from there
      */
     discoverModels(): Promise<Map<number, SunspecModel>>;
     /**
@@ -36,6 +44,11 @@ export declare class SunspecModbusClient {
      * Convert unsigned 16-bit value to signed
      */
     private convertToSigned16;
+    /**
+     * Check if a value is "unimplemented" according to Sunspec
+     * Returns true if the value represents an unimplemented/not applicable register
+     */
+    private isUnimplementedValue;
     /**
      * Helper to clean string values by removing null characters
      */
@@ -58,6 +71,7 @@ export declare class SunspecModbusClient {
     private readInverterScaleFactors;
     /**
      * Apply scale factor to a value
+     * Returns undefined if the value is unimplemented or scale factor is out of range
      */
     private applyScaleFactor;
     /**

package/dist/sunspec-modbus-client.js

@@ -48,29 +48,63 @@ export class SunspecModbusClient {
             this.scaleFactors = {};
         }
     }
+    /**
+     * Detect the base address and addressing mode (0-based or 1-based) for SunSpec
+     */
+    async detectSunspecBaseAddress() {
+        if (!this.modbusClient) {
+            throw new Error('Modbus client not initialized');
+        }
+        // Try 1-based addressing first (most common)
+        try {
+            const sunspecId = await this.modbusClient.readRegisterStringValue(40001, 2);
+            if (sunspecId.includes('SunS')) {
+                console.log('Detected 1-based addressing mode (base address: 40001)');
+                this.baseAddress = 40001;
+                return {
+                    baseAddress: 40001,
+                    isZeroBased: false,
+                    nextAddress: 40003
+                };
+            }
+        }
+        catch (error) {
+            console.debug('Could not read SunS at 40001:', error);
+        }
+        // Try 0-based addressing
+        try {
+            const sunspecId = await this.modbusClient.readRegisterStringValue(40000, 2);
+            if (sunspecId.includes('SunS')) {
+                console.log('Detected 0-based addressing mode (base address: 40000)');
+                this.baseAddress = 40000;
+                return {
+                    baseAddress: 40000,
+                    isZeroBased: true,
+                    nextAddress: 40002
+                };
+            }
+        }
+        catch (error) {
+            console.debug('Could not read SunS at 40000:', error);
+        }
+        throw new Error('Device is not SunSpec compliant - "SunS" identifier not found at addresses 40000 or 40001');
+    }
     /**
      * Discover all available Sunspec models
-     * Scans through the address space starting at 40001
+     * Automatically detects base address (40000 or 40001) and scans from there
      */
     async discoverModels() {
         if (!this.connected) {
             throw new Error('Not connected to Modbus device');
         }
         this.discoveredModels.clear();
-        let currentAddress = this.baseAddress;
         const maxAddress = 50000; // Safety limit
+        let currentAddress = 0;
         console.log('Starting Sunspec model discovery...');
         try {
-            // First, check for Sunspec identifier "SunS" at 40001
-            if (!this.modbusClient) {
-                throw new Error('Modbus client not initialized');
-            }
-            const sunspecId = await this.modbusClient.readRegisterStringValue(40001, 2);
-            if (!sunspecId.includes('SunS')) {
-                console.warn('Device may not be Sunspec compliant - missing SunS identifier');
-            }
-            // Start scanning after the SunS identifier
-            currentAddress = 40003;
+            // Detect the base address and addressing mode
+            const addressInfo = await this.detectSunspecBaseAddress();
+            currentAddress = addressInfo.nextAddress;
             while (currentAddress < maxAddress) {
                 // Read model ID and length
                 if (!this.modbusClient) {
@@ -152,6 +186,24 @@ export class SunspecModbusClient {
         }
         return value;
     }
+    /**
+     * Check if a value is "unimplemented" according to Sunspec
+     * Returns true if the value represents an unimplemented/not applicable register
+     */
+    isUnimplementedValue(value, dataType = 'uint16') {
+        switch (dataType) {
+            case 'uint16':
+                return value === 0xFFFF || value === 65535;
+            case 'int16':
+                return value === 0x7FFF || value === 32767;
+            case 'uint32':
+                return value === 0xFFFFFFFF;
+            case 'int32':
+                return value === 0x7FFFFFFF;
+            default:
+                return false;
+        }
+    }
     /**
      * Helper to clean string values by removing null characters
      */
@@ -231,6 +283,15 @@ export class SunspecModbusClient {
             // Read all scale factors first using fault-tolerant reader
             const scaleFactors = await this.readInverterScaleFactors(baseAddr);
             // Read values using fault-tolerant reader with proper data types
+            // Read raw voltage values to check for unimplemented phases
+            const voltageANRaw = await this.readRegisterValue(baseAddr + 10, 1, 'uint16');
+            const voltageBNRaw = await this.readRegisterValue(baseAddr + 11, 1, 'uint16');
+            const voltageCNRaw = await this.readRegisterValue(baseAddr + 12, 1, 'uint16');
+            console.log('Inverter Raw Voltage Values:', {
+                voltageANRaw: `0x${voltageANRaw.toString(16).toUpperCase()} (${voltageANRaw})`,
+                voltageBNRaw: `0x${voltageBNRaw.toString(16).toUpperCase()} (${voltageBNRaw})`,
+                voltageCNRaw: `0x${voltageCNRaw.toString(16).toUpperCase()} (${voltageCNRaw})`
+            });
             const data = {
                 blockNumber: 103,
                 blockAddress: model.address,
@@ -244,9 +305,10 @@ export class SunspecModbusClient {
                 voltageAB: this.applyScaleFactor(await this.readRegisterValue(baseAddr + 7, 1, 'uint16'), scaleFactors.V_SF),
                 voltageBC: this.applyScaleFactor(await this.readRegisterValue(baseAddr + 8, 1, 'uint16'), scaleFactors.V_SF),
                 voltageCA: this.applyScaleFactor(await this.readRegisterValue(baseAddr + 9, 1, 'uint16'), scaleFactors.V_SF),
-                voltageAN: this.applyScaleFactor(await this.readRegisterValue(baseAddr + 10, 1, 'uint16'), scaleFactors.V_SF),
-                voltageBN: this.applyScaleFactor(await this.readRegisterValue(baseAddr + 11, 1, 'uint16'), scaleFactors.V_SF),
-                voltageCN: this.applyScaleFactor(await this.readRegisterValue(baseAddr + 12, 1, 'uint16'), scaleFactors.V_SF),
+                // Apply scale factor with unimplemented value checking
+                voltageAN: this.applyScaleFactor(voltageANRaw, scaleFactors.V_SF),
+                voltageBN: this.applyScaleFactor(voltageBNRaw, scaleFactors.V_SF),
+                voltageCN: this.applyScaleFactor(voltageCNRaw, scaleFactors.V_SF),
                 // Power values - Offsets 14, 18, 20, 22
                 acPower: this.applyScaleFactor(await this.readRegisterValue(baseAddr + 14, 1, 'int16'), scaleFactors.W_SF),
                 apparentPower: this.applyScaleFactor(await this.readRegisterValue(baseAddr + 18, 1, 'uint16'), scaleFactors.VA_SF),
@@ -312,7 +374,7 @@ export class SunspecModbusClient {
      * Read inverter scale factors
      */
     async readInverterScaleFactors(baseAddr) {
-        return {
+        const scaleFactors = {
             A_SF: await this.readRegisterValue(baseAddr + 6, 1, 'int16'), // Offset 6
             V_SF: await this.readRegisterValue(baseAddr + 13, 1, 'int16'), // Offset 13
             W_SF: await this.readRegisterValue(baseAddr + 15, 1, 'int16'), // Offset 15
@@ -326,11 +388,23 @@ export class SunspecModbusClient {
             DCW_SF: await this.readRegisterValue(baseAddr + 31, 1, 'int16'), // Offset 31
             Tmp_SF: await this.readRegisterValue(baseAddr + 36, 1, 'int16') // Offset 36
         };
+        console.log('Inverter Scale Factors:', JSON.stringify(scaleFactors, null, 2));
+        return scaleFactors;
     }
     /**
      * Apply scale factor to a value
+     * Returns undefined if the value is unimplemented or scale factor is out of range
      */
-    applyScaleFactor(value, scaleFactor) {
+    applyScaleFactor(value, scaleFactor, dataType = 'uint16') {
+        // Check for unimplemented values
+        if (this.isUnimplementedValue(value, dataType)) {
+            return undefined;
+        }
+        // Validate scale factor is within reasonable range (-10 to +10)
+        if (Math.abs(scaleFactor) > 10) {
+            console.warn(`Scale factor ${scaleFactor} is outside reasonable range, clamping to ±10`);
+            scaleFactor = Math.max(-10, Math.min(10, scaleFactor));
+        }
         return value * Math.pow(10, scaleFactor);
     }
     /**
@@ -356,6 +430,28 @@ export class SunspecModbusClient {
                 DCWH_SF: await this.readRegisterValue(moduleAddr + 17, 1, 'int16'),
                 Tmp_SF: await this.readRegisterValue(moduleAddr + 21, 1, 'int16')
             };
+            console.log(`MPPT Module ${moduleId} Scale Factors:`, JSON.stringify(scaleFactors, null, 2));
+            // Read raw values first
+            const dcCurrentRaw = await this.readRegisterValue(moduleAddr + 9, 1, 'uint16');
+            const dcVoltageRaw = await this.readRegisterValue(moduleAddr + 11, 1, 'uint16');
+            const dcPowerRaw = await this.readRegisterValue(moduleAddr + 13, 1, 'uint16');
+            const dcEnergyRaw = await this.readRegisterValue(moduleAddr + 15, 2, 'acc32');
+            const temperatureRaw = await this.readRegisterValue(moduleAddr + 20, 1, 'int16');
+            console.log(`MPPT Module ${moduleId} Raw Values:`, {
+                dcCurrentRaw: `0x${dcCurrentRaw.toString(16).toUpperCase()} (${dcCurrentRaw})`,
+                dcVoltageRaw: `0x${dcVoltageRaw.toString(16).toUpperCase()} (${dcVoltageRaw})`,
+                dcPowerRaw: `0x${dcPowerRaw.toString(16).toUpperCase()} (${dcPowerRaw})`,
+                dcEnergyRaw: `0x${dcEnergyRaw.toString(16).toUpperCase()} (${dcEnergyRaw})`,
+                temperatureRaw: `0x${temperatureRaw.toString(16).toUpperCase()} (${temperatureRaw})`
+            });
+            // Check if this module is actually implemented/connected
+            // If all key values are unimplemented, this module doesn't exist
+            if (this.isUnimplementedValue(dcCurrentRaw, 'uint16') &&
+                this.isUnimplementedValue(dcVoltageRaw, 'uint16') &&
+                this.isUnimplementedValue(dcPowerRaw, 'uint16')) {
+                console.log(`MPPT module ${moduleId} appears to be unconnected (all values are 0xFFFF)`);
+                return null;
+            }
             const data = {
                 blockNumber: 160,
                 blockAddress: model.address,
@@ -364,22 +460,24 @@ export class SunspecModbusClient {
                 // String ID - Offset 1 (8 registers for string)
                 stringId: await this.readRegisterValue(moduleAddr + 1, 8, 'string'),
                 // DC Current - Offset 9
-                dcCurrent: this.applyScaleFactor(await this.readRegisterValue(moduleAddr + 9, 1, 'uint16'), scaleFactors.DCA_SF),
+                dcCurrent: this.applyScaleFactor(dcCurrentRaw, scaleFactors.DCA_SF),
                 dcCurrentSF: scaleFactors.DCA_SF,
                 // DC Voltage - Offset 11
-                dcVoltage: this.applyScaleFactor(await this.readRegisterValue(moduleAddr + 11, 1, 'uint16'), scaleFactors.DCV_SF),
+                dcVoltage: this.applyScaleFactor(dcVoltageRaw, scaleFactors.DCV_SF),
                 dcVoltageSF: scaleFactors.DCV_SF,
                 // DC Power - Offset 13
-                dcPower: this.applyScaleFactor(await this.readRegisterValue(moduleAddr + 13, 1, 'uint16'), scaleFactors.DCW_SF),
+                dcPower: this.applyScaleFactor(dcPowerRaw, scaleFactors.DCW_SF),
                 dcPowerSF: scaleFactors.DCW_SF,
                 // DC Energy - Offset 15-16 (32-bit accumulator)
-                dcEnergy: BigInt(await this.readRegisterValue(moduleAddr + 15, 2, 'acc32')) *
-                    BigInt(Math.pow(10, scaleFactors.DCWH_SF)),
+                // Only calculate if value is not unimplemented
+                dcEnergy: !this.isUnimplementedValue(dcEnergyRaw, 'uint32')
+                    ? BigInt(dcEnergyRaw) * BigInt(Math.pow(10, scaleFactors.DCWH_SF))
+                    : undefined,
                 dcEnergySF: scaleFactors.DCWH_SF,
                 // Timestamp - Offset 18-19 (32-bit)
                 timestamp: await this.readRegisterValue(moduleAddr + 18, 2, 'uint32'),
                 // Temperature - Offset 20
-                temperature: this.applyScaleFactor(await this.readRegisterValue(moduleAddr + 20, 1, 'int16'), scaleFactors.Tmp_SF),
+                temperature: this.applyScaleFactor(temperatureRaw, scaleFactors.Tmp_SF, 'int16'),
                 temperatureSF: scaleFactors.Tmp_SF,
                 // Operating State - Offset 22
                 operatingState: await this.readRegisterValue(moduleAddr + 22, 1, 'uint16'),
@@ -402,9 +500,19 @@ export class SunspecModbusClient {
         const mpptData = [];
         // Try to read up to 4 MPPT strings (typical maximum)
         for (let i = 1; i <= 4; i++) {
-            const data = await this.readMPPTData(i);
-            if (data && data.dcCurrent !== undefined && data.dcCurrent > 0) {
-                mpptData.push(data);
+            try {
+                const data = await this.readMPPTData(i);
+                // Only include if we got valid data (not null) and it has actual values
+                if (data &&
+                    (data.dcCurrent !== undefined ||
+                        data.dcVoltage !== undefined ||
+                        data.dcPower !== undefined)) {
+                    mpptData.push(data);
+                }
+            }
+            catch (error) {
+                console.debug(`Could not read MPPT module ${i}: ${error}`);
+                // Continue to try other modules
             }
         }
         return mpptData;
@@ -449,15 +557,31 @@ export class SunspecModbusClient {
             return null;
         }
         const baseAddr = model.address + 2; // Skip ID and Length
+        console.log(`Reading Common Block - Model address: ${model.address}, Base address for data: ${baseAddr}`);
         try {
             // Read all strings using fault-tolerant reader with proper data type conversion
-            const manufacturer = await this.readRegisterValue(baseAddr + 2, 16, 'string'); // Offset 2-17
-            const modelName = await this.readRegisterValue(baseAddr + 18, 16, 'string'); // Offset 18-33
-            const options = await this.readRegisterValue(baseAddr + 34, 8, 'string'); // Offset 34-41
-            const version = await this.readRegisterValue(baseAddr + 42, 8, 'string'); // Offset 42-49
-            const serialNumber = await this.readRegisterValue(baseAddr + 50, 16, 'string'); // Offset 50-65
-            const deviceAddress = await this.readRegisterValue(baseAddr + 66, 1, 'uint16'); // Offset 66
-            return {
+            // Common block offsets are relative to the start of the data (after ID and Length)
+            const manufacturerAddr = baseAddr; // Offset 0-15 (16 registers) from data start
+            const modelAddr = baseAddr + 16; // Offset 16-31 (16 registers) from data start
+            const optionsAddr = baseAddr + 32; // Offset 32-39 (8 registers) from data start
+            const versionAddr = baseAddr + 40; // Offset 40-47 (8 registers) from data start
+            const serialAddr = baseAddr + 48; // Offset 48-63 (16 registers) from data start
+            const deviceAddrAddr = baseAddr + 64; // Offset 64 from data start
+            console.log(`Reading manufacturer from address ${manufacturerAddr} (16 registers)`);
+            const manufacturer = await this.readRegisterValue(manufacturerAddr, 16, 'string');
+            console.log(`Manufacturer raw value: "${manufacturer}"`);
+            console.log(`Reading model from address ${modelAddr} (16 registers)`);
+            const modelName = await this.readRegisterValue(modelAddr, 16, 'string');
+            console.log(`Model raw value: "${modelName}"`);
+            console.log(`Reading options from address ${optionsAddr} (8 registers)`);
+            const options = await this.readRegisterValue(optionsAddr, 8, 'string');
+            console.log(`Reading version from address ${versionAddr} (8 registers)`);
+            const version = await this.readRegisterValue(versionAddr, 8, 'string');
+            console.log(`Reading serial from address ${serialAddr} (16 registers)`);
+            const serialNumber = await this.readRegisterValue(serialAddr, 16, 'string');
+            console.log(`Reading device address from address ${deviceAddrAddr}`);
+            const deviceAddress = await this.readRegisterValue(deviceAddrAddr, 1, 'uint16');
+            const result = {
                 manufacturer: manufacturer,
                 model: modelName,
                 options: options,
@@ -465,6 +589,8 @@ export class SunspecModbusClient {
                 serialNumber: serialNumber,
                 deviceAddress: deviceAddress
             };
+            console.log('Common Block Data:', JSON.stringify(result, null, 2));
+            return result;
         }
         catch (error) {
             console.error(`Error reading common block: ${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.4";
+export declare const SDK_VERSION = "0.0.6";
 /**
  * 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.4';
+export const SDK_VERSION = '0.0.6';
 /**
  * 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.4",
+  "version": "0.0.6",
   "description": "enyo Energy Sunspec SDK",
   "type": "module",
   "main": "dist/index.js",