From 7e047c0c090f9bbf3f058278f02beeb4a8388adf Mon Sep 17 00:00:00 2001
From: Marcel Peterkau <marcel@peterkau.de>
Date: Mon, 17 Apr 2023 20:23:05 +0200
Subject: [PATCH] some Wifi-defines renamed for consistency

---
 Software/include/sanitycheck.h | 35 ++++++++++++++++++++--------------
 Software/platformio.ini        |  6 +++---
 Software/src/main.cpp          |  9 +++++----
 3 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/Software/include/sanitycheck.h b/Software/include/sanitycheck.h
index 45d4b93..b30573e 100644
--- a/Software/include/sanitycheck.h
+++ b/Software/include/sanitycheck.h
@@ -2,20 +2,27 @@
 #define _SANITYCHECK_H_
 
 #ifndef ADMIN_PASSWORD
-#error "You need to define ADMIN_PASSWORD for OTA-Update"
-#endif
-#ifndef WIFI_PASSWORD
-#error "You must define an WIFI_PASSWORD for OTA-Update"
-#endif
-#ifndef WIFI_SSID
-#error "You must define an WIFI_SSID for OTA-Update"
-#endif
-#ifndef WIFI_AP_SSID
-#warning "No WIFI_AP_SSID defined. Using DeviceName"
-#define WIFI_AP_SSID DEVICE_NAME
-#endif
-#ifndef WIFI_AP_PASSWORD
-#error "You must define an WIFI_AP_PASSWORD for Standalone AP-Mode"
+    #error "You need to define ADMIN_PASSWORD for OTA-Update"
 #endif
 
+#ifndef WIFI_AP_SSID
+    #warning "No WIFI_AP_SSID defined. Using DeviceName"
+    #define WIFI_AP_SSID DEVICE_NAME
+#endif
+
+#ifndef WIFI_AP_PASSWORD
+    #error "You must define an WIFI_AP_PASSWORD for Standalone AP-Mode"
+#endif
+
+
+#ifdef FEATURE_ENABLE_WIFI_CLIENT
+    #ifndef WIFI_CLIENT_PASSWORD
+        #error "You must define an WIFI_PASSWORD for OTA-Update"
+    #endif
+    #ifndef WIFI_CLIENT_SSID
+        #error "You must define an WIFI_SSID for OTA-Update"
+    #endif
+#endif
+
+
 #endif //_SANITYCHECK_H_
\ No newline at end of file
diff --git a/Software/platformio.ini b/Software/platformio.ini
index 342986f..7611d24 100644
--- a/Software/platformio.ini
+++ b/Software/platformio.ini
@@ -27,13 +27,13 @@ upload_speed = 921600
 build_flags=
   !python git_rev_macro.py
   -DATOMIC_FS_UPDATE
-  ;-DFEATURE_ENABLE_WIFI_CLIENT
+  -DFEATURE_ENABLE_WIFI_CLIENT
   ;-DFEATURE_ENABLE_LORA
   ;-DCAPTIVE
   -DWIFI_AP_IP_GW=10,0,0,1
   -DADMIN_PASSWORD=${wifi_cred.admin_password}
-  -DWIFI_SSID=${wifi_cred.wifi_ssid}
-  -DWIFI_PASSWORD=${wifi_cred.wifi_password}
+  -DWIFI_CLIENT_SSID=${wifi_cred.wifi_client_ssid}
+  -DWIFI_CLIENT_PASSWORD=${wifi_cred.wifi_client_password}
   -DWIFI_AP_SSID=${wifi_cred.wifi_ap_ssid}
   -DWIFI_AP_PASSWORD=${wifi_cred.wifi_ap_password}
   -DDEVICE_NAME='"Dark Emergency Timer"'
diff --git a/Software/src/main.cpp b/Software/src/main.cpp
index 17c2ab9..3300294 100644
--- a/Software/src/main.cpp
+++ b/Software/src/main.cpp
@@ -89,15 +89,16 @@ void setup()
 	Serial.begin(115200);
 	Serial.setDebugOutput(false);
 
-	Serial.println("\n\nDark Emergency Timer - by Hiabuto Defense");
-	Serial.println(globals.DeviceName);
+	Serial.print("\n\n-------------------START-------------------\n");
+	Serial.print(globals.DeviceName);
+	Serial.print("\nby Hiabuto Defense\n");
 
 	ClearAllDTC(); // Init DTC-Storage
 
 	InitEEPROM();
 	GetConfig_EEPROM();
 	GetPersistence_EEPROM();
-	Serial.print("\nEE-Init done");
+	Serial.print("EE-Init done\n");
 
 	if (i2c_io.begin())
 	{
@@ -133,7 +134,7 @@ void setup()
 #ifdef FEATURE_ENABLE_WIFI_CLIENT
 	WiFi.mode(WIFI_STA);
 	WiFi.setHostname(globals.DeviceName);
-	wifiMulti.addAP(QUOTE(WIFI_SSID_CLIENT), QUOTE(WIFI_PASSWORD_CLIENT));
+	wifiMulti.addAP(QUOTE(WIFI_CLIENT_SSID), QUOTE(WIFI_CLIENT_PASSWORD));
 	tmrWiFiMaintainConnection.start();
 	Serial.print("WiFi-Client Initialized\n");
 #else