Skip to content

climate: display humidity if the device does not support temperature #3743

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.

Sign up for GitHub

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

Closed
Shulyaka wants to merge 1 commit into from
Closed

climate: display humidity if the device does not support temperature #3743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
52 changes: 46 additions & 6 deletions src/components/state-history-chart-line.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,11 +163,23 @@ class StateHistoryChartLine extends LocalizeMixin(PolymerElement) {
domain === "climate"
? (state) => state.attributes.hvac_action === "cooling"
: (state) => state.state === "cool";
const isDrying =
domain === "climate"
? (state) => state.attributes.hvac_action === "drying"
: (state) => state.state === "dry";

// We differentiate between thermostats that have a target temperature
// range versus ones that have just a target temperature

// Using step chart by step-before so manually interpolation not needed.
const hasTemp = states.states.some(
(state) =>
state.attributes && isFinite(state.attributes.current_temperature)
);
const hasHumidity = states.states.some(
(state) =>
state.attributes && isFinite(state.attributes.current_humidity)
);
const hasTargetRange = states.states.some(
(state) =>
state.attributes &&
Expand All @@ -176,8 +188,14 @@ class StateHistoryChartLine extends LocalizeMixin(PolymerElement) {
);
const hasHeat = states.states.some(isHeating);
const hasCool = states.states.some(isCooling);
const hasDry = states.states.some(isDrying);

addColumn(name + " current temperature", true);
if (hasTemp) {
addColumn(name + " current temperature", true);
}
if (hasHumidity) {
addColumn(name + " current humidity", true);
}
if (hasHeat) {
addColumn(name + " heating", true, true);
// The "heating" series uses steppedArea to shade the area below the current
Expand All @@ -188,36 +206,58 @@ class StateHistoryChartLine extends LocalizeMixin(PolymerElement) {
// The "cooling" series uses steppedArea to shade the area below the current
// temperature when the thermostat is calling for heat.
}
if (hasDry) {
addColumn(name + " drying", true, true);
// The "drying" series uses steppedArea to shade the area below the current
// humidity when the device is calling for dry.
}

if (hasTargetRange) {
addColumn(name + " target temperature high", true);
addColumn(name + " target temperature low", true);
} else {
} else if (hasTemp) {
addColumn(name + " target temperature", true);
}

if (hasHumidity) {
addColumn(name + " target humidity", true);
}

states.states.forEach((state) => {
if (!state.attributes) return;
const series = [];
const curTemp = safeParseFloat(state.attributes.current_temperature);
const series = [curTemp];
if (hasTemp) {
series.push(curTemp);
}
const curHumidity = safeParseFloat(state.attributes.current_humidity);
if (hasHumidity) {
series.push(curHumidity);
}
if (hasHeat) {
series.push(isHeating(state) ? curTemp : null);
}
if (hasCool) {
series.push(isCooling(state) ? curTemp : null);
}
if (hasDry) {
series.push(isDrying(state) ? curHumidity : null);
}
if (hasTargetRange) {
const targetHigh = safeParseFloat(
state.attributes.target_temp_high
);
const targetLow = safeParseFloat(state.attributes.target_temp_low);
series.push(targetHigh, targetLow);
pushData(new Date(state.last_changed), series);
} else {
} else if (hasTemp) {
const target = safeParseFloat(state.attributes.temperature);
series.push(target);
pushData(new Date(state.last_changed), series);
}
if (hasHumidity) {
const target = safeParseFloat(state.attributes.humidity);
series.push(target);
}
pushData(new Date(state.last_changed), series);
});
} else {
// Only disable interpolation for sensors
Expand Down
2 changes: 2 additions & 0 deletions src/data/history.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ const LINE_ATTRIBUTES_TO_KEEP = [
"target_temp_low",
"target_temp_high",
"hvac_action",
"humidity",
"current_humidity",
];

export interface LineChartState {
Expand Down
41 changes: 34 additions & 7 deletions src/panels/lovelace/cards/hui-thermostat-card.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,13 +136,17 @@ export class HuiThermostatCard extends LitElement implements LovelaceCard {
</div>
<div class="current-temperature">
<span class="current-temperature-text">
${stateObj.attributes.current_temperature}
${stateObj.attributes.current_temperature
? stateObj.attributes.current_temperature
: stateObj.attributes.current_humidity}
${stateObj.attributes.current_temperature
? html`
<span class="uom"
>${this.hass.config.unit_system.temperature}</span
>
`
: stateObj.attributes.current_humidity
? "%"
: ""}
</span>
</div>
Expand Down Expand Up @@ -222,8 +226,12 @@ export class HuiThermostatCard extends LitElement implements LovelaceCard {
sliderType,
value: sliderValue,
disabled: sliderValue === null,
min: stateObj.attributes.min_temp,
max: stateObj.attributes.max_temp,
min: stateObj.attributes.current_temperature
? stateObj.attributes.min_temp
: stateObj.attributes.min_humidity,
max: stateObj.attributes.current_temperature
? stateObj.attributes.max_temp
: stateObj.attributes.max_humidity,
});
this._updateSetTemp(uiValue);
}
Expand All @@ -232,6 +240,9 @@ export class HuiThermostatCard extends LitElement implements LovelaceCard {
private get _stepSize(): number {
const stateObj = this.hass!.states[this._config!.entity] as ClimateEntity;

if (!stateObj.attributes.current_temperature) {
return 0.5;
}
if (stateObj.attributes.target_temp_step) {
return stateObj.attributes.target_temp_step;
}
Expand Down Expand Up @@ -271,8 +282,12 @@ export class HuiThermostatCard extends LitElement implements LovelaceCard {
this._jQuery("#thermostat", this.shadowRoot).roundSlider({
...thermostatConfig,
radius,
min: stateObj.attributes.min_temp,
max: stateObj.attributes.max_temp,
min: stateObj.attributes.current_temperature
? stateObj.attributes.min_temp
: stateObj.attributes.min_humidity,
max: stateObj.attributes.current_temperature
? stateObj.attributes.max_temp
: stateObj.attributes.max_humidity,
sliderType,
change: (value) => this._setTemperature(value),
drag: (value) => this._dragEvent(value),
Expand All @@ -295,6 +310,7 @@ export class HuiThermostatCard extends LitElement implements LovelaceCard {
sliderValue = null;
uiValue = this.hass!.localize("state.default.unavailable");
} else if (
stateObj.attributes.current_temperature &&
stateObj.attributes.target_temp_low &&
stateObj.attributes.target_temp_high
) {
Expand All @@ -309,12 +325,18 @@ export class HuiThermostatCard extends LitElement implements LovelaceCard {
],
false
);
} else {
} else if (stateObj.attributes.current_temperature) {
sliderType = "min-range";
sliderValue = Number.isFinite(Number(stateObj.attributes.temperature))
? stateObj.attributes.temperature
: null;
uiValue = sliderValue !== null ? String(sliderValue) : "";
} else {
sliderType = "min-range";
sliderValue = stateObj.attributes.humidity
? stateObj.attributes.humidity
: null;
uiValue = sliderValue !== null ? String(sliderValue) : "";
}

return [sliderValue, uiValue, sliderType];
Expand All @@ -330,7 +352,12 @@ export class HuiThermostatCard extends LitElement implements LovelaceCard {

private _setTemperature(e): void {
const stateObj = this.hass!.states[this._config!.entity] as ClimateEntity;
if (
if (!stateObj.attributes.current_temperature) {
this.hass!.callService("climate", "set_humidity", {
entity_id: this._config!.entity,
humidity: e.value,
});
} else if (
stateObj.attributes.target_temp_low &&
stateObj.attributes.target_temp_high
) {
Expand Down