wip

assets/js/components/Loadpoint.vue

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

assets/js/components/LoadpointSettingsModal.vue

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

core/keys/loadpoint.go

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

core/loadpoint.go

@@ -624,18 +624,13 @@ 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.ChargerPhases1p3p, lp.hasPhaseSwitching())
+	lp.publish(keys.ChargerPhaseSwitching, lp.hasPhaseSwitching())
+	lp.publish(keys.ChargerPhaseReading, lp.getChargerPhysicalPhases() != 0)
 	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)