Skip to content

Merge main to dev#435

Merged
stevebuk1 merged 78 commits intodevfrom
main
Apr 6, 2026
Merged

Merge main to dev#435
stevebuk1 merged 78 commits intodevfrom
main

Conversation

@stevebuk1
Copy link
Copy Markdown
Owner

No description provided.

First code for Octopus Free Electricity Session handling.
in def write_and_poll_time:
1) change variable time to times to avoid confusion with time.sleep.
2) change verbose to false (couple into debug mode as future work)

Correct bug in solis.py so that value of
id_timed_charge_discharge_button is loaded from config.yaml if overide is in place.
The day of week weighting guides the contribution of two arrrays.
One is an average of all 7 days.
The other is from what it was last week on that particular day.

Whilst they are the same length (and there is a check for that), they start at different times so all the final summations are off. This fix rectifies that.

refactor: move EV substraction to separate def, no code changes.

Bugfix for #424, add "_" to calls to host  to sunsynk.py to match solis.py factor.
#424: Updates to sunsynk.py to get Sunsynk inverter read/write working
#415: Tidy up comments, delete unused/experimental code.
stevebuk1 and others added 29 commits April 4, 2026 20:38
Removed donation section for Mountain Rescue Team from README.
Migrated to use the new calendar entity for free electricity events, replacing the deprecated event entity.
Updated links and descriptions for Solis integrations in README.
Added a detailed table of contents to the README for easier navigation and included additional information about the application and its benefits.
Updated introduction section for clarity and conciseness.
Removed the Table of Contents title from the README.
Update feature from main
Updated links to point to the new repository locations for Solis integration and configuration files.
Removed extra code block markers from log examples.
Added a step to pull latest changes before pushing.
Replaced git push command with force-with-lease option and removed unnecessary pull command.
Updated the GitHub Actions workflow to ensure correct branch checkout and removed unnecessary fetch and rebase steps.
Added fetch-depth option to checkout step
@stevebuk1 stevebuk1 merged commit 9b1b672 into dev Apr 6, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant