yehor/ha_client
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolves #522 Fix temperature change for thermostat

Browse Source
This commit is contained in:
Yegor Vialov
2020-02-19 14:20:44 +00:00
parent 14c272af92
commit 92e008a380
1 changed files with 17 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
lib/entities/climate/widgets/climate_controls.dart
View File

@ -10,9 +10,8 @@ class ClimateControlWidget extends StatefulWidget {
class _ClimateControlWidgetState extends State<ClimateControlWidget> { class _ClimateControlWidgetState extends State<ClimateControlWidget> {
bool _showPending = false; bool _temperaturePending = false;
bool _changedHere = false; bool _changedHere = false;
Timer _resetTimer;
Timer _tempThrottleTimer; Timer _tempThrottleTimer;
Timer _targetTempThrottleTimer; Timer _targetTempThrottleTimer;
double _tmpTemperature = 0.0; double _tmpTemperature = 0.0;
@ -27,9 +26,11 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
bool _tmpAuxHeat = false; bool _tmpAuxHeat = false;
void _resetVars(ClimateEntity entity) { void _resetVars(ClimateEntity entity) {
_tmpTemperature = entity.temperature; if (!_temperaturePending) {
_tmpTargetHigh = entity.targetHigh; _tmpTemperature = entity.temperature;
_tmpTargetLow = entity.targetLow; _tmpTargetHigh = entity.targetHigh;
_tmpTargetLow = entity.targetLow;
}
_tmpHVACMode = entity.state; _tmpHVACMode = entity.state;
_tmpFanMode = entity.fanMode; _tmpFanMode = entity.fanMode;
_tmpSwingMode = entity.swingMode; _tmpSwingMode = entity.swingMode;
@ -38,7 +39,6 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
_tmpAuxHeat = entity.auxHeat; _tmpAuxHeat = entity.auxHeat;
_tmpTargetHumidity = entity.targetHumidity; _tmpTargetHumidity = entity.targetHumidity;
_showPending = false;
_changedHere = false; _changedHere = false;
} }
@ -73,46 +73,44 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
} }
void _setTemperature(ClimateEntity entity) { void _setTemperature(ClimateEntity entity) {
if (_tempThrottleTimer!=null) { _tempThrottleTimer?.cancel();
_tempThrottleTimer.cancel();
}
setState(() { setState(() {
_changedHere = true; _changedHere = true;
_temperaturePending = true;
_tmpTemperature = double.parse(_tmpTemperature.toStringAsFixed(1)); _tmpTemperature = double.parse(_tmpTemperature.toStringAsFixed(1));
}); });
_tempThrottleTimer = Timer(Duration(seconds: 2), () { _tempThrottleTimer = Timer(Duration(seconds: 2), () {
setState(() { setState(() {
_changedHere = true; _changedHere = true;
_temperaturePending = false;
ConnectionManager().callService( ConnectionManager().callService(
domain: entity.domain, domain: entity.domain,
service: "set_temperature", service: "set_temperature",
entityId: entity.entityId, entityId: entity.entityId,
data: {"temperature": "${_tmpTemperature.toStringAsFixed(1)}"} data: {"temperature": "${_tmpTemperature.toStringAsFixed(1)}"}
); );
_resetStateTimer(entity);
}); });
}); });
} }
void _setTargetTemp(ClimateEntity entity) { void _setTargetTemp(ClimateEntity entity) {
if (_targetTempThrottleTimer!=null) { _targetTempThrottleTimer?.cancel();
_targetTempThrottleTimer.cancel();
}
setState(() { setState(() {
_changedHere = true; _changedHere = true;
_temperaturePending = true;
_tmpTargetLow = double.parse(_tmpTargetLow.toStringAsFixed(1)); _tmpTargetLow = double.parse(_tmpTargetLow.toStringAsFixed(1));
_tmpTargetHigh = double.parse(_tmpTargetHigh.toStringAsFixed(1)); _tmpTargetHigh = double.parse(_tmpTargetHigh.toStringAsFixed(1));
}); });
_targetTempThrottleTimer = Timer(Duration(seconds: 2), () { _targetTempThrottleTimer = Timer(Duration(seconds: 2), () {
setState(() { setState(() {
_changedHere = true; _changedHere = true;
_temperaturePending = false;
ConnectionManager().callService( ConnectionManager().callService(
domain: entity.domain, domain: entity.domain,
service: "set_temperature", service: "set_temperature",
entityId: entity.entityId, entityId: entity.entityId,
data: {"target_temp_high": "${_tmpTargetHigh.toStringAsFixed(1)}", "target_temp_low": "${_tmpTargetLow.toStringAsFixed(1)}"} data: {"target_temp_high": "${_tmpTargetHigh.toStringAsFixed(1)}", "target_temp_low": "${_tmpTargetLow.toStringAsFixed(1)}"}
); );
_resetStateTimer(entity);
}); });
}); });
} }
@ -127,7 +125,6 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
entityId: entity.entityId, entityId: entity.entityId,
data: {"humidity": "$_tmpTargetHumidity"} data: {"humidity": "$_tmpTargetHumidity"}
); );
_resetStateTimer(entity);
}); });
} }
@ -141,7 +138,6 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
entityId: entity.entityId, entityId: entity.entityId,
data: {"hvac_mode": "$_tmpHVACMode"} data: {"hvac_mode": "$_tmpHVACMode"}
); );
_resetStateTimer(entity);
}); });
} }
@ -155,7 +151,6 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
entityId: entity.entityId, entityId: entity.entityId,
data: {"swing_mode": "$_tmpSwingMode"} data: {"swing_mode": "$_tmpSwingMode"}
); );
_resetStateTimer(entity);
}); });
} }
@ -164,7 +159,6 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
_tmpFanMode = value; _tmpFanMode = value;
_changedHere = true; _changedHere = true;
ConnectionManager().callService(domain: entity.domain, service: "set_fan_mode", entityId: entity.entityId, data: {"fan_mode": "$_tmpFanMode"}); ConnectionManager().callService(domain: entity.domain, service: "set_fan_mode", entityId: entity.entityId, data: {"fan_mode": "$_tmpFanMode"});
_resetStateTimer(entity);
}); });
} }
@ -173,7 +167,6 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
_tmpPresetMode = value; _tmpPresetMode = value;
_changedHere = true; _changedHere = true;
ConnectionManager().callService(domain: entity.domain, service: "set_preset_mode", entityId: entity.entityId, data: {"preset_mode": "$_tmpPresetMode"}); ConnectionManager().callService(domain: entity.domain, service: "set_preset_mode", entityId: entity.entityId, data: {"preset_mode": "$_tmpPresetMode"});
_resetStateTimer(entity);
}); });
} }
@ -191,17 +184,6 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
_tmpAuxHeat = value; _tmpAuxHeat = value;
_changedHere = true; _changedHere = true;
ConnectionManager().callService(domain: entity.domain, service: "set_aux_heat", entityId: entity.entityId, data: {"aux_heat": "$_tmpAuxHeat"}); ConnectionManager().callService(domain: entity.domain, service: "set_aux_heat", entityId: entity.entityId, data: {"aux_heat": "$_tmpAuxHeat"});
_resetStateTimer(entity);
});
}
void _resetStateTimer(ClimateEntity entity) {
if (_resetTimer!=null) {
_resetTimer.cancel();
}
_resetTimer = Timer(Duration(seconds: 3), () {
setState(() {});
_resetVars(entity);
}); });
} }
@ -209,11 +191,11 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
final entityModel = EntityModel.of(context); final entityModel = EntityModel.of(context);
final ClimateEntity entity = entityModel.entityWrapper.entity; final ClimateEntity entity = entityModel.entityWrapper.entity;
Logger.d("[Climate widget build] changed here = $_changedHere");
if (_changedHere) { if (_changedHere) {
_showPending = (_tmpTemperature != entity.temperature || _tmpTargetHigh != entity.targetHigh || _tmpTargetLow != entity.targetLow); //_showPending = (_tmpTemperature != entity.temperature || _tmpTargetHigh != entity.targetHigh || _tmpTargetLow != entity.targetLow);
_changedHere = false; _changedHere = false;
} else { } else {
_resetTimer?.cancel();
_resetVars(entity); _resetVars(entity);
} }
return Padding( return Padding(
@ -321,7 +303,7 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
)), )),
TemperatureControlWidget( TemperatureControlWidget(
value: _tmpTemperature, value: _tmpTemperature,
fontColor: _showPending ? Colors.red : Colors.black, fontColor: _temperaturePending ? Colors.red : Colors.black,
onDec: () => _temperatureDown(entity), onDec: () => _temperatureDown(entity),
onInc: () => _temperatureUp(entity), onInc: () => _temperatureUp(entity),
) )
@ -338,7 +320,7 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
controls.addAll(<Widget>[ controls.addAll(<Widget>[
TemperatureControlWidget( TemperatureControlWidget(
value: _tmpTargetLow, value: _tmpTargetLow,
fontColor: _showPending ? Colors.red : Colors.black, fontColor: _temperaturePending ? Colors.red : Colors.black,
onDec: () => _targetLowDown(entity), onDec: () => _targetLowDown(entity),
onInc: () => _targetLowUp(entity), onInc: () => _targetLowUp(entity),
), ),
@ -351,7 +333,7 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
controls.add( controls.add(
TemperatureControlWidget( TemperatureControlWidget(
value: _tmpTargetHigh, value: _tmpTargetHigh,
fontColor: _showPending ? Colors.red : Colors.black, fontColor: _temperaturePending ? Colors.red : Colors.black,
onDec: () => _targetHighDown(entity), onDec: () => _targetHighDown(entity),
onInc: () => _targetHighUp(entity), onInc: () => _targetHighUp(entity),
) )
@ -429,7 +411,6 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
@override @override
void dispose() { void dispose() {
_resetTimer?.cancel();
super.dispose(); super.dispose();
} }