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

Rename range to vehicleRange

Browse source
This commit is contained in:
andig 2021-10-10 13:01:14 +02:00
parent da3c98d08d
commit b809356d4f
15 changed files with 45 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -30,7 +30,7 @@ Base.args = {
enabled: true,
connected: true,
charging: true,
vehicleSoc: 66,
vehicleSoC: 66,
targetSoC: 90,
};
@ -45,6 +45,6 @@ Disabled.args = {
enabled: true,
connected: true,
charging: false,
vehicleSoc: 66,
vehicleSoC: 66,
targetSoC: 100,
};

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

@ -52,6 +52,8 @@ export default {
enabled: Boolean,
vehicleTitle: String,
vehicleSoC: Number,
vehiclePresent: Boolean,
vehicleRange: Number,
minSoC: Number,
timerSet: Boolean,
timerActive: Boolean,
@ -61,9 +63,7 @@ export default {
chargePower: Number,
chargedEnergy: Number,
// chargeDuration: Number,
vehiclePresent: Boolean,
climater: String,
range: Number,
chargeRemainingDuration: Number,
// other information

6
assets/js/components/LoadpointDetails.stories.js
View file

@ -41,7 +41,7 @@ VehicleRange.args = {
chargedEnergy: 11e3,
chargeDuration: 95 * 60,
vehiclePresent: true,
range: 240.123,
vehicleRange: 240.123,
chargeRemainingDuration: 5 * 3600,
};
@ -51,7 +51,7 @@ VehicleClimater.args = {
chargedEnergy: 11e3,
chargeDuration: 95 * 60,
vehiclePresent: true,
range: 240.123,
vehicleRange: 240.123,
chargeRemainingDuration: 5 * 3600,
climater: "on",
};
@ -62,7 +62,7 @@ VehicleTimer.args = {
chargedEnergy: 11e3,
chargeDuration: 95 * 60,
vehiclePresent: true,
range: 240.123,
vehicleRange: 240.123,
chargeRemainingDuration: 5 * 3600,
timerSet: true,
timerActive: true,

8
assets/js/components/LoadpointDetails.vue
View file

@ -34,10 +34,10 @@
</h3>
</div>
<div class="col-6 col-sm-3 col-lg-2 mt-3" v-if="range && range >= 0">
<div class="mb-2 value">{{ $t("main.loadpointDetails.range") }}</div>
<div class="col-6 col-sm-3 col-lg-2 mt-3" v-if="vehicleRange && vehicleRange >= 0">
<div class="mb-2 value">{{ $t("main.loadpointDetails.vehicleRange") }}</div>
<h3 class="value">
{{ Math.round(range) }}
{{ Math.round(vehicleRange) }}
<small class="text-muted">km</small>
</h3>
</div>
@ -76,7 +76,7 @@ export default {
chargePower: Number,
climater: String,
vehiclePresent: Boolean,
range: Number,
vehicleRange: Number,
},
mixins: [formatter],
};

15
assets/js/components/Site.stories.js
View file

@ -44,9 +44,9 @@ Single.args = {
connected: true,
vehiclePresent: true,
charging: true,
vehicleSoc: 66,
vehicleSoC: 66,
vehicleRange: 344,
targetSoC: 90,
range: 344,
chargeRemainingDuration: 999,
chargePower: 11232,
chargeDuration: 123982,
@ -73,9 +73,9 @@ Multi.args = {
connected: true,
vehiclePresent: true,
charging: true,
vehicleSoc: 66,
vehicleSoC: 66,
vehicleRange: 344,
targetSoC: 90,
range: 344,
chargeRemainingDuration: 999,
chargePower: 11232,
chargeDuration: 123982,
@ -84,18 +84,19 @@ Multi.args = {
{
title: "Ladepunkt 2",
mode: "pv",
vehicleTitle: "Mein anderes Auto",
},
{
title: "Ladepunkt 3",
mode: "now",
socTitle: "Mein anderes Auto",
vehicleTitle: "Mein drittes Auto",
enabled: true,
connected: true,
hasVehicle: true,
charging: true,
socCharge: 22,
vehicleSoC: 22,
vehicleRange: 34,
targetSoC: 100,
range: 34,
chargeRemainingDuration: 22,
chargePower: 1423,
chargeDuration: 243,

16
assets/js/components/Vehicle.stories.js
View file

@ -20,7 +20,7 @@ Base.args = {
enabled: true,
connected: true,
vehiclePresent: true,
vehicleSoc: 42,
vehicleSoC: 42,
targetSoC: 90,
id: 0,
};
@ -32,7 +32,7 @@ Connected.args = {
connected: true,
vehiclePresent: true,
charging: false,
vehicleSoc: 66,
vehicleSoC: 66,
targetSoC: 90,
id: 0,
};
@ -44,7 +44,7 @@ ReadyToCharge.args = {
connected: true,
vehiclePresent: true,
charging: false,
vehicleSoc: 66,
vehicleSoC: 66,
targetSoC: 90,
id: 0,
};
@ -56,7 +56,7 @@ Charging.args = {
connected: true,
vehiclePresent: true,
charging: true,
vehicleSoc: 66,
vehicleSoC: 66,
targetSoC: 90,
id: 0,
};
@ -73,7 +73,7 @@ TargetChargePlanned.args = {
enabled: false,
connected: true,
vehiclePresent: true,
vehicleSoc: 31,
vehicleSoC: 31,
minSoC: 20,
charging: false,
timerSet: true,
@ -89,7 +89,7 @@ TargetChargeActive.args = {
enabled: true,
connected: true,
vehiclePresent: true,
vehicleSoc: 66,
vehicleSoC: 66,
minSoC: 30,
charging: true,
timerSet: true,
@ -105,7 +105,7 @@ MinCharge.args = {
enabled: true,
connected: true,
vehiclePresent: true,
vehicleSoc: 17,
vehicleSoC: 17,
minSoC: 20,
charging: true,
targetSoC: 90,
@ -155,7 +155,7 @@ DisconnectedKnownSoc.args = {
connected: false,
enabled: false,
vehiclePresent: true,
vehicleSoc: 17,
vehicleSoC: 17,
targetSoC: 60,
id: 0,
};

2
assets/js/i18n/de.js
View file

@ -88,7 +88,7 @@ export default {
},
loadpointDetails: {
power: "Leistung",
range: "Reichweite",
vehicleRange: "Reichweite",
charged: "Geladen",
duration: "Dauer",
remaining: "Restzeit",

2
assets/js/i18n/en.js
View file

@ -88,7 +88,7 @@ export default {
},
loadpointDetails: {
power: "Power",
range: "Range",
vehicleRange: "Range",
charged: "Charged",
duration: "Duration",
remaining: "Remaining",

2
assets/js/i18n/it.js
View file

@ -68,7 +68,7 @@ export default {
},
loadpointDetails: {
power: "Potenza",
range: "Autonomia",
vehicleRange: "Autonomia",
charged: "Ricaricato",
duration: "Duarata",
remaining: "Rimanenti",

4
core/loadpoint.go
View file

@ -1190,7 +1190,7 @@ func (lp *LoadPoint) publishSoCAndRange() {
if vs, ok := lp.vehicle.(api.VehicleRange); ok {
if rng, err := vs.Range(); err == nil {
lp.log.DEBUG.Printf("vehicle range: %vkm", rng)
lp.publish("range", rng)
lp.publish("vehicleRange", rng)
}
}
@ -1203,7 +1203,7 @@ func (lp *LoadPoint) publishSoCAndRange() {
lp.publish("chargeRemainingDuration", time.Duration(-1))
// range
lp.publish("range", -1)
lp.publish("vehicleRange", -1)
}
}

4
dist/index.html vendored
View file

@ -1,4 +1,4 @@
<!DOCTYPE html><html lang="de"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><meta name="description" content="EV Charge Controller"><meta name="author" content="andig"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black"><link rel="apple-touch-icon" sizes="180x180" href="ico/apple-touch-icon.png?[[.Version]]"><link rel="icon" type="image/png" sizes="32x32" href="ico/favicon-32x32.png?[[.Version]]"><link rel="icon" type="image/png" sizes="16x16" href="ico/favicon-16x16.png?[[.Version]]"><link rel="manifest" href="ico/site.webmanifest"><link rel="mask-icon" href="ico/safari-pinned-tab.svg?[[.Version]]" color="#18191a"><link rel="shortcut icon" href="ico/favicon.ico?[[.Version]]"><meta name="apple-mobile-web-app-title" content="evcc"><meta name="application-name" content="evcc"><meta name="msapplication-TileColor" content="#18191a"><meta name="msapplication-config" content="ico/browserconfig.xml"><meta name="theme-color" content="#18191a"><title>evcc</title><link href="css/chunk-vendors.63c5e34a.css" rel="preload" as="style"><link href="css/index.401ef0ac.css" rel="preload" as="style"><link href="js/chunk-vendors.0dc6e0ff.js" rel="preload" as="script"><link href="js/index.2ef89f05.js" rel="preload" as="script"><link href="css/chunk-vendors.63c5e34a.css" rel="stylesheet"><link href="css/index.401ef0ac.css" rel="stylesheet"></head><body><script>window.evcc = {
<!DOCTYPE html><html lang="de"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><meta name="description" content="EV Charge Controller"><meta name="author" content="andig"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black"><link rel="apple-touch-icon" sizes="180x180" href="ico/apple-touch-icon.png?[[.Version]]"><link rel="icon" type="image/png" sizes="32x32" href="ico/favicon-32x32.png?[[.Version]]"><link rel="icon" type="image/png" sizes="16x16" href="ico/favicon-16x16.png?[[.Version]]"><link rel="manifest" href="ico/site.webmanifest"><link rel="mask-icon" href="ico/safari-pinned-tab.svg?[[.Version]]" color="#18191a"><link rel="shortcut icon" href="ico/favicon.ico?[[.Version]]"><meta name="apple-mobile-web-app-title" content="evcc"><meta name="application-name" content="evcc"><meta name="msapplication-TileColor" content="#18191a"><meta name="msapplication-config" content="ico/browserconfig.xml"><meta name="theme-color" content="#18191a"><title>evcc</title><link href="css/chunk-vendors.63c5e34a.css" rel="preload" as="style"><link href="css/index.401ef0ac.css" rel="preload" as="style"><link href="js/chunk-vendors.0dc6e0ff.js" rel="preload" as="script"><link href="js/index.5ba815f1.js" rel="preload" as="script"><link href="css/chunk-vendors.63c5e34a.css" rel="stylesheet"><link href="css/index.401ef0ac.css" rel="stylesheet"></head><body><script>window.evcc = {
version: "[[.Version]]",
configured: "[[.Configured]]",
};</script><div id="app"></div><script src="js/chunk-vendors.0dc6e0ff.js"></script><script src="js/index.2ef89f05.js"></script></body></html>
};</script><div id="app"></div><script src="js/chunk-vendors.0dc6e0ff.js"></script><script src="js/index.5ba815f1.js"></script></body></html>

1
dist/js/index.2ef89f05.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/js/index.2ef89f05.js → dist/js/index.5ba815f1.js vendored
View file

File diff suppressed because one or more lines are too long

1
dist/js/index.5ba815f1.js.map vendored Normal file
View file

File diff suppressed because one or more lines are too long

8
server/mqtt.go
View file

@ -124,6 +124,14 @@ func (m *MQTT) Run(site site.API, in <-chan util.Param) {
updated := time.Now().Unix()
m.publish(fmt.Sprintf("%s/updated", m.root), true, updated)
// remove deprecated topics
for id := range site.LoadPoints() {
topic := fmt.Sprintf("%s/loadpoints/%d", m.root, id+1)
for _, dep := range []string{"range", "socCharge", "vehicleSoc"} {
m.publish(fmt.Sprintf("%s/%s", topic, dep), true, nil)
}
}
// publish
for p := range in {
topic := fmt.Sprintf("%s/site", m.root)