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

Merge master into Release #2039

Merged
merged 241 commits into from
Nov 25, 2024
Merged

Merge master into Release #2039

merged 241 commits into from
Nov 25, 2024

Conversation

LKuemmel
Copy link
Contributor

No description provided.

ndrsnhs and others added 30 commits July 25, 2024 12:16
Neu kann auch für Acthor und andere der Zu meldende Überschuss im Manuellen  Modus übergeben werden.
Alle möglichen MQTT Topics sind im mqtt modul besschrieben:
Generisches MQTT modul
Wenn Einschaltbedingung erreicht (Beispiel hier mit Device 2)
openWB/LegacySmartHome/Devices/2/ReqRelay = 1
openWB/LegacySmartHome/Devices/2/Ueberschuss = in Watt
Wenn Ausschaltbedingung erreicht
openWB/LegacySmartHome/Devices/2/ReqRelay = 0
openWB/LegacySmartHome/Devices/2/Ueberschuss = in Watt
ReqRelay gibt den Status vom Gerät aus Sicht openWb an (1 = eingeschaltet, 0 = ausgeschaltet)
Bei der periodischen Abfrage wird die aktuelle Leistung
openWB/set/LegacySmartHome/Devices/2/Aktpower = in Watt erwartet
openWB/set/LegacySmartHome/Devices/2/Tempa = Temperatur in C mit max 2 Nachkommastellen
openWB/set/LegacySmartHome/Devices/2/Tempb = Temperatur in C mit max 2 Nachkommastellen
openWB/set/LegacySmartHome/Devices/2/Tempc = Temperatur in C mit max 2 Nachkommastellen
und der aktuelle Zähler in Wattstunden wird hier erwartet
openWB/set/LegacySmartHome/Devices/2/Powerc
wenn kein Zähler übergeben oder 0 übergeben wird, wird der Zähler selber gerechnet
openWB/set/LegacySmartHome/Devices/2/Ueberschuss = in Watt
alle Geräte (nicht nur MQTT) können bezüglich manuell / automatisch von extern gesteuert werden.
openWB/set/LegacySmartHome/config/set/Devices/2/mode
Mode steuert das Gerät (1 = manueller Modus, 0 = automatischer Modus)
openWB/set/LegacySmartHome/config/set/Devices/2/device_manual_control
device_manual_control steuert das Ferät im manuellen Modus (1 = ein, 0 = aus)
openWB/set/LegacySmartHome/config/set/Devices/2/manueb = vorgebener Überschuss in Watt ohne Nachkommastellen
Dieser Wert wird wenn das Gerät auf Manueller Modus und ein geschaltet ist, als Überschuss an das jeweilige Gerät übergeben. (nur relevant für Acthor, Elwa, IDM, Lambda die mit überschuss gesteuert werden)
* thread handler: don't start multiple thread instances

* logging

* review: log message only if the thread was really started
* DC charging

* fix test

* fix max current

* fix rebase

* DC charging

* draft

* draft

* fixes

* naming

* update config

* fix test

* fix test

* undo

* fix update config

* fix

* remove old code
* DC charging

* fix test

* fix max current

* fix rebase

* DC charging

* draft

* draft

* fixes

* naming

* update config

* fix test

* fix test

* undo

* fix update config

* fix

* remove old code

* fix configuration.json
* fix consider less charging

* fix test
Bumps [aiohttp](https://github.com/aio-libs/aiohttp) from 3.9.4 to 3.10.2.
- [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.9.4...v3.10.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* rename Sdm630 to Sdm630_72

* naming soc for vehicle

* feed in limit in message

* unneeded log message removed
* error timestamp for pro, external, satelllit and smartwb

* fix rebase

* fix pytest
* et_provider_available

* fix ev.py

* typos in strings

* fix component_initializer

* fix local variable names

* markdown fixes

* fix data types
* open and close ModbusClient

* do not establish new connection on exception in huawai and qcells module
bimmer_connected was updated for MyBMW App 4.7.2
benderl and others added 29 commits November 7, 2024 08:49
update cards display theme dependencies
* Solis: fix modbus address for SOC

The Solis support was created based on Fox ESS. It looks like the
creator missed to adjust the modbus address for SOC, it's 33139 based
on a register map I got from solis support.

Total discharge energy is also in kWh, not 1/10kWh units.

* Solis: read all registers as input registers

Every modbus query fails, as all registers need to be read as input
registers (code 0x04), instead of holding register.

* Solis: Fix for unreachable local variables

right now I get the following error:
UnboundLocalError: local variable 'power' referenced before assignment

Fix it by moving some code around.

* Review

---------

Co-authored-by: LKuemmel <76958050+LKuemmel@users.noreply.github.com>
Update for Polestar auth change:client id and optional acceptance of terms and conditions
remove console output in production build
* Wiki

* typos Wiki
clear browser console at midnight
@LKuemmel LKuemmel merged commit 9b5fded into Release Nov 25, 2024
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.