Skip to content
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

Adding features #30

Closed
wants to merge 9 commits into from
Closed

Adding features #30

wants to merge 9 commits into from

Conversation

jnxxx
Copy link
Contributor

@jnxxx jnxxx commented Jul 29, 2022

Lets try to finally get the two versions merged together, before they get too different.
I see you have updated pydanfossally to version 0.0.27 that is compatible with my changes.
So, I now use it from there and it seems to be working fine.

Changes are as follows:

  • Reading and writing setpoints using: manual_mode_fast, at_home_setting, leaving_home_setting, pause_setting, holiday_setting depending on the preset mode, rather than using temp_set as before.

  • Holiday preset mode added.

  • Quicker reaction to changes performed in the UI

  • Added floor temperature sensor

  • Fix for setmode issue

  • Added action and service call to set target temperature for a specific preset mode.
    Preset mode is optional, and writes to current preset mode when not specified.

  • Added an indication for 'banner control' (local override).
    When setpoint is changed locally from the thermostat it raises this flag and uses this as manual target setpoint.

@MTrab
Copy link
Owner

MTrab commented Sep 7, 2022

Sorry for the lack of reaction - been pretty busy.
There is some conflicts that need attention before a merge is possible

@MTrab
Copy link
Owner

MTrab commented Sep 19, 2022

@jnxxx

@jnxxx
Copy link
Contributor Author

jnxxx commented Sep 19, 2022

I do not know GIT well enough to figure out how to merge it when there are changes on both sides.
I tried to adapt your changes into mine when I last looked at it.
But it seems it raises any difference as a conflict, despite it being required for the additions to work.

@MTrab
Copy link
Owner

MTrab commented Oct 10, 2022

I have tried resolving this for you - please check if it still works as intended.

And for another time, please create a new branch and merge from that. I think your issue lies burried there.

@MTrab MTrab changed the title Merging in my additions Adding features Oct 10, 2022
@MTrab MTrab added enhancement Enhancement of the integration invalid This doesn't seem right and removed enhancement Enhancement of the integration labels Oct 10, 2022
@MTrab
Copy link
Owner

MTrab commented Oct 10, 2022

Just made a test run myself, and this PR is loaded with errors.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
invalid This doesn't seem right
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants