From 4947f0ec7fb00046dc4595e56f466192a9167511 Mon Sep 17 00:00:00 2001
From: Gunnar Skjold <gunnar.skjold@gmail.com>
Date: Sat, 1 Apr 2023 08:02:12 +0200
Subject: [PATCH] Clear HA config in next config version

---
 lib/AmsConfiguration/include/AmsConfiguration.h | 3 +--
 lib/AmsConfiguration/src/AmsConfiguration.cpp   | 6 ++++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/AmsConfiguration/include/AmsConfiguration.h b/lib/AmsConfiguration/include/AmsConfiguration.h
index 7acbd349..6af438e2 100644
--- a/lib/AmsConfiguration/include/AmsConfiguration.h
+++ b/lib/AmsConfiguration/include/AmsConfiguration.h
@@ -154,7 +154,6 @@ struct DomoticzConfig {
 }; // 10
 
 struct HomeAssistantConfig {
-	uint8_t tag; // Just to find out if we have this config already. Can be removed in v2.3
 	char discoveryPrefix[64];
 	char discoveryHostname[64];
 	char discoveryNameTag[16];
@@ -315,7 +314,7 @@ private:
 	bool relocateConfig96(); // 2.1.14
 	bool relocateConfig100(); // 2.2-dev
 	bool relocateConfig101(); // 2.2.0 through 2.2.8
-	bool relocateConfig102(); // 2.2.9
+	bool relocateConfig102(); // 2.2.9 through 2.2.11
 
 	void saveToFs();
 	bool loadFromFs(uint8_t version);
diff --git a/lib/AmsConfiguration/src/AmsConfiguration.cpp b/lib/AmsConfiguration/src/AmsConfiguration.cpp
index cbf69fd6..07eb0be4 100644
--- a/lib/AmsConfiguration/src/AmsConfiguration.cpp
+++ b/lib/AmsConfiguration/src/AmsConfiguration.cpp
@@ -336,7 +336,6 @@ bool AmsConfiguration::getHomeAssistantConfig(HomeAssistantConfig& config) {
 	if(hasConfig()) {
 		EEPROM.begin(EEPROM_SIZE);
 		EEPROM.get(CONFIG_HA_START, config);
-		if(config.tag != 0xA7) clearHomeAssistantConfig(config);
 		EEPROM.end();
 		return true;
 	} else {
@@ -367,7 +366,6 @@ bool AmsConfiguration::setHomeAssistantConfig(HomeAssistantConfig& config) {
 }
 
 void AmsConfiguration::clearHomeAssistantConfig(HomeAssistantConfig& config) {
-	config.tag = 0xA7;
 	strcpy(config.discoveryPrefix, "");
 	strcpy(config.discoveryHostname, "");
 	strcpy(config.discoveryNameTag, "");
@@ -1035,6 +1033,10 @@ bool AmsConfiguration::relocateConfig102() {
 	gpioConfig.hanPinPullup = true;
 	EEPROM.put(CONFIG_GPIO_START, gpioConfig);
 
+	HomeAssistantConfig haconf;
+	clearHomeAssistantConfig(haconf);
+	EEPROM.put(CONFIG_HA_START, haconf);
+
 	EEPROM.put(EEPROM_CONFIG_ADDRESS, 103);
 	bool ret = EEPROM.commit();
 	EEPROM.end();