Skip to content

Commit

Permalink
Merge pull request fboundy#295 from fboundy/solis-cloud
Browse files Browse the repository at this point in the history
Updated license to acknowledge soliscontrol
  • Loading branch information
fboundy authored Nov 16, 2024
2 parents 9c11da3 + 7bdc059 commit 8e31ca5
Show file tree
Hide file tree
Showing 6 changed files with 61 additions and 3 deletions.
6 changes: 6 additions & 0 deletions .test/solis_cloud_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -225,3 +225,9 @@ def set_timer(self, direction, start, end, power):
# %%
sc.set_timer("charge", pd.Timestamp("00:50"), pd.Timestamp("01:00"), 3000)
# %%
sc.set_mode_switch(35)
# %%
r=sc.set_code(696, 3600)
# %%

# %%
9 changes: 9 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
This contains code from the following projects:

[solis_control](https://github.com/stevegal/solis_control)

It has been modified by fboundy. The original licenses for all above projects can be found in the
[licenses folder](https://github.com/fboundy/pv_opt/licenses).


MIT License

Copyright (c) 2023 fboundy
Expand All @@ -19,3 +27,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# PV Opt: Home Assistant Solar/Battery Optimiser v3.18.1
# PV Opt: Home Assistant Solar/Battery Optimiser v3.18.2

<h2>This documentation needs updating!</h2>

Expand Down
5 changes: 3 additions & 2 deletions apps/pv_opt/pv_opt.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from numpy import nan
import re

VERSION = "3.18.1"
VERSION = "3.18.2"


OCTOPUS_PRODUCT_URL = r"https://api.octopus.energy/v1/products/"
Expand Down Expand Up @@ -465,9 +465,10 @@ def initialize(self):
self.log(f"******************* PV Opt v{VERSION} *******************")
self.log("")
self.io = False
self.agile = False
self.debug = DEBUG
self.redact_regex = REDACT_REGEX

self.contract_last_loaded = pd.Timestamp("1970-01-01", tz="UTC")
try:
subver = int(VERSION.split(".")[2])
except:
Expand Down
21 changes: 21 additions & 0 deletions licenses/pvopt license.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2023 fboundy

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
21 changes: 21 additions & 0 deletions licenses/soliscontrol license.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2023 stevegal

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

0 comments on commit 8e31ca5

Please sign in to comment.