Add invertersCount to InverterConfiguraton

longzheng · Nov 3, 2024 · 9f44ffe · 9f44ffe
1 parent 8ebaac9
commit 9f44ffe
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/src/coordinator/helpers/derSample.test.ts b/src/coordinator/helpers/derSample.test.ts
@@ -90,6 +90,7 @@ describe('generateDerSample', () => {
                     ConnectStatus.Connected |
                     ConnectStatus.Operating,
             },
+            invertersCount: 1,
         } satisfies typeof result);
     });
 
@@ -193,6 +194,7 @@ describe('generateDerSample', () => {
                     ConnectStatus.Connected |
                     ConnectStatus.Operating,
             },
+            invertersCount: 2,
         } satisfies typeof result);
     });
 });
diff --git a/src/coordinator/helpers/derSample.ts b/src/coordinator/helpers/derSample.ts
@@ -43,6 +43,7 @@ export const derSampleDataSchema = z.object({
         operationalModeStatus: z.number(),
         genConnectStatus: z.number(),
     }),
+    invertersCount: z.number(),
 });
 
 export type DerSampleData = z.infer<typeof derSampleDataSchema>;
@@ -124,5 +125,6 @@ export function generateDerSample({
                 0,
             ) satisfies ConnectStatus,
         },
+        invertersCount: invertersData.length,
     };
 }
diff --git a/src/coordinator/helpers/inverterController.ts b/src/coordinator/helpers/inverterController.ts
@@ -47,6 +47,7 @@ export type InverterConfiguration =
     | { type: 'disconnect' }
     | {
           type: 'limit';
+          invertersCount: number;
           targetSolarWatts: number;
           targetSolarPowerRatio: number;
       };
@@ -278,13 +279,18 @@ export class InverterController {
             })),
         );
 
+        const maxInvertersCount = Math.max(
+            ...recentDerSamples.map((sample) => sample.invertersCount),
+        );
+
         const rampedInverterConfiguration = ((): InverterConfiguration => {
             const configuration = calculateInverterConfiguration({
                 activeInverterControlLimit:
                     this.controlLimitsCache.activeInverterControlLimit,
                 nameplateMaxW: averagedNameplateMaxW,
                 siteWatts: averagedSiteWatts,
                 solarWatts: averagedSolarWatts,
+                maxInvertersCount,
             });
 
             switch (configuration.type) {
@@ -335,6 +341,7 @@ export class InverterController {
 
                     return {
                         type: 'limit',
+                        invertersCount: configuration.invertersCount,
                         targetSolarWatts: rampedTargetSolarWatts,
                         targetSolarPowerRatio: rampedTargetSolarPowerRatio,
                     };
@@ -351,11 +358,13 @@ export function calculateInverterConfiguration({
     siteWatts,
     solarWatts,
     nameplateMaxW,
+    maxInvertersCount,
 }: {
     activeInverterControlLimit: ActiveInverterControlLimit;
     siteWatts: number;
     solarWatts: number;
     nameplateMaxW: number;
+    maxInvertersCount: number;
 }): InverterConfiguration {
     const logger = pinoLogger.child({
         module: 'calculateInverterConfiguration',
@@ -435,6 +444,7 @@ export function calculateInverterConfiguration({
 
     return {
         type: 'limit',
+        invertersCount: maxInvertersCount,
         targetSolarWatts,
         targetSolarPowerRatio: roundToDecimals(targetSolarPowerRatio, 4),
     };