reptil1990/AquaMasterMQTT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 22 Wiki Activity

Formatting all c files

Browse Source
This commit is contained in:
Carsten Graf
2025-07-12 17:32:16 +02:00
parent 94b30ed7a3
commit 585d2d7d5d
13 changed files with 1129 additions and 1118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

121
src/wificlass.h
View File

@@ -1,13 +1,15 @@
#pragma once
#include <Arduino.h>
#include <esp_wifi.h>
#include <PrettyOTA.h>
#include <esp_now.h>
#include <WiFi.h>
#include <ESPmDNS.h> // <-- mDNS hinzufügen
#include <PrettyOTA.h>
#include <WiFi.h>
#include <esp_now.h>
#include <esp_wifi.h>
#include "master.h"
#include "licenceing.h"
#include "master.h"
String uniqueSSID;
@@ -17,84 +19,79 @@ String getUniqueSSID();
void setupWifi() {
uniqueSSID = getUniqueSSID();
ssidAP = uniqueSSID.c_str();
if (ssidSTA == nullptr || passwordSTA == nullptr || String(ssidSTA).isEmpty() || String(passwordSTA).isEmpty() ) {
Serial.println("Fehler: ssidSTA oder passwordSTA ist null!");
WiFi.mode(WIFI_MODE_AP);
WiFi.softAP(ssidAP, passwordAP);
uniqueSSID = getUniqueSSID();
ssidAP = uniqueSSID.c_str();
if (ssidSTA == nullptr || passwordSTA == nullptr ||
String(ssidSTA).isEmpty() || String(passwordSTA).isEmpty()) {
Serial.println("Fehler: ssidSTA oder passwordSTA ist null!");
WiFi.mode(WIFI_MODE_AP);
WiFi.softAP(ssidAP, passwordAP);
} else {
WiFi.mode(WIFI_MODE_APSTA);
WiFi.begin(ssidSTA, passwordSTA);
WiFi.softAP(ssidAP, passwordAP);
// Add timeout for WiFi connection
unsigned long startAttemptTime = millis();
while (WiFi.status() != WL_CONNECTED &&
millis() - startAttemptTime < 10000) { // 10 seconds timeout
delay(500);
Serial.print(".");
}
else
{
WiFi.mode(WIFI_MODE_APSTA);
WiFi.begin(ssidSTA, passwordSTA);
WiFi.softAP(ssidAP, passwordAP);
// Add timeout for WiFi connection
unsigned long startAttemptTime = millis();
while (WiFi.status() != WL_CONNECTED &&
millis() - startAttemptTime < 10000) { // 10 seconds timeout
delay(500);
Serial.print(".");
}
if (WiFi.status() != WL_CONNECTED) {
Serial.println("Fehler: Verbindung zum WLAN fehlgeschlagen!");
Serial.println("Starte Access Point...");
WiFi.mode(WIFI_MODE_AP);
WiFi.softAP(ssidAP, passwordAP);
}
else {
Serial.println("Erfolgreich mit WLAN verbunden!");
Serial.print("IP Adresse: ");
Serial.println(WiFi.localIP());
if (WiFi.status() != WL_CONNECTED) {
Serial.println("Fehler: Verbindung zum WLAN fehlgeschlagen!");
Serial.println("Starte Access Point...");
WiFi.mode(WIFI_MODE_AP);
WiFi.softAP(ssidAP, passwordAP);
} else {
Serial.println("Erfolgreich mit WLAN verbunden!");
Serial.print("IP Adresse: ");
Serial.println(WiFi.localIP());
}
//Only wait for connection if ssidSTA and passwordSTA are set
// Only wait for connection if ssidSTA and passwordSTA are set
Serial.println("WiFi AP gestartet");
Serial.print("SSID: ");
Serial.println(WiFi.softAPSSID());
Serial.print("IP Adresse: ");
Serial.println(WiFi.softAPIP());
Serial.println("PrettyOTA can be accessed at: http://" + WiFi.softAPIP().toString() + "/update");
Serial.println("PrettyOTA can be accessed at: http://" +
WiFi.softAPIP().toString() + "/update");
// mDNS starten
if (MDNS.begin("aquacross-timer")) { // z.B. http://aquacross-timer.local/
Serial.println("mDNS responder gestartet: http://aquacross-timer.local/");
Serial.println("mDNS responder gestartet: http://aquacross-timer.local/");
} else {
Serial.println("Fehler beim Starten von mDNS!");
}
Serial.println("Fehler beim Starten von mDNS!");
}
}
}
void setupOTA(AsyncWebServer *server) {
// Initialize PrettyOTA
OTAUpdates.Begin(server);
// Initialize PrettyOTA
OTAUpdates.Begin(server);
// Set unique Hardware-ID for your hardware/board
OTAUpdates.SetHardwareID("AquaCross-Master");
// Set firmware version to 1.0.0
OTAUpdates.SetAppVersion(firmwareversion);
// Set unique Hardware-ID for your hardware/board
OTAUpdates.SetHardwareID("AquaCross-Master");
// Set current build time and date
PRETTY_OTA_SET_CURRENT_BUILD_TIME_AND_DATE();
// Set firmware version to 1.0.0
OTAUpdates.SetAppVersion(firmwareversion);
// Set current build time and date
PRETTY_OTA_SET_CURRENT_BUILD_TIME_AND_DATE();
}
String getUniqueSSID() {
uint8_t mac[6];
esp_wifi_get_mac(WIFI_IF_STA, mac);
// Create a 5-character string from last 3 bytes of MAC
char uniqueId[6];
snprintf(uniqueId, sizeof(uniqueId), "%02X%03X", mac[4], mac[5]);
return String("AquaCross-") + String(uniqueId);
uint8_t mac[6];
esp_wifi_get_mac(WIFI_IF_STA, mac);
// Create a 5-character string from last 3 bytes of MAC
char uniqueId[6];
snprintf(uniqueId, sizeof(uniqueId), "%02X%03X", mac[4], mac[5]);
return String("AquaCross-") + String(uniqueId);
}
// WiFi als Access Point