jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-07-21 08:16:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prioritize battery consumption before solar consumption (#25467)

Browse Source
This commit is contained in:
karwosts 2025-05-15 00:32:07 -07:00 committed by GitHub
parent 785929b370
commit 28e5a30772
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 60 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/data/energy.ts
View File

@ -1036,33 +1036,46 @@ export const computeConsumptionSingle = (data: {
let used_total_remaining = Math.max(used_total, 0); let used_total_remaining = Math.max(used_total, 0);
// Consumption Priority // Consumption Priority
// Battery_Out -> Grid_Out
// Solar -> Grid_Out
// Solar -> Battery_In // Solar -> Battery_In
// Solar -> Grid_Out
// Battery_Out -> Grid_Out
// Grid_In -> Battery_In // Grid_In -> Battery_In
// Solar -> Consumption // Solar -> Consumption
// Battery_Out -> Consumption // Battery_Out -> Consumption
// Grid_In -> Consumption // Grid_In -> Consumption
// Battery_Out -> Grid_Out // If we have more grid_in than consumption, the excess must be charging the battery
battery_to_grid = Math.min(from_battery, to_grid); // This must be accounted for before filling the battery from solar, or else the grid
from_battery -= battery_to_grid; // input could be stranded with nowhere to go.
to_grid -= battery_to_grid; const excess_grid_in_after_consumption = Math.max(
0,
Math.min(to_battery, from_grid - used_total_remaining)
);
grid_to_battery += excess_grid_in_after_consumption;
to_battery -= excess_grid_in_after_consumption;
from_grid -= excess_grid_in_after_consumption;
// Fill the remainder of the battery input from solar
// Solar -> Battery_In
solar_to_battery = Math.min(solar, to_battery);
to_battery -= solar_to_battery;
solar -= solar_to_battery;
// Solar -> Grid_Out // Solar -> Grid_Out
solar_to_grid = Math.min(solar, to_grid); solar_to_grid = Math.min(solar, to_grid);
to_grid -= solar_to_grid; to_grid -= solar_to_grid;
solar -= solar_to_grid; solar -= solar_to_grid;
// Solar -> Battery_In // Battery_Out -> Grid_Out
solar_to_battery = Math.min(solar, to_battery); battery_to_grid = Math.min(from_battery, to_grid);
to_battery -= solar_to_battery; from_battery -= battery_to_grid;
solar -= solar_to_battery; to_grid -= battery_to_grid;
// Grid_In -> Battery_In // Grid_In -> Battery_In (second pass)
grid_to_battery = Math.min(from_grid, to_battery); const grid_to_battery_2 = Math.min(from_grid, to_battery);
from_grid -= grid_to_battery; grid_to_battery += grid_to_battery_2;
to_battery -= grid_to_battery; from_grid -= grid_to_battery_2;
to_battery -= grid_to_battery_2;
// Solar -> Consumption // Solar -> Consumption
used_solar = Math.min(used_total_remaining, solar); used_solar = Math.min(used_total_remaining, solar);

41
test/data/energy.test.ts
View File

@ -378,13 +378,13 @@ describe("Energy Usage Calculation Tests", () => {
}), }),
{ {
grid_to_battery: 0, grid_to_battery: 0,
battery_to_grid: 3, battery_to_grid: 0,
used_solar: 4, used_solar: 1,
used_grid: 5, used_grid: 5,
used_battery: 7, used_battery: 10,
used_total: 16, used_total: 16,
solar_to_battery: 3, solar_to_battery: 3,
solar_to_grid: 0, solar_to_grid: 3,
} }
); );
assert.deepEqual( assert.deepEqual(
@ -416,13 +416,13 @@ describe("Energy Usage Calculation Tests", () => {
}), }),
{ {
grid_to_battery: 0, grid_to_battery: 0,
battery_to_grid: 1, battery_to_grid: 0,
used_solar: 2, used_solar: 1,
used_grid: 2, used_grid: 2,
used_battery: 0, used_battery: 1,
used_total: 4, used_total: 4,
solar_to_battery: 1, solar_to_battery: 1,
solar_to_grid: 6, solar_to_grid: 7,
} }
); );
assert.deepEqual( assert.deepEqual(
@ -506,6 +506,31 @@ describe("Energy Usage Calculation Tests", () => {
} }
); );
}); });
it("bug #25387", () => {
assert.deepEqual(
checkConsumptionResult(
{
from_grid: 0.059,
to_grid: 48.0259,
solar: 61.22,
to_battery: 5.716,
from_battery: 4.83,
},
false
),
{
grid_to_battery: 0,
battery_to_grid: 0,
used_solar: 7.478099999999998,
used_grid: 0.05899999999999572,
used_battery: 4.83,
solar_to_battery: 5.716,
solar_to_grid: 48.0259,
used_total: 12.367099999999994,
}
);
});
}); });
describe("Self-consumed solar gauge tests", () => { describe("Self-consumed solar gauge tests", () => {