Merge remote-tracking branch 'upstream/master'

Author: WulfgarW

CONTRIBUTING.md

@@ -115,6 +115,13 @@ make ui build
 
 evcc already includes many translations for the UI. We're using [Weblate](https://hosted.weblate.org/projects/evcc/evcc/) to maintain translations. Feel free to add more languages or verify and edit existing translations. Weblate will automatically push all modifications to the evcc repository where they get reviewed and merged.
 
+If you find a text that is not yet translatable in [Weblate](https://hosted.weblate.org/projects/evcc/evcc/), you can help us by making it translatable. To do this, you can simply find the missing translation text in the code and apply similar changes as in these two Pull Requests:
+
+- [UI: Add missing translation for Error during startup](https://github.com/evcc-io/evcc/pull/14695)
+- [Translation: kein Plan, keine Grenze](https://github.com/evcc-io/evcc/pull/7461/)
+
+Note: To ensure the build succeeds after creating new translations, make sure to include your new translations in both the [de.toml](i18n/de.toml) and [en.toml](i18n/en.toml) files.
+
 [![Languages](https://hosted.weblate.org/widgets/evcc/-/evcc/multi-auto.svg)](https://hosted.weblate.org/engage/evcc/)
 
 [1]: https://go.dev

Dockerfile

@@ -84,13 +84,15 @@ COPY packaging/docker/bin/* /app/
 
 # mDNS
 EXPOSE 5353/udp
+# EEBus
+EXPOSE 4712/tcp
 # UI and /api
 EXPOSE 7070/tcp
 # KEBA charger
 EXPOSE 7090/udp
 # OCPP charger
 EXPOSE 8887/tcp
-# GoodWe Wifi Inverter
+# Modbus UDP
 EXPOSE 8899/udp
 # SMA Energy Manager
 EXPOSE 9522/udp

api/api.go

@@ -222,6 +222,7 @@ type Circuit interface {
 	SetTitle(string)
 	GetParent() Circuit
 	RegisterChild(child Circuit)
+	Wrap(parent Circuit) error
 	HasMeter() bool
 	GetMaxPower() float64
 	GetMaxCurrent() float64

api/feature.go

@@ -10,4 +10,5 @@ const (
 	IntegratedDevice
 	Heating
 	Retryable
+	WelcomeCharge
 )

api/feature_enumer.go

@@ -6,9 +6,9 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/evcc-io/evcc/charger/eebus"
 	"github.com/evcc-io/evcc/provider/mqtt"
 	"github.com/evcc-io/evcc/push"
+	"github.com/evcc-io/evcc/server/eebus"
 	"github.com/evcc-io/evcc/util/config"
 	"github.com/evcc-io/evcc/util/modbus"
 )

api/globalconfig/types.go

@@ -250,6 +250,10 @@ a:hover {
 	--bs-btn-hover-border-color: var(--bs-gray-medium);
 }
 
+.btn-link:hover {
+	color: var(--bs-primary);
+}
+
 .dark .btn-outline-secondary {
 	--bs-btn-color: var(--bs-gray-bright);
 	--bs-btn-border-color: var(--bs-gray-bright);

api/mock.go

@@ -9,7 +9,7 @@
 			<div class="value m-0 d-block align-items-baseline justify-content-center">
 				<button class="value-button p-0" :class="buttonColor" @click="openModal">
 					<strong v-if="enabled">
-						<span class="targetTimeLabel"> {{ targetTimeLabel() }}</span>
+						<span class="targetTimeLabel"> {{ targetTimeLabel }}</span>
 						<div
 							class="extraValue text-nowrap"
 							:class="{ 'text-warning': planTimeUnreachable }"
@@ -106,6 +106,8 @@ import collector from "../mixins/collector";
 import api from "../api";
 import { optionStep, fmtEnergy } from "../utils/energyOptions";
 
+const ONE_MINUTE = 60 * 1000;
+
 export default {
 	name: "ChargingPlan",
 	components: { LabelAndValue, ChargingPlanSettings, ChargingPlanArrival },
@@ -140,6 +142,8 @@ export default {
 			modal: null,
 			isModalVisible: false,
 			activeTab: "departure",
+			targetTimeLabel: "",
+			interval: null,
 		};
 	},
 	computed: {
@@ -203,16 +207,24 @@ export default {
 			return `loadpoints/${this.id}/`;
 		},
 	},
+	watch: {
+		effectivePlanTime() {
+			this.updateTargetTimeLabel();
+		},
+	},
 	mounted() {
 		this.modal = Modal.getOrCreateInstance(this.$refs.modal);
 		this.$refs.modal.addEventListener("show.bs.modal", this.modalVisible);
 		this.$refs.modal.addEventListener("hidden.bs.modal", this.modalInvisible);
 		this.$refs.modal.addEventListener("hide.bs.modal", this.checkUnsavedOnClose);
+		this.interval = setInterval(this.updateTargetTimeLabel, ONE_MINUTE);
+		this.updateTargetTimeLabel();
 	},
 	unmounted() {
 		this.$refs.modal?.removeEventListener("show.bs.modal", this.modalVisible);
 		this.$refs.modal?.removeEventListener("hidden.bs.modal", this.modalInvisible);
 		this.$refs.modal?.removeEventListener("hide.bs.modal", this.checkUnsavedOnClose);
+		clearInterval(this.interval);
 	},
 	methods: {
 		checkUnsavedOnClose: function () {
@@ -241,10 +253,9 @@ export default {
 			}
 			this.modal.show();
 		},
-		// not computed because it needs to update over time
-		targetTimeLabel: function () {
+		updateTargetTimeLabel: function () {
 			const targetDate = new Date(this.effectivePlanTime);
-			return this.fmtAbsoluteDate(targetDate);
+			this.targetTimeLabel = this.fmtAbsoluteDate(targetDate);
 		},
 		showDeatureTab: function () {
 			this.activeTab = "departure";

assets/css/app.css

@@ -6,7 +6,6 @@
 		docs="/docs/features/loadmanagement"
 		:defaultYaml="defaultYaml"
 		endpoint="/config/circuits"
-		size="md"
 		@changed="$emit('changed')"
 	/>
 </template>

assets/js/components/ChargingPlan.vue

@@ -80,26 +80,25 @@
 								:defaultPort="modbus.Port"
 								:capabilities="modbusCapabilities"
 							/>
-							<FormRow
-								v-for="param in templateParams"
-								:id="`meterParam${param.Name}`"
+							<PropertyEntry
+								v-for="param in normalParams"
 								:key="param.Name"
-								:optional="!param.Required"
-								:label="param.Description || `[${param.Name}]`"
-								:help="param.Description === param.Help ? undefined : param.Help"
-								:example="param.Example"
-							>
-								<PropertyField
-									:id="`meterParam${param.Name}`"
-									v-model="values[param.Name]"
-									:masked="param.Mask"
-									:property="param.Name"
-									:type="param.Type"
-									class="me-2"
-									:required="param.Required"
-									:validValues="param.ValidValues"
-								/>
-							</FormRow>
+								:id="`meterParam${param.Name}`"
+								v-bind="param"
+								v-model="values[param.Name]"
+							/>
+
+							<PropertyCollapsible>
+								<template v-if="advancedParams.length" #advanced>
+									<PropertyEntry
+										v-for="param in advancedParams"
+										:key="param.Name"
+										:id="`meterParam${param.Name}`"
+										v-bind="param"
+										v-model="values[param.Name]"
+									/>
+								</template>
+							</PropertyCollapsible>
 
 							<TestResult
 								v-if="templateName"
@@ -158,7 +157,8 @@
 
 <script>
 import FormRow from "./FormRow.vue";
-import PropertyField from "./PropertyField.vue";
+import PropertyEntry from "./PropertyEntry.vue";
+import PropertyCollapsible from "./PropertyCollapsible.vue";
 import TestResult from "./TestResult.vue";
 import api from "../../api";
 import test from "./mixins/test";
@@ -171,9 +171,18 @@ function sleep(ms) {
 	return new Promise((resolve) => setTimeout(resolve, ms));
 }
 
+const CUSTOM_FIELDS = ["usage", "modbus"];
+
 export default {
 	name: "MeterModal",
-	components: { FormRow, PropertyField, Modbus, TestResult, AddDeviceButton },
+	components: {
+		FormRow,
+		PropertyEntry,
+		Modbus,
+		TestResult,
+		AddDeviceButton,
+		PropertyCollapsible,
+	},
 	mixins: [test],
 	props: {
 		id: Number,
@@ -215,18 +224,20 @@ export default {
 			return this.products.filter((p) => p.group === "generic");
 		},
 		templateParams() {
-			const params = this.template?.Params || [];
-			return (
-				params
-					// deprecated fields
-					.filter((p) => !p.Deprecated)
-					// remove usage option
-					.filter((p) => p.Name !== "usage")
-					// remove modbus, handles separately
-					.filter((p) => p.Name !== "modbus")
-					// capacity only for battery meters
-					.filter((p) => this.meterType === "battery" || p.Name !== "capacity")
-			);
+			return (this.template?.Params || [])
+				.filter((p) => !CUSTOM_FIELDS.includes(p.Name))
+				.map((p) => {
+					if (this.meterType === "battery" && p.Name === "capacity") {
+						p.Advanced = false;
+					}
+					return p;
+				});
+		},
+		normalParams() {
+			return this.templateParams.filter((p) => !p.Advanced);
+		},
+		advancedParams() {
+			return this.templateParams.filter((p) => p.Advanced);
 		},
 		modbus() {
 			const params = this.template?.Params || [];

assets/js/components/Config/CircuitsModal.vue

@@ -0,0 +1,62 @@
+<template>
+	<div v-if="$slots.advanced || $slots.more">
+		<button
+			class="btn btn-link btn-sm text-gray px-0 border-0 d-flex align-items-center mb-2"
+			:class="open ? 'text-primary' : ''"
+			type="button"
+			@click="toggle"
+		>
+			<span v-if="open">Hide advanced settings</span>
+			<span v-else>Show advanced settings</span>
+			<DropdownIcon class="icon" :class="{ iconUp: open }" />
+		</button>
+
+		<Transition>
+			<div v-if="open" class="pt-2">
+				<slot name="advanced"></slot>
+				<hr v-if="$slots.advanced && $slots.more" class="my-5" />
+				<slot name="more"></slot>
+			</div>
+		</Transition>
+	</div>
+</template>
+
+<script>
+import DropdownIcon from "../MaterialIcon/Dropdown.vue";
+
+export default {
+	name: "PropertyCollapsible",
+	components: { DropdownIcon },
+	data() {
+		return { open: false };
+	},
+
+	methods: {
+		toggle() {
+			this.open = !this.open;
+		},
+	},
+};
+</script>
+<style scoped>
+.icon {
+	transform: rotate(0deg);
+	transition: transform var(--evcc-transition-medium) ease;
+}
+.iconUp {
+	transform: rotate(-180deg);
+}
+.v-enter-active,
+.v-leave-active {
+	transition:
+		transform var(--evcc-transition-medium) ease,
+		opacity var(--evcc-transition-medium) ease;
+	transform: translateY(0);
+}
+
+.v-enter-from,
+.v-leave-to {
+	opacity: 0;
+	transform: translateY(-0.5rem);
+}
+</style>