From f510d621820c157ba89481debf2b66ee955f779f Mon Sep 17 00:00:00 2001
From: Eric Duminil <eric.duminil@gmail.com>
Date: Mon, 28 Dec 2020 22:42:10 +0100
Subject: [PATCH] util does not depend on wifi_util anymore
---
ampel-firmware/util.h | 3 ++-
ampel-firmware/wifi_util.cpp | 2 +-
ampel-firmware/wifi_util.h | 7 +------
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/ampel-firmware/util.h b/ampel-firmware/util.h
index c9a8a94..4bd2810 100644
--- a/ampel-firmware/util.h
+++ b/ampel-firmware/util.h
@@ -2,7 +2,6 @@
#define AMPEL_UTIL_H_INCLUDED
#include <Arduino.h>
#include "config.h"
-#include "wifi_util.h" // To get MAC
#ifdef AMPEL_CSV
# include "csv_writer.h" // To close filesystem before reset
#endif
@@ -12,9 +11,11 @@
#if defined(ESP8266)
# define BOARD "ESP8266"
+# include <ESP8266WiFi.h>
# define get_free_heap_size() system_get_free_heap_size()
#elif defined(ESP32)
# define BOARD "ESP32"
+# include <WiFi.h>
# define get_free_heap_size() esp_get_free_heap_size()
#else
# define BOARD "Unknown"
diff --git a/ampel-firmware/wifi_util.cpp b/ampel-firmware/wifi_util.cpp
index 32de8f9..5160b52 100644
--- a/ampel-firmware/wifi_util.cpp
+++ b/ampel-firmware/wifi_util.cpp
@@ -16,7 +16,7 @@ namespace config {
void WiFiConnect(const String &hostname) {
//NOTE: WiFi Multi could allow multiple SSID and passwords.
WiFi.persistent(false); // Don't write user & password to Flash.
- WiFi.mode(WIFI_STA); // Set ESP8266 to be a WiFi-client only
+ WiFi.mode(WIFI_STA); // Set ESP to be a WiFi-client only
#if defined(ESP8266)
WiFi.hostname(hostname);
#elif defined(ESP32)
diff --git a/ampel-firmware/wifi_util.h b/ampel-firmware/wifi_util.h
index d6303fb..3fb4713 100644
--- a/ampel-firmware/wifi_util.h
+++ b/ampel-firmware/wifi_util.h
@@ -1,10 +1,5 @@
#ifndef WIFI_UTIL_H_INCLUDED
-# define WIFI_UTIL_H_INCLUDED
-# if defined(ESP8266)
-# include <ESP8266WiFi.h>
-# elif defined(ESP32)
-# include <WiFi.h>
-# endif
+#define WIFI_UTIL_H_INCLUDED
#include "led_effects.h"
#include "config.h"
--
GitLab