Stefan/evcc-io
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Battery settings: improve buffer start (#12357)

Browse source
This commit is contained in:
andig 2024-02-22 16:51:33 +01:00
commit 1c830341bb
5 changed files with 70 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

111
assets/js/components/BatterySettingsModal.vue
View file

@ -162,31 +162,19 @@
<select
id="bufferStartSelect"
class="custom-select"
:value="selectedBufferStartSoc"
@change="changeBufferStart"
>
<option
v-for="option in [
'never',
'full',
'medium',
'low',
]"
:key="option"
:value="option"
v-for="option in bufferStartOptions"
:key="option.value"
:value="option.value"
>
{{
$t(
`batterySettings.bufferStart.${option}`
)
}}
{{ option.name }}
</option>
</select>
<span class="text-decoration-underline">
{{
$t(
`batterySettings.bufferStart.${bufferStartOption}`
)
}}
{{ bufferStartOption.name }}
</span>
</label>
</small>
@ -311,6 +299,25 @@ export default {
if (!this.selectedBufferStartSoc) return 0;
return 100 - this.selectedBufferStartSoc;
},
bufferStartOptions() {
const options = [];
for (let i = 100; i >= this.bufferSoc; i -= 5) {
options.push({
value: i,
name: this.$t(`batterySettings.bufferStart.${i === 100 ? "full" : "above"}`, {
soc: this.fmtSoc(i),
}),
});
}
options.push({
value: 0,
name: this.$t("batterySettings.bufferStart.never"),
});
return options;
},
bufferStartOption() {
return this.bufferStartOptions.find((option) => this.bufferStartSoc >= option.value);
},
topHeight() {
return 100 - (this.bufferSoc || 100);
},
@ -320,13 +327,6 @@ export default {
bottomHeight() {
return this.prioritySoc;
},
bufferStartOption() {
if (!this.selectedBufferStartSoc) return "never";
if (this.selectedBufferStartSoc >= this.bufferStartOptionToSoc("full")) return "full";
if (this.selectedBufferStartSoc >= this.bufferStartOptionToSoc("medium"))
return "medium";
return "low";
},
batteryDetails() {
if (!Array.isArray(this.battery)) {
return;
@ -382,52 +382,35 @@ export default {
this.isModalVisible = false;
},
changeBufferStart($event) {
this.setBufferStart($event.target.value);
this.setBufferStartSoc(parseInt($event.target.value, 10));
},
changePrioritySoc($event) {
const value = parseInt($event.target.value, 10);
if (value > this.bufferSoc) {
const startOption = this.bufferStartOption;
this.saveBufferSoc(value);
this.setBufferStart(startOption);
const soc = parseInt($event.target.value, 10);
if (soc > (this.bufferSoc || 100)) {
this.saveBufferSoc(soc);
if (soc > this.bufferStartSoc && this.bufferStartSoc > 0) {
this.setBufferStartSoc(soc);
}
} else {
this.savePrioritySoc(value);
}
},
bufferStartOptionToSoc(option) {
const bufferSoc = this.selectedBufferSoc;
const bufferHeight = 100 - bufferSoc;
switch (option) {
case "low":
return bufferSoc + bufferHeight * 0.2;
case "medium":
return bufferSoc + bufferHeight * 0.5;
case "full":
return bufferSoc + bufferHeight * 0.8;
case "never":
return 0;
this.savePrioritySoc(soc);
}
},
toggleBufferStart() {
const next = {
never: "low",
low: "medium",
medium: "full",
full: "never",
};
const nextOption = next[this.bufferStartOption];
if (nextOption) {
this.setBufferStart(nextOption);
const options = this.bufferStartOptions.map((option) => option.value);
const index = options.findIndex((value) => this.bufferStartSoc >= value);
const nextIndex = index === 0 ? options.length - 1 : index - 1;
this.setBufferStartSoc(options[nextIndex]);
},
async setBufferStartSoc(soc) {
this.selectedBufferStartSoc = soc;
await this.saveBufferStartSoc(this.selectedBufferStartSoc);
},
async changeBufferSoc($event) {
const soc = parseInt($event.target.value, 10);
if (soc > this.bufferStartSoc && this.bufferStartSoc > 0) {
await this.setBufferStartSoc(soc);
}
},
setBufferStart(option) {
this.selectedBufferStartSoc = this.bufferStartOptionToSoc(option);
this.saveBufferStartSoc(this.selectedBufferStartSoc);
},
changeBufferSoc($event) {
const startOption = this.bufferStartOption;
this.saveBufferSoc(parseInt($event.target.value, 10));
this.setBufferStart(startOption);
await this.saveBufferSoc(soc);
},
async savePrioritySoc(soc) {
this.selectedPrioritySoc = soc;

21
assets/js/components/TopNavigation.vue
View file

@ -28,7 +28,12 @@
</li>
<li><hr class="dropdown-divider" /></li>
<li>
<button type="button" class="dropdown-item" @click="openSettingsModal">
<button
type="button"
class="dropdown-item"
data-testid="topnavigation-settings"
@click="openSettingsModal"
>
<span
v-if="sponsorTokenExpires"
class="d-inline-block p-1 rounded-circle bg-danger border border-light rounded-circle"
@ -37,12 +42,22 @@
</button>
</li>
<li v-if="batteryModalAvailable">
<button type="button" class="dropdown-item" @click="openBatterySettingsModal">
<button
type="button"
class="dropdown-item"
data-testid="topnavigation-battery"
@click="openBatterySettingsModal"
>
{{ $t("batterySettings.modalTitle") }}
</button>
</li>
<li v-if="gridModalAvailable">
<button type="button" class="dropdown-item" @click="openGridSettingsModal">
<button
type="button"
class="dropdown-item"
data-testid="topnavigation-grid"
@click="openGridSettingsModal"
>
{{ $t("gridSettings.modalTitle") }}
</button>
</li>

2
core/site_api.go
View file

@ -218,7 +218,7 @@ func (site *Site) SetBufferStartSoc(soc float64) error {
return ErrBatteryNotConfigured
}
if soc != 0 && soc <= site.bufferSoc {
if soc != 0 && soc < site.bufferSoc {
return errors.New("buffer start soc must be larger than buffer soc")
}

5
i18n/de.toml
View file

@ -16,9 +16,8 @@ legendTopSubline = "ohne Unterbrechungen"
modalTitle = "Batterieeinstellungen"
[batterySettings.bufferStart]
full = "wenn fast voll"
low = "wenn etwas voll"
medium = "wenn halbvoll"
above = "wenn über {soc}"
full = "wenn auf {soc}"
never = "nur mit genug PV-Überschuss"
[config]

5
i18n/en.toml
View file

@ -16,9 +16,8 @@ legendTopSubline = "without interruptions"
modalTitle = "Battery Settings"
[batterySettings.bufferStart]
full = "when nearly full"
low = "when somewhat full"
medium = "when half full"
above = "when above {soc}"
full = "when at {soc}"
never = "only with enough surplus"
[config]