Skip to content

Merge master into Beta#1576

Merged
LKuemmel merged 225 commits intoBetafrom
master
Apr 19, 2024
Merged

Merge master into Beta#1576
LKuemmel merged 225 commits intoBetafrom
master

Conversation

@LKuemmel
Copy link
Copy Markdown
Contributor

No description provided.

benderl and others added 30 commits July 17, 2023 11:46
Merge master into Release
Merge master into Release
Merge master into Release
Merge master into Release
Bumps [aiohttp](https://github.com/aio-libs/aiohttp) from 3.7.4 to 3.9.0.
- [Release notes](https://github.com/aio-libs/aiohttp/releases)
- [Changelog](https://github.com/aio-libs/aiohttp/blob/master/CHANGES.rst)
- [Commits](aio-libs/aiohttp@v3.7.4...v3.9.0)

---
updated-dependencies:
- dependency-name: aiohttp
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Bei Dac DA02 wird neu auch die bisherige Leistungsaufnahme in die Berechnung von 0 - 10 V mit einbezogen um Schwingen zu vermeidebb

https://forum.openwb.de/viewtopic.php?p=103457#p103457
* acthor 27k

Unterstützung zwei verbundene Acthors (9000 Watt + 18000 Watt), Gesamthaft 27k Watt. Kann für 1.9 und 2.0 übernommen werden.
Der Acthor wird als ein Gerät angesteuert und macht Verteilung selber.
Kann für 1.9 und 2.0 übernommen werden, Gui für 2.0 kommt separat.

* acthor 45K

Neuer acthor type zugelassen 45000 Watt
#  fix for pymodbus endian class (changes once 2023 august to enum to uppercases only,
#   checked during runtime,
#   not compatible betwwen openwb 1.9 (want lowercases) and openwb 2.0 (wants upercase))
auto = "@"
big = ">"
little = "<"

siehe auch
https://forum.openwb.de/viewtopic.php?p=104639#p104639
LKuemmel and others added 29 commits April 17, 2024 11:07
fix bat_mode: bat_mode battery is charging or full
* Pro: loosen power validation

* fix test
smarthome power optional excluded from home consumption
Nur für openwb 2.0 nicht für openwb 1.9
der mqtt smarthomeclient
erwartet unter dem  topic
openWB/set/LegacySmartHome/Devices/"+devicenumber + /Aktpower
(aktuelle Leistung)
openWB/set/LegacySmartHome/Devices/"+devicenumber + /Powerc
(Zäjlerstand oder 0/ nicht gelifert)
bei on Bedingung wird
openWB/set/LegacySmartHome/Devices/"+devicenumber +"/ReqRelay", "1"
und
"openWB/set/LegacySmartHome/Devices/"+str(devicenumber)
 + /Ueberschuss

bei off Bedingung wird
openWB/set/LegacySmartHome/Devices/"+devicenumber +"/ReqRelay", "9"
und
"openWB/set/LegacySmartHome/Devices/"+str(devicenumber)
 + /Ueberschuss
gepublished.
lseparates log entfernt.
mqtt smarthome openWB 2.0
Bat-Mode: add charging power to switch on threshold at min soc reached
* mqtt für openwb 2.0

Neu können auch Temp. übergeben werden.
Brauchte noch ein Anpasung in setdata da sonst topics grad wieder gelöscht.
Nur für Openwb 2.0
Guid kommt noch separat.
Siehe auch:
https://forum.openwb.de/viewtopic.php?t=8415

* flake8...

* anpassungen gemacht

...
…nd inverter values (#1537)

* Updated sungrow modbus addresses, moved version from counter to device level

* Fixed wrong Endian import

* Fixed WiNet-S frequency accuracy

* Reading powers per phase now, added more registers to modbus.md documentation

* Added load power register 13007 for SH_WiNet, so all versions deliver accurate data for load now

* Using register 13033 instead of 13007 to have accurate data in retrofit scenarios

* Preserving original version numbers

Co-authored-by: LKuemmel <76958050+LKuemmel@users.noreply.github.com>

* Using SimCounter instead of battery counters due to too low resolution.

* Added update_config.py procedure to move Sungrow device version from counter to parent

* Fixed PEP 8 errors

* Fixed PEP 8 errors

* Fixed PEP 8 errors

* Added system message in case of Sungrow configuration update

* Datastore update now includes hierarchy update for Sungrow hybrid inverters with battery

* Fixed Flake8 f-string complaint

---------

Co-authored-by: LKuemmel <76958050+LKuemmel@users.noreply.github.com>
* fix charging bar

* add compiled code

* fix MQ viewer

* remove package-lock.json
fix erorr handling for all components of a device
bat_mode: fix switch off condition
@LKuemmel LKuemmel merged commit d548b28 into Beta Apr 19, 2024
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.