From e843e4a8139721163993958213e2dc8342561f1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20H=C3=B6chst?= <git@jonashoechst.de>
Date: Mon, 16 Sep 2024 16:19:17 +0200
Subject: [PATCH] added vedirect_dump for sane Victron readouts

---
 .gitmodules                 | 3 +++
 boot/firmware/mqttutil.conf | 4 ++--
 home/pi/vedirect_dump       | 1 +
 home/pi/wittypi4            | 2 +-
 tsOS-Base.Pifile            | 4 ++--
 5 files changed, 9 insertions(+), 5 deletions(-)
 create mode 160000 home/pi/vedirect_dump

diff --git a/.gitmodules b/.gitmodules
index 86a40ba..af32b37 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -25,3 +25,6 @@
 [submodule "home/pi/wittypi4"]
 	path = home/pi/wittypi4
 	url = https://github.com/tRackIT-Systems/wittypi4
+[submodule "home/pi/vedirect_dump"]
+	path = home/pi/vedirect_dump
+	url = https://github.com/tRackIT-Systems/vedirect_dump
diff --git a/boot/firmware/mqttutil.conf b/boot/firmware/mqttutil.conf
index 3017622..62cb78c 100644
--- a/boot/firmware/mqttutil.conf
+++ b/boot/firmware/mqttutil.conf
@@ -57,8 +57,8 @@ func = 'json.loads(subprocess.check_output(["/usr/bin/python3", "-m", "smartsola
 
 # get solar power via vedirect
 [vedirect]
-requires = ["vedirect"]
-func = 'vedirect.VEDirect()._data'
+requires = ["vedirect_dump"]
+func = 'vedirect_dump.query_device()'
 
 [wittypi4]
 requires = ["wittypi4"]
diff --git a/home/pi/vedirect_dump b/home/pi/vedirect_dump
new file mode 160000
index 0000000..88b2bf6
--- /dev/null
+++ b/home/pi/vedirect_dump
@@ -0,0 +1 @@
+Subproject commit 88b2bf638320a6ed52f8cc104dbe63a3f44216e9
diff --git a/home/pi/wittypi4 b/home/pi/wittypi4
index 28788ff..92e7136 160000
--- a/home/pi/wittypi4
+++ b/home/pi/wittypi4
@@ -1 +1 @@
-Subproject commit 28788ff1c7993649fcb65e67b467d9ea8e0042b2
+Subproject commit 92e7136549416fd9dfa697603104d4a78aa0af01
diff --git a/tsOS-Base.Pifile b/tsOS-Base.Pifile
index dbbb04c..822f84a 100644
--- a/tsOS-Base.Pifile
+++ b/tsOS-Base.Pifile
@@ -239,8 +239,8 @@ EOF
 # Install pysmartsolar
 RUN python3 -m pip install --break-system-packages -e /home/pi/pysmartsolar
 
-# Install vedirect
-RUN python3 -m pip install --break-system-packages vedirect
+# Install vedirect_dump
+RUN python3 -m pip install --break-system-packages -e /home/pi/vedirect_dump
 
 # Install and enable pymqttutil
 RUN python3 -m pip install --break-system-packages -e /home/pi/pymqttutil