From 0779bb96f0534380eca4c93aac3dcd6266078f60 Mon Sep 17 00:00:00 2001
From: Stefan Allius <stefan.allius@t-online.de>
Date: Sun, 7 Apr 2024 20:00:00 +0200
Subject: [PATCH 1/5] pick some changes from dev-0.7.0 branch

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 538f7cf..041b476 100644
--- a/README.md
+++ b/README.md
@@ -39,12 +39,12 @@ If you use a Pi-hole, you can also store the host entry in the Pi-hole.
 
 ## Features
 
-- supports TSUN GEN3 inverters: TSOL MS-300, MS-350, MS-400, MS-600, MS-700 and MS-800
-- support for TSUN GEN3 PLUS inverters since proxy version 0.6 (e.g. MS-2000)
+- supports TSUN GEN3 PLUS inverters: TSOL-MS2000, MS1800 and MS1600
+- supports TSUN GEN3 inverters: TSOL-MS800, MS700, MS600, MS400, MS350 and MS300
 - `MQTT` support
 - `Home-Assistant` auto-discovery support
 - Self-sufficient island operation without internet (for TSUN GEN3 PLUS inverters in preparation)
-- non-root Docker Container
+- runs in a non-root Docker Container
 
 ## Home Assistant Screenshots
 

From ddde988e2c40238966c241dfc26f87ad78014135 Mon Sep 17 00:00:00 2001
From: Stefan Allius <stefan.allius@t-online.de>
Date: Mon, 8 Apr 2024 21:58:06 +0200
Subject: [PATCH 2/5] switch to aiomqtt version 2.0.0

---
 app/requirements.txt |  2 +-
 app/src/mqtt.py      | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/requirements.txt b/app/requirements.txt
index fd06d2f..7558187 100644
--- a/app/requirements.txt
+++ b/app/requirements.txt
@@ -1,3 +1,3 @@
-    aiomqtt==1.2.1
+    aiomqtt==2.0.0
     schema==0.7.5
     aiocron==1.8
\ No newline at end of file
diff --git a/app/src/mqtt.py b/app/src/mqtt.py
index 413daf4..7ada981 100644
--- a/app/src/mqtt.py
+++ b/app/src/mqtt.py
@@ -73,17 +73,17 @@ class Mqtt(metaclass=Singleton):
                     if self.cb_MqttIsUp:
                         await self.cb_MqttIsUp()
 
-                    async with self.__client.messages() as messages:
-                        await self.__client.subscribe(
-                            f"{ha['auto_conf_prefix']}"
-                            "/status")
-                        async for message in messages:
-                            status = message.payload.decode("UTF-8")
-                            logger_mqtt.info('Home-Assistant Status:'
-                                             f' {status}')
-                            if status == 'online':
-                                self.ha_restarts += 1
-                                await self.cb_MqttIsUp()
+                    # async with self.__client.messages() as messages:
+                    await self.__client.subscribe(
+                        f"{ha['auto_conf_prefix']}"
+                        "/status")
+                    async for message in self.__client.messages:
+                        status = message.payload.decode("UTF-8")
+                        logger_mqtt.info('Home-Assistant Status:'
+                                         f' {status}')
+                        if status == 'online':
+                            self.ha_restarts += 1
+                            await self.cb_MqttIsUp()
 
             except aiomqtt.MqttError:
                 logger_mqtt.info(f"Connection lost; Reconnecting in {interval}"

From 26b7ccd40f41fbf1f06e35f67350f4b0bc63718f Mon Sep 17 00:00:00 2001
From: Stefan Allius <stefan.allius@t-online.de>
Date: Tue, 9 Apr 2024 00:13:45 +0200
Subject: [PATCH 3/5] switch to aiomqtt 2.0.0

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 169e968..2a78aac 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
 <p align="center">
     <a href="https://opensource.org/licenses/BSD-3-Clause"><img alt="License: BSD-3-Clause" src="https://img.shields.io/badge/License-BSD_3--Clause-green.svg"></a>
     <a href="https://www.python.org/downloads/release/python-3120/"><img alt="Supported Python versions" src="https://img.shields.io/badge/python-3.12-blue.svg"></a>
-    <a href="https://sbtinstruments.github.io/aiomqtt/introduction.html"><img alt="Supported aiomqtt versions" src="https://img.shields.io/badge/aiomqtt-1.2.1-lightblue.svg"></a>
+    <a href="https://sbtinstruments.github.io/aiomqtt/introduction.html"><img alt="Supported aiomqtt versions" src="https://img.shields.io/badge/aiomqtt-2.0.0-lightblue.svg"></a>
     <a href="https://libraries.io/pypi/aiocron"><img alt="Supported aiocron versions" src="https://img.shields.io/badge/aiocron-1.8-lightblue.svg"></a>
     <a href="https://toml.io/en/v1.0.0"><img alt="Supported toml versions" src="https://img.shields.io/badge/toml-1.0.0-lightblue.svg"></a>
 

From 1760a764ea55942e7653b54dbdb25211795a79ed Mon Sep 17 00:00:00 2001
From: Stefan Allius <stefan.allius@t-online.de>
Date: Tue, 9 Apr 2024 00:15:03 +0200
Subject: [PATCH 4/5] add branch name and date to version string

---
 app/build.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/build.sh b/app/build.sh
index 25c5547..d552cb6 100755
--- a/app/build.sh
+++ b/app/build.sh
@@ -11,6 +11,7 @@
 set -e
 
 BUILD_DATE=$(date -Iminutes)
+BRANCH=$(git rev-parse --abbrev-ref HEAD)
 VERSION=$(git describe --tags --abbrev=0)
 VERSION="${VERSION:1}"
 arr=(${VERSION//./ })
@@ -19,7 +20,7 @@ IMAGE=tsun-gen3-proxy
 
 if [[ $1 == dev ]] || [[ $1 == rc ]] ;then
 IMAGE=docker.io/sallius/${IMAGE}
-VERSION=${VERSION}-$1
+VERSION=${VERSION}-$1-${BRANCH}-$(date +%Y%m%d%H%M)
 elif [[ $1 == rel ]];then
 IMAGE=ghcr.io/s-allius/${IMAGE}
 else

From 234eb26eae43cfb7e472aa95fe44605ec54fdb85 Mon Sep 17 00:00:00 2001
From: Stefan Allius <stefan.allius@t-online.de>
Date: Tue, 9 Apr 2024 00:37:30 +0200
Subject: [PATCH 5/5] remove builddate from version

---
 app/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.sh b/app/build.sh
index d552cb6..bb89cfa 100755
--- a/app/build.sh
+++ b/app/build.sh
@@ -20,7 +20,7 @@ IMAGE=tsun-gen3-proxy
 
 if [[ $1 == dev ]] || [[ $1 == rc ]] ;then
 IMAGE=docker.io/sallius/${IMAGE}
-VERSION=${VERSION}-$1-${BRANCH}-$(date +%Y%m%d%H%M)
+VERSION=${VERSION}-$1-${BRANCH}
 elif [[ $1 == rel ]];then
 IMAGE=ghcr.io/s-allius/${IMAGE}
 else