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

Resolves #259 target_temp_step support for climate

Browse Source
This commit is contained in:
Yegor Vialov
2019-02-16 20:44:41 +02:00
parent 3dea844e1e
commit e06b66c523
2 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/entity_class/climate_entity.class.dart
View File

@ -80,6 +80,7 @@ class ClimateEntity extends Entity {
double get targetHumidity => _getDoubleAttributeValue('humidity'); double get targetHumidity => _getDoubleAttributeValue('humidity');
double get maxHumidity => _getDoubleAttributeValue('max_humidity'); double get maxHumidity => _getDoubleAttributeValue('max_humidity');
double get minHumidity => _getDoubleAttributeValue('min_humidity'); double get minHumidity => _getDoubleAttributeValue('min_humidity');
double get temperatureStep => _getDoubleAttributeValue('target_temp_step') ?? 0.5;
String get operationMode => attributes['operation_mode']; String get operationMode => attributes['operation_mode'];
String get fanMode => attributes['fan_mode']; String get fanMode => attributes['fan_mode'];
String get swingMode => attributes['swing_mode']; String get swingMode => attributes['swing_mode'];

36
lib/entity_widgets/controls/climate_controls.dart
View File

@ -42,33 +42,33 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
_changedHere = false; _changedHere = false;
} }
void _temperatureUp(ClimateEntity entity, double step) { void _temperatureUp(ClimateEntity entity) {
_tmpTemperature = ((_tmpTemperature + step) <= entity.maxTemp) ? _tmpTemperature + step : entity.maxTemp; _tmpTemperature = ((_tmpTemperature + entity.temperatureStep) <= entity.maxTemp) ? _tmpTemperature + entity.temperatureStep : entity.maxTemp;
_setTemperature(entity); _setTemperature(entity);
} }
void _temperatureDown(ClimateEntity entity, double step) { void _temperatureDown(ClimateEntity entity) {
_tmpTemperature = ((_tmpTemperature - step) >= entity.minTemp) ? _tmpTemperature - step : entity.minTemp; _tmpTemperature = ((_tmpTemperature - entity.temperatureStep) >= entity.minTemp) ? _tmpTemperature - entity.temperatureStep : entity.minTemp;
_setTemperature(entity); _setTemperature(entity);
} }
void _targetLowUp(ClimateEntity entity, double step) { void _targetLowUp(ClimateEntity entity) {
_tmpTargetLow = ((_tmpTargetLow + step) <= entity.maxTemp) ? _tmpTargetLow + step : entity.maxTemp; _tmpTargetLow = ((_tmpTargetLow + entity.temperatureStep) <= entity.maxTemp) ? _tmpTargetLow + entity.temperatureStep : entity.maxTemp;
_setTargetTemp(entity); _setTargetTemp(entity);
} }
void _targetLowDown(ClimateEntity entity, double step) { void _targetLowDown(ClimateEntity entity) {
_tmpTargetLow = ((_tmpTargetLow - step) >= entity.minTemp) ? _tmpTargetLow - step : entity.minTemp; _tmpTargetLow = ((_tmpTargetLow - entity.temperatureStep) >= entity.minTemp) ? _tmpTargetLow - entity.temperatureStep : entity.minTemp;
_setTargetTemp(entity); _setTargetTemp(entity);
} }
void _targetHighUp(ClimateEntity entity, double step) { void _targetHighUp(ClimateEntity entity) {
_tmpTargetHigh = ((_tmpTargetHigh + step) <= entity.maxTemp) ? _tmpTargetHigh + step : entity.maxTemp; _tmpTargetHigh = ((_tmpTargetHigh + entity.temperatureStep) <= entity.maxTemp) ? _tmpTargetHigh + entity.temperatureStep : entity.maxTemp;
_setTargetTemp(entity); _setTargetTemp(entity);
} }
void _targetHighDown(ClimateEntity entity, double step) { void _targetHighDown(ClimateEntity entity) {
_tmpTargetHigh = ((_tmpTargetHigh - step) >= entity.minTemp) ? _tmpTargetHigh - step : entity.minTemp; _tmpTargetHigh = ((_tmpTargetHigh - entity.temperatureStep) >= entity.minTemp) ? _tmpTargetHigh - entity.temperatureStep : entity.minTemp;
_setTargetTemp(entity); _setTargetTemp(entity);
} }
@ -296,8 +296,8 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
TemperatureControlWidget( TemperatureControlWidget(
value: _tmpTemperature, value: _tmpTemperature,
fontColor: _showPending ? Colors.red : Colors.black, fontColor: _showPending ? Colors.red : Colors.black,
onDec: () => _temperatureDown(entity, 0.5), onDec: () => _temperatureDown(entity),
onInc: () => _temperatureUp(entity, 0.5), onInc: () => _temperatureUp(entity),
) )
], ],
); );
@ -313,8 +313,8 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
TemperatureControlWidget( TemperatureControlWidget(
value: _tmpTargetLow, value: _tmpTargetLow,
fontColor: _showPending ? Colors.red : Colors.black, fontColor: _showPending ? Colors.red : Colors.black,
onDec: () => _targetLowDown(entity, 0.5), onDec: () => _targetLowDown(entity),
onInc: () => _targetLowUp(entity, 0.5), onInc: () => _targetLowUp(entity),
), ),
Expanded( Expanded(
child: Container(height: 10.0), child: Container(height: 10.0),
@ -326,8 +326,8 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
TemperatureControlWidget( TemperatureControlWidget(
value: _tmpTargetHigh, value: _tmpTargetHigh,
fontColor: _showPending ? Colors.red : Colors.black, fontColor: _showPending ? Colors.red : Colors.black,
onDec: () => _targetHighDown(entity, 0.5), onDec: () => _targetHighDown(entity),
onInc: () => _targetHighUp(entity, 0.5), onInc: () => _targetHighUp(entity),
) )
); );
} }