Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -116,13 +116,18 @@ const socSliderMarker = {
100: '100%',
};

const reset = () => {
// Reset temporary soc value
socValue.value = undefined;
};

const confirmChanges = () => {
mqttStore.vehicleSocManualValue(props.vehicleId, props.chargePointId).value =
socInputValue.value;
reset();
};

const cancelChanges = () => {
// Reset temporary soc value
socValue.value = undefined;
reset();
};
</script>
Original file line number Diff line number Diff line change
Expand Up @@ -208,9 +208,8 @@ export interface VehicleChargeTarget {
}

export interface CalculatedSocState {
imported_start: number;
manual_soc?: number;
soc_start: number;
last_imported?: number;
manual_soc?: number | null;
}

export interface GraphDataPoint {
Expand Down
44 changes: 4 additions & 40 deletions packages/modules/web_themes/koala/source/src/stores/mqtt-store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2564,44 +2564,6 @@ export const useMqttStore = defineStore('mqtt', () => {
});
};

/**
* Get or set the manual SoC for a vehicle connected to a charge point
* @param chargePointId charge point id
* @returns number | undefined
*/
const chargePointConnectedVehicleSocManual = (chargePointId: number) => {
return computed({
get() {
const vehicleInfo =
chargePointConnectedVehicleInfo(chargePointId).value;
const vehicleId = vehicleInfo?.id;
const topic = `openWB/vehicle/${vehicleId}/soc_module/calculated_soc_state`;
const socState = getValue.value(topic) as
CalculatedSocState | undefined;
return socState?.manual_soc ?? socState?.soc_start ?? 0;
},
set(newValue: number) {
const vehicleInfo =
chargePointConnectedVehicleInfo(chargePointId).value;
if (!vehicleInfo) {
console.warn('No vehicle connected to charge point', chargePointId);
return;
}
const vehicleId = vehicleInfo.id;
doPublish(
`openWB/set/vehicle/${vehicleId}/soc_module/calculated_soc_state/manual_soc`,
newValue,
);
// Also update the charge point connected vehicle soc
const cpTopic = `openWB/chargepoint/${chargePointId}/get/connected_vehicle/soc`;
const cpSoc = getValue.value(cpTopic) as { soc?: number };
if (cpSoc && cpSoc.soc !== undefined) {
updateTopic(cpTopic, newValue, 'soc', true);
}
},
});
};

/**
* Get the charge point connected vehicle SoC type identified by the charge point id
* @param chargePointId charge point id
Expand Down Expand Up @@ -3014,7 +2976,10 @@ export const useMqttStore = defineStore('mqtt', () => {
const topic = `openWB/vehicle/${vehicleId}/soc_module/calculated_soc_state`;
const socState = getValue.value(topic) as
CalculatedSocState | undefined;
return socState?.manual_soc ?? socState?.soc_start ?? 0;
const currentSoc = getValue.value(
`openWB/vehicle/${vehicleId}/get/soc`,
) as number | undefined;
return socState?.manual_soc ?? currentSoc ?? 0;
},
set(newValue: number) {
doPublish(
Expand Down Expand Up @@ -4927,7 +4892,6 @@ export const useMqttStore = defineStore('mqtt', () => {
vehicleTimeChargingPlanWeeklyDays,
vehicleTimeChargingPlanDcPower,
chargePointConnectedVehicleSocType,
chargePointConnectedVehicleSocManual,
// Battery data
batteryConfigured,
batteryIds,
Expand Down
Loading