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

Sungrow Fixes #2713

Closed
wants to merge 58 commits into from
Closed
Show file tree
Hide file tree
Changes from 56 commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
2df8aa6
add kostal sem
LKuemmel Dec 15, 2022
840bb4e
add smartme
LKuemmel Dec 15, 2022
e992314
fix deviceconfig
LKuemmel Dec 15, 2022
b337eac
add solarwatt
LKuemmel Dec 16, 2022
b47d2b9
fix phase names
LKuemmel Dec 16, 2022
ad92c1d
fix deviceconfig
LKuemmel Dec 15, 2022
d93dcee
solarworld
LKuemmel Jan 12, 2023
2f79487
Update modules/wr_solarworld/main.sh
LKuemmel Jan 17, 2023
c855d5e
display chargepoints in yieldmeter
cshagen Apr 1, 2023
4d75708
add version to script tags
cshagen Apr 1, 2023
6d63099
update preview picture
cshagen Apr 1, 2023
342b2d7
modify month graph calculation
cshagen Apr 1, 2023
29a77c9
Sungrow Fixes
Maxify23 May 8, 2023
4bed182
Sungrow Modulkonfiguration Anpassungen
Maxify23 May 10, 2023
f6e2eaf
Merge pull request #2555 from LKuemmel/smartme
LKuemmel May 10, 2023
a21178e
Merge pull request #2556 from LKuemmel/ksem
LKuemmel May 11, 2023
004bce2
Wiedereingliederung der Modbus ID
Maxify23 May 11, 2023
800d3bf
Wiedereingliederung der Modbus ID Teil2
Maxify23 May 11, 2023
5b95126
smarthome 2.0 openWB 1.9 Zerlegung
okaegi May 11, 2023
e01aa1d
Bump version 1.9.301.1
LKuemmel May 12, 2023
3af201e
fix solaredge charge bat from external inverter
LKuemmel May 12, 2023
a66e28a
Merge pull request #2718 from LKuemmel/fix
LKuemmel May 12, 2023
22de756
fix evse precise current
LKuemmel May 15, 2023
2489b0a
fix
LKuemmel May 15, 2023
1808695
fix
LKuemmel May 15, 2023
f1f8f77
fix port
LKuemmel May 16, 2023
7873b2b
Merge pull request #2720 from LKuemmel/fix
LKuemmel May 16, 2023
97067ea
fix solaredge synergy units undocumented
LKuemmel May 16, 2023
e893857
Merge pull request #2721 from LKuemmel/fix
LKuemmel May 16, 2023
cdb3ddb
Hinweistexte überarbeitet.
Maxify23 May 16, 2023
5341a8d
smarthome...
okaegi May 17, 2023
2b87fa3
flake8
okaegi May 17, 2023
be29edd
remove sleep
okaegi May 18, 2023
b3a246d
anpassung subprocess
okaegi May 18, 2023
04b7158
Update smarthomeconfig.php
egeu5 May 18, 2023
4179bb3
Update...
okaegi May 23, 2023
56b5996
typo
okaegi May 23, 2023
2d52063
add solarview (#2557)
LKuemmel May 23, 2023
5c07888
Merge pull request #2558 from LKuemmel/solarwatt
LKuemmel May 23, 2023
3d131d8
Merge pull request #2717 from okaegi/sm1005000
LKuemmel May 23, 2023
2068a20
Merge pull request #2723 from egeu5/patch-1
benderl May 25, 2023
a6a9c31
Merge pull request #2674 from cshagen/master
benderl May 25, 2023
97611a6
Smarthome askoheat
okaegi May 26, 2023
34664df
Merge pull request #2725 from okaegi/smart181
benderl May 26, 2023
2ddbf11
Merge pull request #2585 from LKuemmel/solarworld
LKuemmel May 30, 2023
40b3a02
Varta (#2591)
LKuemmel May 30, 2023
8dd9fd0
Sungrow Fixes
Maxify23 May 8, 2023
8506fe1
Sungrow Modulkonfiguration Anpassungen
Maxify23 May 10, 2023
868c6a8
Wiedereingliederung der Modbus ID
Maxify23 May 11, 2023
a36787a
Wiedereingliederung der Modbus ID Teil2
Maxify23 May 11, 2023
4dbebd7
Hinweistexte überarbeitet.
Maxify23 May 16, 2023
6c2e461
solve Python Test problems
Maxify23 Jun 1, 2023
4315635
Merge remote-tracking branch 'origin/master'
Maxify23 Jun 1, 2023
5da264e
Revert "solve Python Test problems"
Maxify23 Jun 1, 2023
1882949
solve Python Test problems 2
Maxify23 Jun 1, 2023
1fe8778
solve Python Test problems 2
Maxify23 Jun 1, 2023
9ca96b4
solve Python Test problems 3
Maxify23 Jun 1, 2023
15b6f78
Merge remote-tracking branch 'origin/master'
Maxify23 Jun 1, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions loadvars.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1092,7 +1092,7 @@ loadvars(){
fi
echo $hausverbrauch > /var/www/html/openWB/ramdisk/hausverbrauch
usesimbezug=0
if [[ $wattbezugmodul == "bezug_solarwatt" ]]|| [[ $wattbezugmodul == "bezug_rct" ]]|| [[ $wattbezugmodul == "bezug_varta" ]] || [[ $wattbezugmodul == "bezug_kostalplenticoreem300haus" ]] || [[ $wattbezugmodul == "bezug_solarlog" ]] ; then
if [[ $wattbezugmodul == "bezug_solarwatt" ]]|| [[ $wattbezugmodul == "bezug_rct" ]]|| [[ $wattbezugmodul == "bezug_kostalplenticoreem300haus" ]] || [[ $wattbezugmodul == "bezug_solarlog" ]] ; then
usesimbezug=1
fi
if ((usesimbezug == 1)); then
Expand Down Expand Up @@ -1182,7 +1182,7 @@ loadvars(){
echo "$pvallwh" > /var/www/html/openWB/ramdisk/pvallwh
fi

if [[ $speichermodul == "speicher_tesvoltsma" ]] || [[ $speichermodul == "speicher_solarwatt" ]] || [[ $speichermodul == "speicher_rct" ]]|| [[ $speichermodul == "speicher_kostalplenticore" ]] || [[ $speichermodul == "speicher_varta" ]] ; then
if [[ $speichermodul == "speicher_tesvoltsma" ]] || [[ $speichermodul == "speicher_solarwatt" ]] || [[ $speichermodul == "speicher_rct" ]]|| [[ $speichermodul == "speicher_kostalplenticore" ]] ; then
ra='^-?[0-9]+$'
watt2=$(</var/www/html/openWB/ramdisk/speicherleistung)
if [[ -e /var/www/html/openWB/ramdisk/speicherwatt0pos ]]; then
Expand Down
2 changes: 1 addition & 1 deletion modules/bezug_ksem/main.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ else
MYLOGFILE="${RAMDISKDIR}/evu.log"
fi

bash "$OPENWBBASEDIR/packages/legacy_run.sh" "bezug_ksem.readksem" "${ksemip}" >>"${MYLOGFILE}" 2>&1
bash "$OPENWBBASEDIR/packages/legacy_run.sh" "modules.devices.kostal_sem.device" "${ksemip}" >>"${MYLOGFILE}" 2>&1
ret=$?

openwbDebugLog ${DMOD} 2 "EVU RET: ${ret}"
Expand Down
103 changes: 0 additions & 103 deletions modules/bezug_ksem/readksem.py

This file was deleted.

2 changes: 1 addition & 1 deletion modules/bezug_smartme/main.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ openwbDebugLog ${DMOD} 2 "Bezug Smartme URL: ${bezug_smartme_url}"
openwbDebugLog ${DMOD} 2 "Bezug Smartme User : ${bezug_smartme_user}"
openwbDebugLog ${DMOD} 2 "Bezug Smartme Passwort: ${bezug_smartme_pass}"

bash "$OPENWBBASEDIR/packages/legacy_run.sh" "bezug_smartme.smartme" "${bezug_smartme_url}" "${bezug_smartme_user}" "${bezug_smartme_pass}" >>"$MYLOGFILE" 2>&1
bash "$OPENWBBASEDIR/packages/legacy_run.sh" "modules.devices.smart_me.device" "counter" "${bezug_smartme_user}" "${bezug_smartme_pass}" "${bezug_smartme_url}" >>"$MYLOGFILE" 2>&1
ret=$?

openwbDebugLog ${DMOD} 2 "RET: ${ret}"
Expand Down
110 changes: 0 additions & 110 deletions modules/bezug_smartme/smartme.py

This file was deleted.

2 changes: 1 addition & 1 deletion modules/bezug_solarview/main.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ else
MYLOGFILE="${RAMDISKDIR}/evu.log"
fi

bash "$OPENWBBASEDIR/packages/legacy_run.sh" "bezug_solarview.solarview" "${solarview_hostname}" "${solarview_port}" "${solarview_timeout}" >>"${MYLOGFILE}" 2>&1
bash "$OPENWBBASEDIR/packages/legacy_run.sh" "modules.devices.solar_view.device" "counter" "${solarview_hostname}" "${solarview_port}" "${solarview_timeout}" >>"${MYLOGFILE}" 2>&1
ret=$?

openwbDebugLog ${DMOD} 2 "RET: ${ret}"
Expand Down
Loading