Skip to content

Commit 2009fe1

Browse files
committed
minor changes
1 parent 9942655 commit 2009fe1

23 files changed

Lines changed: 118 additions & 47 deletions

File tree

modules/sdm630modbusbezug/main.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ while read -r line; do
3434
if (( $n == 5 )); then
3535
wl3=$(echo "$line" | cut -c2- |sed 's/\..*$//')
3636
fi
37+
if (( $n == 6 )); then
38+
echo "$line" | cut -c2- |sed 's/\..*$//' > /var/www/html/openWB/ramdisk/bezugkwh
39+
fi
3740

3841
n=$((n + 1))
3942
done <<< "$output"

modules/sdm630modbusbezug/readsdm.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,8 @@
3030
print(struct.unpack('>f',struct.pack('>HH',*resp.registers)))
3131
resp = client.read_input_registers(0x10,2, unit=sdmid)
3232
print(struct.unpack('>f',struct.pack('>HH',*resp.registers)))
33+
resp = client.read_input_registers(0x0156,2, unit=sdmid)
34+
print(struct.unpack('>f',struct.pack('>HH',*resp.registers)))
35+
36+
3337

modules/sdm630modbusll/main.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ fi
2828
if (( $n == 3 )); then
2929
echo "$line" | cut -c2- |sed 's/\..*$//' > /var/www/html/openWB/ramdisk/llaktuell
3030
fi
31+
if (( $n == 4 )); then
32+
echo "$line" | cut -c2- |sed 's/\..*$//' > /var/www/html/openWB/ramdisk/llkwh
33+
fi
34+
3135
n=$((n + 1))
3236
done <<< "$output"
3337

modules/sdm630modbusll/readsdm.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,8 @@
2626

2727
resp = client.read_input_registers(0x0C,2, unit=sdmid)
2828
print(struct.unpack('>f',struct.pack('>HH',*resp.registers)))
29+
resp = client.read_input_registers(0x0156,2, unit=sdmid)
30+
print(struct.unpack('>f',struct.pack('>HH',*resp.registers)))
31+
2932

3033

openwb-install.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ then
135135
else
136136
echo "EXTRA_OPTS="-L 0"" >> /etc/default/cron
137137
fi
138+
sudo apt-get -qq install -y python-pip
138139
sudo pip install -U pymodbus
139140

140141
chmod 777 /var/www/html/openWB/openwb.conf

openwb.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,15 +92,15 @@ socmodul=soc_from_elastic
9292
#Nachtlademodus
9393
# Geladen wird in der Zeit von 22 bis 7 Uhr (Beispiel) bis xx% soc, ist Soc Modul none (also keines vorhanden) wird durchgehend in der Zeit geladen
9494
# Soll nachts geladen werden? (wert 0 oder 1)
95-
nachtladen=0
95+
nachtladen=1
9696
# Ladeleistung für die Nacht (Wert 6-32) wobei 6 = 6A und 32 = 32A maximale WB Leistung ist
9797
nachtll=18
9898
# Ab wieviel Uhr abends soll geladen werden? (17-23 Uhr möglich, angabe in Stunden)
9999
nachtladenabuhr=22
100100
# Bis wieviel Uhr morgens soll geladen werden? (01-10 Uhr möglich, angabe in Stunden)
101101
nachtladenbisuhr=6
102102
# Sofern Soc ausgelesen wird, bis wieviel % SOC laden?
103-
nachtsoc=85
103+
nachtsoc=50
104104

105105

106106
#Uberschussregelung

ramdisk/lademodus

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1
1+
2

ramdisk/ladestatus

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1
1+
0

ramdisk/lla1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7
1+
0

ramdisk/llaktuell

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1613
1+
0

0 commit comments

Comments
 (0)