Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support chargers without vehicle #6316

Merged
merged 8 commits into from
Feb 21, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Hide vehicle title on fixed connection
  • Loading branch information
andig committed Feb 19, 2023
commit 8e1b73736ffd6943b7c97d42ad2f639f36423de9
6 changes: 6 additions & 0 deletions assets/js/components/Loadpoint.vue
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,9 @@ export default {
chargeDuration: Number,
charging: Boolean,

// charger
chargerFeatureFixedConnection: Boolean,

// vehicle
connected: Boolean,
// charging: Boolean,
Expand Down Expand Up @@ -194,6 +197,9 @@ export default {
};
},
computed: {
hideTitle: function () {
return this.chargerFeatureFixedConnection;
},
andig marked this conversation as resolved.
Show resolved Hide resolved
phasesProps: function () {
return this.collectProps(Phases);
},
Expand Down
1 change: 1 addition & 0 deletions assets/js/components/Vehicle.vue
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ export default {
props: {
id: [String, Number],
connected: Boolean,
hideTitle: Boolean,
vehiclePresent: Boolean,
vehicleSoc: Number,
vehicleTargetSoc: Number,
Expand Down
4 changes: 4 additions & 0 deletions assets/js/components/VehicleTitle.vue
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ export default {
components: { VehicleOptions, VehicleIcon },
props: {
id: [String, Number],
hideTitle: Boolean,
vehiclePresent: Boolean,
vehicleTitle: String,
vehicleIcon: String,
Expand All @@ -70,6 +71,9 @@ export default {
return null;
},
name() {
if (this.hideTitle) {
return "";
}
if (this.vehiclePresent || this.parked) {
return this.vehicleTitle || this.$t("main.vehicle.fallbackName");
}
Expand Down
4 changes: 3 additions & 1 deletion core/loadpoint.go
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,9 @@ func (lp *Loadpoint) evVehicleConnectHandler() {
}

// set default or start detection
lp.vehicleDefaultOrDetect()
if !lp.chargerHasFeature(api.FixedConnection) {
lp.vehicleDefaultOrDetect()
}

// immediately allow pv mode activity
lp.elapsePVTimer()
Expand Down