From f9ddd7533a2311ca72f09a815c3aed9840039b3e Mon Sep 17 00:00:00 2001
From: Gunnar Skjold <gunnar@origin.no>
Date: Thu, 21 Jul 2022 20:54:55 +0200
Subject: [PATCH] Changes after testing + adding S2 profiles

---
 scripts/makeweb.py       | 2 --
 src/web/AmsWebServer.cpp | 8 ++++++++
 web/head.html            | 2 +-
 web/setup.html           | 6 +++++-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/scripts/makeweb.py b/scripts/makeweb.py
index 69ca56e1..658f4ca4 100644
--- a/scripts/makeweb.py
+++ b/scripts/makeweb.py
@@ -59,8 +59,6 @@ for filename in os.listdir(webroot):
     try:    
         if filename.endswith(".html"):
             content = html_minify(content)
-        if filename.endswith(".svg"):
-            content = html_minify(content)
         elif filename.endswith(".css"):
             content = css_minify(content)
         elif (filename.endswith(".js") and filename != 'gaugemeter.js') or filename.endswith(".json"):
diff --git a/src/web/AmsWebServer.cpp b/src/web/AmsWebServer.cpp
index 3a634b75..870eebb2 100644
--- a/src/web/AmsWebServer.cpp
+++ b/src/web/AmsWebServer.cpp
@@ -1073,6 +1073,14 @@ void AmsWebServer::handleSetup() {
 				gpioConfig->ledPin = 2;
 				gpioConfig->ledInverted = false;
 				break;
+			case 50: // S2
+				gpioConfig->hanPin = 18;
+				break;
+			case 51: // S2-mini
+				gpioConfig->hanPin = 18;
+				gpioConfig->ledPin = 15;
+				gpioConfig->ledInverted = false;
+				break;
 		}
 
 		WiFiConfig wifi;
diff --git a/web/head.html b/web/head.html
index 5ea5f361..343c3c8f 100644
--- a/web/head.html
+++ b/web/head.html
@@ -63,7 +63,7 @@
                             <a class="dropdown-item" href="/mqtt">MQTT</a>
                             <a class="dropdown-item" href="/web">Web</a>
                             <a class="dropdown-item" href="/ntp">NTP</a>
-                            <a class="dropdown-item d-none" href="/entsoe">ENTSO-E API</a>
+                            <a class="dropdown-item d-none ssl-capable" href="/entsoe">ENTSO-E API</a>
                             <div class="dropdown-divider"></div>
                             <a class="dropdown-item" href="https://github.com/gskjold/AmsToMqttBridge/wiki" target="_blank">Documentation</a>
                         </div>
diff --git a/web/setup.html b/web/setup.html
index ec1ad2fe..d8028281 100644
--- a/web/setup.html
+++ b/web/setup.html
@@ -41,7 +41,11 @@
                             <option value="202" ${config.boardType202}>Adafruit HUZZAH32</option>
                             <option value="203" ${config.boardType203}>DevKitC</option>
                             <option value="200" ${config.boardType200}>Generic ESP32</option>
-                            </optgroup>
+                        </optgroup>
+                        <optgroup label="ESP32-S2">
+                            <option value="51" ${config.boardType51}>Wemos S2 mini</option>
+                            <option value="50" ${config.boardType50}>Generic ESP32-S2</option>
+                        </optgroup>
                     </select>
                 </div>
             </div>