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

Revert "chore: fix phase configuration (#18062)"

Browse source 
This reverts commit 65bdb40494.
This commit is contained in:
andig 2025-01-07 22:22:24 +01:00
parent 54b6b911ce
commit e9d67ee006
4 changed files with 21 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
assets/js/components/Loadpoint.vue
View file

@ -183,8 +183,8 @@ export default {
phases: Number,
phasesConfigured: Number,
phasesActive: Number,
chargerPhaseSwitching: Boolean,
chargerPhaseReading: Boolean,
chargerPhases1p3p: Boolean,
chargerPhysicalPhases: Number,
minCurrent: Number,
maxCurrent: Number,
chargeCurrent: Number,

20
assets/js/components/LoadpointSettingsModal.vue
View file

@ -47,7 +47,7 @@
{{ $t("main.loadpointSettings.phasesConfigured.label") }}
</label>
<div class="col-sm-8 pe-0">
<p v-if="!chargerPhaseSwitching" class="mt-0 mb-2">
<p v-if="!chargerPhases1p3p" class="mt-0 mb-2">
<small>
{{
$t(
@ -184,8 +184,8 @@ export default {
id: [String, Number],
phasesConfigured: Number,
phasesActive: Number,
chargerPhaseSwitching: Boolean,
chargerPhaseReading: Boolean,
chargerPhases1p3p: Boolean,
chargerPhysicalPhases: Number,
batteryBoost: Boolean,
batteryBoostAvailable: Boolean,
mode: String,
@ -215,14 +215,14 @@ export default {
},
computed: {
phasesOptions() {
if (this.chargerPhaseSwitching) {
// automatic switching
return [PHASES_AUTO, PHASES_3, PHASES_1];
}
if (this.chargerPhaseReading) {
if (this.chargerPhysicalPhases == 1) {
// known fixed phase configuration, no settings required
return [];
}
if (this.chargerPhases1p3p) {
// automatic switching
return [PHASES_AUTO, PHASES_3, PHASES_1];
}
// 1p or 3p possible
return [PHASES_3, PHASES_1];
},
@ -230,7 +230,7 @@ export default {
return this.collectProps(LoadpointSettingsBatteryBoost);
},
maxPower() {
if (this.chargerPhaseSwitching) {
if (this.chargerPhases1p3p) {
if (this.phasesConfigured === PHASES_AUTO) {
return this.maxPowerPhases(3);
}
@ -241,7 +241,7 @@ export default {
return this.fmtW(this.maxCurrent * V * this.phasesActive);
},
minPower() {
if (this.chargerPhaseSwitching) {
if (this.chargerPhases1p3p) {
if (this.phasesConfigured === PHASES_AUTO) {
return this.minPowerPhases(1);
}

4
core/keys/loadpoint.go
View file

@ -22,8 +22,8 @@ const (
ChargerIcon = "chargerIcon" // charger icon for ui
ChargerFeature = "chargerFeature" // charger feature
ChargerPhaseSwitching = "chargerPhaseSwitching" // api.PhaseSwitcher: phase switcher (1p3p chargers) available
ChargerPhaseReading = "chargerPhaseReading" // api.PhaseDescriber: get charger phases available
ChargerPhysicalPhases = "chargerPhysicalPhases" // charger phases
ChargerPhases1p3p = "chargerPhases1p3p" // phase switcher (1p3p chargers)
ChargerStatusReason = "chargerStatusReason" // either awaiting authorization or disconnect required
// loadpoint status

9
core/loadpoint.go
View file

@ -624,13 +624,18 @@ func (lp *Loadpoint) Prepare(uiChan chan<- util.Param, pushChan chan<- push.Even
lp.publish(keys.DisableDelay, lp.Disable.Delay)
lp.publish(keys.PhasesConfigured, lp.configuredPhases)
lp.publish(keys.ChargerPhaseSwitching, lp.hasPhaseSwitching())
lp.publish(keys.ChargerPhaseReading, lp.getChargerPhysicalPhases() != 0)
lp.publish(keys.ChargerPhases1p3p, lp.hasPhaseSwitching())
lp.publish(keys.PhasesEnabled, lp.phases)
lp.publish(keys.PhasesActive, lp.ActivePhases())
lp.publishTimer(phaseTimer, 0, timerInactive)
lp.publishTimer(pvTimer, 0, timerInactive)
if phases := lp.getChargerPhysicalPhases(); phases != 0 {
lp.publish(keys.ChargerPhysicalPhases, phases)
} else {
lp.publish(keys.ChargerPhysicalPhases, nil)
}
// charger features
for _, f := range []api.Feature{api.IntegratedDevice, api.Heating} {
lp.publishChargerFeature(f)