Merge branch 'master' into chore/validvalues

evcc-io · Dec 24, 2024 · 172ddf6 · 172ddf6
2 parents e3ed2cf + 11779a6
commit 172ddf6
Show file tree

Hide file tree

Showing 140 changed files with 2,211 additions and 615 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -7,15 +7,19 @@
 		"ghcr.io/devcontainers/features/docker-outside-of-docker:1": {
 			"moby": true,
 			"installDockerBuildx": true,
+			"installDockerComposeSwitch": true,
 			"version": "latest",
 			"dockerDashComposeVersion": "v2"
 		},
 		"ghcr.io/devcontainers/features/node:1": {
 			"nodeGypDependencies": true,
 			"installYarnUsingApt": true,
-			"version": "latest",
+			"version": "lts",
 			"pnpmVersion": "latest",
 			"nvmVersion": "latest"
+		},
+		"ghcr.io/devcontainers/features/go:1": {
+			"version": "latest"
 		}
 	},
 	"postCreateCommand": "make install-ui && make install",

diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml
@@ -208,16 +208,6 @@ jobs:
       - name: Build Go
         run: make build
 
-      - uses: actions/cache@v4
-        id: playwright-cache
-        with:
-          path: |
-            ~/.cache/ms-playwright
-          key: ${{ runner.os }}-playwright-${{ hashFiles('**/package-lock.json') }}
-
-      - name: Install playwright
-        run: npx playwright install --with-deps chromium
-
       - name: Run tests
         run: npx playwright test
 

diff --git a/.prettierrc.js b/.prettierrc.js
@@ -1,4 +1,5 @@
 export default {
   printWidth: 100,
   trailingComma: "es5",
+  plugins: ["prettier-plugin-sh"],
 };
diff --git a/assets/js/components/ChargingPlan.story.vue b/assets/js/components/ChargingPlan.story.vue
@@ -15,27 +15,6 @@ const hoursFromNow = function (hours) {
 		<Variant title="target charge">
 			<ChargingPlan id="1" :targetTime="hoursFromNow(14)" />
 		</Variant>
-		<Variant title="price EUR limit">
-			<ChargingPlan
-				id="1"
-				:smartCostLimit="0.13"
-				smartCostType="price"
-				currency="EUR"
-				:tariffGrid="0.3"
-			/>
-		</Variant>
-		<Variant title="price SEK limit">
-			<ChargingPlan
-				id="1"
-				:smartCostLimit="0.43"
-				smartCostType="price"
-				currency="SEK"
-				:tariffGrid="0.32"
-			/>
-		</Variant>
-		<Variant title="co2 limit">
-			<ChargingPlan id="1" :smartCostLimit="400" smartCostType="co2" :tariffCo2="623" />
-		</Variant>
 		<Variant title="min soc">
 			<ChargingPlan id="1" :minSoc="30" :vehicleSoc="25" />
 		</Variant>

diff --git a/assets/js/components/ChargingPlan.vue b/assets/js/components/ChargingPlan.vue
@@ -134,7 +134,6 @@ export default {
 		planTimeUnreachable: Boolean,
 		planOverrun: Number,
 		rangePerSoc: Number,
-		smartCostLimit: Number,
 		smartCostType: String,
 		socBasedPlanning: Boolean,
 		socBasedCharging: Boolean,

diff --git a/assets/js/components/ChargingPlanWarnings.vue b/assets/js/components/ChargingPlanWarnings.vue
@@ -9,9 +9,6 @@
 		<span v-if="timeTooFarInTheFuture" class="d-block evcc-gray mb-1">
 			{{ $t("main.targetCharge.targetIsTooFarInTheFuture") }}
 		</span>
-		<span v-if="costLimitExists" class="d-block evcc-gray mb-1">
-			{{ $t("main.targetCharge.costLimitIgnore", { limit: costLimitText }) }}
-		</span>
 		<span v-if="notReachableInTime" class="d-block text-warning mb-1">
 			{{ $t("main.targetCharge.notReachableInTime", { overrun: overrunFmt }) }}
 		</span>
@@ -22,7 +19,6 @@
 </template>
 
 <script>
-import { CO2_TYPE } from "../units";
 import formatter from "../mixins/formatter";
 
 export default {
@@ -38,9 +34,6 @@ export default {
 		socBasedPlanning: Boolean,
 		socPerKwh: Number,
 		rangePerSoc: Number,
-		smartCostLimit: Number,
-		smartCostType: String,
-		currency: String,
 		mode: String,
 		tariff: Object,
 		plan: Object,
@@ -108,22 +101,6 @@ export default {
 			}
 			return this.fmtWh(this.planEnergy * 1e3);
 		},
-		costLimitExists: function () {
-			return this.smartCostLimit !== null;
-		},
-		costLimitText: function () {
-			if (this.isCo2) {
-				return this.$t("main.targetCharge.co2Limit", {
-					co2: this.fmtCo2Short(this.smartCostLimit),
-				});
-			}
-			return this.$t("main.targetCharge.priceLimit", {
-				price: this.fmtPricePerKWh(this.smartCostLimit, this.currency, true),
-			});
-		},
-		isCo2() {
-			return this.smartCostType === CO2_TYPE;
-		},
 	},
 	methods: {
 		fmtSoc(soc) {

diff --git a/assets/js/components/ChargingPlansSettings.vue b/assets/js/components/ChargingPlansSettings.vue
@@ -97,7 +97,6 @@ export default {
 		socBasedPlanning: Boolean,
 		socPerKwh: Number,
 		rangePerSoc: Number,
-		smartCostLimit: Number,
 		smartCostType: String,
 		currency: String,
 		mode: String,

diff --git a/assets/js/components/VehicleStatus.story.vue b/assets/js/components/VehicleStatus.story.vue
@@ -14,7 +14,7 @@ const planProjectedEnd = getFutureTime(5, 43);
 </script>
 
 <template>
-	<Story title="VehicleStatus" :layout="{ type: 'grid', iframe: false, width: 420 }">
+	<Story title="VehicleStatus" :layout="{ type: 'grid', iframe: false, width: 320 }">
 		<Variant title="status: disconnected">
 			<VehicleStatus />
 		</Variant>
@@ -124,7 +124,6 @@ const planProjectedEnd = getFutureTime(5, 43);
 			<VehicleStatus
 				connected
 				enabled
-				charging
 				:smartCostLimit="500"
 				smartCostType="co2"
 				:smartCostNextStart="planProjectedStart"
@@ -219,7 +218,7 @@ const planProjectedEnd = getFutureTime(5, 43);
 		<Variant title="combination: maximal">
 			<VehicleStatus
 				connected
-				charging
+				enabled
 				:sessionSolarPercentage="94"
 				:minSoc="20"
 				:vehicleSoc="10"

diff --git a/assets/js/components/VehicleStatus.vue b/assets/js/components/VehicleStatus.vue
@@ -1,11 +1,13 @@
 <template>
 	<div
-		class="d-flex justify-content-between gap-4 evcc-gray"
+		class="d-flex justify-content-between gap-3 evcc-gray align-items-start flex-wrap"
 		style="min-height: 24px"
 		data-testid="vehicle-status"
 	>
-		<div class="text-nowrap" data-testid="vehicle-status-charger">{{ chargerStatus }}</div>
-		<div class="d-flex flex-wrap justify-content-end gap-3">
+		<div class="charger-status" data-testid="vehicle-status-charger">
+			{{ chargerStatus }}
+		</div>
+		<div class="d-flex flex-wrap justify-content-end gap-3 flex-grow-1">
 			<!-- pv/phase timer -->
 			<div
 				v-if="pvTimerVisible"
@@ -716,6 +718,9 @@ export default {
 </script>
 
 <style scoped>
+.charger-status {
+	padding-top: 2px;
+}
 .entry {
 	display: flex;
 	align-items: center;

diff --git a/assets/js/views/Log.vue b/assets/js/views/Log.vue
@@ -197,7 +197,7 @@ export default {
 		},
 	},
 	watch: {
-		selectedAreas() {
+		areas() {
 			this.updateLogs();
 		},
 		level() {
@@ -339,7 +339,7 @@ export default {
 	--opacity: 1;
 	opacity: var(--opacity);
 	animation-name: fadeIn;
-	animation-duration: 1s;
+	animation-duration: var(--transition-duration-fast);
 	animation-fill-mode: forwards;
 	animation-timing-function: ease-out;
 	text-indent: 1rem hanging;
@@ -361,9 +361,9 @@ export default {
 	color: var(--bs-danger);
 }
 .log-debug {
-	--opacity: 0.6;
+	--opacity: 0.7;
 }
 .log-trace {
-	--opacity: 0.4;
+	--opacity: 0.5;
 }
 </style>
diff --git a/charger/abl.go b/charger/abl.go
@@ -96,7 +96,7 @@ func NewABLeMHFromConfig(other map[string]interface{}) (api.Charger, error) {
 	return NewABLeMH(cc.URI, cc.Device, cc.Comset, cc.Baudrate, cc.ID, cc.Timeout)
 }
 
-//go:generate go run ../cmd/tools/decorate.go -f decorateABLeMH -b *ABLeMH -r api.Charger -t "api.Meter,CurrentPower,func() (float64, error)" -t "api.PhaseCurrents,Currents,func() (float64, float64, float64, error)"
+//go:generate decorate -f decorateABLeMH -b *ABLeMH -r api.Charger -t "api.Meter,CurrentPower,func() (float64, error)" -t "api.PhaseCurrents,Currents,func() (float64, float64, float64, error)"
 
 // NewABLeMH creates ABLeMH charger
 func NewABLeMH(uri, device, comset string, baudrate int, slaveID uint8, timeout time.Duration) (api.Charger, error) {

diff --git a/charger/alfen.go b/charger/alfen.go
@@ -56,7 +56,7 @@ func init() {
 	registry.AddCtx("alfen", NewAlfenFromConfig)
 }
 
-//go:generate go run ../cmd/tools/decorate.go -f decorateAlfen -b *Alfen -r api.Charger -t "api.PhaseSwitcher,Phases1p3p,func(int) error" -t "api.PhaseGetter,GetPhases,func() (int, error)"
+//go:generate decorate -f decorateAlfen -b *Alfen -r api.Charger -t "api.PhaseSwitcher,Phases1p3p,func(int) error" -t "api.PhaseGetter,GetPhases,func() (int, error)"
 
 // NewAlfenFromConfig creates a Alfen charger from generic config
 func NewAlfenFromConfig(ctx context.Context, other map[string]interface{}) (api.Charger, error) {

diff --git a/charger/amperfied.go b/charger/amperfied.go
@@ -58,7 +58,7 @@ func init() {
 	registry.AddCtx("amperfied", NewAmperfiedFromConfig)
 }
 
-//go:generate go run ../cmd/tools/decorate.go -f decorateAmperfied -b *Amperfied -r api.Charger -t "api.PhaseSwitcher,Phases1p3p,func(int) error" -t "api.PhaseGetter,GetPhases,func() (int, error)"
+//go:generate decorate -f decorateAmperfied -b *Amperfied -r api.Charger -t "api.PhaseSwitcher,Phases1p3p,func(int) error" -t "api.PhaseGetter,GetPhases,func() (int, error)"
 
 // NewAmperfiedFromConfig creates a Amperfied charger from generic config
 func NewAmperfiedFromConfig(ctx context.Context, other map[string]interface{}) (api.Charger, error) {

diff --git a/charger/bender.go b/charger/bender.go
@@ -84,7 +84,7 @@ func NewBenderCCFromConfig(other map[string]interface{}) (api.Charger, error) {
 	return NewBenderCC(cc.URI, cc.ID)
 }
 
-//go:generate go run ../cmd/tools/decorate.go -f decorateBenderCC -b *BenderCC -r api.Charger -t "api.Meter,CurrentPower,func() (float64, error)" -t "api.PhaseCurrents,Currents,func() (float64, float64, float64, error)" -t "api.PhaseVoltages,Voltages,func() (float64, float64, float64, error)" -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.Battery,Soc,func() (float64, error)" -t "api.Identifier,Identify,func() (string, error)"
+//go:generate decorate -f decorateBenderCC -b *BenderCC -r api.Charger -t "api.Meter,CurrentPower,func() (float64, error)" -t "api.PhaseCurrents,Currents,func() (float64, float64, float64, error)" -t "api.PhaseVoltages,Voltages,func() (float64, float64, float64, error)" -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.Battery,Soc,func() (float64, error)" -t "api.Identifier,Identify,func() (string, error)"
 
 // NewBenderCC creates BenderCC charger
 func NewBenderCC(uri string, id uint8) (api.Charger, error) {

diff --git a/charger/cfos.go b/charger/cfos.go
@@ -37,7 +37,7 @@ func init() {
 	registry.Add("cfos", NewCfosPowerBrainFromConfig)
 }
 
-//go:generate go run ../cmd/tools/decorate.go -f decorateCfos -b *CfosPowerBrain -r api.Charger -t "api.Meter,CurrentPower,func() (float64, error)" -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.PhaseCurrents,Currents,func() (float64, float64, float64, error)" -t "api.PhaseSwitcher,Phases1p3p,func(int) error"
+//go:generate decorate -f decorateCfos -b *CfosPowerBrain -r api.Charger -t "api.Meter,CurrentPower,func() (float64, error)" -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.PhaseCurrents,Currents,func() (float64, float64, float64, error)" -t "api.PhaseSwitcher,Phases1p3p,func(int) error"
 
 // NewCfosPowerBrainFromConfig creates a cFos charger from generic config
 func NewCfosPowerBrainFromConfig(other map[string]interface{}) (api.Charger, error) {

diff --git a/charger/charger.go b/charger/charger.go
@@ -24,7 +24,7 @@ func init() {
 	registry.AddCtx(api.Custom, NewConfigurableFromConfig)
 }
 
-//go:generate go run ../cmd/tools/decorate.go -f decorateCustom -b *Charger -r api.Charger -t "api.ChargerEx,MaxCurrentMillis,func(float64) error" -t "api.Identifier,Identify,func() (string, error)" -t "api.PhaseSwitcher,Phases1p3p,func(int) error" -t "api.Resurrector,WakeUp,func() error" -t "api.Battery,Soc,func() (float64, error)" -t "api.Meter,CurrentPower,func() (float64, error)" -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.PhaseCurrents,Currents,func() (float64, float64, float64, error)" -t "api.PhaseVoltages,Voltages,func() (float64, float64, float64, error)"
+//go:generate decorate -f decorateCustom -b *Charger -r api.Charger -t "api.ChargerEx,MaxCurrentMillis,func(float64) error" -t "api.Identifier,Identify,func() (string, error)" -t "api.PhaseSwitcher,Phases1p3p,func(int) error" -t "api.Resurrector,WakeUp,func() error" -t "api.Battery,Soc,func() (float64, error)" -t "api.Meter,CurrentPower,func() (float64, error)" -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.PhaseCurrents,Currents,func() (float64, float64, float64, error)" -t "api.PhaseVoltages,Voltages,func() (float64, float64, float64, error)"
 
 // NewConfigurableFromConfig creates a new configurable charger
 func NewConfigurableFromConfig(ctx context.Context, other map[string]interface{}) (api.Charger, error) {

diff --git a/charger/eebus.go b/charger/eebus.go
@@ -72,7 +72,7 @@ func NewEEBusFromConfig(other map[string]interface{}) (api.Charger, error) {
 	return NewEEBus(cc.Ski, cc.Ip, cc.Meter, cc.ChargedEnergy, cc.VasVW)
 }
 
-//go:generate go run ../cmd/tools/decorate.go -f decorateEEBus -b *EEBus -r api.Charger -t "api.Meter,CurrentPower,func() (float64, error)" -t "api.PhaseCurrents,Currents,func() (float64, float64, float64, error)" -t "api.ChargeRater,ChargedEnergy,func() (float64, error)"
+//go:generate decorate -f decorateEEBus -b *EEBus -r api.Charger -t "api.Meter,CurrentPower,func() (float64, error)" -t "api.PhaseCurrents,Currents,func() (float64, float64, float64, error)" -t "api.ChargeRater,ChargedEnergy,func() (float64, error)"
 
 // NewEEBus creates EEBus charger
 func NewEEBus(ski, ip string, hasMeter, hasChargedEnergy, vasVW bool) (api.Charger, error) {

diff --git a/charger/em2go.go b/charger/em2go.go
@@ -66,7 +66,7 @@ func init() {
 	registry.Add("em2go-home", NewEm2GoFromConfig)
 }
 
-//go:generate go run ../cmd/tools/decorate.go -f decorateEm2Go -b *Em2Go -r api.Charger -t "api.ChargerEx,MaxCurrentMillis,func(float64) error" -t "api.PhaseSwitcher,Phases1p3p,func(int) error" -t "api.PhaseGetter,GetPhases,func() (int, error)"
+//go:generate decorate -f decorateEm2Go -b *Em2Go -r api.Charger -t "api.ChargerEx,MaxCurrentMillis,func(float64) error" -t "api.PhaseSwitcher,Phases1p3p,func(int) error" -t "api.PhaseGetter,GetPhases,func() (int, error)"
 
 // NewEm2GoFromConfig creates a Em2Go charger from generic config
 func NewEm2GoFromConfig(other map[string]interface{}) (api.Charger, error) {

diff --git a/charger/evsewifi.go b/charger/evsewifi.go
@@ -28,7 +28,7 @@ func init() {
 	registry.Add("evsewifi", NewEVSEWifiFromConfig)
 }
 
-//go:generate go run ../cmd/tools/decorate.go -f decorateEVSE -b *EVSEWifi -r api.Charger -t "api.Meter,CurrentPower,func() (float64, error)" -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.PhaseCurrents,Currents,func() (float64, float64, float64, error)" -t "api.PhaseVoltages,Voltages,func() (float64, float64, float64, error)" -t "api.ChargerEx,MaxCurrentMillis,func(float64) error" -t "api.Identifier,Identify,func() (string, error)"
+//go:generate decorate -f decorateEVSE -b *EVSEWifi -r api.Charger -t "api.Meter,CurrentPower,func() (float64, error)" -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.PhaseCurrents,Currents,func() (float64, float64, float64, error)" -t "api.PhaseVoltages,Voltages,func() (float64, float64, float64, error)" -t "api.ChargerEx,MaxCurrentMillis,func(float64) error" -t "api.Identifier,Identify,func() (string, error)"
 
 // NewEVSEWifiFromConfig creates a EVSEWifi charger from generic config
 func NewEVSEWifiFromConfig(other map[string]interface{}) (api.Charger, error) {

diff --git a/charger/go-e.go b/charger/go-e.go
@@ -41,7 +41,7 @@ func init() {
 	registry.Add("go-e", NewGoEFromConfig)
 }
 
-//go:generate go run ../cmd/tools/decorate.go -f decorateGoE -b *GoE -r api.Charger -t "api.PhaseSwitcher,Phases1p3p,func(int) error"
+//go:generate decorate -f decorateGoE -b *GoE -r api.Charger -t "api.PhaseSwitcher,Phases1p3p,func(int) error"
 
 // NewGoEFromConfig creates a go-e charger from generic config
 func NewGoEFromConfig(other map[string]interface{}) (api.Charger, error) {

diff --git a/charger/hardybarth-salia.go b/charger/hardybarth-salia.go
@@ -53,7 +53,7 @@ func init() {
 	registry.AddCtx("hardybarth-salia", NewSaliaFromConfig)
 }
 
-//go:generate go run ../cmd/tools/decorate.go -f decorateSalia -b *Salia -r api.Charger -t "api.Meter,CurrentPower,func() (float64, error)" -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.PhaseCurrents,Currents,func() (float64, float64, float64, error)" -t "api.PhaseSwitcher,Phases1p3p,func(int) error" -t "api.PhaseGetter,GetPhases,func() (int, error)"
+//go:generate decorate -f decorateSalia -b *Salia -r api.Charger -t "api.Meter,CurrentPower,func() (float64, error)" -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.PhaseCurrents,Currents,func() (float64, float64, float64, error)" -t "api.PhaseSwitcher,Phases1p3p,func(int) error" -t "api.PhaseGetter,GetPhases,func() (int, error)"
 
 // NewSaliaFromConfig creates a Salia cPH2 charger from generic config
 func NewSaliaFromConfig(ctx context.Context, other map[string]interface{}) (api.Charger, error) {

diff --git a/charger/innogy.go b/charger/innogy.go
@@ -82,7 +82,7 @@ func NewInnogyFromConfig(other map[string]interface{}) (api.Charger, error) {
 	return decorateInnogy(wb, totalEnergy, voltages), nil
 }
 
-//go:generate go run ../cmd/tools/decorate.go -f decorateInnogy -b *Innogy -r api.Charger -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.PhaseVoltages,Voltages,func() (float64, float64, float64, error)"
+//go:generate decorate -f decorateInnogy -b *Innogy -r api.Charger -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.PhaseVoltages,Voltages,func() (float64, float64, float64, error)"
 
 // NewInnogy creates a Innogy charger
 func NewInnogy(uri string, id uint8) (*Innogy, error) {

diff --git a/charger/keba-modbus.go b/charger/keba-modbus.go
@@ -66,7 +66,7 @@ func init() {
 	registry.AddCtx("keba-modbus", NewKebaFromConfig)
 }
 
-//go:generate go run ../cmd/tools/decorate.go -f decorateKeba -b *Keba -r api.Charger -t "api.Meter,CurrentPower,func() (float64, error)" -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.PhaseCurrents,Currents,func() (float64, float64, float64, error)" -t "api.Identifier,Identify,func() (string, error)" -t "api.StatusReasoner,StatusReason,func() (api.Reason, error)" -t "api.PhaseSwitcher,Phases1p3p,func(int) error" -t "api.PhaseGetter,GetPhases,func() (int, error)"
+//go:generate decorate -f decorateKeba -b *Keba -r api.Charger -t "api.Meter,CurrentPower,func() (float64, error)" -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.PhaseCurrents,Currents,func() (float64, float64, float64, error)" -t "api.Identifier,Identify,func() (string, error)" -t "api.StatusReasoner,StatusReason,func() (api.Reason, error)" -t "api.PhaseSwitcher,Phases1p3p,func(int) error" -t "api.PhaseGetter,GetPhases,func() (int, error)"
 
 // NewKebaFromConfig creates a new Keba ModbusTCP charger
 func NewKebaFromConfig(ctx context.Context, other map[string]interface{}) (api.Charger, error) {

diff --git a/charger/keba-udp.go b/charger/keba-udp.go
@@ -32,7 +32,7 @@ func init() {
 	registry.Add("keba-udp", NewKebaUdpFromConfig)
 }
 
-//go:generate go run ../cmd/tools/decorate.go -f decorateKebaUdp -b *KebaUdp -r api.Charger -t "api.Meter,CurrentPower,func() (float64, error)" -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.PhaseCurrents,Currents,func() (float64, float64, float64, error)"
+//go:generate decorate -f decorateKebaUdp -b *KebaUdp -r api.Charger -t "api.Meter,CurrentPower,func() (float64, error)" -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.PhaseCurrents,Currents,func() (float64, float64, float64, error)"
 
 // NewKebaUdpFromConfig creates a new Keba UDP charger
 func NewKebaUdpFromConfig(other map[string]interface{}) (api.Charger, error) {

diff --git a/charger/kse.go b/charger/kse.go
@@ -70,7 +70,7 @@ func NewKSEFromConfig(other map[string]interface{}) (api.Charger, error) {
 	return NewKSE(cc.URI, cc.Device, cc.Comset, cc.Baudrate, cc.ID)
 }
 
-//go:generate go run ../cmd/tools/decorate.go -f decorateKSE -b *KSE -r api.Charger -t "api.PhaseSwitcher,Phases1p3p,func(int) error" -t "api.PhaseGetter,GetPhases,func() (int, error)" -t "api.Identifier,Identify,func() (string, error)"
+//go:generate decorate -f decorateKSE -b *KSE -r api.Charger -t "api.PhaseSwitcher,Phases1p3p,func(int) error" -t "api.PhaseGetter,GetPhases,func() (int, error)" -t "api.Identifier,Identify,func() (string, error)"
 
 // NewKSE creates KSE charger
 func NewKSE(uri, device, comset string, baudrate int, slaveID uint8) (api.Charger, error) {

diff --git a/charger/nrggen2.go b/charger/nrggen2.go
@@ -48,7 +48,7 @@ func init() {
 	registry.Add("nrggen2", NewNRGKickGen2FromConfig)
 }
 
-//go:generate go run ../cmd/tools/decorate.go -f decorateNRGKickGen2 -b *NRGKickGen2 -r api.Charger -t "api.PhaseSwitcher,Phases1p3p,func(int) error"
+//go:generate decorate -f decorateNRGKickGen2 -b *NRGKickGen2 -r api.Charger -t "api.PhaseSwitcher,Phases1p3p,func(int) error"
 
 // NewNRGKickGen2FromConfig creates a NRGKickGen2 charger from generic config
 func NewNRGKickGen2FromConfig(other map[string]interface{}) (api.Charger, error) {