-
Notifications
You must be signed in to change notification settings - Fork 9
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
Trying solution for Core issue #132479 #661
Merged
Merged
Changes from 31 commits
Commits
Show all changes
32 commits
Select commit
Hold shift + click to select a range
2f2461c
Add updated userdata for Anna Elga cooling change to heating
bouwew fc76fef
Extend related test
bouwew ec9142e
Add related test-data json-file
bouwew a830c32
Correct directory name
bouwew 07ecca3
Correct related test-case
bouwew c2e06ab
Userdata fixes
bouwew e46042e
Assert fix
bouwew 74509da
Improve helper.py
bouwew 5b8baf2
test_anna: fix to smile._cooling_enabled
bouwew 2a90f25
Make _cooling_enabled for Smile class
bouwew 7e7930e
test_anna: also fix to smile._cooling_active
bouwew 16356c9
Test-adam also add/improve cooling asserts
bouwew 45adc06
Disable setting self._cooling_enabled in smile.py
bouwew 8293aa5
Extend test_init output
bouwew 30d52fa
Revert back to self._cooling_*
bouwew 29fe41c
Adam: add cooling_enabled when not in xml-data
bouwew f0b0cf3
Clean up unused code, clarify function via comment
bouwew 161f5db
Save updated fixture and test-json files
bouwew 12d2566
Revert adding self._cooling_enabled at top-level
bouwew 2b69b2a
Add back setting self._cooling_enabled at top-level
bouwew 62d910c
Another revert
bouwew ce6176b
Clean up
bouwew 3463856
Add elga_2 tinker_thermostat test
bouwew 573298c
Correct-extend tinker_thermostat_temp()
bouwew 7c6901d
Adapt relevant testcases
bouwew c2deae7
Elga_2_cooling: tests again after async_update
bouwew 74931e4
Update CHANGELOG
bouwew 4bb7b95
Bump to v1.6.3a0 test-version
bouwew e654a08
Fix complexity
bouwew 6c4339c
Fix to python 3.13.0
bouwew 66e3ab2
Set cooling_enabled binary_sensor for Loria/Thermastage too
bouwew 54ef0ce
Set to v1.6.3 release-version
bouwew File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,100 @@ | ||
{ | ||
"entities": { | ||
"573c152e7d4f4720878222bd75638f5b": { | ||
"available": true, | ||
"binary_sensors": { | ||
"compressor_state": true, | ||
"cooling_enabled": false, | ||
"cooling_state": false, | ||
"dhw_state": false, | ||
"flame_state": true, | ||
"heating_state": true, | ||
"secondary_boiler_state": false | ||
}, | ||
"dev_class": "heater_central", | ||
"location": "d34dfe6ab90b410c98068e75de3eb631", | ||
"maximum_boiler_temperature": { | ||
"lower_bound": 0.0, | ||
"resolution": 1.0, | ||
"setpoint": 60.0, | ||
"upper_bound": 100.0 | ||
}, | ||
"model": "Generic heater/cooler", | ||
"name": "OpenTherm", | ||
"sensors": { | ||
"domestic_hot_water_setpoint": 60.0, | ||
"intended_boiler_temperature": 0.0, | ||
"modulation_level": 0.0, | ||
"outdoor_air_temperature": 3.0, | ||
"return_temperature": 23.4, | ||
"water_pressure": 0.5, | ||
"water_temperature": 22.8 | ||
}, | ||
"switches": { | ||
"dhw_cm_switch": true | ||
}, | ||
"vendor": "Techneco" | ||
}, | ||
"ebd90df1ab334565b5895f37590ccff4": { | ||
"active_preset": "home", | ||
"available_schedules": [ | ||
"Thermostat schedule", | ||
"off" | ||
], | ||
"climate_mode": "auto", | ||
"dev_class": "thermostat", | ||
"firmware": "2018-02-08T11:15:53+01:00", | ||
"hardware": "6539-1301-5002", | ||
"location": "d3ce834534114348be628b61b26d9220", | ||
"model": "ThermoTouch", | ||
"name": "Anna", | ||
"preset_modes": [ | ||
"away", | ||
"no_frost", | ||
"vacation", | ||
"home", | ||
"asleep" | ||
], | ||
"select_schedule": "Thermostat schedule", | ||
"sensors": { | ||
"cooling_activation_outdoor_temperature": 26.0, | ||
"cooling_deactivation_threshold": 3.0, | ||
"illuminance": 0.5, | ||
"setpoint_high": 30.0, | ||
"setpoint_low": 19.5, | ||
"temperature": 18.9 | ||
}, | ||
"temperature_offset": { | ||
"lower_bound": -2.0, | ||
"resolution": 0.1, | ||
"setpoint": 0.0, | ||
"upper_bound": 2.0 | ||
}, | ||
"thermostat": { | ||
"lower_bound": 4.0, | ||
"resolution": 0.1, | ||
"setpoint_high": 30.0, | ||
"setpoint_low": 19.5, | ||
"upper_bound": 30.0 | ||
}, | ||
"vendor": "Plugwise" | ||
}, | ||
"fb49af122f6e4b0f91267e1cf7666d6f": { | ||
"binary_sensors": { | ||
"plugwise_notification": false | ||
}, | ||
"dev_class": "gateway", | ||
"firmware": "4.2.1", | ||
"hardware": "AME Smile 2.0 board", | ||
"location": "d34dfe6ab90b410c98068e75de3eb631", | ||
"mac_address": "C4930002FE76", | ||
"model": "Gateway", | ||
"model_id": "smile_thermo", | ||
"name": "Smile Anna", | ||
"sensors": { | ||
"outdoor_temperature": 3.0 | ||
}, | ||
"vendor": "Plugwise" | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe we should 'match/case' this, but at least just return before the match against gateway (as that wouldn't be processed e.g. there is nothing more to do once heater central is done)?