From 16a4a28a1c356d979361e0d2c1407fa5c3406021 Mon Sep 17 00:00:00 2001
From: jgauchia <jgauchia@gmx.es>
Date: Wed, 13 Nov 2024 18:59:42 +0100
Subject: [PATCH 01/55] chore: Update version

---
 include/hal.hpp                   | 2 +-
 lib/battery/battery.cpp           | 2 +-
 lib/battery/battery.hpp           | 2 +-
 lib/bme/bme.cpp                   | 2 +-
 lib/bme/bme.hpp                   | 2 +-
 lib/cli/utils.h                   | 2 +-
 lib/compass/compass.cpp           | 2 +-
 lib/compass/compass.hpp           | 2 +-
 lib/gps/gps.cpp                   | 2 +-
 lib/gps/gps.hpp                   | 2 +-
 lib/gps/timezone.hpp              | 2 +-
 lib/gpx/src/addWaypoint.cpp       | 2 +-
 lib/gpx/src/addWaypoint.hpp       | 2 +-
 lib/gpx/src/deleteWaypoint.cpp    | 2 +-
 lib/gpx/src/deleteWaypoint.hpp    | 2 +-
 lib/gpx/src/editWaypoint.cpp      | 2 +-
 lib/gpx/src/editWaypoint.hpp      | 2 +-
 lib/gpx/src/globalGpxDef.h        | 2 +-
 lib/gpx/src/loadWaypoint.cpp      | 2 +-
 lib/gpx/src/loadWaypoint.hpp      | 2 +-
 lib/gui/src/buttonBar.cpp         | 2 +-
 lib/gui/src/buttonBar.hpp         | 2 +-
 lib/gui/src/deviceSettingsScr.cpp | 2 +-
 lib/gui/src/deviceSettingsScr.hpp | 2 +-
 lib/gui/src/globalGuiDef.h        | 2 +-
 lib/gui/src/mainScr.cpp           | 2 +-
 lib/gui/src/mainScr.hpp           | 2 +-
 lib/gui/src/mapSettingsScr.cpp    | 2 +-
 lib/gui/src/mapSettingsScr.hpp    | 2 +-
 lib/gui/src/navScr.cpp            | 2 +-
 lib/gui/src/navScr.hpp            | 2 +-
 lib/gui/src/notifyBar.cpp         | 2 +-
 lib/gui/src/notifyBar.hpp         | 2 +-
 lib/gui/src/satInfoScr.cpp        | 2 +-
 lib/gui/src/satInfoScr.hpp        | 2 +-
 lib/gui/src/searchSatScr.cpp      | 2 +-
 lib/gui/src/searchSatScr.hpp      | 2 +-
 lib/gui/src/settingsScr.cpp       | 2 +-
 lib/gui/src/settingsScr.hpp       | 2 +-
 lib/gui/src/splashScr.cpp         | 2 +-
 lib/gui/src/splashScr.hpp         | 2 +-
 lib/gui/src/waypointListScr.cpp   | 2 +-
 lib/gui/src/waypointListScr.hpp   | 2 +-
 lib/gui/src/waypointScr.cpp       | 2 +-
 lib/gui/src/waypointScr.hpp       | 2 +-
 lib/gui/src/widgets.cpp           | 2 +-
 lib/gui/src/widgets.hpp           | 2 +-
 lib/lvgl/src/lvglFuncs.cpp        | 2 +-
 lib/lvgl/src/lvglFuncs.hpp        | 2 +-
 lib/lvgl/src/lvglSetup.cpp        | 2 +-
 lib/lvgl/src/lvglSetup.hpp        | 2 +-
 lib/maps/src/globalMapsDef.h      | 2 +-
 lib/maps/src/mapsDrawFunc.h       | 2 +-
 lib/maps/src/renderMaps.cpp       | 2 +-
 lib/maps/src/renderMaps.hpp       | 2 +-
 lib/maps/src/vectorMaps.cpp       | 2 +-
 lib/maps/src/vectorMaps.hpp       | 2 +-
 lib/panel/ICENAV_BOARD.hpp        | 2 +-
 lib/panel/ILI9341_XPT2046_SPI.hpp | 2 +-
 lib/panel/ILI9488_FT5x06_16B.hpp  | 2 +-
 lib/panel/ILI9488_FT5x06_SPI.hpp  | 2 +-
 lib/panel/ILI9488_NOTOUCH_8B.hpp  | 2 +-
 lib/panel/ILI9488_XPT2046_SPI.hpp | 2 +-
 lib/panel/LILYGO_TDECK.hpp        | 2 +-
 lib/power/power.cpp               | 2 +-
 lib/power/power.hpp               | 2 +-
 lib/settings/settings.cpp         | 2 +-
 lib/settings/settings.hpp         | 2 +-
 lib/storage/storage.cpp           | 2 +-
 lib/storage/storage.hpp           | 2 +-
 lib/tasks/tasks.cpp               | 2 +-
 lib/tasks/tasks.hpp               | 2 +-
 lib/tft/tft.cpp                   | 2 +-
 lib/tft/tft.hpp                   | 2 +-
 lib/utils/src/gpsMath.cpp         | 2 +-
 lib/utils/src/gpsMath.hpp         | 2 +-
 lib/webfile/src/webpage.h         | 2 +-
 lib/webfile/src/webserver.h       | 2 +-
 platformio.ini                    | 4 ++--
 src/main.cpp                      | 4 ++--
 80 files changed, 82 insertions(+), 82 deletions(-)

diff --git a/include/hal.hpp b/include/hal.hpp
index 551f118b..a45074a8 100644
--- a/include/hal.hpp
+++ b/include/hal.hpp
@@ -2,7 +2,7 @@
  * @file hal.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Boards Pin definitions
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/battery/battery.cpp b/lib/battery/battery.cpp
index 80ae3446..33010b99 100644
--- a/lib/battery/battery.cpp
+++ b/lib/battery/battery.cpp
@@ -2,7 +2,7 @@
  * @file battery.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Battery monitor definition and functions
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/battery/battery.hpp b/lib/battery/battery.hpp
index b85ed78d..b972fe63 100644
--- a/lib/battery/battery.hpp
+++ b/lib/battery/battery.hpp
@@ -2,7 +2,7 @@
  * @file battery.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Battery monitor definition and functions
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/bme/bme.cpp b/lib/bme/bme.cpp
index 59e72dad..5df81cc6 100644
--- a/lib/bme/bme.cpp
+++ b/lib/bme/bme.cpp
@@ -2,7 +2,7 @@
  * @file bme.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  BME280 Sensor functions
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/bme/bme.hpp b/lib/bme/bme.hpp
index d9b23178..c4d3a0e2 100644
--- a/lib/bme/bme.hpp
+++ b/lib/bme/bme.hpp
@@ -2,7 +2,7 @@
  * @file bme.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  BME280 Sensor functions
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/cli/utils.h b/lib/cli/utils.h
index 4e327594..51f0043f 100644
--- a/lib/cli/utils.h
+++ b/lib/cli/utils.h
@@ -2,7 +2,7 @@
  * @file utils.h
  * @author @Hpsaturn
  * @brief  Network CLI and custom internal commands
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/compass/compass.cpp b/lib/compass/compass.cpp
index 73c55089..43f83d40 100644
--- a/lib/compass/compass.cpp
+++ b/lib/compass/compass.cpp
@@ -2,7 +2,7 @@
  * @file compass.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Compass definition and functions
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/compass/compass.hpp b/lib/compass/compass.hpp
index cf08bc33..f9b56c03 100644
--- a/lib/compass/compass.hpp
+++ b/lib/compass/compass.hpp
@@ -2,7 +2,7 @@
  * @file compass.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Compass definition and functions
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/gps/gps.cpp b/lib/gps/gps.cpp
index 60c2284f..9a8f1f90 100644
--- a/lib/gps/gps.cpp
+++ b/lib/gps/gps.cpp
@@ -2,7 +2,7 @@
  * @file gps.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  GPS definition and functions
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/gps/gps.hpp b/lib/gps/gps.hpp
index 88959c7c..f7c1a51c 100644
--- a/lib/gps/gps.hpp
+++ b/lib/gps/gps.hpp
@@ -2,7 +2,7 @@
  * @file gps.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  GPS definition and functions
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/gps/timezone.hpp b/lib/gps/timezone.hpp
index 99d2d21e..2b9a6709 100644
--- a/lib/gps/timezone.hpp
+++ b/lib/gps/timezone.hpp
@@ -2,7 +2,7 @@
  * @file timezone.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Time zone adjust
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/gpx/src/addWaypoint.cpp b/lib/gpx/src/addWaypoint.cpp
index 2b05770a..4e9a5d48 100644
--- a/lib/gpx/src/addWaypoint.cpp
+++ b/lib/gpx/src/addWaypoint.cpp
@@ -2,7 +2,7 @@
  * @file addWaypoint.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Add Waypoint functions
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/gpx/src/addWaypoint.hpp b/lib/gpx/src/addWaypoint.hpp
index 809571b0..9a01b9cd 100644
--- a/lib/gpx/src/addWaypoint.hpp
+++ b/lib/gpx/src/addWaypoint.hpp
@@ -2,7 +2,7 @@
  * @file addWaypoint.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Add Waypoint functions
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/gpx/src/deleteWaypoint.cpp b/lib/gpx/src/deleteWaypoint.cpp
index e453453a..ce9175f4 100644
--- a/lib/gpx/src/deleteWaypoint.cpp
+++ b/lib/gpx/src/deleteWaypoint.cpp
@@ -2,7 +2,7 @@
  * @file deleteWaypoint.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Delete Waypoint functions
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/gpx/src/deleteWaypoint.hpp b/lib/gpx/src/deleteWaypoint.hpp
index d21ad13e..1111f5a0 100644
--- a/lib/gpx/src/deleteWaypoint.hpp
+++ b/lib/gpx/src/deleteWaypoint.hpp
@@ -2,7 +2,7 @@
  * @file deleteWaypoint.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Delete Waypoint functions
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/gpx/src/editWaypoint.cpp b/lib/gpx/src/editWaypoint.cpp
index e3651712..155689ed 100644
--- a/lib/gpx/src/editWaypoint.cpp
+++ b/lib/gpx/src/editWaypoint.cpp
@@ -2,7 +2,7 @@
  * @file editWaypoint.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Edit Waypoint functions
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/gpx/src/editWaypoint.hpp b/lib/gpx/src/editWaypoint.hpp
index fe4026e0..281742e0 100644
--- a/lib/gpx/src/editWaypoint.hpp
+++ b/lib/gpx/src/editWaypoint.hpp
@@ -2,7 +2,7 @@
  * @file editWaypoint.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Edit Waypoint functions
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/gpx/src/globalGpxDef.h b/lib/gpx/src/globalGpxDef.h
index 04741142..5f43c37e 100644
--- a/lib/gpx/src/globalGpxDef.h
+++ b/lib/gpx/src/globalGpxDef.h
@@ -2,7 +2,7 @@
  * @file globalGpxDef.h
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Global GPX Variables
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/gpx/src/loadWaypoint.cpp b/lib/gpx/src/loadWaypoint.cpp
index 2a8b4802..1152b58b 100644
--- a/lib/gpx/src/loadWaypoint.cpp
+++ b/lib/gpx/src/loadWaypoint.cpp
@@ -2,7 +2,7 @@
  * @file loadWaypoint.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Load Waypoint functions
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/gpx/src/loadWaypoint.hpp b/lib/gpx/src/loadWaypoint.hpp
index 678dcf69..f27460b5 100644
--- a/lib/gpx/src/loadWaypoint.hpp
+++ b/lib/gpx/src/loadWaypoint.hpp
@@ -2,7 +2,7 @@
  * @file loadWaypoint.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Load Waypoint functions
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/gui/src/buttonBar.cpp b/lib/gui/src/buttonBar.cpp
index 4c22c2b1..46aa87d1 100644
--- a/lib/gui/src/buttonBar.cpp
+++ b/lib/gui/src/buttonBar.cpp
@@ -2,7 +2,7 @@
  * @file buttonBar.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL - Button Bar 
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/gui/src/buttonBar.hpp b/lib/gui/src/buttonBar.hpp
index 04ed9a60..24f9a1db 100644
--- a/lib/gui/src/buttonBar.hpp
+++ b/lib/gui/src/buttonBar.hpp
@@ -2,7 +2,7 @@
  * @file buttonBar.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL - Button Bar
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/gui/src/deviceSettingsScr.cpp b/lib/gui/src/deviceSettingsScr.cpp
index 52f428e2..00c2b7c3 100644
--- a/lib/gui/src/deviceSettingsScr.cpp
+++ b/lib/gui/src/deviceSettingsScr.cpp
@@ -2,7 +2,7 @@
  * @file deviceSettingsScr.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL - Device Settings Screen
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/gui/src/deviceSettingsScr.hpp b/lib/gui/src/deviceSettingsScr.hpp
index 5ce3c2d6..248d6147 100644
--- a/lib/gui/src/deviceSettingsScr.hpp
+++ b/lib/gui/src/deviceSettingsScr.hpp
@@ -2,7 +2,7 @@
  * @file deviceSettingsScr.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL - Device Settings Screen
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/gui/src/globalGuiDef.h b/lib/gui/src/globalGuiDef.h
index 23d977f9..92a12d53 100644
--- a/lib/gui/src/globalGuiDef.h
+++ b/lib/gui/src/globalGuiDef.h
@@ -1,7 +1,7 @@
 /**
  * @file globalGuiDef.h
  * @brief  Global GUI Variables
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/gui/src/mainScr.cpp b/lib/gui/src/mainScr.cpp
index 4ebfda2f..1627d2d1 100644
--- a/lib/gui/src/mainScr.cpp
+++ b/lib/gui/src/mainScr.cpp
@@ -2,7 +2,7 @@
  * @file mainScr.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL - Main Screen
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/gui/src/mainScr.hpp b/lib/gui/src/mainScr.hpp
index b97532fe..4d8c9f2e 100644
--- a/lib/gui/src/mainScr.hpp
+++ b/lib/gui/src/mainScr.hpp
@@ -2,7 +2,7 @@
  * @file mainScr.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL - Main Screen
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/gui/src/mapSettingsScr.cpp b/lib/gui/src/mapSettingsScr.cpp
index d0e52f66..110ff6a2 100644
--- a/lib/gui/src/mapSettingsScr.cpp
+++ b/lib/gui/src/mapSettingsScr.cpp
@@ -2,7 +2,7 @@
  * @file mapSettingsScr.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL - Map Settings screen
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/gui/src/mapSettingsScr.hpp b/lib/gui/src/mapSettingsScr.hpp
index 2572245d..e09a6eac 100644
--- a/lib/gui/src/mapSettingsScr.hpp
+++ b/lib/gui/src/mapSettingsScr.hpp
@@ -2,7 +2,7 @@
  * @file mapSettingsScr.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL - Map Settings screen
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/gui/src/navScr.cpp b/lib/gui/src/navScr.cpp
index ab96fc07..3e8754e6 100644
--- a/lib/gui/src/navScr.cpp
+++ b/lib/gui/src/navScr.cpp
@@ -2,7 +2,7 @@
  * @file navScr.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL - Navigation screen 
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/gui/src/navScr.hpp b/lib/gui/src/navScr.hpp
index a8bdd982..b53b8f69 100644
--- a/lib/gui/src/navScr.hpp
+++ b/lib/gui/src/navScr.hpp
@@ -2,7 +2,7 @@
  * @file navScr.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL - Navigation screen 
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/gui/src/notifyBar.cpp b/lib/gui/src/notifyBar.cpp
index 056d6cfc..cbcebce9 100644
--- a/lib/gui/src/notifyBar.cpp
+++ b/lib/gui/src/notifyBar.cpp
@@ -2,7 +2,7 @@
  * @file notifyBar.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief LVGL - Notify Bar Screen
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/gui/src/notifyBar.hpp b/lib/gui/src/notifyBar.hpp
index fdf5c311..470bb14d 100644
--- a/lib/gui/src/notifyBar.hpp
+++ b/lib/gui/src/notifyBar.hpp
@@ -2,7 +2,7 @@
  * @file notifyBar.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief LVGL - Notify Bar Screen
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/gui/src/satInfoScr.cpp b/lib/gui/src/satInfoScr.cpp
index b543e37a..c418a9b0 100644
--- a/lib/gui/src/satInfoScr.cpp
+++ b/lib/gui/src/satInfoScr.cpp
@@ -2,7 +2,7 @@
  * @file satInfoScr.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL - Satellite info screen 
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/gui/src/satInfoScr.hpp b/lib/gui/src/satInfoScr.hpp
index 659ece63..e66c44e4 100644
--- a/lib/gui/src/satInfoScr.hpp
+++ b/lib/gui/src/satInfoScr.hpp
@@ -2,7 +2,7 @@
  * @file satInfoScr.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL - Satellite info screen 
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/gui/src/searchSatScr.cpp b/lib/gui/src/searchSatScr.cpp
index 44fee130..87bdb7b3 100644
--- a/lib/gui/src/searchSatScr.cpp
+++ b/lib/gui/src/searchSatScr.cpp
@@ -2,7 +2,7 @@
  * @file searchSatScr.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL - GPS satellite search screen
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/gui/src/searchSatScr.hpp b/lib/gui/src/searchSatScr.hpp
index d2929e64..489b8335 100644
--- a/lib/gui/src/searchSatScr.hpp
+++ b/lib/gui/src/searchSatScr.hpp
@@ -2,7 +2,7 @@
  * @file searchSatScr.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL - GPS satellite search screen
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/gui/src/settingsScr.cpp b/lib/gui/src/settingsScr.cpp
index 3b351691..37fb9ae0 100644
--- a/lib/gui/src/settingsScr.cpp
+++ b/lib/gui/src/settingsScr.cpp
@@ -2,7 +2,7 @@
  * @file settingsScr.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL - Settings Screen
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/gui/src/settingsScr.hpp b/lib/gui/src/settingsScr.hpp
index cf7f32e7..40ee59b7 100644
--- a/lib/gui/src/settingsScr.hpp
+++ b/lib/gui/src/settingsScr.hpp
@@ -2,7 +2,7 @@
  * @file settingsScr.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL - Settings Screen
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/gui/src/splashScr.cpp b/lib/gui/src/splashScr.cpp
index 136cea6b..01a18a7d 100644
--- a/lib/gui/src/splashScr.cpp
+++ b/lib/gui/src/splashScr.cpp
@@ -2,7 +2,7 @@
  * @file splashScr.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Splash screen - NOT LVGL
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/gui/src/splashScr.hpp b/lib/gui/src/splashScr.hpp
index 3d272514..b1519785 100644
--- a/lib/gui/src/splashScr.hpp
+++ b/lib/gui/src/splashScr.hpp
@@ -2,7 +2,7 @@
  * @file splashScr.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Splash screen - NOT LVGL
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/gui/src/waypointListScr.cpp b/lib/gui/src/waypointListScr.cpp
index 22a00c9d..b726e052 100644
--- a/lib/gui/src/waypointListScr.cpp
+++ b/lib/gui/src/waypointListScr.cpp
@@ -2,7 +2,7 @@
  * @file waypointListScr.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL - Waypoint list screen
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/gui/src/waypointListScr.hpp b/lib/gui/src/waypointListScr.hpp
index c312e8a6..31f566ae 100644
--- a/lib/gui/src/waypointListScr.hpp
+++ b/lib/gui/src/waypointListScr.hpp
@@ -2,7 +2,7 @@
  * @file waypointListScr.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL - Waypoint list screen
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/gui/src/waypointScr.cpp b/lib/gui/src/waypointScr.cpp
index 23d73094..425bfcfd 100644
--- a/lib/gui/src/waypointScr.cpp
+++ b/lib/gui/src/waypointScr.cpp
@@ -2,7 +2,7 @@
  * @file waypointScr.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL - Waypoint Screen
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/gui/src/waypointScr.hpp b/lib/gui/src/waypointScr.hpp
index 18db45c6..111f95c8 100644
--- a/lib/gui/src/waypointScr.hpp
+++ b/lib/gui/src/waypointScr.hpp
@@ -2,7 +2,7 @@
  * @file waypointScr.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL - Add Waypoint Screen
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/gui/src/widgets.cpp b/lib/gui/src/widgets.cpp
index 12934720..a1885e78 100644
--- a/lib/gui/src/widgets.cpp
+++ b/lib/gui/src/widgets.cpp
@@ -2,7 +2,7 @@
  * @file widgets.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL - Widgets
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/gui/src/widgets.hpp b/lib/gui/src/widgets.hpp
index f02c241d..b3e7bfc3 100644
--- a/lib/gui/src/widgets.hpp
+++ b/lib/gui/src/widgets.hpp
@@ -2,7 +2,7 @@
  * @file widgets.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL - Widgets
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/lvgl/src/lvglFuncs.cpp b/lib/lvgl/src/lvglFuncs.cpp
index c98b40e2..59196ff2 100644
--- a/lib/lvgl/src/lvglFuncs.cpp
+++ b/lib/lvgl/src/lvglFuncs.cpp
@@ -2,7 +2,7 @@
  * @file lvglFuncs.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL custom functions
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/lvgl/src/lvglFuncs.hpp b/lib/lvgl/src/lvglFuncs.hpp
index 73f29959..1f8cf7b5 100644
--- a/lib/lvgl/src/lvglFuncs.hpp
+++ b/lib/lvgl/src/lvglFuncs.hpp
@@ -2,7 +2,7 @@
  * @file lvglFuncs.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL custom functions
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/lvgl/src/lvglSetup.cpp b/lib/lvgl/src/lvglSetup.cpp
index b5b623de..45b9af48 100644
--- a/lib/lvgl/src/lvglSetup.cpp
+++ b/lib/lvgl/src/lvglSetup.cpp
@@ -2,7 +2,7 @@
  * @file lvglSetup.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL Screen implementation
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/lvgl/src/lvglSetup.hpp b/lib/lvgl/src/lvglSetup.hpp
index c0588183..f38c237e 100644
--- a/lib/lvgl/src/lvglSetup.hpp
+++ b/lib/lvgl/src/lvglSetup.hpp
@@ -2,7 +2,7 @@
  * @file lvglSetup.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL Screen implementation
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/maps/src/globalMapsDef.h b/lib/maps/src/globalMapsDef.h
index 18151ba6..92f4a19f 100644
--- a/lib/maps/src/globalMapsDef.h
+++ b/lib/maps/src/globalMapsDef.h
@@ -1,7 +1,7 @@
 /**
  * @file globalMapsDef.h
  * @brief  Global Maps Variables
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/maps/src/mapsDrawFunc.h b/lib/maps/src/mapsDrawFunc.h
index 0f2709bb..fffdff20 100644
--- a/lib/maps/src/mapsDrawFunc.h
+++ b/lib/maps/src/mapsDrawFunc.h
@@ -1,7 +1,7 @@
 /**
  * @file mapsDrawFunc.h
  * @brief  Extra Draw functions for maps
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/maps/src/renderMaps.cpp b/lib/maps/src/renderMaps.cpp
index c71dadc1..ca28d0dc 100644
--- a/lib/maps/src/renderMaps.cpp
+++ b/lib/maps/src/renderMaps.cpp
@@ -2,7 +2,7 @@
  * @file renderMaps.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Render maps draw functions
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/maps/src/renderMaps.hpp b/lib/maps/src/renderMaps.hpp
index 0355c7c0..677ed4a7 100644
--- a/lib/maps/src/renderMaps.hpp
+++ b/lib/maps/src/renderMaps.hpp
@@ -2,7 +2,7 @@
  * @file renderMaps.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Render maps draw functions
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/maps/src/vectorMaps.cpp b/lib/maps/src/vectorMaps.cpp
index a162658c..85f1de10 100644
--- a/lib/maps/src/vectorMaps.cpp
+++ b/lib/maps/src/vectorMaps.cpp
@@ -2,7 +2,7 @@
  * @file vectorMaps.cpp
  * @author @aresta - https://github.com/aresta/ESP32_GPS
  * @brief  Vector maps draw functions
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/maps/src/vectorMaps.hpp b/lib/maps/src/vectorMaps.hpp
index bbef50d4..a17d78ab 100644
--- a/lib/maps/src/vectorMaps.hpp
+++ b/lib/maps/src/vectorMaps.hpp
@@ -2,7 +2,7 @@
  * @file vectorMaps.hpp
  * @author @aresta - https://github.com/aresta/ESP32_GPS
  * @brief  Vector maps draw functions
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/panel/ICENAV_BOARD.hpp b/lib/panel/ICENAV_BOARD.hpp
index a70a8a04..04790821 100644
--- a/lib/panel/ICENAV_BOARD.hpp
+++ b/lib/panel/ICENAV_BOARD.hpp
@@ -2,7 +2,7 @@
  * @file ICENAV_BOARD.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LOVYANGFX TFT driver for IceNaV board
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/panel/ILI9341_XPT2046_SPI.hpp b/lib/panel/ILI9341_XPT2046_SPI.hpp
index 43d3c2c0..97fc0003 100644
--- a/lib/panel/ILI9341_XPT2046_SPI.hpp
+++ b/lib/panel/ILI9341_XPT2046_SPI.hpp
@@ -2,7 +2,7 @@
 //  * @file ILI9341_XPT2046_SPI.hpp
 //  * @author Jordi Gauchía (jgauchia@gmx.es)
 //  * @brief  LOVYANGFX TFT driver for ILI9341 SPI With XPT2046 Touch controller
-//  * @version 0.1.8
+//  * @version 0.1.9_alpha
 //  * @date 2024-11
 //  */
 
diff --git a/lib/panel/ILI9488_FT5x06_16B.hpp b/lib/panel/ILI9488_FT5x06_16B.hpp
index 03d17c0e..5c886792 100644
--- a/lib/panel/ILI9488_FT5x06_16B.hpp
+++ b/lib/panel/ILI9488_FT5x06_16B.hpp
@@ -2,7 +2,7 @@
  * @file ILI9488_FT5x06_16B.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LOVYANGFX TFT driver for ILI9488 16 Bits parallel  With FT5x06 Touch controller
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/panel/ILI9488_FT5x06_SPI.hpp b/lib/panel/ILI9488_FT5x06_SPI.hpp
index 0828819d..00d37723 100644
--- a/lib/panel/ILI9488_FT5x06_SPI.hpp
+++ b/lib/panel/ILI9488_FT5x06_SPI.hpp
@@ -2,7 +2,7 @@
  * @file ILI9488_XPT2046_SPI.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LOVYANGFX TFT driver for ILI9488 SPI With XPT2046 Touch controller
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/panel/ILI9488_NOTOUCH_8B.hpp b/lib/panel/ILI9488_NOTOUCH_8B.hpp
index 8dc3efc8..9ca36f08 100644
--- a/lib/panel/ILI9488_NOTOUCH_8B.hpp
+++ b/lib/panel/ILI9488_NOTOUCH_8B.hpp
@@ -2,7 +2,7 @@
  * @file ILI9488_NOTOUCH_8B.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LOVYANGFX TFT driver for ILI9488 8 Bits parallel  Without Touch controller
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/panel/ILI9488_XPT2046_SPI.hpp b/lib/panel/ILI9488_XPT2046_SPI.hpp
index 5535bba2..c43300e8 100644
--- a/lib/panel/ILI9488_XPT2046_SPI.hpp
+++ b/lib/panel/ILI9488_XPT2046_SPI.hpp
@@ -2,7 +2,7 @@
  * @file ILI9488_XPT2046_SPI.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LOVYANGFX TFT driver for ILI9488 SPI With XPT2046 Touch controller
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/panel/LILYGO_TDECK.hpp b/lib/panel/LILYGO_TDECK.hpp
index effad505..9e1a5f09 100644
--- a/lib/panel/LILYGO_TDECK.hpp
+++ b/lib/panel/LILYGO_TDECK.hpp
@@ -2,7 +2,7 @@
  * @file LILYGO_TDECK.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es) and Antonio Vanegas @Hpsturn
  * @brief  LOVYANGFX TFT driver for ST7789 SPI With GT911 Touch controller
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/power/power.cpp b/lib/power/power.cpp
index 6641aac6..c5a51c91 100644
--- a/lib/power/power.cpp
+++ b/lib/power/power.cpp
@@ -2,7 +2,7 @@
  * @file power.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  ESP32 Power Management functions
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/power/power.hpp b/lib/power/power.hpp
index 6ad300aa..78192ab7 100644
--- a/lib/power/power.hpp
+++ b/lib/power/power.hpp
@@ -2,7 +2,7 @@
  * @file power.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  ESP32 Power Management functions
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/settings/settings.cpp b/lib/settings/settings.cpp
index 142625b7..2adfeea2 100644
--- a/lib/settings/settings.cpp
+++ b/lib/settings/settings.cpp
@@ -2,7 +2,7 @@
  * @file settings.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Settings functions
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/settings/settings.hpp b/lib/settings/settings.hpp
index 40df22e1..f4b64b36 100644
--- a/lib/settings/settings.hpp
+++ b/lib/settings/settings.hpp
@@ -2,7 +2,7 @@
  * @file settings.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Settings functions
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/storage/storage.cpp b/lib/storage/storage.cpp
index 5530f5ab..8a26730e 100644
--- a/lib/storage/storage.cpp
+++ b/lib/storage/storage.cpp
@@ -2,7 +2,7 @@
  * @file storage.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Storage definition and functions
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/storage/storage.hpp b/lib/storage/storage.hpp
index 166ba4d6..ec754c21 100644
--- a/lib/storage/storage.hpp
+++ b/lib/storage/storage.hpp
@@ -2,7 +2,7 @@
  * @file storage.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Storage definition and functions
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/tasks/tasks.cpp b/lib/tasks/tasks.cpp
index 8ecf3e8b..fe654cc3 100644
--- a/lib/tasks/tasks.cpp
+++ b/lib/tasks/tasks.cpp
@@ -2,7 +2,7 @@
  * @file tasks.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Core Tasks functions
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/tasks/tasks.hpp b/lib/tasks/tasks.hpp
index 2351aeac..0283d7d0 100644
--- a/lib/tasks/tasks.hpp
+++ b/lib/tasks/tasks.hpp
@@ -2,7 +2,7 @@
  * @file tasks.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Core Tasks functions
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/tft/tft.cpp b/lib/tft/tft.cpp
index b01896fa..9df780ca 100644
--- a/lib/tft/tft.cpp
+++ b/lib/tft/tft.cpp
@@ -2,7 +2,7 @@
  * @file tft.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief TFT definition and functions
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/tft/tft.hpp b/lib/tft/tft.hpp
index 9b9ab578..e94c0672 100644
--- a/lib/tft/tft.hpp
+++ b/lib/tft/tft.hpp
@@ -2,7 +2,7 @@
  * @file tft.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief TFT definition and functions
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/utils/src/gpsMath.cpp b/lib/utils/src/gpsMath.cpp
index d4a3248c..b168ec5a 100644
--- a/lib/utils/src/gpsMath.cpp
+++ b/lib/utils/src/gpsMath.cpp
@@ -2,7 +2,7 @@
  * @file gpsMath.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Math and various functions
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/utils/src/gpsMath.hpp b/lib/utils/src/gpsMath.hpp
index a87d9eda..e5242300 100644
--- a/lib/utils/src/gpsMath.hpp
+++ b/lib/utils/src/gpsMath.hpp
@@ -2,7 +2,7 @@
  * @file gpsMath.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Math and various functions
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/webfile/src/webpage.h b/lib/webfile/src/webpage.h
index 373c703e..99cd6a6c 100644
--- a/lib/webfile/src/webpage.h
+++ b/lib/webfile/src/webpage.h
@@ -2,7 +2,7 @@
  * @file webpage.h
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief Web file server page
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/lib/webfile/src/webserver.h b/lib/webfile/src/webserver.h
index 11d88d56..600236b8 100644
--- a/lib/webfile/src/webserver.h
+++ b/lib/webfile/src/webserver.h
@@ -2,7 +2,7 @@
  * @file webserver.h
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief Web file server functions
- * @version 0.1.8
+ * @version 0.1.9_alpha
  * @date 2024-11
  */
 
diff --git a/platformio.ini b/platformio.ini
index 7587d769..7fe1ea36 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -15,7 +15,7 @@ default_envs = ICENAV_BOARD
 [common]
 platform = espressif32
 framework = arduino
-version = 0.1.8
+version = 0.1.9_alpha
 revision = 82
 monitor_speed = 115200
 ;monitor_rts = 0
@@ -25,7 +25,7 @@ monitor_filters =
 extra_scripts = pre:prebuild.py
 build_flags = 
   -D LV_CONF_PATH="${PROJECT_DIR}/lib/lvgl/lv_conf.h"
-  -D CORE_DEBUG_LEVEL=0
+  -D CORE_DEBUG_LEVEL=5
   -D USE_LINE_BUFFER=1
   -D DISABLE_RADIO=1
   -D BAUDRATE=115200
diff --git a/src/main.cpp b/src/main.cpp
index eeaff483..40b743f6 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2,8 +2,8 @@
  * @file main.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  ESP32 GPS Navigation main code
- * @version 0.1.8
- * @date 2024-08
+ * @version 0.1.9_alpha
+ * @date 2024-11
  */
 
 #include <Arduino.h>

From 4b76d942fac6aae3a54c3387398312acf566a6a5 Mon Sep 17 00:00:00 2001
From: jgauchia <jgauchia@gmx.es>
Date: Wed, 13 Nov 2024 20:14:08 +0100
Subject: [PATCH 02/55] build: Update libraries

---
 README.md      |  8 ++++----
 platformio.ini | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index d8ce1e5d..2d9180b8 100644
--- a/README.md
+++ b/README.md
@@ -107,10 +107,10 @@ To do this, simply include the following Build Flag in the required env in platf
 |:------------|:--------------|:-----------------------------------|:-------------------------------------------------------|
 |             | 🔋 Batt. Monitor | ```-DADC1``` or ```-DADC2``` <br> ```-DBATT_PIN=ADCn_CHANNEL_x``` |                       |   
 | AT6558D     | 🛰️ GPS        | ```-DAT6558D_GPS```                |                                                        |
-| HMC5883L    | 🧭 Compass    | ```-DHMC5883L```                   | ```dfrobot/DFRobot_QMC5883@^1.0.0```                   |
-| QMC5883     | 🧭 Compass    | ```-DQMC5883```                    | ```dfrobot/DFRobot_QMC5883@^1.0.0```                   |
-| MPU9250     | 🧭 IMU (Compass) | ```-DIMU_MPU9250```                | ```bolderflight/Bolder Flight Systems MPU9250@^1.0.2```|
-| BME280      | 🌡️ Temp <br> ☁️ Pres <br> 💧 Hum | ```-DBME280```                     | ```adafruit/Adafruit Unified Sensor@^1.1.14``` <br> ```adafruit/Adafruit BusIO@^1.16.1``` <br> ```adafruit/Adafruit BME280 Library@^2.2.4```|
+| HMC5883L    | 🧭 Compass    | ```-DHMC5883L```                   | ```dfrobot/DFRobot_QMC5883@1.0.0```                   |
+| QMC5883     | 🧭 Compass    | ```-DQMC5883```                    | ```dfrobot/DFRobot_QMC5883@1.0.0```                   |
+| MPU9250     | 🧭 IMU (Compass) | ```-DIMU_MPU9250```                | ```bolderflight/Bolder Flight Systems MPU9250@1.0.2```|
+| BME280      | 🌡️ Temp <br> ☁️ Pres <br> 💧 Hum | ```-DBME280```                     | ```adafruit/Adafruit Unified Sensor@1.1.14``` <br> ```adafruit/Adafruit BusIO@1.16.2``` <br> ```adafruit/Adafruit BME280 Library@2.2.4```|
 
 [^1]: For ELECROW board UART port is shared with USB connection, GPS pinout are mapped to IO19 and IO40 (Analog and Digital Port). If CLI isn't used is possible to attach GPS module to UART port but for upload the firmware (change pinout at **hal.hpp**), the module should be disconnected.
 [^2]: See **hal.hpp** for pinouts configuration
diff --git a/platformio.ini b/platformio.ini
index 7fe1ea36..b9828ab5 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -41,13 +41,13 @@ build_flags =
 lib_deps = 
   ; slashdevin/NeoGPS@4.2.9
   https://github.com/jgauchia/NeoGPS.git#43c4766
- 	lvgl/lvgl@9.2.0
+ 	lvgl/lvgl@9.2.2
 	lovyan03/LovyanGFX@1.1.16
 	bblanchon/StreamUtils@1.9.0
-  hpsaturn/EasyPreferences@0.1.2
-  hpsaturn/ESP32 Wifi CLI@0.3.2
+  hpsaturn/EasyPreferences@0.1.3
+  hpsaturn/ESP32 Wifi CLI@0.3.3
   kubafilinger/AsyncTCP@1.1.1
-  esphome/ESPAsyncWebServer-esphome@2.1.0
+  esphome/ESPAsyncWebServer-esphome@3.3.0
 
 [esp32_common]
 extends = common
@@ -58,7 +58,7 @@ board = icenav-esp32-s3
 lib_deps =
   ${common.lib_deps}
   adafruit/Adafruit Unified Sensor@1.1.14
-  adafruit/Adafruit BusIO@1.16.1
+  adafruit/Adafruit BusIO@1.16.2
   adafruit/Adafruit BME280 Library@2.2.4
   dfrobot/DFRobot_QMC5883@1.0.0
 build_flags =
@@ -83,7 +83,7 @@ board = elecrow-esp32-s3-n16r8v-terminal
 lib_deps =
   ${common.lib_deps}
 ; adafruit/Adafruit Unified Sensor@1.1.14
-; adafruit/Adafruit BusIO@1.16.1
+; adafruit/Adafruit BusIO@1.16.2
 ; adafruit/Adafruit BME280 Library@2.2.4
 ; dfrobot/DFRobot_QMC5883@1.0.0
 build_flags =
@@ -122,7 +122,7 @@ board_build.partitions = default_16MB.csv
 lib_deps = 
   ${common.lib_deps}
 ;  adafruit/Adafruit Unified Sensor@1.1.14
-;  adafruit/Adafruit BusIO@1.16.1
+;  adafruit/Adafruit BusIO@1.16.2
 ;  adafruit/Adafruit BME280 Library@2.2.4
 ;  dfrobot/DFRobot_QMC5883@1.0.0
 build_flags = 
@@ -143,7 +143,7 @@ board_build.partitions = default_16MB.csv
 lib_deps =
   ${common.lib_deps}
 ;  adafruit/Adafruit Unified Sensor@1.1.14
-;  adafruit/Adafruit BusIO@1.16.1
+;  adafruit/Adafruit BusIO@1.16.2
 ;  adafruit/Adafruit BME280 Library@2.2.4
 ;  dfrobot/DFRobot_QMC5883@1.0.0
 build_flags =

From 487235911d686431e37cb9ecd7ed4d9a35495153 Mon Sep 17 00:00:00 2001
From: jgauchia <jgauchia@gmx.es>
Date: Wed, 13 Nov 2024 20:40:06 +0100
Subject: [PATCH 03/55] fix(gps): Maintain last fixed coordinates after fix

---
 lib/gps/gps.cpp | 5 +++--
 src/main.cpp    | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/gps/gps.cpp b/lib/gps/gps.cpp
index 9a8f1f90..74fcdd0d 100644
--- a/lib/gps/gps.cpp
+++ b/lib/gps/gps.cpp
@@ -151,8 +151,9 @@ void getGPSData()
     gpsData.speed = (uint16_t)fix.speed_kph();
 
   // Latitude and Longitude
-  gpsData.latitude = getLat();
-  gpsData.longitude = getLon();
+  if (fix.valid.location)
+    gpsData.latitude = getLat();
+    gpsData.longitude = getLon();
 
   // Heading
   if (fix.valid.heading)
diff --git a/src/main.cpp b/src/main.cpp
index 40b743f6..ba693aea 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -104,6 +104,9 @@ void setup()
   mapTempSprite.deleteSprite();
   mapTempSprite.createSprite(TILE_WIDTH, TILE_HEIGHT);
 
+  gpsData.latitude = getLat();
+  gpsData.longitude = getLon();
+
   // Preload Map
   if (isVectorMap)
   {
@@ -111,8 +114,6 @@ void setup()
   else
   {
     // Get init Latitude and Longitude
-    gpsData.latitude = getLat();
-    gpsData.longitude = getLon();
     tileSize = RENDER_TILE_SIZE;
     generateRenderMap();
   }

From 0ec35380ee58f8e16a8cdaf11004e40d80e0698d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jordi=20Gauch=C3=ADa?= <jgauchia@gmx.es>
Date: Thu, 14 Nov 2024 09:22:56 +0100
Subject: [PATCH 04/55] build: Fix espressif version

---
 platformio.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platformio.ini b/platformio.ini
index b9828ab5..4023d7c7 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -13,7 +13,7 @@ description = ESP32 GPS Navigator
 default_envs = ICENAV_BOARD
 
 [common]
-platform = espressif32
+platform = espressif32@6.9.0
 framework = arduino
 version = 0.1.9_alpha
 revision = 82

From 5a9e25979006674479c59a5ba04ff6df5de9a447 Mon Sep 17 00:00:00 2001
From: jgauchia <jgauchia@gmx.es>
Date: Thu, 14 Nov 2024 23:00:19 +0100
Subject: [PATCH 05/55] feat(wpt): Add back button in waypoint add/edit screen

---
 lib/gui/src/waypointScr.cpp | 59 ++++++++++++++++++++++++++++++-------
 lib/gui/src/waypointScr.hpp |  1 +
 2 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/lib/gui/src/waypointScr.cpp b/lib/gui/src/waypointScr.cpp
index 425bfcfd..e56feb8b 100644
--- a/lib/gui/src/waypointScr.cpp
+++ b/lib/gui/src/waypointScr.cpp
@@ -55,8 +55,6 @@ static void waypointScreenEvent(lv_event_t *event)
               editWaypointName(loadWpt.name, newName);
             }
             break;
-          // default:
-          //   break;
         }
 
         isMainScreen = true;
@@ -106,8 +104,6 @@ static void waypointScreenEvent(lv_event_t *event)
            editWaypointName(loadWpt.name, newName);
         }
         break;
-      // default:
-      //   break;
     }
 
     isMainScreen = true;
@@ -155,6 +151,46 @@ static void rotateScreen(lv_event_t *event)
   lv_refr_now(display);
 }
 
+/**
+ * @brief Waypoint Name event
+ *
+ * @param event
+ */
+static void waypointNameEvent(lv_event_t *event)
+{
+  lv_event_code_t code = lv_event_get_code(event);
+  if(code == LV_EVENT_CLICKED)
+  {
+    switch (wptAction)
+      {
+        case WPT_ADD:
+          addWpt.name = (char *)lv_textarea_get_text(waypointName);
+
+          if ( strcmp(addWpt.name,"") != 0)
+          {
+            openGpxFile(wptFile);
+            vTaskDelay(100);
+            addWaypointToFile(wptFile,addWpt);
+          }
+          break;
+        case WPT_EDIT:
+          char *newName = (char *)lv_textarea_get_text(waypointName);
+
+          if ( strcmp(loadWpt.name, newName) != 0)
+          {
+            editWaypointName(loadWpt.name, newName);
+          }
+          break;
+      }
+
+    isMainScreen = true;
+    redrawMap = true;
+    wptAction = WPT_NONE;
+    lv_refr_now(display);
+    loadMainScreen();
+  }
+}
+
 /**
  * @brief Update current waypoint postion to add
  *
@@ -221,13 +257,16 @@ void createWaypointScreen()
     lv_obj_center(rotateScreenLbl);
   #endif
 
-  lv_obj_t* label;
-  label = lv_label_create(waypointScreen);
-  lv_obj_set_style_text_font(label, fontOptions, 0);
-  lv_label_set_text_static(label, "Waypoint Name:");
-  lv_obj_center(label);
-  lv_obj_align(label,LV_ALIGN_TOP_LEFT,10,10);
+  lv_obj_t* labelWpt;
+  labelWpt = lv_label_create(waypointScreen);
+  lv_obj_set_style_text_font(labelWpt, fontOptions, 0);
+  lv_label_set_text_static(labelWpt, LV_SYMBOL_LEFT " Waypoint Name:");
+  lv_obj_center(labelWpt);
+  lv_obj_align(labelWpt,LV_ALIGN_TOP_LEFT,10,10);
+  lv_obj_add_flag(labelWpt, LV_OBJ_FLAG_CLICKABLE);
+  lv_obj_add_event_cb(labelWpt, waypointNameEvent, LV_EVENT_ALL, NULL);
 
+  lv_obj_t* label;
   label = lv_label_create(waypointScreen);
   lv_obj_set_style_text_font(label, fontOptions, 0);
   lv_label_set_text_static(label, "Lat:");
diff --git a/lib/gui/src/waypointScr.hpp b/lib/gui/src/waypointScr.hpp
index 111f95c8..593be18b 100644
--- a/lib/gui/src/waypointScr.hpp
+++ b/lib/gui/src/waypointScr.hpp
@@ -19,6 +19,7 @@ void loadMainScreen();
 
 static void waypointScreenEvent(lv_event_t *event);
 static void rotateScreen(lv_event_t *event);
+static void waypointNameEvent(lv_event_t *event);
 
 void updateWaypointPos();
 void createWaypointScreen();

From 6877719369206cadb740d4dbf5a2e09b9c70b0b5 Mon Sep 17 00:00:00 2001
From: jgauchia <jgauchia@gmx.es>
Date: Thu, 14 Nov 2024 23:23:52 +0100
Subject: [PATCH 06/55] fix(wpt): Fix waypoint add/edit rotation button size

---
 lib/gui/src/waypointScr.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/gui/src/waypointScr.cpp b/lib/gui/src/waypointScr.cpp
index e56feb8b..e8bcb441 100644
--- a/lib/gui/src/waypointScr.cpp
+++ b/lib/gui/src/waypointScr.cpp
@@ -252,6 +252,7 @@ void createWaypointScreen()
     lv_obj_align(rotateScreenBtn, LV_ALIGN_TOP_RIGHT, -10, 5);
     lv_obj_add_flag(rotateScreenBtn, LV_OBJ_FLAG_CLICKABLE);
     lv_obj_add_event_cb(rotateScreenBtn, rotateScreen, LV_EVENT_CLICKED, NULL);
+    lv_obj_set_size(rotateScreenBtn, 40, 35);
     lv_obj_t *rotateScreenLbl = lv_label_create(rotateScreenBtn);
     lv_label_set_text(rotateScreenLbl, LV_SYMBOL_LOOP);
     lv_obj_center(rotateScreenLbl);

From cff1c7a12ebda7b9cdcec51b3bc8fdbd27652b08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jordi=20Gauch=C3=ADa?= <jgauchia@gmx.es>
Date: Fri, 15 Nov 2024 07:29:26 +0100
Subject: [PATCH 07/55] docs: Update README.md

---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index 2d9180b8..23fe16ca 100644
--- a/README.md
+++ b/README.md
@@ -84,8 +84,6 @@ If the board has a BOOT button (GPIO0) it is possible to use power saving functi
 To do this, simply include the following Build Flag in the required env in platformio.ini
 
 ```-DPOWER_SAVE``` <br>
-```-DARDUINO_RUNNING_CORE=1``` <br>
-```-DARDUINO_EVENT_RUNNING_CORE=1``` <br>
 
 > [!IMPORTANT]
 > Currently, this project can run on any board with an ESP32S3 and at least a 320x480 TFT screen. The idea is to support all existing boards on the market that I can get to work, so if you don't want to use the specific IceNav board, please feel free to create an issue, and I will look into providing support.

From fff3bfcde397a98559ef0ab0150890fd78ef0147 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jordi=20Gauch=C3=ADa?= <jgauchia@gmx.es>
Date: Fri, 15 Nov 2024 07:31:11 +0100
Subject: [PATCH 08/55] fix(board): Fix elecrow board definition

---
 boards/elecrow-esp32-s3-n16r8v-terminal.json | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/boards/elecrow-esp32-s3-n16r8v-terminal.json b/boards/elecrow-esp32-s3-n16r8v-terminal.json
index 730b6480..1bdd7ad9 100644
--- a/boards/elecrow-esp32-s3-n16r8v-terminal.json
+++ b/boards/elecrow-esp32-s3-n16r8v-terminal.json
@@ -8,9 +8,7 @@
       "core": "esp32",
       "extra_flags": [
         "-DBOARD_HAS_PSRAM",
-        "-DARDUINO_USB_MODE=1",
-        "-DARDUINO_RUNNING_CORE=1",
-        "-DARDUINO_EVENT_RUNNING_CORE=1"
+        "-DARDUINO_USB_MODE=1"
       ],
       "f_cpu": "240000000L",
       "f_flash": "80000000L",

From 043dd1bc6328dbb601f3cb7ad95637ae0154a6e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jordi=20Gauch=C3=ADa?= <jgauchia@gmx.es>
Date: Fri, 15 Nov 2024 07:43:46 +0100
Subject: [PATCH 09/55] docs: Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 23fe16ca..607f783c 100644
--- a/README.md
+++ b/README.md
@@ -336,7 +336,7 @@ To access the Web File Server, simply use any browser and go to the following ad
 - [X] Vector maps
 - [ ] Google Maps navigation style
 - [x] Optimize code
-- [ ] Fix bugs!
+- [X] Fix bugs!
 - [X] Web file server
       
 

From f91aed0f604e767ee5d4cdd5b9fdaa890d1a4334 Mon Sep 17 00:00:00 2001
From: jgauchia <jgauchia@gmx.es>
Date: Fri, 15 Nov 2024 08:45:23 +0100
Subject: [PATCH 10/55] fix(board): Fix IceNav board definition

---
 boards/icenav-esp32-s3.json | 2 --
 1 file changed, 2 deletions(-)

diff --git a/boards/icenav-esp32-s3.json b/boards/icenav-esp32-s3.json
index ef141a4a..19728ee6 100644
--- a/boards/icenav-esp32-s3.json
+++ b/boards/icenav-esp32-s3.json
@@ -11,8 +11,6 @@
         "-DBOARD_HAS_PSRAM",
         "-DARDUINO_USB_MODE=1",
         "-DARDUINO_USB_CDC_ON_BOOT=1",
-        "-DARDUINO_RUNNING_CORE=1",
-        "-DARDUINO_EVENT_RUNNING_CORE=1",
         "-DPOWER_SAVE",
         "-DADC2",
         "-DBATT_PIN=ADC2_CHANNEL_6",

From cd6d568188ffd694ce929389a9f63c9c3241ce59 Mon Sep 17 00:00:00 2001
From: jgauchia <jgauchia@gmx.es>
Date: Sat, 16 Nov 2024 12:34:41 +0100
Subject: [PATCH 11/55] refactor(cli): Delete settings option from CLI

---
 README.md       |  3 ---
 lib/cli/cli.cpp | 43 -------------------------------------------
 platformio.ini  |  2 +-
 3 files changed, 1 insertion(+), 47 deletions(-)

diff --git a/README.md b/README.md
index 607f783c..25c71863 100644
--- a/README.md
+++ b/README.md
@@ -246,7 +246,6 @@ outnmea:        toggle GPS NMEA output (or Ctrl+C to stop)
 poweroff:       perform a ESP32 deep sleep
 reboot:         perform a ESP32 reboot
 scshot:         screenshot to SD or sending a PC
-settings:       device settings
 waypoint:       waypoint utilities
 webfile:        enable/disable Web file server
 wipe:           wipe preferences to factory default
@@ -298,8 +297,6 @@ nc -l -p 8123 > screenshot.png
 
 Additionally, you can download the screenshot with webfile server.
 
-**settings**: Device settings type `settings` for detailed options.
-
 **waypoint**: type `waypoint` for detailed options.
 
 Additionally, this waypoint command can send the waypoint over WiFi using the following syntax (replace IP with your PC IP):
diff --git a/lib/cli/cli.cpp b/lib/cli/cli.cpp
index 6d836280..f5bacbf7 100644
--- a/lib/cli/cli.cpp
+++ b/lib/cli/cli.cpp
@@ -267,48 +267,6 @@ void wcli_waypoint(char *args, Stream *response)
   }
 }
 
-void wcli_settings(char *args, Stream *response)
-{
-  Pair<String, String> operands = wcli.parseCommand(args);
-  String commands = operands.first();
-  String value = operands.second();
-  int8_t gpio = -1;
-
-  if (commands.isEmpty())
-  {
-    response->println("");
-    response->println(F( "\033[1;31m----\033[1;32m Available commands \033[1;31m----\033[0;37m\r\n" ));
-    response->println(F( "\033[1;32msetgpstx:\t\033[0;37mset GPS Tx GPIO"));
-    response->println(F( "\033[1;32msetgpsrx:\t\033[0;37mset GPS Rx GPIO"));
-  }
-  else if (commands.equals("setgpstx"))
-  {
-      if(value.isEmpty())
-        response->println(F("Tx GPIO missing, use: setgpstx \033[1;32mGPIO\033[0;37m"));
-      else
-      {
-        gpio = value.toInt();
-        saveGpsGpio(gpio, -1);
-        response->println("");
-        response->printf("GPS \033[1;31mTx GPIO\033[0;37m set to: \033[1;32m%i\033[0;37m\r\n",gpio);
-        response->println("Please reboot device");
-      }
-  }
-  else if (commands.equals("setgpsrx"))
-  {
-      if(value.isEmpty())
-        response->println(F("Rx GPIO missing, use: setgpsrx \033[1;32mGPIO\033[0;37m"));
-      else
-      {
-        gpio = value.toInt();
-        saveGpsGpio(-1, gpio);
-        response->println("");
-        response->printf("GPS \033[1;31mRx GPIO\033[0;37m set to: \033[1;32m%i\033[0;37m\r\n",gpio);
-        response->println("Please reboot device");
-      }
-  }
-}
-
 void wcli_outnmea (char *args, Stream *response){
     nmea_output_enable = !nmea_output_enable;
 }
@@ -365,7 +323,6 @@ void initShell(){
   wcli.add("clear", &wcli_clear, "\t\tclear shell");
   wcli.add("scshot", &wcli_scshot, "\tscreenshot to SD or sending a PC");
   wcli.add("waypoint", &wcli_waypoint, "\twaypoint utilities");
-  wcli.add("settings", &wcli_settings, "\tdevice settings");
   wcli.add("webfile", &wcli_webfile, "\tenable/disable Web file server");
   wcli.add("klist", &wcli_klist, "\t\tlist of user preferences. ('all' param show all)");
   wcli.add("kset", &wcli_kset, "\t\tset an user extra preference");
diff --git a/platformio.ini b/platformio.ini
index 4023d7c7..0c321b26 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -34,7 +34,7 @@ build_flags =
   -D SHELLMINATOR_BUFF_DIM=70
   -D SHELLMINATOR_LOGO_COLOR=BLUE
   -D COMMANDER_MAX_COMMAND_SIZE=70
-  -D WCLI_MAX_CMDS=14           # set n+1 of defined commands for CLI
+  -D WCLI_MAX_CMDS=12           # set n+1 of defined commands for CLI
   ; -D DISABLE_CLI_TELNET=1     # disable remote access via telnet. It needs CLI
   ; -D DISABLE_CLI=1            # removed CLI module. Config via Bluetooth only
 

From 2a21a638eb0a35aab271baa766f3d7c8ce2154a9 Mon Sep 17 00:00:00 2001
From: jgauchia <jgauchia@gmx.es>
Date: Sat, 16 Nov 2024 12:44:32 +0100
Subject: [PATCH 12/55] fix(cli): Fix poweroff CLI option

---
 lib/cli/cli.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/cli/cli.cpp b/lib/cli/cli.cpp
index f5bacbf7..ebf19034 100644
--- a/lib/cli/cli.cpp
+++ b/lib/cli/cli.cpp
@@ -28,7 +28,7 @@ void wcli_reboot(char *args, Stream *response)
 }
 
 void wcli_poweroff(char *args, Stream *response) {
-  deviceSuspend();
+  deviceShutdown();
 }
 
 void wcli_info(char *args, Stream *response)

From 6a029810ee6083324b524ade39c4361e3adb416f Mon Sep 17 00:00:00 2001
From: jgauchia <jgauchia@gmx.es>
Date: Sat, 16 Nov 2024 22:20:19 +0100
Subject: [PATCH 13/55] fix(power): Fix deep sleep for IceNav board

---
 lib/power/power.cpp | 12 +++++++++---
 src/main.cpp        |  7 ++++++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/lib/power/power.cpp b/lib/power/power.cpp
index c5a51c91..faa2ed60 100644
--- a/lib/power/power.cpp
+++ b/lib/power/power.cpp
@@ -21,9 +21,14 @@ void powerDeepSleep()
   esp_wifi_stop();
   esp_deep_sleep_disable_rom_logging();
   delay(10);
-  // If you need other peripherals to maintain power, please set the IO port to hold
-  // gpio_hold_en((gpio_num_t)BOARD_POWERON);
-  // gpio_deep_sleep_hold_en();
+
+  #ifdef ICENAV_BOARD
+    // If you need other peripherals to maintain power, please set the IO port to hold
+    gpio_hold_en((gpio_num_t)TFT_BL);
+    gpio_hold_en((gpio_num_t)BOARD_BOOT_PIN);
+    gpio_deep_sleep_hold_en();
+  #endif
+
   esp_sleep_enable_ext1_wakeup(1ull << BOARD_BOOT_PIN, ESP_EXT1_WAKEUP_ANY_LOW);
   esp_deep_sleep_start();
 }
@@ -83,6 +88,7 @@ void deviceShutdown()
 void powerOffPeripherals()
 {
   tftOff();
+  tft.fillScreen(TFT_BLACK);
   SPI.end();
   Wire.end();
 }
diff --git a/src/main.cpp b/src/main.cpp
index ba693aea..ff18c3ea 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -59,7 +59,12 @@ void setup()
   
   // Force GPIO0 to internal PullUP  during boot (avoid LVGL key read)
   #ifdef POWER_SAVE
-     pinMode(BOARD_BOOT_PIN,INPUT_PULLUP);
+    pinMode(BOARD_BOOT_PIN,INPUT_PULLUP);
+    #ifdef ICENAV_BOARD
+      gpio_hold_dis((gpio_num_t)TFT_BL);
+      gpio_hold_dis((gpio_num_t)BOARD_BOOT_PIN);
+      gpio_deep_sleep_hold_dis();
+    #endif
   #endif
 
   #ifdef ARDUINO_USB_CDC_ON_BOOT

From 8038ff6f3526cc9a4938d022b5bd5a3851bf266e Mon Sep 17 00:00:00 2001
From: jgauchia <jgauchia@gmx.es>
Date: Sun, 17 Nov 2024 01:03:18 +0100
Subject: [PATCH 14/55] feat(cli): Add GMT user settings (kset) in CLI #159

---
 README.md                          |  1 +
 lib/gps/timezone.hpp               | 14 ++++++--------
 lib/preferences/preferences-keys.h |  1 +
 lib/settings/settings.cpp          |  2 ++
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 25c71863..a57e1edc 100644
--- a/README.md
+++ b/README.md
@@ -267,6 +267,7 @@ Some extra details:
    VmaxBatt     custom         
    VminBatt     custom          
    tempOffs     custom
+     defGMT     custom     
 ```          
 
 **kset KEYNAME**: Set user custom settings:
diff --git a/lib/gps/timezone.hpp b/lib/gps/timezone.hpp
index 2b9a6709..a380b818 100644
--- a/lib/gps/timezone.hpp
+++ b/lib/gps/timezone.hpp
@@ -9,14 +9,7 @@
 #ifndef TIMEZONE_HPP
 #define TIMEZONE_HPP
 
-// Set these values to the offset of your timezone from GMT
-
-static const int32_t          zone_hours   =  1L; 
-static const int32_t          zone_minutes =  0L; // usually zero
-static const NeoGPS::clock_t  zone_offset  =
-                              zone_hours   * NeoGPS::SECONDS_PER_HOUR +
-                              zone_minutes * NeoGPS::SECONDS_PER_MINUTE;
-
+extern int32_t defGMT;          // Default GMT offset
 
 // Uncomment one DST changeover rule, or define your own:
 
@@ -51,6 +44,11 @@ static void adjustTime( NeoGPS::time_t & dt )
 {
   NeoGPS::clock_t seconds = dt; // convert date/time structure to seconds
 
+  // Set these values to the offset of your timezone from GMT
+  static const int32_t          zone_minutes =  0L; // usually zero
+  static const NeoGPS::clock_t  zone_offset = (int32_t)defGMT * NeoGPS::SECONDS_PER_HOUR +
+                                              zone_minutes * NeoGPS::SECONDS_PER_MINUTE;
+
   #ifdef CALCULATE_DST
     //  Calculate DST changeover times once per reset and year!
     static NeoGPS::time_t  changeover;
diff --git a/lib/preferences/preferences-keys.h b/lib/preferences/preferences-keys.h
index 88d13d00..09a1d110 100644
--- a/lib/preferences/preferences-keys.h
+++ b/lib/preferences/preferences-keys.h
@@ -29,4 +29,5 @@
   X(KVMAX_BATT, "VmaxBatt", FLOAT)       \
   X(KVMIN_BATT, "VminBatt", FLOAT)       \
   X(KTEMP_OFFS, "tempOffs", INT)         \
+  X(KGMT_OFFS, "defGMT", INT)            \
   X(KCOUNT, "KCOUNT", UNKNOWN)
diff --git a/lib/settings/settings.cpp b/lib/settings/settings.cpp
index 2adfeea2..7a797369 100644
--- a/lib/settings/settings.cpp
+++ b/lib/settings/settings.cpp
@@ -31,6 +31,7 @@ uint8_t zoom = 0;           // Actual Zoom Level
 bool isMapRotation = true;    // Map Compass Rotation
 uint8_t defaultZoom = 0;      // Default Zoom Value
 uint8_t defBright = 255;      // Default Brightness
+int32_t defGMT = 1;           // Default GMT offset
 bool showMapCompass = true;   // Compass in map screen
 bool isCompassRot = true;     // Compass rotation in map screen
 bool showMapSpeed = true;     // Speed in map screen
@@ -81,6 +82,7 @@ void loadPreferences()
   speedPosY = cfg.getInt(PKEYS::KSPEED_Y, TFT_HEIGHT - 130);
   isVectorMap = cfg.getBool(PKEYS::KMAP_VECTOR, false);
   defBright = cfg.getUInt(PKEYS::KDEF_BRIGT, 254);
+  defGMT = cfg.getInt(PKEYS::KGMT_OFFS, 1);
   if (isVectorMap)
   {
     minZoom = 1;

From 36bb08978d6d370e5b32cbc5f0c37e8bfc112e6f Mon Sep 17 00:00:00 2001
From: jgauchia <jgauchia@gmx.es>
Date: Sun, 17 Nov 2024 11:56:25 +0100
Subject: [PATCH 15/55] refactor(storage): Refactor to class

---
 lib/gui/src/notifyBar.cpp |   5 +-
 lib/storage/storage.cpp   | 107 +++++++++++++++++++++-----------------
 lib/storage/storage.hpp   |  17 ++++--
 src/main.cpp              |   6 ++-
 4 files changed, 80 insertions(+), 55 deletions(-)

diff --git a/lib/gui/src/notifyBar.cpp b/lib/gui/src/notifyBar.cpp
index cbcebce9..6c85b8fc 100644
--- a/lib/gui/src/notifyBar.cpp
+++ b/lib/gui/src/notifyBar.cpp
@@ -7,6 +7,7 @@
  */
 
 #include "notifyBar.hpp"
+#include "storage.hpp"
 #include "font/lv_symbol_def.h"
 #include "misc/lv_event.h"
 
@@ -14,6 +15,8 @@ lv_obj_t *mainScreen;
 lv_obj_t *notifyBarIcons;
 lv_obj_t *notifyBarHour;
 
+Storage storage;
+
 /**
  * @brief Update notify bar event
  *
@@ -168,7 +171,7 @@ void createNotifyBar()
   lv_obj_add_event_cb(temp, updateNotifyBar, LV_EVENT_VALUE_CHANGED, NULL);
   #endif
   
-  if (isSdLoaded)
+  if (storage.getSdLoaded())
   {
     sdCard = lv_label_create(notifyBarIcons);
     lv_label_set_text_static(sdCard, LV_SYMBOL_SD_CARD);
diff --git a/lib/storage/storage.cpp b/lib/storage/storage.cpp
index 8a26730e..e04ad8e6 100644
--- a/lib/storage/storage.cpp
+++ b/lib/storage/storage.cpp
@@ -10,74 +10,85 @@
 #include "esp_err.h"
 #include "esp_spiffs.h"
 
-bool isSdLoaded = false;
+// Pin definitions (should be configurable if needed)
 extern const int SD_CS;
 extern const int SD_MISO;
 extern const int SD_MOSI;
 extern const int SD_CLK;
-extern const int BOARD_TFT_CS;
-extern const int RADIO_CS_PIN;
+
+Storage::Storage() : isSdLoaded(false) {}
+
 
 /**
  * @brief SD Card init
  *
  */
-void initSD()
+void Storage::initSD() 
 {
-  bool SDInitOk = false;
-  pinMode(SD_CS,OUTPUT);
-  digitalWrite(SD_CS,LOW);
+    bool SDInitOk = false;
+    pinMode(SD_CS, OUTPUT);
+    digitalWrite(SD_CS, LOW);
 
-  SPI.begin(SD_CLK, SD_MISO, SD_MOSI);
-  SDInitOk = SD.begin(SD_CS, SPI, sdFreq);
-  
-  if (!SDInitOk)
-  {
-    log_e("SD Card Mount Failed");
-    return;
-  }
-  else
-  {
-    log_v("SD Card Mounted");
-    isSdLoaded = true;
-  }
- }
+    SPI.begin(SD_CLK, SD_MISO, SD_MOSI);
+    
+    if (!SD.begin(SD_CS, SPI, sdFreq)) 
+    {
+        log_e("SD Card Mount Failed");
+        isSdLoaded = false;
+    } 
+    else 
+    {
+        log_v("SD Card Mounted");
+        isSdLoaded = true;
+    }
+}
 
 /**
- * @brief SPIFFS Init
+ * @brief SPIFFS initialization
  *
+ * @return esp_err_t Error code for SPIFFS setup
  */
-esp_err_t initSPIFFS()
+esp_err_t Storage::initSPIFFS() 
 {
-  log_i("Initializing SPIFFS");
+    log_i("Initializing SPIFFS");
 
-  esp_vfs_spiffs_conf_t conf = {
-    .base_path = "/spiffs",
-    .partition_label = NULL,
-    .max_files = 5,
-    .format_if_mount_failed = false
-  };
+    esp_vfs_spiffs_conf_t conf =
+    {
+        .base_path = "/spiffs",
+        .partition_label = NULL,
+        .max_files = 5,
+        .format_if_mount_failed = false
+    };
 
-  esp_err_t ret = esp_vfs_spiffs_register(&conf);
+    esp_err_t ret = esp_vfs_spiffs_register(&conf);
 
-  if (ret !=ESP_OK)
-  {
-    if (ret == ESP_FAIL)
-      log_e("Failed to mount or format filesystem");
-    else if (ret == ESP_ERR_NOT_FOUND)
-      log_e("Failed to find SPIFFS partition");
+    if (ret != ESP_OK) 
+    {
+        if (ret == ESP_FAIL)
+            log_e("Failed to mount or format filesystem");
+        else if (ret == ESP_ERR_NOT_FOUND)
+            log_e("Failed to find SPIFFS partition");
+        else
+            log_e("Failed to initialize SPIFFS (%s)", esp_err_to_name(ret));
+        return ESP_FAIL;
+    }
+
+    size_t total = 0, used = 0;
+    ret = esp_spiffs_info(NULL, &total, &used);
+    if (ret != ESP_OK)
+        log_e("Failed to get SPIFFS partition information (%s)", esp_err_to_name(ret));
     else
-      log_e("Failed to initialize SPIFFS (%s)",esp_err_to_name(ret));
-    return ESP_FAIL;
-  }
+        log_i("Partition size: total: %d used: %d", total, used);
 
-  size_t total = 0, used = 0;
-  ret = esp_spiffs_info(NULL, &total, &used);
-  if (ret!= ESP_OK)
-    log_e("Failed to get SPIFFS partition information (%s)", esp_err_to_name(ret));
-  else
-    log_i("Partition size: total: %d used: %d", total, used);
-  
-  return ESP_OK;
+    return ESP_OK;
 }
 
+/**
+ * @brief Get SD status
+ *
+ * @return true if SD card is loaded, false otherwise
+ */
+bool Storage::getSdLoaded() const 
+{
+    return isSdLoaded;
+}
diff --git a/lib/storage/storage.hpp b/lib/storage/storage.hpp
index ec754c21..35ccac5a 100644
--- a/lib/storage/storage.hpp
+++ b/lib/storage/storage.hpp
@@ -14,11 +14,20 @@
 #include <LovyanGFX.hpp>
 #include <tft.hpp>
 
-static uint32_t sdFreq = 40000000;
 
-extern bool isSdLoaded;
+class Storage
+{
+private:
+    bool isSdLoaded;
+    static const uint32_t sdFreq = 40000000;
 
-void initSD();
-esp_err_t initSPIFFS();
+public:
+    Storage();
+
+    void initSD();
+    esp_err_t initSPIFFS();
+
+    bool getSdLoaded() const;
+};
 
 #endif
diff --git a/src/main.cpp b/src/main.cpp
index ff18c3ea..ab043f91 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -40,6 +40,7 @@
 #endif
 
 extern xSemaphoreHandle gpsMutex;
+extern Storage storage;
 
 #include "webpage.h"
 #include "webserver.h"
@@ -49,6 +50,7 @@ extern xSemaphoreHandle gpsMutex;
 #include "lvglSetup.hpp"
 #include "tasks.hpp"
 
+
 /**
  * @brief Setup
  *
@@ -97,8 +99,8 @@ void setup()
   #endif
 
   powerOn();
-  initSD();
-  initSPIFFS();
+  storage.initSD();
+  storage.initSPIFFS();
   initTFT();
   loadPreferences();
   initGPS();

From 9a4ae4883c94c8d6ccf0e5aea1ad724a550b3d2a Mon Sep 17 00:00:00 2001
From: jgauchia <jgauchia@gmx.es>
Date: Sun, 17 Nov 2024 13:38:00 +0100
Subject: [PATCH 16/55] refactor(battery): Refactor to class

---
 lib/battery/battery.cpp   | 102 +++++++++++++++++++-------------------
 lib/battery/battery.hpp   |  21 ++++----
 lib/gui/src/notifyBar.cpp |  14 +++---
 lib/gui/src/notifyBar.hpp |   7 ++-
 lib/settings/settings.cpp |   7 ++-
 lib/settings/settings.hpp |   2 -
 src/main.cpp              |   8 ++-
 7 files changed, 86 insertions(+), 75 deletions(-)

diff --git a/lib/battery/battery.cpp b/lib/battery/battery.cpp
index 33010b99..278e8f3d 100644
--- a/lib/battery/battery.cpp
+++ b/lib/battery/battery.cpp
@@ -9,73 +9,75 @@
 
 #include "battery.hpp"
 
-/**
- * @brief Battery values
- *
- */
-uint8_t battLevel = 0;
-uint8_t battLevelOld = 0;
-float batteryMax = 4.2;      // maximum voltage of battery
-float batteryMin = 3.6;      // minimum voltage of battery before shutdown
+
+// ADC characteristics (global for simplicity)
+static esp_adc_cal_characteristics_t characteristics;
+
+Battery::Battery() {}
 
 /**
  * @brief Configure ADC Channel for battery reading
  *
  */
-void initADC()
+void Battery::initADC()
 {
-  // When VDD_A is 3.3V:
-  //     0dB attenuation (ADC_ATTEN_DB_0) gives full-scale voltage 1.1V
-  //     2.5dB attenuation (ADC_ATTEN_DB_2_5) gives full-scale voltage 1.5V
-  //     6dB attenuation (ADC_ATTEN_DB_6) gives full-scale voltage 2.2V
-  //     12dB attenuation (ADC_ATTEN_DB_12) gives full-scale voltage 3.9V
-
-  #ifdef ADC1
+#ifdef ADC1
     adc1_config_width(ADC_WIDTH_BIT_12);
-    adc1_config_channel_atten(BATT_PIN, ADC_ATTEN_DB_12); 
-  #endif
+    adc1_config_channel_atten(BATT_PIN, ADC_ATTEN_DB_12);
+#endif
 
-  #ifdef ADC2
+#ifdef ADC2
     adc2_config_channel_atten(BATT_PIN, ADC_ATTEN_DB_12);
-  #endif
+#endif
+}
+
+/**
+ * @brief Set battery voltage levels
+ *
+ * @param maxVoltage -> Full Charge voltage
+ * @param minVoltage -> Min Charge voltage
+ */
+void Battery::setBatteryLevels(float maxVoltage, float minVoltage)
+{
+  batteryMax = maxVoltage;
+  batteryMin = minVoltage;
 }
 
 /**
- * @brief Read battery charge and return %
+ * @brief Read battery charge and return %.
  *
  * @return float -> % Charge
  */
-float batteryRead()
+float Battery::readBattery() 
 {
-  long sum = 0;        // sum of samples taken
-  float voltage = 0.0; // calculated voltage
-  float output = 0.0;  // output value
-  for (int i = 0; i < 100; i++)
-  {
+    long sum = 0;        // Sum of samples taken
+    float voltage = 0.0; // Calculated voltage
+    float output = 0.0;  // Output value
+
+    for (int i = 0; i < 100; i++)
+    {
+      #ifdef ADC1
+        sum += static_cast<long>(adc1_get_raw(BATT_PIN));
+      #endif
+
+      #ifdef ADC2
+        int readRaw;
+        esp_err_t r = adc2_get_raw(BATT_PIN, ADC_WIDTH_BIT_12, &readRaw);
+        if (r == ESP_OK)
+            sum += static_cast<long>(readRaw);
+      #endif
 
-    #ifdef ADC1
-      sum += (long)adc1_get_raw(BATT_PIN);
-    #endif
+      delayMicroseconds(150);
+    }
 
-    #ifdef ADC2
-     int readRaw;
-     esp_err_t r = adc2_get_raw(BATT_PIN, ADC_WIDTH_BIT_12, &readRaw);
-     if (r == ESP_OK)
-      sum += (long)readRaw;
-    #endif
+    voltage = sum / 100.0;
+    // Custom board has a divider circuit
+    constexpr float R1 = 100000.0; // Resistance of R1 (100K)
+    constexpr float R2 = 100000.0; // Resistance of R2 (100K)
+    voltage = (voltage * V_REF) / 4096.0;
+    voltage = voltage / (R2 / (R1 + R2));
+    voltage = roundf(voltage * 100) / 100;
 
-    delayMicroseconds(150);
-  }
-  voltage = sum / (float)100;
-  // custom board has a divider circuit
-  float R1 = 100000.0; // resistance of R1 (100K)
-  float R2 = 100000.0; // resistance of R2 (100K)
-  voltage = (voltage * V_REF) / 4096.0;
-  voltage = voltage / (R2 / (R1 + R2));
-  voltage = roundf(voltage * 100) / 100;
-  output = ((voltage - batteryMin) / (batteryMax - batteryMin)) * 100;
-  if (output <= 160)
-    return output;
-  else
-    return 0.0f;
+    output = ((voltage - batteryMin) / (batteryMax - batteryMin)) * 100;
+    return (output <= 160) ? output : 0.0f;
 }
diff --git a/lib/battery/battery.hpp b/lib/battery/battery.hpp
index b972fe63..072f360e 100644
--- a/lib/battery/battery.hpp
+++ b/lib/battery/battery.hpp
@@ -13,16 +13,19 @@
 #include <driver/adc.h>
 #include <esp_adc_cal.h>
 
-static esp_adc_cal_characteristics_t characteristics;
-#define V_REF 3.9 // ADC reference voltage
+class Battery
+{
+private:
+    float batteryMax;
+    float batteryMin;
+    static constexpr float V_REF = 3.9; // ADC reference voltage
 
-extern float batteryMax;     // 4.2;      // maximum voltage of battery
-extern float batteryMin;     // 3.6;      // minimum voltage of battery before shutdown
+public:
+    Battery();
 
-extern uint8_t battLevel;
-extern uint8_t battLevelOld;
-
-void initADC();
-float batteryRead();
+    void initADC();
+    void setBatteryLevels(float maxVoltage, float minVoltage);
+    float readBattery();
+};
 
 #endif
diff --git a/lib/gui/src/notifyBar.cpp b/lib/gui/src/notifyBar.cpp
index 6c85b8fc..06a8709a 100644
--- a/lib/gui/src/notifyBar.cpp
+++ b/lib/gui/src/notifyBar.cpp
@@ -7,7 +7,6 @@
  */
 
 #include "notifyBar.hpp"
-#include "storage.hpp"
 #include "font/lv_symbol_def.h"
 #include "misc/lv_event.h"
 
@@ -16,6 +15,7 @@ lv_obj_t *notifyBarIcons;
 lv_obj_t *notifyBarHour;
 
 Storage storage;
+Battery battery;
 
 /**
  * @brief Update notify bar event
@@ -37,7 +37,7 @@ void updateNotifyBar(lv_event_t *event)
   if (obj == gpsCount)
     lv_label_set_text_fmt(obj, LV_SYMBOL_GPS "%2d", gpsData.satellites);
 
-  if (obj == battery)
+  if (obj == battIcon)
   {
     if (battLevel <= 160 && battLevel > 140)
       lv_label_set_text_static(obj, "  " LV_SYMBOL_CHARGE);
@@ -118,10 +118,10 @@ void updateNotifyBarTimer(lv_timer_t *t)
   }
   #endif
 
-  battLevel = batteryRead();
+  battLevel = battery.readBattery();
   if (battLevel != battLevelOld)
   {
-    lv_obj_send_event(battery, LV_EVENT_VALUE_CHANGED, NULL);
+    lv_obj_send_event(battIcon, LV_EVENT_VALUE_CHANGED, NULL);
     battLevelOld = battLevel;
   }
 }
@@ -191,9 +191,9 @@ void createNotifyBar()
   lv_label_set_text_static(gpsFixMode, "----");
   lv_obj_add_event_cb(gpsFixMode, updateNotifyBar, LV_EVENT_VALUE_CHANGED, NULL);
   
-  battery = lv_label_create(notifyBarIcons);
-  lv_label_set_text_static(battery, LV_SYMBOL_BATTERY_EMPTY);
-  lv_obj_add_event_cb(battery, updateNotifyBar, LV_EVENT_VALUE_CHANGED, NULL);
+  battIcon = lv_label_create(notifyBarIcons);
+  lv_label_set_text_static(battIcon, LV_SYMBOL_BATTERY_EMPTY);
+  lv_obj_add_event_cb(battIcon, updateNotifyBar, LV_EVENT_VALUE_CHANGED, NULL);
   
   lv_timer_t *timerNotifyBar = lv_timer_create(updateNotifyBarTimer, UPDATE_NOTIFY_PERIOD, NULL);
   lv_timer_ready(timerNotifyBar);
diff --git a/lib/gui/src/notifyBar.hpp b/lib/gui/src/notifyBar.hpp
index 470bb14d..b0b9ba11 100644
--- a/lib/gui/src/notifyBar.hpp
+++ b/lib/gui/src/notifyBar.hpp
@@ -13,6 +13,8 @@
 #include "globalGuiDef.h"
 #include "tasks.hpp"
 #include "storage.hpp"
+#include "battery.hpp"
+#include "settings.hpp"
 
 /**
  * @brief Notify Bar screen objects
@@ -22,11 +24,14 @@ static lv_obj_t *gpsTime;    // Time
 static lv_obj_t *gpsCount;   // Satellite count
 static lv_obj_t *gpsFix;     // Satellite fix
 static lv_obj_t *gpsFixMode; // Satellite fix mode
-static lv_obj_t *battery;    // Battery level
+static lv_obj_t *battIcon;    // Battery level
 static lv_obj_t *sdCard;     // SD card icon
 static lv_obj_t *temp;       // Temperature
 static lv_obj_t *wifi;       // Wifi 
 
+static float battLevel = 0;
+static float battLevelOld = 0;
+
 #define UPDATE_NOTIFY_PERIOD 1000 // Notify Bar update time
 
 /**
diff --git a/lib/settings/settings.cpp b/lib/settings/settings.cpp
index 7a797369..315f3bfa 100644
--- a/lib/settings/settings.cpp
+++ b/lib/settings/settings.cpp
@@ -51,8 +51,8 @@ uint16_t speedPosY = 0;       // Speed widget position Y
 bool enableWeb = true;        // Enable/disable web file server
 bool showToolBar = false;     // Show Map Toolbar
 int8_t tempOffset = 0;        // BME Temperature offset
-// float batteryMax = 0.0;       // 4.2;      // maximum voltage of battery
-// float batteryMin = 0.0;       // 3.6;      // minimum voltage of battery before shutdown
+
+extern Battery battery;
 
 /**
  * @brief Load stored preferences
@@ -114,8 +114,7 @@ void loadPreferences()
   speedPosY = cfg.isKey(CONFKEYS::KSPEED_Y) ? cfg.getInt(CONFKEYS::KSPEED_Y, speedPosY) : 94;
   #endif
 
-  batteryMax = cfg.getFloat(PKEYS::KVMAX_BATT,4.2);
-  batteryMin = cfg.getFloat(PKEYS::KVMIN_BATT,3.6);
+  battery.setBatteryLevels(cfg.getFloat(PKEYS::KVMAX_BATT,4.2),cfg.getFloat(PKEYS::KVMIN_BATT,3.6));
 
   // compassPosX = 60;
   // compassPosY = 82;
diff --git a/lib/settings/settings.hpp b/lib/settings/settings.hpp
index f4b64b36..5da632cb 100644
--- a/lib/settings/settings.hpp
+++ b/lib/settings/settings.hpp
@@ -21,8 +21,6 @@ extern uint8_t defZoomRender;  // Default Zoom Level for render map
 extern uint8_t defZoomVector;  // Default Zoom Level for vector map
 extern uint8_t zoom;           // Actual Zoom Level
 extern uint8_t defBright;      // Default brightness
-extern float batteryMax;       // 4.2;      // maximum voltage of battery
-extern float batteryMin;       // 3.6;      // minimum voltage of battery before shutdown
 
 extern bool isMapRotation;    // Map Compass Rotation
 extern uint8_t defaultZoom;   // Default Zoom Value
diff --git a/src/main.cpp b/src/main.cpp
index ab043f91..072295cc 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -40,11 +40,14 @@
 #endif
 
 extern xSemaphoreHandle gpsMutex;
-extern Storage storage;
 
 #include "webpage.h"
 #include "webserver.h"
 #include "battery.hpp"
+
+extern Storage storage;
+extern Battery battery;
+
 #include "power.hpp"
 #include "settings.hpp"
 #include "lvglSetup.hpp"
@@ -101,11 +104,12 @@ void setup()
   powerOn();
   storage.initSD();
   storage.initSPIFFS();
+  battery.initADC();
   initTFT();
   loadPreferences();
   initGPS();
   initLVGL();
-  initADC();
+
   
   // Reserve PSRAM for buffer map
   mapTempSprite.deleteSprite();

From cf8ed80a6404d97006c9807e6fdf9967d03a0b18 Mon Sep 17 00:00:00 2001
From: jgauchia <jgauchia@gmx.es>
Date: Sun, 17 Nov 2024 14:28:21 +0100
Subject: [PATCH 17/55] build: Clear unused variables

---
 lib/battery/battery.cpp     | 4 ----
 lib/gui/src/mainScr.cpp     | 1 -
 lib/gui/src/notifyBar.cpp   | 2 --
 lib/lvgl/src/lvglSetup.cpp  | 2 --
 lib/maps/src/vectorMaps.cpp | 2 --
 lib/storage/storage.cpp     | 1 -
 lib/webfile/src/webserver.h | 1 -
 7 files changed, 13 deletions(-)

diff --git a/lib/battery/battery.cpp b/lib/battery/battery.cpp
index 278e8f3d..473306bd 100644
--- a/lib/battery/battery.cpp
+++ b/lib/battery/battery.cpp
@@ -9,10 +9,6 @@
 
 #include "battery.hpp"
 
-
-// ADC characteristics (global for simplicity)
-static esp_adc_cal_characteristics_t characteristics;
-
 Battery::Battery() {}
 
 /**
diff --git a/lib/gui/src/mainScr.cpp b/lib/gui/src/mainScr.cpp
index 1627d2d1..671845cd 100644
--- a/lib/gui/src/mainScr.cpp
+++ b/lib/gui/src/mainScr.cpp
@@ -206,7 +206,6 @@ void updateMainScreen(lv_timer_t *t)
  */
 void gestureEvent(lv_event_t *event)
 {
-  lv_obj_t *screen = (lv_obj_t *)lv_event_get_current_target(event);
   lv_dir_t dir = lv_indev_get_gesture_dir(lv_indev_get_act());
   if (activeTile == MAP && isMainScreen)
   {
diff --git a/lib/gui/src/notifyBar.cpp b/lib/gui/src/notifyBar.cpp
index 06a8709a..d4ee873c 100644
--- a/lib/gui/src/notifyBar.cpp
+++ b/lib/gui/src/notifyBar.cpp
@@ -154,8 +154,6 @@ void createNotifyBar()
   lv_obj_add_style(notifyBarIcons, &styleBar, LV_PART_MAIN);
   lv_obj_add_style(notifyBarHour, &styleBar, LV_PART_MAIN);
   
-  lv_obj_t *label;
-  
   gpsTime = lv_label_create(notifyBarHour);
   lv_obj_set_style_text_font(gpsTime, fontLarge, 0);
   lv_label_set_text_fmt(gpsTime, timeFormat, 0, 0, 0);
diff --git a/lib/lvgl/src/lvglSetup.cpp b/lib/lvgl/src/lvglSetup.cpp
index 45b9af48..4b8e2acd 100644
--- a/lib/lvgl/src/lvglSetup.cpp
+++ b/lib/lvgl/src/lvglSetup.cpp
@@ -137,7 +137,6 @@ void IRAM_ATTR gpioRead(lv_indev_t *indev_driver, lv_indev_data_t *data)
 */
 void gpioLongEvent(lv_event_t *event)
 {
-  lv_event_code_t code = lv_event_get_code(event);
   log_v("Shuting down device");
   powerMsg = lv_msgbox_create(lv_scr_act());
   lv_obj_set_width(powerMsg,TFT_WIDTH);
@@ -158,7 +157,6 @@ void gpioLongEvent(lv_event_t *event)
 */
 void gpioClickEvent(lv_event_t *event)
 {
-  lv_event_code_t code = lv_event_get_code(event);
   lv_indev_reset_long_press(lv_indev_active());
   lv_indev_reset(NULL,lv_scr_act());
   log_v("Entering sleep mode");
diff --git a/lib/maps/src/vectorMaps.cpp b/lib/maps/src/vectorMaps.cpp
index 85f1de10..b6e5339b 100644
--- a/lib/maps/src/vectorMaps.cpp
+++ b/lib/maps/src/vectorMaps.cpp
@@ -204,7 +204,6 @@ BBox parseBbox(String str)
 MapBlock *readMapBlock(String fileName)
 {
   log_d("readMapBlock: %s", fileName.c_str());
-  char c;
   char str[30];
   MapBlock *mblock = new MapBlock();
   fs::File file_ = SD.open(fileName + ".fmp");
@@ -236,7 +235,6 @@ MapBlock *readMapBlock(String fileName)
     uint32_t totalPoints = 0;
     Polygon polygon;
     Point16 p;
-    int16_t maxVectorZoom;// = 4;
     while (count > 0)
     {
       // log_d("line: %i", line);
diff --git a/lib/storage/storage.cpp b/lib/storage/storage.cpp
index e04ad8e6..faaa39d1 100644
--- a/lib/storage/storage.cpp
+++ b/lib/storage/storage.cpp
@@ -25,7 +25,6 @@ Storage::Storage() : isSdLoaded(false) {}
  */
 void Storage::initSD() 
 {
-    bool SDInitOk = false;
     pinMode(SD_CS, OUTPUT);
     digitalWrite(SD_CS, LOW);
 
diff --git a/lib/webfile/src/webserver.h b/lib/webfile/src/webserver.h
index 600236b8..a27abb39 100644
--- a/lib/webfile/src/webserver.h
+++ b/lib/webfile/src/webserver.h
@@ -237,7 +237,6 @@ String listFiles(bool ishtml, int page = 0)
 {
   String returnText = "";
 
-  int fileIndex = 0; 
   int startIdx = page * FILES_PER_PAGE; 
   int endIdx = startIdx + FILES_PER_PAGE; 
 

From 2fc21c99b1b8bdcc4bb07a4224dd702a0f33b2de Mon Sep 17 00:00:00 2001
From: jgauchia <jgauchia@gmx.es>
Date: Sun, 17 Nov 2024 16:23:36 +0100
Subject: [PATCH 18/55] refactor(power): Refactor to class

---
 lib/cli/cli.cpp            |  4 ++-
 lib/lvgl/src/lvglSetup.cpp |  6 ++--
 lib/power/power.cpp        | 72 +++++++++++++++++++++++---------------
 lib/power/power.hpp        | 24 +++++++++----
 lib/storage/storage.hpp    |  1 -
 src/main.cpp               |  5 +--
 6 files changed, 70 insertions(+), 42 deletions(-)

diff --git a/lib/cli/cli.cpp b/lib/cli/cli.cpp
index ebf19034..5cb46baa 100644
--- a/lib/cli/cli.cpp
+++ b/lib/cli/cli.cpp
@@ -22,13 +22,15 @@ const char logo[] =
 ""
 ;
 
+extern Power power;
+
 void wcli_reboot(char *args, Stream *response)
 {
   ESP.restart();
 }
 
 void wcli_poweroff(char *args, Stream *response) {
-  deviceShutdown();
+  power.deviceShutdown();
 }
 
 void wcli_info(char *args, Stream *response)
diff --git a/lib/lvgl/src/lvglSetup.cpp b/lib/lvgl/src/lvglSetup.cpp
index 4b8e2acd..43f1e725 100644
--- a/lib/lvgl/src/lvglSetup.cpp
+++ b/lib/lvgl/src/lvglSetup.cpp
@@ -26,6 +26,8 @@ lv_group_t *scrGroup;     // Screen group
 lv_group_t *keyGroup;     // GPIO group
 lv_obj_t *powerMsg;       // Power Message
 
+Power power;
+
 /**
  * @brief LVGL display update
  *
@@ -148,7 +150,7 @@ void gpioLongEvent(lv_event_t *event)
   lv_obj_invalidate(powerMsg);
   lv_refr_now(display);
   vTaskDelay(2000);
-  deviceShutdown();
+  power.deviceShutdown();
 }
 
 /**
@@ -170,7 +172,7 @@ void gpioClickEvent(lv_event_t *event)
   lv_obj_invalidate(powerMsg);
   lv_refr_now(display);
   vTaskDelay(2000);
-  deviceSuspend();
+  power.deviceSuspend();
 }
 
 /**
diff --git a/lib/power/power.cpp b/lib/power/power.cpp
index faa2ed60..62bdb978 100644
--- a/lib/power/power.cpp
+++ b/lib/power/power.cpp
@@ -10,11 +10,22 @@
 
 extern const uint8_t BOARD_BOOT_PIN;
 
+Power::Power()
+{
+  #ifdef DISABLE_RADIO
+    WiFi.disconnect(true);
+    WiFi.mode(WIFI_OFF);
+    btStop();
+    esp_wifi_stop();
+    esp_bt_controller_disable();
+  #endif
+}
+
 /**
  * @brief Deep Sleep Mode
  * 
  */
-void powerDeepSleep()
+void Power::powerDeepSleep()
 {
   esp_bluedroid_disable();
   esp_bt_controller_disable();
@@ -38,7 +49,7 @@ void powerDeepSleep()
  * 
  * @param millis 
  */
-void powerLightSleepTimer(int millis)
+void Power::powerLightSleepTimer(int millis)
 {
   esp_sleep_enable_timer_wakeup(millis * 1000);
   esp_err_t rtc_gpio_hold_en(gpio_num_t GPIO_NUM_5);
@@ -49,16 +60,27 @@ void powerLightSleepTimer(int millis)
  * @brief Sleep Mode
  * 
  */
-void powerLightSleep()
+void Power::powerLightSleep()
 {
   esp_sleep_enable_ext1_wakeup(1ull << BOARD_BOOT_PIN, ESP_EXT1_WAKEUP_ANY_LOW);
   esp_light_sleep_start();
 }
 
+/**
+ * @brief Power off peripherals devices
+ */
+void Power::powerOffPeripherals()
+{
+  tftOff();
+  tft.fillScreen(TFT_BLACK);
+  SPI.end();
+  Wire.end();
+}
+
 /**
  * @brief Core light suspend and TFT off
  */
-void deviceSuspend()
+void Power::deviceSuspend()
 {
   int brightness = tft.getBrightness();
   lv_msgbox_close(powerMsg); 
@@ -75,35 +97,27 @@ void deviceSuspend()
 
 /**
  * @brief Power off peripherals and deep sleep
+ *
  */
-void deviceShutdown()
+void Power::deviceShutdown()
 {
   powerOffPeripherals();
   powerDeepSleep();
 }
 
-/**
- * @brief Power off peripherals devices
- */
-void powerOffPeripherals()
-{
-  tftOff();
-  tft.fillScreen(TFT_BLACK);
-  SPI.end();
-  Wire.end();
-}
 
-/**
- * @brief On Mode
- * 
- */
-void powerOn()
-{
-#ifdef DISABLE_RADIO
-  WiFi.disconnect(true);
-  WiFi.mode(WIFI_OFF);
-  btStop();
-  esp_wifi_stop();
-  esp_bt_controller_disable();
-#endif
-}
+
+// /**
+//  * @brief On Mode
+//  * 
+//  */
+// void powerOn()
+// {
+// #ifdef DISABLE_RADIO
+//   WiFi.disconnect(true);
+//   WiFi.mode(WIFI_OFF);
+//   btStop();
+//   esp_wifi_stop();
+//   esp_bt_controller_disable();
+// #endif
+// }
diff --git a/lib/power/power.hpp b/lib/power/power.hpp
index 78192ab7..bc9e7db0 100644
--- a/lib/power/power.hpp
+++ b/lib/power/power.hpp
@@ -19,12 +19,22 @@
 #include "lvgl.h"
 #include "globalGuiDef.h"
 
-void powerDeepSeep();
-void powerLightSleepTimer(int millis);
-void powerLightSleep();
-void powerOffPeripherals();
-void deviceSuspend();
-void deviceShutdown();
-void powerOn();
+// void powerOn();
+
+class Power
+{
+private:
+    void powerDeepSleep();
+    void powerLightSleepTimer(int millis);
+    void powerLightSleep();
+    void powerOffPeripherals();
+
+public:
+    Power();
+
+    void deviceSuspend();
+    void deviceShutdown();
+};
+
 
 #endif
\ No newline at end of file
diff --git a/lib/storage/storage.hpp b/lib/storage/storage.hpp
index 35ccac5a..aa42897a 100644
--- a/lib/storage/storage.hpp
+++ b/lib/storage/storage.hpp
@@ -14,7 +14,6 @@
 #include <LovyanGFX.hpp>
 #include <tft.hpp>
 
-
 class Storage
 {
 private:
diff --git a/src/main.cpp b/src/main.cpp
index 072295cc..f768ccd3 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -44,11 +44,12 @@ extern xSemaphoreHandle gpsMutex;
 #include "webpage.h"
 #include "webserver.h"
 #include "battery.hpp"
+#include "power.hpp"
 
 extern Storage storage;
 extern Battery battery;
+extern Power power;
 
-#include "power.hpp"
 #include "settings.hpp"
 #include "lvglSetup.hpp"
 #include "tasks.hpp"
@@ -101,7 +102,7 @@ void setup()
    initCompass();
   #endif
 
-  powerOn();
+  // powerOn();
   storage.initSD();
   storage.initSPIFFS();
   battery.initADC();

From 4b4f19904155b21ac67386cfc577efb2e28da681 Mon Sep 17 00:00:00 2001
From: jgauchia <jgauchia@gmx.es>
Date: Sun, 24 Nov 2024 11:37:01 +0100
Subject: [PATCH 19/55] refactor: Clean Code

---
 lib/gpx/src/addWaypoint.cpp       |  2 +-
 lib/gpx/src/addWaypoint.hpp       |  6 +-----
 lib/gpx/src/deleteWaypoint.hpp    |  4 ----
 lib/gpx/src/editWaypoint.hpp      |  4 ----
 lib/gpx/src/loadWaypoint.hpp      |  5 -----
 lib/gui/src/buttonBar.cpp         |  5 -----
 lib/gui/src/buttonBar.hpp         |  2 ++
 lib/gui/src/deviceSettingsScr.cpp |  1 -
 lib/gui/src/deviceSettingsScr.hpp |  2 --
 lib/gui/src/globalGuiDef.h        |  9 ++-------
 lib/gui/src/mainScr.cpp           | 29 ++++-------------------------
 lib/gui/src/mainScr.hpp           |  9 +++------
 lib/gui/src/mapSettingsScr.cpp    |  2 --
 lib/gui/src/mapSettingsScr.hpp    |  1 -
 lib/gui/src/navScr.hpp            |  1 -
 lib/gui/src/notifyBar.cpp         |  2 --
 lib/gui/src/notifyBar.hpp         |  1 -
 lib/gui/src/satInfoScr.cpp        |  1 -
 lib/gui/src/satInfoScr.hpp        |  1 -
 lib/gui/src/searchSatScr.cpp      |  1 -
 lib/gui/src/searchSatScr.hpp      |  1 -
 lib/gui/src/settingsScr.cpp       |  1 -
 lib/gui/src/settingsScr.hpp       |  2 --
 lib/gui/src/splashScr.hpp         |  1 -
 lib/gui/src/waypointListScr.hpp   |  4 ----
 lib/gui/src/waypointScr.cpp       |  6 ------
 lib/gui/src/waypointScr.hpp       |  2 +-
 lib/gui/src/widgets.hpp           |  2 --
 lib/lvgl/src/lvglFuncs.hpp        |  3 ---
 lib/lvgl/src/lvglSetup.cpp        |  4 ----
 lib/lvgl/src/lvglSetup.hpp        | 19 ++++---------------
 lib/maps/src/mapsDrawFunc.h       |  4 ++--
 lib/maps/src/renderMaps.cpp       |  8 --------
 lib/maps/src/renderMaps.hpp       |  6 ------
 lib/maps/src/vectorMaps.hpp       |  7 -------
 lib/power/power.hpp               |  2 --
 lib/settings/settings.cpp         |  9 ---------
 lib/storage/storage.cpp           | 10 ++++------
 lib/storage/storage.hpp           |  4 +---
 lib/tasks/tasks.cpp               |  2 --
 lib/tasks/tasks.hpp               |  6 +++++-
 lib/tft/tft.cpp                   |  6 ------
 42 files changed, 30 insertions(+), 167 deletions(-)

diff --git a/lib/gpx/src/addWaypoint.cpp b/lib/gpx/src/addWaypoint.cpp
index 4e9a5d48..b2355171 100644
--- a/lib/gpx/src/addWaypoint.cpp
+++ b/lib/gpx/src/addWaypoint.cpp
@@ -8,7 +8,7 @@
 
 #include "addWaypoint.hpp"
 
-extern const int SD_CS;
+extern const uint8_t SD_CS;
 
 wayPoint addWpt = {0, 0, 0, (char *)"", (char *)"", (char *)"", (char *)"", (char *)"", (char *)"", 0, 0, 0, 0};
 wayPoint loadWpt = {0, 0, 0, (char *)"", (char *)"", (char *)"", (char *)"", (char *)"", (char *)"", 0, 0, 0, 0};
diff --git a/lib/gpx/src/addWaypoint.hpp b/lib/gpx/src/addWaypoint.hpp
index 9a01b9cd..2ae526cf 100644
--- a/lib/gpx/src/addWaypoint.hpp
+++ b/lib/gpx/src/addWaypoint.hpp
@@ -9,12 +9,8 @@
 #ifndef ADDWAYPOINT_HPP
 #define ADDWAYPOINT_HPP
 
-#include "globalGpxDef.h"
 #include "SD.h"
-#include "FS.h"
-#include "tft.hpp"
-#include "storage.hpp"
-#include "lvgl.h"
+#include "globalGpxDef.h"
 
 extern wayPoint addWpt;
 
diff --git a/lib/gpx/src/deleteWaypoint.hpp b/lib/gpx/src/deleteWaypoint.hpp
index 1111f5a0..a610cf04 100644
--- a/lib/gpx/src/deleteWaypoint.hpp
+++ b/lib/gpx/src/deleteWaypoint.hpp
@@ -10,10 +10,6 @@
 #define DELETEWAYPOINT_HPP
 
 #include "SD.h"
-#include "FS.h"
-#include "tft.hpp"
-#include "storage.hpp"
-#include "globalGuiDef.h"
 #include "globalGpxDef.h"
 
 void deleteWaypointName(char * wpt);
diff --git a/lib/gpx/src/editWaypoint.hpp b/lib/gpx/src/editWaypoint.hpp
index 281742e0..e8b9ee31 100644
--- a/lib/gpx/src/editWaypoint.hpp
+++ b/lib/gpx/src/editWaypoint.hpp
@@ -10,10 +10,6 @@
 #define EDITWAYPOINT_HPP
 
 #include "SD.h"
-#include "FS.h"
-#include "tft.hpp"
-#include "storage.hpp"
-#include "globalGuiDef.h"
 #include "globalGpxDef.h"
 
 void editWaypointName(char* oldName, char *newName);
diff --git a/lib/gpx/src/loadWaypoint.hpp b/lib/gpx/src/loadWaypoint.hpp
index f27460b5..1fcfadf7 100644
--- a/lib/gpx/src/loadWaypoint.hpp
+++ b/lib/gpx/src/loadWaypoint.hpp
@@ -9,11 +9,6 @@
 #ifndef LOADWAYPOINT_HPP
 #define LOADWAYPOINT_HPP
 
-#include "SD.h"
-#include "FS.h"
-#include "tft.hpp"
-#include "storage.hpp"
-#include "globalGuiDef.h"
 #include "globalGpxDef.h"
 
 extern wayPoint loadWpt;
diff --git a/lib/gui/src/buttonBar.cpp b/lib/gui/src/buttonBar.cpp
index 46aa87d1..f7bc133e 100644
--- a/lib/gui/src/buttonBar.cpp
+++ b/lib/gui/src/buttonBar.cpp
@@ -7,10 +7,6 @@
  */
 
 #include "buttonBar.hpp"
-#include "waypointScr.hpp"
-#include "waypointListScr.hpp"
-#include "display/lv_display.h"
-#include "globalGuiDef.h"
 
 bool isWaypointOpt = false;
 bool isTrackOpt = false;
@@ -59,7 +55,6 @@ void buttonBarEvent(lv_event_t *event)
   if (strcmp(option,"waypoint") == 0)
   {
     log_v("Waypoint");
-  //  isMainScreen = false;
     isWaypointOpt = true;
     isTrackOpt = false;
     if (!isOptionLoaded)
diff --git a/lib/gui/src/buttonBar.hpp b/lib/gui/src/buttonBar.hpp
index 24f9a1db..30a579f3 100644
--- a/lib/gui/src/buttonBar.hpp
+++ b/lib/gui/src/buttonBar.hpp
@@ -11,6 +11,8 @@
 
 #include "globalGuiDef.h"
 #include "mainScr.hpp"
+#include "waypointScr.hpp"
+#include "waypointListScr.hpp"
 
 static const char *waypointIconFile PROGMEM = "/wpt.bin";      // Waypoint icon
 static const char *trackIconFile PROGMEM = "/track.bin";       // Track icon
diff --git a/lib/gui/src/deviceSettingsScr.cpp b/lib/gui/src/deviceSettingsScr.cpp
index 00c2b7c3..3ad66778 100644
--- a/lib/gui/src/deviceSettingsScr.cpp
+++ b/lib/gui/src/deviceSettingsScr.cpp
@@ -7,7 +7,6 @@
  */
 
 #include "deviceSettingsScr.hpp"
-#include "globalGuiDef.h"
 
 lv_obj_t *deviceSettingsScreen; // Device Settings Screen
 
diff --git a/lib/gui/src/deviceSettingsScr.hpp b/lib/gui/src/deviceSettingsScr.hpp
index 248d6147..5ecec47d 100644
--- a/lib/gui/src/deviceSettingsScr.hpp
+++ b/lib/gui/src/deviceSettingsScr.hpp
@@ -10,8 +10,6 @@
 #define DEVICESETTINGSCR_HPP
 
 #include "globalGuiDef.h"
-#include "gps.hpp"
-#include "settings.hpp"
 #include "lvglSetup.hpp"
 
 static lv_obj_t *deviceSettingsOptions;
diff --git a/lib/gui/src/globalGuiDef.h b/lib/gui/src/globalGuiDef.h
index 92a12d53..858caf17 100644
--- a/lib/gui/src/globalGuiDef.h
+++ b/lib/gui/src/globalGuiDef.h
@@ -89,14 +89,9 @@ static bool getPngSize(const char* filename, uint16_t *width, uint16_t *height)
     return false;
   }
 
-  byte table[32];
+  uint8_t table[32];
 
-  // for (int i = 0; file.available() && i < 32; i++)
-  // {
-  //   table[i] = file.read();
-  // }
-
-  fread(table, sizeof(byte), 32, file);
+  fread(table, sizeof(uint8_t), 32, file);
 
   *width=table[16]*256*256*256+table[17]*256*256+table[18]*256+table[19];
   *height=table[20]*256*256*256+table[21]*256*256+table[22]*256+table[23];
diff --git a/lib/gui/src/mainScr.cpp b/lib/gui/src/mainScr.cpp
index 671845cd..dab9ec3f 100644
--- a/lib/gui/src/mainScr.cpp
+++ b/lib/gui/src/mainScr.cpp
@@ -7,16 +7,6 @@
  */
 
 #include "mainScr.hpp"
-#include "buttonBar.hpp"
-#include "core/lv_obj.h"
-#include "core/lv_obj_pos.h"
-#include "globalGuiDef.h"
-#include "globalMapsDef.h"
-#include "settings.hpp"
-#include "tft.hpp"
-
-extern const int SD_CS;
-extern const uint8_t TFT_SPI_CS;
 
 bool isMainScreen = false;    // Flag to indicate main screen is selected
 bool isScrolled = true;       // Flag to indicate when tileview was scrolled
@@ -27,12 +17,12 @@ uint8_t wptAction = WPT_NONE; // Current Waypoint Action
 int wptPosX, wptPosY = 0;     // Waypoint position on map
 
 #ifdef LARGE_SCREEN
-  int toolBarOffset = 100;
-  int toolBarSpace = 60;
+  uint8_t toolBarOffset = 100;
+  uint8_t toolBarSpace = 60;
 #endif
 #ifndef LARGE_SCREEN
-  int toolBarOffset = 80;
-  int toolBarSpace = 50;
+  uint8_t toolBarOffset = 80;
+  uint8_t toolBarSpace = 50;
 #endif
 
 lv_obj_t *tilesScreen;
@@ -59,10 +49,8 @@ void updateCompassScr(lv_event_t * event)
   lv_obj_t *obj = (lv_obj_t *)lv_event_get_current_target(event);
   if (obj==compassHeading)
   {
-    //#ifdef ENABLE_COMPASS
     lv_label_set_text_fmt(compassHeading, "%5d\xC2\xB0", heading);
     lv_img_set_angle(compassImg, -(heading * 10));
-    //#endif
   }
   if (obj==latitude)
     lv_label_set_text_fmt(latitude, "%s", latFormatString(gpsData.latitude));
@@ -86,11 +74,6 @@ void getActTile(lv_event_t *event)
     isScrolled = true;
     redrawMap = true;
 
-    if (activeTile == SATTRACK)
-    {
-      // createSatSprite(spriteSat);
-      // createConstelSprite(constelSprite);
-    }
     if (activeTile == MAP)
     {
       createMapScrSprites();
@@ -240,8 +223,6 @@ void updateMap(lv_event_t *event)
 
       getMapBlocks(viewPort.bbox, memCache);
                
-      // deleteMapScrSprites();
-      // createMapScrSprites();
       generateVectorMap(viewPort, memCache, mapTempSprite); 
       
       isPosMoved = false;
@@ -418,9 +399,7 @@ void updateNavEvent(lv_event_t *event)
   if (wptDistance == 0)
   {
     lv_img_set_src(arrowNav, &navfinish);
-    //#ifdef ENABLE_COMPASS
     lv_img_set_angle(arrowNav, 0);
-    //#endif
   }
   else
   {
diff --git a/lib/gui/src/mainScr.hpp b/lib/gui/src/mainScr.hpp
index 4d8c9f2e..a147f139 100644
--- a/lib/gui/src/mainScr.hpp
+++ b/lib/gui/src/mainScr.hpp
@@ -10,13 +10,9 @@
 #define MAINSCR_HPP
 
 #include "globalGuiDef.h"
-#include "lvglFuncs.hpp"
-#include "misc/lv_color.h"
-#include "notifyBar.hpp"
 #include "buttonBar.hpp"
 #include "renderMaps.hpp"
 #include "vectorMaps.hpp"
-#include "addWaypoint.hpp"
 #include "loadWaypoint.hpp"
 #include "deleteWaypoint.hpp"
 #include "editWaypoint.hpp"
@@ -57,13 +53,14 @@ extern lv_obj_t *satTrackTile;
 extern lv_obj_t *btnFullScreen;
 extern lv_obj_t *btnZoomIn;
 extern lv_obj_t *btnZoomOut;
-extern int toolBarOffset;
-extern int toolBarSpace;
+extern uint8_t toolBarOffset;
+extern uint8_t toolBarSpace;
 
 void updateCompassScr(lv_event_t * event);
 
 void deleteMapScrSprites();
 void createMapScrSprites();
+void displayMap(uint16_t tileSize);
 
 void getActTile(lv_event_t *event);
 void scrollTile(lv_event_t *event);
diff --git a/lib/gui/src/mapSettingsScr.cpp b/lib/gui/src/mapSettingsScr.cpp
index 110ff6a2..29db0312 100644
--- a/lib/gui/src/mapSettingsScr.cpp
+++ b/lib/gui/src/mapSettingsScr.cpp
@@ -7,8 +7,6 @@
  */
 
 #include "mapSettingsScr.hpp"
-#include "core/lv_obj.h"
-#include "settings.hpp"
 
 lv_obj_t *mapSettingsScreen; // Map Settings Screen
 
diff --git a/lib/gui/src/mapSettingsScr.hpp b/lib/gui/src/mapSettingsScr.hpp
index e09a6eac..6168abf5 100644
--- a/lib/gui/src/mapSettingsScr.hpp
+++ b/lib/gui/src/mapSettingsScr.hpp
@@ -10,7 +10,6 @@
 #define MAPSETTINGSCR_HPP
 
 #include "globalGuiDef.h"
-#include "settings.hpp"
 #include "lvglFuncs.hpp"
 #include "vectorMaps.hpp"
 #include "renderMaps.hpp"
diff --git a/lib/gui/src/navScr.hpp b/lib/gui/src/navScr.hpp
index b53b8f69..5fea2489 100644
--- a/lib/gui/src/navScr.hpp
+++ b/lib/gui/src/navScr.hpp
@@ -9,7 +9,6 @@
 #ifndef NAVSCR_HPP
 #define NAVSCR_HPP
 
-#include "lvgl.h"
 #include "globalGuiDef.h"
 #include "navup.c"
 
diff --git a/lib/gui/src/notifyBar.cpp b/lib/gui/src/notifyBar.cpp
index d4ee873c..507d67fd 100644
--- a/lib/gui/src/notifyBar.cpp
+++ b/lib/gui/src/notifyBar.cpp
@@ -7,8 +7,6 @@
  */
 
 #include "notifyBar.hpp"
-#include "font/lv_symbol_def.h"
-#include "misc/lv_event.h"
 
 lv_obj_t *mainScreen;
 lv_obj_t *notifyBarIcons;
diff --git a/lib/gui/src/notifyBar.hpp b/lib/gui/src/notifyBar.hpp
index b0b9ba11..cb7c5e7b 100644
--- a/lib/gui/src/notifyBar.hpp
+++ b/lib/gui/src/notifyBar.hpp
@@ -9,7 +9,6 @@
 #ifndef NOTIFYBAR_HPP
 #define NOTIFYBAR_HPP
 
-#include <WiFi.h>
 #include "globalGuiDef.h"
 #include "tasks.hpp"
 #include "storage.hpp"
diff --git a/lib/gui/src/satInfoScr.cpp b/lib/gui/src/satInfoScr.cpp
index c418a9b0..cfd41f9b 100644
--- a/lib/gui/src/satInfoScr.cpp
+++ b/lib/gui/src/satInfoScr.cpp
@@ -35,7 +35,6 @@ void drawTextOnLayer(const char * text, lv_layer_t * layer, lv_point_t * p, lv_a
   lv_draw_rect_dsc_t draw_rect_dsc;
   lv_draw_rect_dsc_init(&draw_rect_dsc);
 
-  //draw_rect_dsc.bg_color = lv_color_black();
   draw_rect_dsc.bg_opa = LV_OPA_TRANSP;
   draw_rect_dsc.radius = 0;
   draw_rect_dsc.bg_image_symbol_font = font;
diff --git a/lib/gui/src/satInfoScr.hpp b/lib/gui/src/satInfoScr.hpp
index e66c44e4..ac98ccfd 100644
--- a/lib/gui/src/satInfoScr.hpp
+++ b/lib/gui/src/satInfoScr.hpp
@@ -9,7 +9,6 @@
 #ifndef SATINFOSCR_HPP
 #define SATINFOSCR_HPP
 
-#include "lvgl.h"
 #include "globalGuiDef.h"
 #include "gps.hpp"
 
diff --git a/lib/gui/src/searchSatScr.cpp b/lib/gui/src/searchSatScr.cpp
index 87bdb7b3..596e92ab 100644
--- a/lib/gui/src/searchSatScr.cpp
+++ b/lib/gui/src/searchSatScr.cpp
@@ -26,7 +26,6 @@ void buttonEvent(lv_event_t *event)
   }
   if (strcmp(option,"settings") == 0)
   {
-    //isMainScreen = false;
     lv_screen_load(settingsScreen); 
   }
 }
diff --git a/lib/gui/src/searchSatScr.hpp b/lib/gui/src/searchSatScr.hpp
index 489b8335..5f211cac 100644
--- a/lib/gui/src/searchSatScr.hpp
+++ b/lib/gui/src/searchSatScr.hpp
@@ -9,7 +9,6 @@
 #ifndef SEARCHSATSCR_HPP
 #define SEARCHSATSCR_HPP
 
-#include <lvgl.h>
 #include "gps.hpp"
 #include "globalGuiDef.h"
 
diff --git a/lib/gui/src/settingsScr.cpp b/lib/gui/src/settingsScr.cpp
index 37fb9ae0..c55e26b9 100644
--- a/lib/gui/src/settingsScr.cpp
+++ b/lib/gui/src/settingsScr.cpp
@@ -7,7 +7,6 @@
  */
 
 #include "settingsScr.hpp"
-#include "globalGuiDef.h"
 
 bool needReboot = false;
 
diff --git a/lib/gui/src/settingsScr.hpp b/lib/gui/src/settingsScr.hpp
index 40ee59b7..c68ee7bf 100644
--- a/lib/gui/src/settingsScr.hpp
+++ b/lib/gui/src/settingsScr.hpp
@@ -11,9 +11,7 @@
 
 #include "globalGuiDef.h"
 #include "mainScr.hpp"
-#include "compass.hpp"
 #include "searchSatScr.hpp"
-#include "settings.hpp"
 
 void loadMainScreen();
 
diff --git a/lib/gui/src/splashScr.hpp b/lib/gui/src/splashScr.hpp
index b1519785..61d22b61 100644
--- a/lib/gui/src/splashScr.hpp
+++ b/lib/gui/src/splashScr.hpp
@@ -9,7 +9,6 @@
 #ifndef SPLASHSCR_HPP
 #define SPLASHSCR_HPP
 
-#include "tft.hpp"
 #include "globalGuiDef.h"
 #include "settings.hpp"
 
diff --git a/lib/gui/src/waypointListScr.hpp b/lib/gui/src/waypointListScr.hpp
index 31f566ae..db3599b9 100644
--- a/lib/gui/src/waypointListScr.hpp
+++ b/lib/gui/src/waypointListScr.hpp
@@ -9,11 +9,7 @@
 #ifndef WAYPOINTLISTSCR_HPP
 #define WAYPOINTLISTSCR_HPP
 
-#include "globalGuiDef.h"
-#include "globalGpxDef.h"
 #include "mainScr.hpp"
-#include "storage.hpp"
-#include <regex>
 
 void loadMainScreen();
 void updateWaypointPos();
diff --git a/lib/gui/src/waypointScr.cpp b/lib/gui/src/waypointScr.cpp
index e8bcb441..aed687a0 100644
--- a/lib/gui/src/waypointScr.cpp
+++ b/lib/gui/src/waypointScr.cpp
@@ -7,11 +7,6 @@
  */
 
 #include "waypointScr.hpp"
-#include "core/lv_obj_pos.h"
-#include "display/lv_display.h"
-#include "globalGuiDef.h"
-#include "tft.hpp"
-#include "addWaypoint.hpp"
 
 lv_obj_t *waypointScreen;  // Add Waypoint Screen
 lv_obj_t *waypointName;
@@ -238,7 +233,6 @@ void createWaypointScreen()
   #ifdef TDECK_ESP32S3
     lv_group_add_obj(scrGroup, waypointName);
     lv_group_focus_obj(waypointName);
-    //lv_group_add_obj(scrGroup, waypointScreen);
   #endif
 
   #ifndef TDECK_ESP32S3
diff --git a/lib/gui/src/waypointScr.hpp b/lib/gui/src/waypointScr.hpp
index 593be18b..4a2fff4d 100644
--- a/lib/gui/src/waypointScr.hpp
+++ b/lib/gui/src/waypointScr.hpp
@@ -9,7 +9,7 @@
 #ifndef waypointScr_HPP
 #define waypointScr_HPP
 
-#include "globalGuiDef.h"
+#include "addWaypoint.hpp"
 #include "mainScr.hpp"
 
 extern lv_obj_t *waypointName;
diff --git a/lib/gui/src/widgets.hpp b/lib/gui/src/widgets.hpp
index b3e7bfc3..5e15f6ee 100644
--- a/lib/gui/src/widgets.hpp
+++ b/lib/gui/src/widgets.hpp
@@ -9,8 +9,6 @@
 #ifndef WIDGETS_HPP
 #define WIDGETS_HPP
 
-#include "lvgl.h"
-#include "globalGuiDef.h"
 #include "globalMapsDef.h"
 #include "lvglFuncs.hpp"
 #include "gpsMath.hpp"
diff --git a/lib/lvgl/src/lvglFuncs.hpp b/lib/lvgl/src/lvglFuncs.hpp
index 1f8cf7b5..0df59194 100644
--- a/lib/lvgl/src/lvglFuncs.hpp
+++ b/lib/lvgl/src/lvglFuncs.hpp
@@ -9,9 +9,6 @@
 #ifndef LVGLFUNCS_HPP
 #define LVGLFUNCS_HPP
 
-#include <Arduino.h>
-#include "tft.hpp"
-#include "lvgl.h"
 #include "globalGuiDef.h"
 
 void objHideCursor(_lv_obj_t *obj);
diff --git a/lib/lvgl/src/lvglSetup.cpp b/lib/lvgl/src/lvglSetup.cpp
index 43f1e725..32819911 100644
--- a/lib/lvgl/src/lvglSetup.cpp
+++ b/lib/lvgl/src/lvglSetup.cpp
@@ -6,11 +6,7 @@
  * @date 2024-11
  */
 
-#include "lvgl_private.h"
 #include "lvglSetup.hpp"
-#include "waypointScr.hpp"
-#include "waypointListScr.hpp"
-#include "globalGuiDef.h"
 
 ViewPort viewPort; // Vector map viewport
 MemCache memCache; // Vector map Memory Cache
diff --git a/lib/lvgl/src/lvglSetup.hpp b/lib/lvgl/src/lvglSetup.hpp
index f38c237e..386e02d9 100644
--- a/lib/lvgl/src/lvglSetup.hpp
+++ b/lib/lvgl/src/lvglSetup.hpp
@@ -9,28 +9,17 @@
 #ifndef LVGLSETUP_HPP
 #define LVGLSETUP_HPP
 
-#include <lvgl.h>
-
-#include "esp_attr.h"
-#include "freertos/FreeRTOS.h"
-#include "freertos/task.h"
-#ifdef TDECK_ESP32S3 
-    #include "Wire.h"
-#endif
-
 #define LV_TICK_PERIOD_MS 5
 
-#include "globalGuiDef.h"
+#include "lvgl_private.h"
+// #ifdef TDECK_ESP32S3 
+//     #include "Wire.h"
+// #endif
 #include "splashScr.hpp"
-#include "searchSatScr.hpp"
 #include "notifyBar.hpp"
-#include "widgets.hpp"
-#include "mainScr.hpp"
-#include "buttonBar.hpp"
 #include "settingsScr.hpp"
 #include "deviceSettingsScr.hpp"
 #include "mapSettingsScr.hpp"
-#include "waypointScr.hpp"
 
 /**
  * @brief Default display driver definition
diff --git a/lib/maps/src/mapsDrawFunc.h b/lib/maps/src/mapsDrawFunc.h
index fffdff20..b8428995 100644
--- a/lib/maps/src/mapsDrawFunc.h
+++ b/lib/maps/src/mapsDrawFunc.h
@@ -94,8 +94,8 @@ static void drawMapWidgets()
     mapHeight = MAP_HEIGHT;
 
 
-  int toolBarOffset = 0;
-  int toolBarSpace = 0;
+  uint8_t toolBarOffset = 0;
+  uint8_t toolBarSpace = 0;
   #ifdef LARGE_SCREEN
     toolBarOffset = 100;
     toolBarSpace = 60;
diff --git a/lib/maps/src/renderMaps.cpp b/lib/maps/src/renderMaps.cpp
index ca28d0dc..fe8ef46a 100644
--- a/lib/maps/src/renderMaps.cpp
+++ b/lib/maps/src/renderMaps.cpp
@@ -7,9 +7,6 @@
  */
 
 #include "renderMaps.hpp"
-#include "mapsDrawFunc.h"
-
-extern const int SD_CS;
 
 MapTile oldMapTile = {(char*)"", 0, 0, 0};     // Old Map tile coordinates and zoom
 MapTile currentMapTile = {(char*)"", 0, 0, 0}; // Current Map tile coordinates and zoom
@@ -20,8 +17,6 @@ bool isMapFound = false;
 
 tileBounds totalBounds = { 90.0, -90.0, 180.0, -180.0}; 
 
-
-
 /**
  * @brief Tile size for position calculation
  *
@@ -172,9 +167,6 @@ void generateRenderMap()
   if (strcmp(currentMapTile.file, oldMapTile.file) != 0 || currentMapTile.zoom != oldMapTile.zoom || 
              currentMapTile.tilex != oldMapTile.tilex || currentMapTile.tiley != oldMapTile.tiley)
   {
-    // deleteMapScrSprites();
-    // createMapScrSprites();
-
     isMapFound  = mapTempSprite.drawPngFile(SD, currentMapTile.file, tileSize, tileSize);
 
     if (!isMapFound)
diff --git a/lib/maps/src/renderMaps.hpp b/lib/maps/src/renderMaps.hpp
index 677ed4a7..e225b12b 100644
--- a/lib/maps/src/renderMaps.hpp
+++ b/lib/maps/src/renderMaps.hpp
@@ -9,11 +9,7 @@
 #ifndef RENDERMAPS_HPP
 #define RENDERMAPS_HPP
 
-#include <Arduino.h>
-#include "tft.hpp"
-#include "compass.hpp"
 #include "settings.hpp"
-#include "globalMapsDef.h"
 #include "mapsDrawFunc.h"
 
 /**
@@ -45,8 +41,6 @@ tileBounds getTileBounds(uint32_t tileX, uint32_t tileY, uint8_t zoom);
 bool isCoordInBounds(double lat, double lon, tileBounds bound);
 void coords2map(double lat, double lon, tileBounds bound, int *pixelX, int *pixelY);
 MapTile getMapTile(double lon, double lat, uint8_t zoomLevel, int16_t offsetX, int16_t offsetY);
-void drawMapWidgets();
 void generateRenderMap();
-void initSD();
 
 #endif
diff --git a/lib/maps/src/vectorMaps.hpp b/lib/maps/src/vectorMaps.hpp
index a17d78ab..2fa746d6 100644
--- a/lib/maps/src/vectorMaps.hpp
+++ b/lib/maps/src/vectorMaps.hpp
@@ -9,17 +9,10 @@
 #ifndef VECTORMAPS_HPP
 #define VECTORMAPS_HPP
 
-#include <SPI.h>
-#include <SD.h>
 #include <StreamUtils.h>
-#include <string>
-#include <stdint.h>
 #include <vector>
-#include <array>
-#include <math.h>
 #include <map>
 #include "globalMapsDef.h"
-#include "tft.hpp"
 #include "gpsMath.hpp"
 #include "settings.hpp"
 
diff --git a/lib/power/power.hpp b/lib/power/power.hpp
index bc9e7db0..3c421a4d 100644
--- a/lib/power/power.hpp
+++ b/lib/power/power.hpp
@@ -19,8 +19,6 @@
 #include "lvgl.h"
 #include "globalGuiDef.h"
 
-// void powerOn();
-
 class Power
 {
 private:
diff --git a/lib/settings/settings.cpp b/lib/settings/settings.cpp
index 315f3bfa..dbf380c3 100644
--- a/lib/settings/settings.cpp
+++ b/lib/settings/settings.cpp
@@ -116,15 +116,6 @@ void loadPreferences()
 
   battery.setBatteryLevels(cfg.getFloat(PKEYS::KVMAX_BATT,4.2),cfg.getFloat(PKEYS::KVMIN_BATT,3.6));
 
-  // compassPosX = 60;
-  // compassPosY = 82;
-  // coordPosX = 66;
-  // coordPosY = 29;
-  // altitudePosX = 8;
-  // altitudePosY = 293;
-  // speedPosX = 1;
-  // speedPosY = 337;
-
   printSettings();
 }
 
diff --git a/lib/storage/storage.cpp b/lib/storage/storage.cpp
index faaa39d1..df920ad6 100644
--- a/lib/storage/storage.cpp
+++ b/lib/storage/storage.cpp
@@ -7,14 +7,12 @@
  */
 
 #include "storage.hpp"
-#include "esp_err.h"
-#include "esp_spiffs.h"
 
 // Pin definitions (should be configurable if needed)
-extern const int SD_CS;
-extern const int SD_MISO;
-extern const int SD_MOSI;
-extern const int SD_CLK;
+extern const uint8_t SD_CS;
+extern const uint8_t SD_MISO;
+extern const uint8_t SD_MOSI;
+extern const uint8_t SD_CLK;
 
 Storage::Storage() : isSdLoaded(false) {}
 
diff --git a/lib/storage/storage.hpp b/lib/storage/storage.hpp
index aa42897a..b6e88cba 100644
--- a/lib/storage/storage.hpp
+++ b/lib/storage/storage.hpp
@@ -10,9 +10,8 @@
 #define STORAGE_HPP
 
 #include "esp_spiffs.h"
+#include "esp_err.h"
 #include <SD.h>
-#include <LovyanGFX.hpp>
-#include <tft.hpp>
 
 class Storage
 {
@@ -25,7 +24,6 @@ class Storage
 
     void initSD();
     esp_err_t initSPIFFS();
-
     bool getSdLoaded() const;
 };
 
diff --git a/lib/tasks/tasks.cpp b/lib/tasks/tasks.cpp
index fe654cc3..37296df7 100644
--- a/lib/tasks/tasks.cpp
+++ b/lib/tasks/tasks.cpp
@@ -7,8 +7,6 @@
  */
 
 #include "tasks.hpp"
-#include "Arduino.h"
-#include "freertos/FreeRTOS.h"
 
 TaskHandle_t LVGLTaskHandler;
 xSemaphoreHandle gpsMutex;
diff --git a/lib/tasks/tasks.hpp b/lib/tasks/tasks.hpp
index 0283d7d0..df460316 100644
--- a/lib/tasks/tasks.hpp
+++ b/lib/tasks/tasks.hpp
@@ -24,6 +24,10 @@
 
 void gpsTask(void *pvParameters);
 void initGpsTask();
-void initCLITask();
+
+#ifndef DISABLE_CLI
+    void cliTask(void *param);
+    void initCLITask();
+#endif
 
 #endif
diff --git a/lib/tft/tft.cpp b/lib/tft/tft.cpp
index 9df780ca..565fb761 100644
--- a/lib/tft/tft.cpp
+++ b/lib/tft/tft.cpp
@@ -14,12 +14,6 @@ uint16_t TFT_WIDTH = 0;
 uint16_t TFT_HEIGHT = 0;
 bool waitScreenRefresh = false;
 
-#ifdef TDECK_ESP32S3 
-  extern const uint8_t TFT_SPI_BL;
-#endif
-
-
-
 /**
  * @brief Turn on TFT Sleep Mode for ILI9488
  *

From e13d5cf018c1afeaa8e675d2ba00c044c8838cd3 Mon Sep 17 00:00:00 2001
From: jgauchia <jgauchia@gmx.es>
Date: Sun, 24 Nov 2024 12:42:47 +0100
Subject: [PATCH 20/55] fix(webserver): Fix drag an drop upload background and
 file names

---
 lib/webfile/src/webpage.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/webfile/src/webpage.h b/lib/webfile/src/webpage.h
index 99cd6a6c..3b461d81 100644
--- a/lib/webfile/src/webpage.h
+++ b/lib/webfile/src/webpage.h
@@ -219,7 +219,7 @@ function dropped(e)
     formData.append("file" + i, fls[i]); 
   }
   var z = document.getElementById("drag");
-  z.style.backgroundColor = "white";
+  z.style.backgroundColor = "black";
 
   var fileNames = "";
   for (var i = 0; i < fls.length; i++) 

From e9c84cf840e0355d76b291a5529c8fa725a9ae89 Mon Sep 17 00:00:00 2001
From: jgauchia <jgauchia@gmx.es>
Date: Sun, 24 Nov 2024 12:48:37 +0100
Subject: [PATCH 21/55] fix(webfile): Fix file delete message

---
 lib/webfile/src/webpage.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/webfile/src/webpage.h b/lib/webfile/src/webpage.h
index 3b461d81..66963ff8 100644
--- a/lib/webfile/src/webpage.h
+++ b/lib/webfile/src/webpage.h
@@ -175,7 +175,8 @@ function downloadDeleteButton(filename, action)
     xhr.open("GET", urltocall, false);
     xhr.send();
     sessionStorage.setItem("msgStatus",xhr.responseText);
-    _("details").innerHTML = xhr.responseText;
+    _("status").innerHTML = "";
+    _("details").innerHTML = "Deleting file: " + filename;
     document.location.reload(true);   
   }
   if (action == "download") 

From 60cabcb7bb9843bb8b2622c77af574102a99247e Mon Sep 17 00:00:00 2001
From: jgauchia <jgauchia@gmx.es>
Date: Sun, 24 Nov 2024 14:55:49 +0100
Subject: [PATCH 22/55] feat(cli): Add set DST zone CLI command

---
 README.md                          |  1 +
 lib/cli/cli.cpp                    | 62 +++++++++++++++++++++++++--
 lib/gps/timezone.hpp               | 69 ++++++++++++++++--------------
 lib/preferences/preferences-keys.h |  1 +
 lib/settings/settings.cpp          |  8 ++++
 lib/settings/settings.hpp          |  2 +
 platformio.ini                     |  2 +-
 7 files changed, 109 insertions(+), 36 deletions(-)

diff --git a/README.md b/README.md
index a57e1edc..c36cfd39 100644
--- a/README.md
+++ b/README.md
@@ -246,6 +246,7 @@ outnmea:        toggle GPS NMEA output (or Ctrl+C to stop)
 poweroff:       perform a ESP32 deep sleep
 reboot:         perform a ESP32 reboot
 scshot:         screenshot to SD or sending a PC
+setdstzone:     set DST (Daylight Saving Time zone: NONE, EU or USA)
 waypoint:       waypoint utilities
 webfile:        enable/disable Web file server
 wipe:           wipe preferences to factory default
diff --git a/lib/cli/cli.cpp b/lib/cli/cli.cpp
index ebf19034..55895c8d 100644
--- a/lib/cli/cli.cpp
+++ b/lib/cli/cli.cpp
@@ -22,15 +22,25 @@ const char logo[] =
 ""
 ;
 
+/**
+ * @brief Reboot ESP
+ */
 void wcli_reboot(char *args, Stream *response)
 {
   ESP.restart();
 }
 
-void wcli_poweroff(char *args, Stream *response) {
+/**
+ * @brief ESP Deep Sleep/shutdown
+ */
+void wcli_poweroff(char *args, Stream *response)
+{
   deviceShutdown();
 }
 
+/**
+ * @brief Display device info
+ */
 void wcli_info(char *args, Stream *response)
 {
   setlocale(LC_NUMERIC, "");
@@ -62,6 +72,9 @@ void wcli_info(char *args, Stream *response)
   response->printf("GPS Rx GPIO:\t: %i\r\n",GPS_RX);
 }
 
+/**
+ * @brief Clear user settings
+ */
 void wcli_swipe(char *args, Stream *response)
 {
   Pair<String, String> operands = wcli.parseCommand(args);
@@ -72,11 +85,17 @@ void wcli_swipe(char *args, Stream *response)
   response->println("done");
 }
 
+/**
+ * @brief Clear CLI console
+ */
 void wcli_clear(char *args, Stream *response)
 {
   wcli.shell->clear();
 }
 
+/**
+ * @brief Take a screenshot
+ */
 void wcli_scshot(char *args, Stream *response)
 {
   Pair<String, String> operands = wcli.parseCommand(args);
@@ -143,6 +162,9 @@ void wcli_kset(char *args, Stream *response)
   }
 }
 
+/**
+ * @brief Waypoint list, download or delete
+ */
 void wcli_waypoint(char *args, Stream *response)
 {
   Pair<String, String> operands = wcli.parseCommand(args);
@@ -267,11 +289,19 @@ void wcli_waypoint(char *args, Stream *response)
   }
 }
 
-void wcli_outnmea (char *args, Stream *response){
+/**
+ * @brief Output NMEA sentences in CLI
+ */
+void wcli_outnmea (char *args, Stream *response)
+{
     nmea_output_enable = !nmea_output_enable;
 }
 
-void wcli_abort_handler () {
+/**
+ * @brief Cancel NMEA Output
+ */
+void wcli_abort_handler () 
+{
   if (nmea_output_enable) {
     nmea_output_enable = false;
     delay(100);
@@ -279,6 +309,9 @@ void wcli_abort_handler () {
   } 
 }
 
+/**
+ * @brief Webfile server enable/disable option
+ */
 void wcli_webfile(char *args, Stream *response)
 {
   Pair<String, String> operands = wcli.parseCommand(args);
@@ -305,6 +338,25 @@ void wcli_webfile(char *args, Stream *response)
   }
 }
 
+/**
+ * @brief Set DST (daylight saving time) zone EU or USA
+ */
+void wcli_setdst(char *args, Stream *response)
+{
+  Pair<String, String> operands = wcli.parseCommand(args);
+  String commands = operands.first();
+  if (commands.isEmpty())
+    response->println(F("missing parameter use: setdstzone \033[1;32mNONE/EU/USA\033[0;37m"));
+  else
+  {
+    commands.toUpperCase();
+    if(commands.equals("NONE") || commands.equals("EU") || commands.equals("USA") )
+      cfg.saveAuto("defDST",commands);
+    else
+      response->println(F("wrong parameter use: \033[1;32mNONE/EU/USA\033[0;37m"));
+  }
+}
+
 void initRemoteShell()
 {
 #ifndef DISABLE_CLI_TELNET 
@@ -312,7 +364,8 @@ void initRemoteShell()
 #endif
 }
 
-void initShell(){
+void initShell()
+{
   wcli.shell->attachLogo(logo);
   wcli.setSilentMode(true);
   // Main Commands:
@@ -327,6 +380,7 @@ void initShell(){
   wcli.add("klist", &wcli_klist, "\t\tlist of user preferences. ('all' param show all)");
   wcli.add("kset", &wcli_kset, "\t\tset an user extra preference");
   wcli.add("outnmea", &wcli_outnmea, "\ttoggle GPS NMEA output (or Ctrl+C to stop)");
+  wcli.add("setdstzone", &wcli_setdst, "\tset DST (Daylight Saving Time zone: NONE, EU or USA)");
   wcli.shell->overrideAbortKey(&wcli_abort_handler);
   wcli.begin("IceNav");
 }
diff --git a/lib/gps/timezone.hpp b/lib/gps/timezone.hpp
index a380b818..14e12c07 100644
--- a/lib/gps/timezone.hpp
+++ b/lib/gps/timezone.hpp
@@ -10,33 +10,22 @@
 #define TIMEZONE_HPP
 
 extern int32_t defGMT;          // Default GMT offset
+extern String defDST;           // Default DST zone
+extern bool calculateDST;       // Calculate DST flag
 
-// Uncomment one DST changeover rule, or define your own:
+//  Calculate DST changeover times once per reset and year!
+static NeoGPS::time_t  changeover;
+static NeoGPS::clock_t springForward, fallBack;
 
-//#define USA_DST
-#define EU_DST
-
-#if defined(USA_DST)
-  static const uint8_t springMonth =  3;
-  static const uint8_t springDate  = 14; // latest 2nd Sunday
-  static const uint8_t springHour  =  2;
-  static const uint8_t fallMonth   = 11;
-  static const uint8_t fallDate    =  7; // latest 1st Sunday
-  static const uint8_t fallHour    =  2;
-  #define CALCULATE_DST
-
-#elif defined(EU_DST)
-  static const uint8_t springMonth =  3;
-  static const uint8_t springDate  = 31; // latest last Sunday
-  static const uint8_t springHour  =  2;
-  static const uint8_t fallMonth   = 10;
-  static const uint8_t fallDate    = 31; // latest last Sunday
-  static const uint8_t fallHour    =  1;
-  #define CALCULATE_DST
-#endif
+static uint8_t springMonth =  0;
+static uint8_t springDate  =  0; // latest last Sunday
+static uint8_t springHour  =  0;
+static uint8_t fallMonth   =  0;
+static uint8_t fallDate    =  0; // latest last Sunday
+static uint8_t fallHour    =  0;
 
 /**
- * @brief Update notify bar event
+ * @brief Adjust Time (GMT and DST)
  *
  * @param dt -> GPS Time
  */
@@ -49,12 +38,29 @@ static void adjustTime( NeoGPS::time_t & dt )
   static const NeoGPS::clock_t  zone_offset = (int32_t)defGMT * NeoGPS::SECONDS_PER_HOUR +
                                               zone_minutes * NeoGPS::SECONDS_PER_MINUTE;
 
-  #ifdef CALCULATE_DST
-    //  Calculate DST changeover times once per reset and year!
-    static NeoGPS::time_t  changeover;
-    static NeoGPS::clock_t springForward, fallBack;
+  if (calculateDST)
+  {
+    if (defDST.equals("USA"))
+    {
+      springMonth =  3;
+      springDate  = 14; // latest 2nd Sunday
+      springHour  =  2;
+      fallMonth   = 11;
+      fallDate    =  7; // latest 1st Sunday
+      fallHour    =  2;
+    }
+    if (defDST.equals("EU"))
+    {
+      springMonth =  3;
+      springDate  = 31; // latest last Sunday
+      springHour  =  2;
+      fallMonth   = 10;
+      fallDate    = 31; // latest last Sunday
+      fallHour    =  1;
+    }
 
-    if ((springForward == 0) || (changeover.year != dt.year)) {
+    if ((springForward == 0) || (changeover.year != dt.year))
+    {
 
       //  Calculate the spring changeover time (seconds)
       changeover.year    = dt.year;
@@ -77,16 +83,17 @@ static void adjustTime( NeoGPS::time_t & dt )
       changeover.date -= (changeover.day - NeoGPS::time_t::SUNDAY);
       fallBack = (NeoGPS::clock_t) changeover;
     }
-  #endif
+  }
 
   //  First, offset from UTC to the local timezone
   seconds += zone_offset;
 
-  #ifdef CALCULATE_DST
+  if (calculateDST)
+  {
     //  Then add an hour if DST is in effect
     if ((springForward <= seconds) && (seconds < fallBack))
       seconds += NeoGPS::SECONDS_PER_HOUR;
-  #endif
+  }
 
   dt = seconds; // convert seconds back to a date/time structure
 
diff --git a/lib/preferences/preferences-keys.h b/lib/preferences/preferences-keys.h
index 09a1d110..6adddf0e 100644
--- a/lib/preferences/preferences-keys.h
+++ b/lib/preferences/preferences-keys.h
@@ -19,6 +19,7 @@
   X(KGPS_SPEED, "GPS_speed", SHORT)      \
   X(KGPS_RATE, "GPS_rate", SHORT)        \
   X(KWEB_FILE, "Web_file", BOOL)         \
+  X(KDST_ZONE, "defDST", STRING)         \
   X(KUSER, "-----", UNKNOWN)             \
   X(KDEF_ZOOM, "defZoom", UINT)          \
   X(KGPS_TX, "gpsTX", UINT)              \
diff --git a/lib/settings/settings.cpp b/lib/settings/settings.cpp
index 7a797369..2aa5697c 100644
--- a/lib/settings/settings.cpp
+++ b/lib/settings/settings.cpp
@@ -51,6 +51,8 @@ uint16_t speedPosY = 0;       // Speed widget position Y
 bool enableWeb = true;        // Enable/disable web file server
 bool showToolBar = false;     // Show Map Toolbar
 int8_t tempOffset = 0;        // BME Temperature offset
+String defDST = "NONE";       // default DST zone
+bool calculateDST = false;    // Calculate DST flag
 // float batteryMax = 0.0;       // 4.2;      // maximum voltage of battery
 // float batteryMin = 0.0;       // 3.6;      // minimum voltage of battery before shutdown
 
@@ -126,6 +128,12 @@ void loadPreferences()
   // speedPosX = 1;
   // speedPosY = 337;
 
+  defDST = cfg.getString(PKEYS::KDST_ZONE, "EU");
+  if (defDST.equals("NONE"))
+    calculateDST = false;
+  else
+    calculateDST = true;
+
   printSettings();
 }
 
diff --git a/lib/settings/settings.hpp b/lib/settings/settings.hpp
index f4b64b36..9bd16196 100644
--- a/lib/settings/settings.hpp
+++ b/lib/settings/settings.hpp
@@ -45,6 +45,8 @@ extern uint16_t speedPosX;    // Speed widget position X
 extern uint16_t speedPosY;    // Speed widget position Y
 extern bool enableWeb;        // Enable/disable web file server
 extern int8_t tempOffset;     // BME Temperature offset
+extern String defDST;         // default DST zone
+extern bool calculateDST;     // Calculate DST flag
 
 void loadPreferences();
 void saveMapRotation(bool zoomRotation);
diff --git a/platformio.ini b/platformio.ini
index 0c321b26..742e855d 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -34,7 +34,7 @@ build_flags =
   -D SHELLMINATOR_BUFF_DIM=70
   -D SHELLMINATOR_LOGO_COLOR=BLUE
   -D COMMANDER_MAX_COMMAND_SIZE=70
-  -D WCLI_MAX_CMDS=12           # set n+1 of defined commands for CLI
+  -D WCLI_MAX_CMDS=13           # set n+1 of defined commands for CLI
   ; -D DISABLE_CLI_TELNET=1     # disable remote access via telnet. It needs CLI
   ; -D DISABLE_CLI=1            # removed CLI module. Config via Bluetooth only
 

From 373f4ec40c95082b1d71165b8b6384f0938db691 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jordi=20Gauch=C3=ADa?= <jgauchia@gmx.es>
Date: Sun, 24 Nov 2024 15:08:16 +0100
Subject: [PATCH 23/55] Update cli.cpp

---
 lib/cli/cli.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/cli/cli.cpp b/lib/cli/cli.cpp
index 4a61fa2a..e0be1bd6 100644
--- a/lib/cli/cli.cpp
+++ b/lib/cli/cli.cpp
@@ -37,7 +37,7 @@ void wcli_reboot(char *args, Stream *response)
  */
 void wcli_poweroff(char *args, Stream *response)
 {
-  deviceShutdown();
+  power.deviceShutdown();
 }
 
 /**

From dc0cc6f83e7b61e629f0473de2b6ac0b7f91ef0c Mon Sep 17 00:00:00 2001
From: jgauchia <jgauchia@gmx.es>
Date: Mon, 25 Nov 2024 19:57:44 +0100
Subject: [PATCH 24/55] feat(webserver): Add folder upload

---
 lib/webfile/src/webpage.h   | 142 ++++++++++++++++++++++++++----------
 lib/webfile/src/webserver.h |  48 ++++++++++++
 2 files changed, 150 insertions(+), 40 deletions(-)

diff --git a/lib/webfile/src/webpage.h b/lib/webfile/src/webpage.h
index 66963ff8..641770cd 100644
--- a/lib/webfile/src/webpage.h
+++ b/lib/webfile/src/webpage.h
@@ -93,6 +93,8 @@ const char index_html[] PROGMEM = R"rawliteral(
             background-color:  black;
             border: 1px solid #aaaaaa;
             text-align: center;
+            overflow-y: auto; 
+            overflow-x: hidden; 
           }    
   </style>
 
@@ -100,11 +102,11 @@ const char index_html[] PROGMEM = R"rawliteral(
 
 <body onload="refresh()">
 
-    <style>
-      body {
-             background-color: black;
-           }
-    </style>
+<style>
+  body {
+          background-color: black;
+        }
+</style>
 
   <img src="logo">
 
@@ -122,7 +124,7 @@ const char index_html[] PROGMEM = R"rawliteral(
   <p class="p3" id="details"></p>
 
 <script>
-
+{
 function _(el)
 {
   return document.getElementById(el);
@@ -200,6 +202,27 @@ function changeDirectory(directory)
   _("details").innerHTML = xhr.responseText;
 }
 
+function uploadButton() 
+{
+  _("detailsheader").innerHTML = "<h3>Upload File(s)</h3>"
+  _("status").innerHTML = "";
+
+  var uploadform =
+  "<form id=\"upload_form\" enctype=\"multipart/form-data\" method=\"post\">" +
+  "<div id=\"drag\"><h3 id=\"filetext\">Drag to upload file</h3></div>" + 
+  "<progress id=\"progressBar\" value=\"0\" max=\"100\" style=\"width:372px;\"></progress>" +
+  "<h3 id=\"status\"></h3>" +
+  "<p id=\"loaded_n_total\"></p>" +
+  "</form>";
+  
+  _("details").innerHTML = uploadform;
+
+  var z = _("drag");
+  z.addEventListener("dragenter", dragged, false);
+  z.addEventListener("dragover", dragged, false);
+  z.addEventListener("drop", dropped, false);
+}
+
 function dragged(e) 
 {  
   var z = _("drag");
@@ -212,51 +235,88 @@ function dragged(e)
 function dropped(e) 
 {
   dragged(e);
-  var fls = e.dataTransfer.files;
+  var dt = e.dataTransfer;
+  var items = dt.items;
+  var n = 0, uploads = [];
   var formData = new FormData();
-
-  for (var i = 0; i < fls.length; i++) 
-  {
-    formData.append("file" + i, fls[i]); 
-  }
-  var z = document.getElementById("drag");
-  z.style.backgroundColor = "black";
-
   var fileNames = "";
-  for (var i = 0; i < fls.length; i++) 
-  {
-    fileNames += fls[i].name + (i < fls.length - 1 ? ", " : ""); 
-  }
-  z.textContent = fileNames;
 
   var xhr = new XMLHttpRequest();
   xhr.upload.addEventListener("progress", progressHandler, false);
   xhr.addEventListener("load", completeHandler, false); 
   xhr.addEventListener("error", errorHandler, false);
   xhr.addEventListener("abort", abortHandler, false);
-  xhr.open("POST", "/");
-  xhr.send(formData);   
-}
 
-function uploadButton() 
-{
-  _("detailsheader").innerHTML = "<h3>Upload File(s)</h3>"
-  _("status").innerHTML = "";
+  function processFiles(files)
+  {
+    for (file of files)
+    {
+      if (file.webkitRelativePath === "")
+      {
+        formData.append("file[]", file, file.name);
+        fileNames += file.name + ", "; 
+      }
+      else
+      {
+        formData.append("file[]", file, file.webkitRelativePath);
+        fileNames += file.webkitRelativePath + ", "; 
+      }
+    }
+    var z = document.getElementById("drag");
+    z.style.backgroundColor = "black";
+    z.textContent = fileNames;
 
-  var uploadform =
-  "<form id=\"upload_form\" enctype=\"multipart/form-data\" method=\"post\">" +
-  "<div id=\"drag\"><h3 id=\"filetext\">Drag to upload file</h3></div>" + 
-  "<progress id=\"progressBar\" value=\"0\" max=\"100\" style=\"width:372px;\"></progress>" +
-  "<h3 id=\"status\"></h3>" +
-  "<p id=\"loaded_n_total\"></p>" +
-  "</form>";
-  
-  _("details").innerHTML = uploadform;
+    xhr.open("POST", "/");
+    xhr.send(formData);
+  }
 
-  var z = _("drag");
-  z.addEventListener("dragenter", dragged, false);
-  z.addEventListener("dragover", dragged, false);
-  z.addEventListener("drop", dropped, false);
+  function traverseFileTree(item, path)
+  {
+    var handleFiles = function handleFiles(item, path) 
+    {
+      path = path || "";
+      if (item.isFile) 
+      {
+        item.file(function(file) 
+        {
+          uploads.push(file); // file exist, but don't append
+          // console.log(file, n, uploads.length); // show info
+          // if (uploads.length === n - 1 || n === 0) 
+          {
+            var files = uploads.slice(0);
+            n = uploads.length = 0;
+            processFiles(files)
+          } 
+        });
+      } 
+      else if (item.isDirectory) 
+      {
+        var dirReader = item.createReader();
+        dirReader.readEntries(function(entries) 
+        {
+          n += entries.length;
+          for (var i = 0; i < entries.length; i++) {
+            handleFiles(entries[i], path + item.name + "/");
+          }
+        });
+      }
+    }
+    handleFiles(item, path);
+  }
+
+  if (n !== 0 && uploads.length !== 0) 
+  {
+    n = uploads.length = 0;
+  }
+
+  for (var i = 0; i < items.length; i++) 
+  {
+    var item = items[i].webkitGetAsEntry();
+    if (item) 
+    {
+      traverseFileTree(item, "", i);
+    }
+  }
 }
 
 function progressHandler(event) 
@@ -296,6 +356,8 @@ function abortHandler(event)
 {
   _("status").innerHTML = "inUpload Aborted";
 }
+
+}
 </script>
 
 </body>
diff --git a/lib/webfile/src/webserver.h b/lib/webfile/src/webserver.h
index a27abb39..286be7a6 100644
--- a/lib/webfile/src/webserver.h
+++ b/lib/webfile/src/webserver.h
@@ -19,6 +19,10 @@ String oldDir;
 String newDir;
 String currentDir;
 
+
+String createDir;
+uint8_t nextSlash = 0;
+
 bool updateList = true;
 
 const int FILES_PER_PAGE = 10; 
@@ -298,6 +302,37 @@ String listFiles(bool ishtml, int page = 0)
   return returnText;
 }
 
+/**
+ * @brief Create directories if needed for upload
+ * 
+ * @param filepath -> Full file path 
+ * @return true/false if successful
+ */
+bool createDirectories(String filepath)
+{
+  uint8_t lastSlash = 0;
+  while (true) 
+  {
+    nextSlash = filepath.indexOf('/', lastSlash + 1);
+    String dir = filepath.substring(0, nextSlash);
+        
+    if (!SD.exists(oldDir + "/" + dir))
+    {
+      if (!SD.mkdir(oldDir + "/" + dir))
+      {
+        log_e("Directory %s creation error", dir.c_str());
+        return false;
+      }
+      log_v("Directory %s created",dir.c_str());
+    }
+    if (nextSlash == 255) break;
+    lastSlash = nextSlash;
+
+    esp_task_wdt_reset();
+  }
+  return true;
+}
+
 /**
  * @brief Upload file handle
  * 
@@ -310,12 +345,25 @@ String listFiles(bool ishtml, int page = 0)
 void handleUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final)
 {
   waitScreenRefresh = true;
+  uint8_t lastSlashIndex = filename.lastIndexOf("/");
+  
+  if (lastSlashIndex != -1) 
+  {
+    String path = filename.substring(0, lastSlashIndex);
+    if (createDir != path)
+    {
+      if (!createDirectories(path))
+        log_e("Directory creation error");
+      createDir = path;
+    }
+  } 
 
   if (!index)
   {
     request->client()->setRxTimeout(15000);
     request->_tempFile = SD.open(oldDir + "/" + filename, "w");
   }
+
   if (len)
     request->_tempFile.write(data, len);
 

From f2a2581eec142556c6c73e8b29f6d759c2229f38 Mon Sep 17 00:00:00 2001
From: jgauchia <jgauchia@gmx.es>
Date: Mon, 25 Nov 2024 20:15:11 +0100
Subject: [PATCH 25/55] fix(webserver): Fix single file upload

---
 lib/webfile/src/webserver.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/webfile/src/webserver.h b/lib/webfile/src/webserver.h
index 286be7a6..f80b4084 100644
--- a/lib/webfile/src/webserver.h
+++ b/lib/webfile/src/webserver.h
@@ -347,16 +347,19 @@ void handleUpload(AsyncWebServerRequest *request, String filename, size_t index,
   waitScreenRefresh = true;
   uint8_t lastSlashIndex = filename.lastIndexOf("/");
   
-  if (lastSlashIndex != -1) 
+  if (lastSlashIndex != 255) 
   {
     String path = filename.substring(0, lastSlashIndex);
     if (createDir != path)
     {
+      log_v("%s",path.c_str());
       if (!createDirectories(path))
         log_e("Directory creation error");
       createDir = path;
     }
   } 
+  
+  log_v("%s", filename.c_str());
 
   if (!index)
   {

From bed83a32a0ad5bd20396e71e0723c7b2490743a1 Mon Sep 17 00:00:00 2001
From: jgauchia <jgauchia@gmx.es>
Date: Tue, 26 Nov 2024 19:56:04 +0100
Subject: [PATCH 26/55] feat(webserver): Add folder delete button

---
 lib/webfile/src/webpage.h   |  9 +++++
 lib/webfile/src/webserver.h | 71 ++++++++++++++++++++++++++++++++++++-
 2 files changed, 79 insertions(+), 1 deletion(-)

diff --git a/lib/webfile/src/webpage.h b/lib/webfile/src/webpage.h
index 641770cd..75066b7f 100644
--- a/lib/webfile/src/webpage.h
+++ b/lib/webfile/src/webpage.h
@@ -181,6 +181,15 @@ function downloadDeleteButton(filename, action)
     _("details").innerHTML = "Deleting file: " + filename;
     document.location.reload(true);   
   }
+  if (action == "deldir")
+  {
+    xhr.open("GET", urltocall, false);
+    xhr.send();
+    sessionStorage.setItem("msgStatus",xhr.responseText);
+    _("status").innerHTML = "";
+    _("details").innerHTML = "Deleting folder: " + filename;
+    document.location.reload(true);   
+  }
   if (action == "download") 
   {
     _("status").innerHTML = "";
diff --git a/lib/webfile/src/webserver.h b/lib/webfile/src/webserver.h
index f80b4084..387a9768 100644
--- a/lib/webfile/src/webserver.h
+++ b/lib/webfile/src/webserver.h
@@ -266,7 +266,9 @@ String listFiles(bool ishtml, int page = 0)
       if (entry.isDirectory) 
       {
         returnText += "<img src=\"folder\"> <a href='#' onclick='changeDirectory(\"" + entry.name + "\")'>" + entry.name + "</a>";
-        returnText += "</td><td style=\"text-align:center\">dir</td><td></td><td></td>";
+        returnText += "</td><td style=\"text-align:center\">dir</td>"; 
+        returnText += "<td></td>";
+        returnText += "<td><button class=\"button\" onclick=\"downloadDeleteButton('" + entry.name + "', 'deldir')\"><img src=\"del\"> Delete</button></td>";
       } 
       else 
       {
@@ -399,6 +401,66 @@ void sendSpiffsImage(const char *imageFile,AsyncWebServerRequest *request)
   free(buffer);
 }
 
+/**
+ * @brief Delete directory recursive
+ * 
+ * @param dirPath -> directory path
+ * @return true/false if successful
+ */
+bool deleteDirRecursive(const char *dirPath)
+{
+  File dir = SD.open(dirPath);
+  if (!dir || !dir.isDirectory())
+  {
+    log_e("Error: %s isn't a directory or can't open", dirPath);
+    return false;
+  }
+
+  while (true) 
+  {
+    File entry = dir.openNextFile();
+    if (!entry)
+      break;
+
+    if (entry.isDirectory()) 
+    {
+      char subDirPath[128]; 
+      snprintf(subDirPath, sizeof(subDirPath), "%s/%s", dirPath, entry.name());
+      
+      if (!deleteDirRecursive(subDirPath)) 
+      {
+        entry.close();
+        return false; 
+      }
+    } 
+    else
+    {
+      char fileName[255];
+      snprintf(fileName, sizeof(fileName), "%s",entry.name());
+      if (!SD.remove(fileName))
+      {
+        log_e("Error deleting file: %s",entry.name());
+        entry.close();
+        return false;
+      }
+      log_v("Deleted file: %s",entry.name());
+    }
+    entry.close(); 
+  }
+
+
+  dir.rewindDirectory();
+  dir.close();
+  if (!SD.rmdir(dirPath)) 
+  {
+    log_e("Error deleting directory: %s",dirPath);
+    return false;
+  }
+
+  log_v("Deleted directory: %s",dirPath);
+  return true;
+}
+
 /**
  * @brief Configure Web Server
  * 
@@ -496,6 +558,13 @@ void configureWebServer()
                     logMessage += " downloaded";
                     request->send(SD, path, "application/octet-stream");
                   }
+                  if (strcmp(fileAction, "deldir") == 0)
+                  {
+                    logMessage += " deleted";
+                    deleteDirRecursive(path.c_str());
+                    request->send(200, "text/plain", "Deleted Folder: " + String(fileName));
+                    updateList = true;
+                  }
                   else if (strcmp(fileAction, "delete") == 0)
                   {
                     logMessage += " deleted";

From 91132b9e9bbcd08d13a10c565ee086de1faabc0b Mon Sep 17 00:00:00 2001
From: jgauchia <jgauchia@gmx.es>
Date: Tue, 26 Nov 2024 20:25:02 +0100
Subject: [PATCH 27/55] fix(webserver): Fix folder upload browser compat.

---
 lib/webfile/src/webpage.h | 84 +++++++++++++++++----------------------
 1 file changed, 37 insertions(+), 47 deletions(-)

diff --git a/lib/webfile/src/webpage.h b/lib/webfile/src/webpage.h
index 75066b7f..05813d25 100644
--- a/lib/webfile/src/webpage.h
+++ b/lib/webfile/src/webpage.h
@@ -243,10 +243,12 @@ function dragged(e)
 
 function dropped(e) 
 {
-  dragged(e);
+  e.preventDefault();
+  e.stopPropagation();
+
   var dt = e.dataTransfer;
   var items = dt.items;
-  var n = 0, uploads = [];
+  var uploads = [];
   var formData = new FormData();
   var fileNames = "";
 
@@ -256,21 +258,14 @@ function dropped(e)
   xhr.addEventListener("error", errorHandler, false);
   xhr.addEventListener("abort", abortHandler, false);
 
-  function processFiles(files)
+  async function processFiles(files) 
   {
-    for (file of files)
+    for (const file of files) 
     {
-      if (file.webkitRelativePath === "")
-      {
-        formData.append("file[]", file, file.name);
-        fileNames += file.name + ", "; 
-      }
-      else
-      {
-        formData.append("file[]", file, file.webkitRelativePath);
-        fileNames += file.webkitRelativePath + ", "; 
-      }
+      formData.append("file[]", file, file.name); 
+      fileNames += file.name + ", ";
     }
+
     var z = document.getElementById("drag");
     z.style.backgroundColor = "black";
     z.textContent = fileNames;
@@ -279,52 +274,47 @@ function dropped(e)
     xhr.send(formData);
   }
 
-  function traverseFileTree(item, path)
+  async function traverseFileTree(item, path = "") 
   {
-    var handleFiles = function handleFiles(item, path) 
-    {
-      path = path || "";
+    return new Promise((resolve) => {
       if (item.isFile) 
       {
-        item.file(function(file) 
-        {
-          uploads.push(file); // file exist, but don't append
-          // console.log(file, n, uploads.length); // show info
-          // if (uploads.length === n - 1 || n === 0) 
-          {
-            var files = uploads.slice(0);
-            n = uploads.length = 0;
-            processFiles(files)
-          } 
+        item.file((file) => {
+          const relativePath = path + file.name;
+          const newFile = new File([file], relativePath, { type: file.type });
+          uploads.push(newFile);
+          resolve();
         });
-      } 
-      else if (item.isDirectory) 
+      } else if (item.isDirectory) 
       {
-        var dirReader = item.createReader();
-        dirReader.readEntries(function(entries) 
-        {
-          n += entries.length;
-          for (var i = 0; i < entries.length; i++) {
-            handleFiles(entries[i], path + item.name + "/");
+        const dirReader = item.createReader();
+        dirReader.readEntries(async (entries) => {
+          for (const entry of entries) {
+            await traverseFileTree(entry, path + item.name + "/");
           }
+          resolve();
         });
       }
-    }
-    handleFiles(item, path);
-  }
-
-  if (n !== 0 && uploads.length !== 0) 
-  {
-    n = uploads.length = 0;
+    });
   }
 
-  for (var i = 0; i < items.length; i++) 
+  async function handleItems(items) 
   {
-    var item = items[i].webkitGetAsEntry();
-    if (item) 
+    const promises = [];
+    for (let i = 0; i < items.length; i++) 
     {
-      traverseFileTree(item, "", i);
+      const item = items[i].webkitGetAsEntry();
+      if (item) 
+      {
+        promises.push(traverseFileTree(item));
+      }
     }
+    await Promise.all(promises);
+    processFiles(uploads);
+  }
+
+  if (items && items.length > 0) {
+    handleItems(items);
   }
 }
 

From 0c6e704a2210c72a5bbe6daabf19ea9b941270f9 Mon Sep 17 00:00:00 2001
From: jgauchia <jgauchia@gmx.es>
Date: Wed, 27 Nov 2024 18:47:26 +0100
Subject: [PATCH 28/55] feat(webserver): Delete folders

---
 lib/webfile/src/webpage.h   |  4 +-
 lib/webfile/src/webserver.h | 90 +++++++++++++++++--------------------
 2 files changed, 45 insertions(+), 49 deletions(-)

diff --git a/lib/webfile/src/webpage.h b/lib/webfile/src/webpage.h
index 05813d25..c7689b9b 100644
--- a/lib/webfile/src/webpage.h
+++ b/lib/webfile/src/webpage.h
@@ -170,10 +170,11 @@ function listFilesButton()
 
 function downloadDeleteButton(filename, action) 
 {
-  var urltocall = "/file?name=/" + filename + "&action=" + action;
+  var urltocall = "";
   xhr = new XMLHttpRequest();
   if (action == "delete")
   {
+    urltocall = "/file?name=/" + filename + "&action=" + action;
     xhr.open("GET", urltocall, false);
     xhr.send();
     sessionStorage.setItem("msgStatus",xhr.responseText);
@@ -183,6 +184,7 @@ function downloadDeleteButton(filename, action)
   }
   if (action == "deldir")
   {
+    urltocall = "/file?name=" + filename + "&action=" + action;
     xhr.open("GET", urltocall, false);
     xhr.send();
     sessionStorage.setItem("msgStatus",xhr.responseText);
diff --git a/lib/webfile/src/webserver.h b/lib/webfile/src/webserver.h
index 387a9768..41c81bdd 100644
--- a/lib/webfile/src/webserver.h
+++ b/lib/webfile/src/webserver.h
@@ -361,8 +361,6 @@ void handleUpload(AsyncWebServerRequest *request, String filename, size_t index,
     }
   } 
   
-  log_v("%s", filename.c_str());
-
   if (!index)
   {
     request->client()->setRxTimeout(15000);
@@ -409,56 +407,57 @@ void sendSpiffsImage(const char *imageFile,AsyncWebServerRequest *request)
  */
 bool deleteDirRecursive(const char *dirPath)
 {
-  File dir = SD.open(dirPath);
-  if (!dir || !dir.isDirectory())
-  {
-    log_e("Error: %s isn't a directory or can't open", dirPath);
-    return false;
-  }
+   String basePath = (String)dirPath;
 
-  while (true) 
-  {
-    File entry = dir.openNextFile();
-    if (!entry)
-      break;
+    File dir = SD.open(dirPath);
+    if (!dir || !dir.isDirectory())
+    {
+        log_e("Error: %s isn't a directory or can't open", dirPath);
+        return false;
+    }
 
-    if (entry.isDirectory()) 
+    while (true)
     {
-      char subDirPath[128]; 
-      snprintf(subDirPath, sizeof(subDirPath), "%s/%s", dirPath, entry.name());
-      
-      if (!deleteDirRecursive(subDirPath)) 
-      {
+        File entry = dir.openNextFile();
+        if (!entry)
+            break;
+
+        if (entry.isDirectory())
+        {
+            String subDirPath = basePath + "/" + entry.name();
+            log_v("New directory found: %s", subDirPath.c_str());
+            if (!deleteDirRecursive(subDirPath.c_str()))
+            {
+                entry.close();
+                return false;
+            }
+        }
+        else
+        {
+            if (!SD.remove(basePath + "/" + entry.name()))
+            {
+                log_e("Error deleting file: %s", entry.name());
+                entry.close();
+                return false;
+            }
+            log_v("Deleted file: %s/%s", basePath.c_str(), entry.name());
+        }
         entry.close();
-        return false; 
-      }
-    } 
-    else
+    }
+
+    esp_task_wdt_reset();
+
+    dir.close();
+
+    if (!SD.rmdir(basePath))
     {
-      char fileName[255];
-      snprintf(fileName, sizeof(fileName), "%s",entry.name());
-      if (!SD.remove(fileName))
-      {
-        log_e("Error deleting file: %s",entry.name());
-        entry.close();
+        log_e("Error deleting directory: %s", basePath.c_str());
         return false;
-      }
-      log_v("Deleted file: %s",entry.name());
     }
-    entry.close(); 
-  }
-
 
-  dir.rewindDirectory();
-  dir.close();
-  if (!SD.rmdir(dirPath)) 
-  {
-    log_e("Error deleting directory: %s",dirPath);
-    return false;
-  }
+    log_v("Deleted directory: %s", basePath.c_str());
+    return true;
 
-  log_v("Deleted directory: %s",dirPath);
-  return true;
 }
 
 /**
@@ -468,11 +467,6 @@ bool deleteDirRecursive(const char *dirPath)
 void configureWebServer()
 {
 
-  //  if (!MDNS.begin(hostname))       
-  //   log_e("nDNS init error");
-
-  //  log_i("mDNS initialized");
-
   server.onNotFound(webNotFound);
   server.onFileUpload(handleUpload);
   oldDir = "/";

From e411138837f825ed40ee69b6fc81ae86d7fba738 Mon Sep 17 00:00:00 2001
From: jgauchia <jgauchia@gmx.es>
Date: Wed, 27 Nov 2024 20:16:58 +0100
Subject: [PATCH 29/55] fix(webserver): Fix delete folder

---
 lib/webfile/src/webserver.h | 92 +++++++++++++++++++++----------------
 1 file changed, 53 insertions(+), 39 deletions(-)

diff --git a/lib/webfile/src/webserver.h b/lib/webfile/src/webserver.h
index 41c81bdd..0e730e3f 100644
--- a/lib/webfile/src/webserver.h
+++ b/lib/webfile/src/webserver.h
@@ -407,57 +407,71 @@ void sendSpiffsImage(const char *imageFile,AsyncWebServerRequest *request)
  */
 bool deleteDirRecursive(const char *dirPath)
 {
-   String basePath = (String)dirPath;
+  String basePath = dirPath;
 
-    File dir = SD.open(dirPath);
-    if (!dir || !dir.isDirectory())
+  log_v("Processing directory: %s", basePath.c_str());
+
+  File dir = SD.open(basePath.c_str());
+  if (!dir || !dir.isDirectory())
+  {
+    log_e("Error: %s isn't a directory or can't open", basePath.c_str());
+    return false;
+  }
+
+  while (true)
+  {
+    File entry = dir.openNextFile();
+    if (!entry)
     {
-        log_e("Error: %s isn't a directory or can't open", dirPath);
-        return false;
+      break; 
     }
 
-    while (true)
+    if (!basePath.endsWith("/"))
     {
-        File entry = dir.openNextFile();
-        if (!entry)
-            break;
-
-        if (entry.isDirectory())
-        {
-            String subDirPath = basePath + "/" + entry.name();
-            log_v("New directory found: %s", subDirPath.c_str());
-            if (!deleteDirRecursive(subDirPath.c_str()))
-            {
-                entry.close();
-                return false;
-            }
-        }
-        else
-        {
-            if (!SD.remove(basePath + "/" + entry.name()))
-            {
-                log_e("Error deleting file: %s", entry.name());
-                entry.close();
-                return false;
-            }
-            log_v("Deleted file: %s/%s", basePath.c_str(), entry.name());
-        }
-        entry.close();
+      basePath += "/";
     }
 
-    esp_task_wdt_reset();
-
-    dir.close();
+    String entryPath = basePath + entry.name(); 
 
-    if (!SD.rmdir(basePath))
+    if (entry.isDirectory())
+    {
+        
+      log_v("Found subdirectory: %s", entryPath.c_str());
+      if (!deleteDirRecursive(entryPath.c_str()))
+      {
+        entry.close();
+        return false;
+      }
+    }
+    else
     {
-        log_e("Error deleting directory: %s", basePath.c_str());
+      log_v("Found file: %s", entryPath.c_str());
+      if (!SD.remove(entryPath.c_str()))
+      {
+        log_e("Error deleting file: %s", entryPath.c_str());
+        entry.close();
         return false;
+      }
+      log_v("Deleted file: %s", entryPath.c_str());
     }
+    entry.close();
+  }
 
-    log_v("Deleted directory: %s", basePath.c_str());
-    return true;
+  dir.close();
 
+  if (basePath.endsWith("/"))
+  {
+    basePath = dirPath;
+  }
+
+  if (!SD.rmdir(basePath.c_str()))
+  {
+    log_e("Error deleting directory: %s", basePath.c_str());
+    return false;
+  }
+
+  log_v("Deleted directory: %s", basePath.c_str());
+  return true;
 }
 
 /**
@@ -537,7 +551,7 @@ void configureWebServer()
 
                 logMessage = "Client:" + request->client()->remoteIP().toString() + " " + request->url() + "?name=" + String(fileName) + "&action=" + String(fileAction);
 
-                String path = oldDir + String(fileName);
+                String path = oldDir + "/" + String(fileName);
                 log_i("%s",path.c_str());
 
                 if (!SD.exists(path))

From 5c1f0e625088a5080e8a26b5eae0fb102a5b8d16 Mon Sep 17 00:00:00 2001
From: jgauchia <jgauchia@gmx.es>
Date: Wed, 27 Nov 2024 20:22:28 +0100
Subject: [PATCH 30/55] fix(webserver): Fix download file

---
 lib/webfile/src/webpage.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/webfile/src/webpage.h b/lib/webfile/src/webpage.h
index c7689b9b..0b39d1c2 100644
--- a/lib/webfile/src/webpage.h
+++ b/lib/webfile/src/webpage.h
@@ -194,6 +194,7 @@ function downloadDeleteButton(filename, action)
   }
   if (action == "download") 
   {
+    urltocall = "/file?name=/" + filename + "&action=" + action;
     _("status").innerHTML = "";
     window.open(urltocall,"_blank");
   }

From 92530911c88e8233fdc5ac6a2fc5b84ca8cb6eae Mon Sep 17 00:00:00 2001
From: jgauchia <jgauchia@gmx.es>
Date: Wed, 27 Nov 2024 22:16:30 +0100
Subject: [PATCH 31/55] feat(webserver): Add pagination

---
 lib/webfile/src/webserver.h | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/webfile/src/webserver.h b/lib/webfile/src/webserver.h
index 0e730e3f..b535b4f0 100644
--- a/lib/webfile/src/webserver.h
+++ b/lib/webfile/src/webserver.h
@@ -291,12 +291,18 @@ String listFiles(bool ishtml, int page = 0)
     
     returnText += "<tr align='left'>"; 
     if (page > 0) 
+    {
+      returnText += "<ti><button class=\"button\" onclick='loadPage(" + String(0) + ")'>First</button></ti>";
       returnText += "<ti><button class=\"button\" onclick='loadPage(" + String(page - 1) + ")'>Prev</button></ti>";
+    }
 
-    returnText += "<ti><span> Page " + String(page + 1) + " </span></ti>";
+    returnText += "<ti><span> Page " + String(page + 1) + "/" + String((fileCache.size() / 10)+1) + " </span></ti>";
 
     if (fileCache.size() > endIdx)
+    {
       returnText += "<ti><button class=\"button\" onclick='loadPage(" + String(page + 1) + ")'>Next</button></ti>";
+      returnText += "<ti><button class=\"button\" onclick='loadPage(" + String((fileCache.size() / 10)) + ")'>Last</button></ti>";
+    }
 
     returnText += "</tr></p>"; 
   }

From b21dce6567eb20cdb3d88f94c7e8849e8c835d73 Mon Sep 17 00:00:00 2001
From: jgauchia <jgauchia@gmx.es>
Date: Wed, 27 Nov 2024 22:32:49 +0100
Subject: [PATCH 32/55] feat(webserver): Add path info in status

---
 lib/webfile/src/webserver.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/webfile/src/webserver.h b/lib/webfile/src/webserver.h
index b535b4f0..9d35a22f 100644
--- a/lib/webfile/src/webserver.h
+++ b/lib/webfile/src/webserver.h
@@ -617,7 +617,7 @@ void configureWebServer()
                     if (oldDir == "")
                       oldDir = "/";
                     currentDir = "";
-                    request->send(200, "text/plain", "Directory changed successfully");
+                    request->send(200, "text/plain", "Path:" + oldDir );
                   }
                   else
                   {
@@ -632,7 +632,7 @@ void configureWebServer()
                   else
                     oldDir = newDir;
                   currentDir = "";
-                    request->send(200, "text/plain", "Directory changed successfully");
+                  request->send(200, "text/plain", "Path:" + oldDir);
                 }
 
                 cacheDirectoryContent(oldDir);

From 6f0114f190eb31325576a67a1b8105743c3add2b Mon Sep 17 00:00:00 2001
From: jgauchia <jgauchia@gmx.es>
Date: Sun, 1 Dec 2024 11:50:06 +0100
Subject: [PATCH 33/55] feat: Add Sunrise and Sunset Calculation

---
 README.md            |  3 ++-
 lib/gps/gps.cpp      |  6 ++++++
 lib/gps/gps.hpp      |  3 +++
 lib/gps/timezone.hpp | 22 ++++++++++++++++++++++
 platformio.ini       |  1 +
 src/main.cpp         | 25 ++++++++++++++++++++++++-
 6 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index c36cfd39..f0f5e2fc 100644
--- a/README.md
+++ b/README.md
@@ -359,7 +359,8 @@ To access the Web File Server, simply use any browser and go to the following ad
 * OSM to binary vectorial maps [OSM_Extract](https://github.com/aresta/OSM_Extract) thanks to [@aresta](https://github.com/aresta)
 * Preferences Library [Easy Preferences](https://github.com/hpsaturn/easy-preferences) thanks to [@hpsaturn](https://github.com/hpsaturn)
 * Wifi CLI manager [esp32-wifi-cli](https://github.com/hpsaturn/esp32-wifi-cli) thanks to [@hpsaturn](https://github.com/hpsaturn)
-* Web file server based in [@smford](https://github.com/smford) [esp32-asyncwebserver-fileupload-example ](https://github.com/smford/esp32-asyncwebserver-fileupload-example)
+* Web file server based in [@smford](https://github.com/smford) [esp32-asyncwebserver-fileupload-example](https://github.com/smford/esp32-asyncwebserver-fileupload-example)
+* Solar sunset and sunrise [SolarCalculator](https://github.com/jpb10/SolarCalculator) thanks to [@jpb10](https://github.com/jpb10)
 
 
 ---
diff --git a/lib/gps/gps.cpp b/lib/gps/gps.cpp
index 74fcdd0d..d3d50d74 100644
--- a/lib/gps/gps.cpp
+++ b/lib/gps/gps.cpp
@@ -140,6 +140,12 @@ void getGPSData()
   {
     adjustTime( fix.dateTime );
     localTime = fix.dateTime;
+    // Calculate Sunrise and Sunset only one time when date & time was valid
+    if (calcSun)
+    {
+       calculateSun();
+       calcSun = false;
+    }
   }
 
   // Altitude
diff --git a/lib/gps/gps.hpp b/lib/gps/gps.hpp
index f7c1a51c..2d936ac3 100644
--- a/lib/gps/gps.hpp
+++ b/lib/gps/gps.hpp
@@ -78,6 +78,9 @@ struct GPSDATA
 
 extern GPSDATA gpsData;
 
+static bool calcSun = true;
+void calculateSun();
+
 void initGPS();
 double getLat();
 double getLon();
diff --git a/lib/gps/timezone.hpp b/lib/gps/timezone.hpp
index 14e12c07..3890e20b 100644
--- a/lib/gps/timezone.hpp
+++ b/lib/gps/timezone.hpp
@@ -98,4 +98,26 @@ static void adjustTime( NeoGPS::time_t & dt )
   dt = seconds; // convert seconds back to a date/time structure
 
 } 
+
+/**
+ * @brief convert hour to HH:MM rounded
+ *
+ * @param h -> hour
+ * @param str -> HH:MM text format
+ */
+static char * hoursToString(double h, char *str)
+{
+  int m = int(round(h * 60));
+  int hr = (m / 60) % 24;
+  int mn = m % 60;
+
+  str[0] = (hr / 10) % 10 + '0';
+  str[1] = (hr % 10) + '0';
+  str[2] = ':';
+  str[3] = (mn / 10) % 10 + '0';
+  str[4] = (mn % 10) + '0';
+  str[5] = '\0';
+  return str;
+}
+
 #endif
\ No newline at end of file
diff --git a/platformio.ini b/platformio.ini
index 742e855d..4c50a5b0 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -48,6 +48,7 @@ lib_deps =
   hpsaturn/ESP32 Wifi CLI@0.3.3
   kubafilinger/AsyncTCP@1.1.1
   esphome/ESPAsyncWebServer-esphome@3.3.0
+  jpb10/SolarCalculator@2.0.1
 
 [esp32_common]
 extends = common
diff --git a/src/main.cpp b/src/main.cpp
index f768ccd3..336a9092 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -16,6 +16,7 @@
 #include <esp_bt.h>
 #include <AsyncTCP.h>
 #include <ESPAsyncWebServer.h>
+#include <SolarCalculator.h>
 
 // Hardware includes
 #include "hal.hpp"
@@ -50,10 +51,32 @@ extern Storage storage;
 extern Battery battery;
 extern Power power;
 
+/**
+ * @brief Sunrise and Sunset
+ *
+ */
+static double transit, sunrise, sunset;
+
 #include "settings.hpp"
 #include "lvglSetup.hpp"
 #include "tasks.hpp"
 
+/**
+ * @brief Calculate Sunrise and Sunset
+ *        Must be a global function
+ *
+ */
+void calculateSun()
+{
+  calcSunriseSunset(2000 + localTime.year, localTime.month, localTime.date, 
+                    gpsData.latitude, gpsData.longitude, 
+                    transit, sunrise, sunset);
+
+  char str[6];
+  log_v("%d/%d/%d",2000 + localTime.year, localTime.month, localTime.date);
+  log_v("Sunrise: %s",hoursToString(sunrise + defGMT, str));
+  log_v("Sunset: %s", hoursToString(sunset + defGMT, str));
+}
 
 /**
  * @brief Setup
@@ -116,6 +139,7 @@ void setup()
   mapTempSprite.deleteSprite();
   mapTempSprite.createSprite(TILE_WIDTH, TILE_HEIGHT);
 
+  // Get init Latitude and Longitude
   gpsData.latitude = getLat();
   gpsData.longitude = getLon();
 
@@ -125,7 +149,6 @@ void setup()
   }
   else
   {
-    // Get init Latitude and Longitude
     tileSize = RENDER_TILE_SIZE;
     generateRenderMap();
   }

From b8dfd00a11dbbd3dca6a9a7c5b42cc3559da7237 Mon Sep 17 00:00:00 2001
From: jgauchia <jgauchia@gmx.es>
Date: Sun, 1 Dec 2024 11:59:02 +0100
Subject: [PATCH 34/55] build: Update LovyanGFX library

---
 platformio.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platformio.ini b/platformio.ini
index 742e855d..ca63839b 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -42,7 +42,7 @@ lib_deps =
   ; slashdevin/NeoGPS@4.2.9
   https://github.com/jgauchia/NeoGPS.git#43c4766
  	lvgl/lvgl@9.2.2
-	lovyan03/LovyanGFX@1.1.16
+	lovyan03/LovyanGFX@1.2.0
 	bblanchon/StreamUtils@1.9.0
   hpsaturn/EasyPreferences@0.1.3
   hpsaturn/ESP32 Wifi CLI@0.3.3

From 311436c8cae06f64e837496bb6178e43e360818f Mon Sep 17 00:00:00 2001
From: jgauchia <jgauchia@gmx.es>
Date: Sun, 1 Dec 2024 13:26:16 +0100
Subject: [PATCH 35/55] feat: Change default Tile if Search satellite skipped

---
 lib/gui/src/mainScr.cpp      | 4 ++++
 lib/gui/src/searchSatScr.cpp | 3 +++
 lib/lvgl/src/lvglSetup.cpp   | 1 +
 3 files changed, 8 insertions(+)

diff --git a/lib/gui/src/mainScr.cpp b/lib/gui/src/mainScr.cpp
index dab9ec3f..c33f8144 100644
--- a/lib/gui/src/mainScr.cpp
+++ b/lib/gui/src/mainScr.cpp
@@ -141,6 +141,10 @@ void scrollTile(lv_event_t *event)
  */
 void updateMainScreen(lv_timer_t *t)
 {
+  log_v("scrolled %d", isScrolled);
+  log_v("tile %d",activeTile);
+  log_v("main scr %d", isMainScreen);
+
   if (isScrolled && isMainScreen)
   {
     switch (activeTile)
diff --git a/lib/gui/src/searchSatScr.cpp b/lib/gui/src/searchSatScr.cpp
index 596e92ab..5fa9eaa7 100644
--- a/lib/gui/src/searchSatScr.cpp
+++ b/lib/gui/src/searchSatScr.cpp
@@ -11,6 +11,7 @@
 static unsigned long millisActual = 0;
 static bool skipSearch = false;
 bool isSearchingSat = true;
+extern uint8_t activeTile;
 
 /**
  * @brief Button events
@@ -51,6 +52,8 @@ void searchGPS(lv_timer_t *searchTimer)
     lv_timer_del(searchTimer);
     isSearchingSat = false;
     zoom = defaultZoom;
+    activeTile = 3;
+    lv_tileview_set_tile_by_index(tilesScreen, 3, 0, LV_ANIM_OFF);
     loadMainScreen();
   }
 }
diff --git a/lib/lvgl/src/lvglSetup.cpp b/lib/lvgl/src/lvglSetup.cpp
index 32819911..c1c0396c 100644
--- a/lib/lvgl/src/lvglSetup.cpp
+++ b/lib/lvgl/src/lvglSetup.cpp
@@ -346,6 +346,7 @@ void initLVGL()
 void loadMainScreen()
 {
   isMainScreen = true;
+  isScrolled = true;
   isSearchingSat = false;
   wptAction = WPT_NONE;
   lv_screen_load(mainScreen);

From 483923ebf4964e47b1f6714600f4a1f0e847e5b0 Mon Sep 17 00:00:00 2001
From: jgauchia <jgauchia@gmx.es>
Date: Sun, 1 Dec 2024 13:44:33 +0100
Subject: [PATCH 36/55] fix(timer): Fix main app Timer init.

---
 lib/gui/src/mainScr.cpp      | 4 ----
 lib/gui/src/mainScr.hpp      | 2 +-
 lib/gui/src/searchSatScr.cpp | 4 ++++
 lib/gui/src/settingsScr.cpp  | 3 +++
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/gui/src/mainScr.cpp b/lib/gui/src/mainScr.cpp
index c33f8144..dab9ec3f 100644
--- a/lib/gui/src/mainScr.cpp
+++ b/lib/gui/src/mainScr.cpp
@@ -141,10 +141,6 @@ void scrollTile(lv_event_t *event)
  */
 void updateMainScreen(lv_timer_t *t)
 {
-  log_v("scrolled %d", isScrolled);
-  log_v("tile %d",activeTile);
-  log_v("main scr %d", isMainScreen);
-
   if (isScrolled && isMainScreen)
   {
     switch (activeTile)
diff --git a/lib/gui/src/mainScr.hpp b/lib/gui/src/mainScr.hpp
index a147f139..06f3eb82 100644
--- a/lib/gui/src/mainScr.hpp
+++ b/lib/gui/src/mainScr.hpp
@@ -20,7 +20,7 @@
 #include "navScr.hpp"
 #include "satInfoScr.hpp"
 
-static lv_timer_t *mainTimer;    // Main Screen Timer
+extern lv_timer_t *mainTimer;    // Main Screen Timer
 #define UPDATE_MAINSCR_PERIOD 30 // Main Screen update time
 
 extern bool isMainScreen;                          // Flag to indicate main screen is selected
diff --git a/lib/gui/src/searchSatScr.cpp b/lib/gui/src/searchSatScr.cpp
index 5fa9eaa7..29856b36 100644
--- a/lib/gui/src/searchSatScr.cpp
+++ b/lib/gui/src/searchSatScr.cpp
@@ -12,6 +12,7 @@ static unsigned long millisActual = 0;
 static bool skipSearch = false;
 bool isSearchingSat = true;
 extern uint8_t activeTile;
+lv_timer_t *mainTimer;        // Main Screen Timer
 
 /**
  * @brief Button events
@@ -29,6 +30,7 @@ void buttonEvent(lv_event_t *event)
   {
     lv_screen_load(settingsScreen); 
   }
+  lv_timer_resume(mainTimer);
 }
 
 /**
@@ -43,6 +45,7 @@ void searchGPS(lv_timer_t *searchTimer)
     while (millis() < millisActual + 500)
       ;
     lv_timer_del(searchTimer);
+    lv_timer_resume(mainTimer);
     isSearchingSat = false;
     loadMainScreen();
   }
@@ -66,6 +69,7 @@ void createSearchSatScr()
 {
   searchTimer = lv_timer_create(searchGPS, 100, NULL);
   lv_timer_ready(searchTimer);
+  lv_timer_pause(mainTimer);
 
   searchSatScreen = lv_obj_create(NULL);
 
diff --git a/lib/gui/src/settingsScr.cpp b/lib/gui/src/settingsScr.cpp
index c55e26b9..518fda83 100644
--- a/lib/gui/src/settingsScr.cpp
+++ b/lib/gui/src/settingsScr.cpp
@@ -18,7 +18,10 @@ bool needReboot = false;
 static void back(lv_event_t *event)
 {
   if (isSearchingSat)
+  {
+    lv_timer_pause(mainTimer);
     lv_screen_load(searchSatScreen);
+  }
   else
     loadMainScreen();
 }

From acaf54964fcac69db66b7a6f1230a44debe74fa9 Mon Sep 17 00:00:00 2001
From: jgauchia <jgauchia@gmx.es>
Date: Sun, 1 Dec 2024 13:52:34 +0100
Subject: [PATCH 37/55] refactor(settings): Refactor device settings code

---
 lib/gui/src/deviceSettingsScr.cpp | 33 +++++++++++++++++--------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/lib/gui/src/deviceSettingsScr.cpp b/lib/gui/src/deviceSettingsScr.cpp
index 3ad66778..a015eeed 100644
--- a/lib/gui/src/deviceSettingsScr.cpp
+++ b/lib/gui/src/deviceSettingsScr.cpp
@@ -37,7 +37,11 @@ void deviceSettingsEvent(lv_event_t *event)
   }
 }
 
-void lv_brightness_cb(lv_event_t *e)
+/**
+ * @brief Brightness callback
+ *
+ */
+void brightnessEvent(lv_event_t *e)
 {
     lv_obj_t *obj =(lv_obj_t*) lv_event_get_target(e);
     defBright =  lv_slider_get_value(obj);
@@ -45,17 +49,11 @@ void lv_brightness_cb(lv_event_t *e)
     tft.setBrightness(defBright);
 }
 
-// void lv_background_opa_cb(lv_event_t *e)
-// {
-//     lv_obj_t *obj =(lv_obj_t*) lv_event_get_target(e);
-//     uint8_t val =  lv_slider_get_value(obj);
-//     std::vector<lv_obj_t *>::iterator it;
-//     for (it = sub_section.begin(); it != sub_section.end(); it++) {
-//         lv_obj_set_style_bg_opa(*it, val, LV_PART_MAIN);
-//     }
-// }
-
-static lv_obj_t *create_text(lv_obj_t *parent, const char *icon, const char *txt)
+/**
+ * @brief Create brightness text
+ *
+ */
+static lv_obj_t *createBrightText(lv_obj_t *parent, const char *icon, const char *txt)
 {
     lv_obj_t *obj = lv_menu_cont_create(parent);
 
@@ -82,10 +80,14 @@ static lv_obj_t *create_text(lv_obj_t *parent, const char *icon, const char *txt
     return obj;
 }
 
-static lv_obj_t *create_slider(lv_obj_t *parent, const char *icon, const char *txt, int32_t min, int32_t max,
+/**
+ * @brief Create brightness slider
+ *
+ */
+static lv_obj_t *createBrightSlider(lv_obj_t *parent, const char *icon, const char *txt, int32_t min, int32_t max,
                                int32_t val, lv_event_cb_t cb, lv_event_code_t filter)
 {
-    lv_obj_t *obj = create_text(parent, icon, txt);
+    lv_obj_t *obj = createBrightText(parent, icon, txt);
 
     lv_obj_t *slider = lv_slider_create(obj);
     lv_obj_set_width(slider,TFT_WIDTH - 80);
@@ -153,7 +155,8 @@ void createDeviceSettingsScr()
   lv_obj_align_to(dropdown, list, LV_ALIGN_OUT_RIGHT_MID, 0, 0);
   lv_obj_add_event_cb(dropdown, deviceSettingsEvent, LV_EVENT_VALUE_CHANGED, (char*)"rate");
 
-  create_slider(deviceSettingsOptions, LV_SYMBOL_SETTINGS, "Brightness", 5, 255, defBright, lv_brightness_cb, LV_EVENT_VALUE_CHANGED);
+  // Brightness Slider
+  createBrightSlider(deviceSettingsOptions, LV_SYMBOL_SETTINGS, "Brightness", 5, 255, defBright, brightnessEvent, LV_EVENT_VALUE_CHANGED);
   
   // Back button
   btn = lv_btn_create(deviceSettingsScreen);

From 4ac533ec9460431761bf5819fd8ab73c47e5c20d Mon Sep 17 00:00:00 2001
From: jgauchia <jgauchia@gmx.es>
Date: Mon, 2 Dec 2024 19:39:27 +0100
Subject: [PATCH 38/55] feat(firmware): Add firmware upgrade from SD Card

---
 README.md                         |   2 +-
 images/dev/devicesettings.jpg     | Bin 11276 -> 0 bytes
 images/dev/devicesettings.png     | Bin 0 -> 7306 bytes
 lib/gui/src/deviceSettingsScr.cpp |  38 +++++++++++-
 lib/gui/src/deviceSettingsScr.hpp |   4 ++
 lib/gui/src/upgradeScr.cpp        |  89 +++++++++++++++++++++++++++
 lib/gui/src/upgradeScr.hpp        |  26 ++++++++
 lib/upgrade/src/firmUpgrade.cpp   |  98 ++++++++++++++++++++++++++++++
 lib/upgrade/src/firmUpgrade.hpp   |  26 ++++++++
 lib/webfile/src/webserver.h       |   2 +-
 10 files changed, 280 insertions(+), 5 deletions(-)
 delete mode 100644 images/dev/devicesettings.jpg
 create mode 100644 images/dev/devicesettings.png
 create mode 100644 lib/gui/src/upgradeScr.cpp
 create mode 100644 lib/gui/src/upgradeScr.hpp
 create mode 100644 lib/upgrade/src/firmUpgrade.cpp
 create mode 100644 lib/upgrade/src/firmUpgrade.hpp

diff --git a/README.md b/README.md
index c36cfd39..1c31fcd8 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ ESP32 Based GPS Navigator (LVGL - LovyanGFX).
 |:-:|:-:|:-:|
 | Add Waypoint | Add Waypoint (landscape) | Waypoint List |
 
-|<img src="images/dev/settings.jpg">|<img src="images/dev/compasscal.jpg">|<img src="images/dev/touchcal.jpg">|<img src="images/dev/mapsettings.jpg">|<img src="images/dev/devicesettings.jpg">|
+|<img src="images/dev/settings.jpg">|<img src="images/dev/compasscal.jpg">|<img src="images/dev/touchcal.jpg">|<img src="images/dev/mapsettings.jpg">|<img src="images/dev/devicesettings.png">|
 |:-:|:-:|:-:|:-:|:-:|
 | Settings | Compass Calibration | Touch Calibration | Map Settings | Device Settings |
 
diff --git a/images/dev/devicesettings.jpg b/images/dev/devicesettings.jpg
deleted file mode 100644
index 8547b0dbd4fb5807a5e48ddda5929113545e41b9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11276
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

diff --git a/images/dev/devicesettings.png b/images/dev/devicesettings.png
new file mode 100644
index 0000000000000000000000000000000000000000..1d59e1556e7717c6d9a597c05f57ccda69a9e49a
GIT binary patch
literal 7306
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

literal 0
HcmV?d00001

diff --git a/lib/gui/src/deviceSettingsScr.cpp b/lib/gui/src/deviceSettingsScr.cpp
index a015eeed..dab1bda3 100644
--- a/lib/gui/src/deviceSettingsScr.cpp
+++ b/lib/gui/src/deviceSettingsScr.cpp
@@ -15,7 +15,7 @@ lv_obj_t *deviceSettingsScreen; // Device Settings Screen
  * 
  * @param event 
  */
-void deviceSettingsEvent(lv_event_t *event)
+static void deviceSettingsEvent(lv_event_t *event)
 {
   lv_obj_t *obj = (lv_obj_t*)lv_event_get_target(event);
   char *option = (char *)lv_event_get_user_data(event);
@@ -40,8 +40,9 @@ void deviceSettingsEvent(lv_event_t *event)
 /**
  * @brief Brightness callback
  *
+ * @param e
  */
-void brightnessEvent(lv_event_t *e)
+static void brightnessEvent(lv_event_t *e)
 {
     lv_obj_t *obj =(lv_obj_t*) lv_event_get_target(e);
     defBright =  lv_slider_get_value(obj);
@@ -49,6 +50,27 @@ void brightnessEvent(lv_event_t *e)
     tft.setBrightness(defBright);
 }
 
+/**
+ * @brief Upgrade firmware event
+ * 
+ * @param event 
+ */
+static void upgradeEvent(lv_event_t *event)
+{
+  createMsgUpgrade();
+  lv_screen_load(msgUpgrade);
+  if (!checkFileUpgrade())
+  {
+    lv_label_set_text_static(msgUprgdText, LV_SYMBOL_WARNING " No Firmware found!");
+  }
+  else
+  {
+    lv_label_set_text_static(msgUprgdText, LV_SYMBOL_WARNING " Firmware found!");
+    lv_obj_clear_flag(btnMsgUpgrade,LV_OBJ_FLAG_HIDDEN);
+    lv_obj_clear_flag(contMeter,LV_OBJ_FLAG_HIDDEN);
+  }
+}
+
 /**
  * @brief Create brightness text
  *
@@ -155,10 +177,20 @@ void createDeviceSettingsScr()
   lv_obj_align_to(dropdown, list, LV_ALIGN_OUT_RIGHT_MID, 0, 0);
   lv_obj_add_event_cb(dropdown, deviceSettingsEvent, LV_EVENT_VALUE_CHANGED, (char*)"rate");
 
+  // Upgrade button
+  list = lv_list_add_btn(deviceSettingsOptions, NULL, NULL);
+  btn = lv_btn_create(list);
+  lv_obj_set_size(btn, TFT_WIDTH - 45, 40 * scale);
+  label = lv_label_create(btn);
+  lv_obj_set_style_text_font(label, fontLarge, 0);
+  lv_label_set_text_static(label, "Firmware Upgrade");
+  lv_obj_center(label);
+  lv_obj_add_event_cb(btn, upgradeEvent, LV_EVENT_CLICKED, NULL);
+
   // Brightness Slider
   createBrightSlider(deviceSettingsOptions, LV_SYMBOL_SETTINGS, "Brightness", 5, 255, defBright, brightnessEvent, LV_EVENT_VALUE_CHANGED);
   
-  // Back button
+   // Back button
   btn = lv_btn_create(deviceSettingsScreen);
   lv_obj_set_size(btn, TFT_WIDTH - 30, 40 * scale);
   label = lv_label_create(btn);
diff --git a/lib/gui/src/deviceSettingsScr.hpp b/lib/gui/src/deviceSettingsScr.hpp
index 5ecec47d..66adb6ff 100644
--- a/lib/gui/src/deviceSettingsScr.hpp
+++ b/lib/gui/src/deviceSettingsScr.hpp
@@ -10,11 +10,15 @@
 #define DEVICESETTINGSCR_HPP
 
 #include "globalGuiDef.h"
+#include "upgradeScr.hpp"
 #include "lvglSetup.hpp"
+#include "firmUpgrade.hpp"
 
 static lv_obj_t *deviceSettingsOptions;
 
 static void deviceSettingsEvent(lv_event_t *event);
+static void brightnessEvent(lv_event_t *e);
+static void upgradeEvent(lv_event_t *event);
 void createDeviceSettingsScr();
 
 #endif
diff --git a/lib/gui/src/upgradeScr.cpp b/lib/gui/src/upgradeScr.cpp
new file mode 100644
index 00000000..984a3f87
--- /dev/null
+++ b/lib/gui/src/upgradeScr.cpp
@@ -0,0 +1,89 @@
+/**
+ * @file upgradeScr.cpp
+ * @author Jordi Gauchía (jgauchia@gmx.es)
+ * @brief  LVGL Firmware upgrade messages
+ * @version 0.1.9_alpha
+ * @date 2024-11
+ */
+
+ #include "upgradeScr.hpp"
+
+ lv_obj_t *msgUpgrade;
+ lv_obj_t *msgUprgdText;
+ lv_obj_t *btnMsgBack;
+ lv_obj_t *btnMsgUpgrade;
+ lv_obj_t *contMeter;
+
+/**
+ * @brief Upgrade Back Message Event
+ * 
+ */
+void msgBackEvent(lv_event_t *event)
+{
+    lv_screen_load(deviceSettingsScreen);
+}
+
+/**
+ * @brief Upgrade Message Event
+ * 
+ */
+void msgUpgrdEvent(lv_event_t *event)
+{
+    log_v("Upgrade firmware");
+    lv_obj_add_flag(btnMsgBack,LV_OBJ_FLAG_HIDDEN);
+    lv_obj_add_flag(btnMsgUpgrade, LV_OBJ_FLAG_HIDDEN);
+    onUpgrdStart();
+    onUpgrdEnd();
+}
+
+
+/**
+ * @brief Create Upgrade Message
+ * 
+ */
+void createMsgUpgrade()
+{
+    msgUpgrade = lv_obj_create(NULL);
+    lv_obj_t *msgBox = lv_msgbox_create(msgUpgrade);
+    lv_msgbox_add_title(msgBox, "Firmware Upgrade");
+    lv_obj_t *content = lv_msgbox_get_content(msgBox);
+    lv_obj_set_flex_flow(content, LV_FLEX_FLOW_COLUMN);
+    lv_obj_set_flex_align(content, LV_FLEX_ALIGN_START, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_CENTER);
+    lv_obj_set_height(msgBox,200);
+
+    lv_obj_t *contText = lv_obj_create(content);
+    lv_obj_set_size(contText, lv_pct(100), LV_SIZE_CONTENT);
+    lv_obj_set_flex_flow(contText, LV_FLEX_FLOW_COLUMN);
+    lv_obj_set_flex_align(contText, LV_FLEX_ALIGN_CENTER,  LV_FLEX_ALIGN_START, LV_FLEX_ALIGN_CENTER);
+    lv_obj_clear_flag(contText,LV_OBJ_FLAG_SCROLLABLE);
+    lv_obj_set_style_border_color(contText,lv_color_black(),0);
+
+    msgUprgdText = lv_label_create(contText);
+    lv_label_set_text_static(msgUprgdText,"");
+    lv_obj_set_style_text_font(msgUprgdText, fontLarge, 0);
+
+    contMeter = lv_obj_create(content);
+    lv_obj_set_size(contMeter, lv_pct(100), LV_SIZE_CONTENT);
+    lv_obj_set_flex_flow(contMeter, LV_FLEX_FLOW_COLUMN);
+    lv_obj_set_flex_align(contMeter, LV_FLEX_ALIGN_CENTER,  LV_FLEX_ALIGN_START, LV_FLEX_ALIGN_CENTER);
+    lv_obj_clear_flag(contMeter,LV_OBJ_FLAG_SCROLLABLE);
+    lv_obj_set_style_border_color(contMeter,lv_color_black(),0);
+    lv_obj_add_flag(contMeter,LV_OBJ_FLAG_HIDDEN);
+
+    static uint32_t objectColor = 0x303030; 
+    static lv_style_t styleBtn;
+    lv_style_init(&styleBtn);
+    lv_style_set_bg_color(&styleBtn, lv_color_hex(objectColor));
+    lv_style_set_border_color(&styleBtn, lv_color_hex(objectColor));
+
+    btnMsgBack = lv_msgbox_add_footer_button(msgBox, "Back");
+    lv_obj_add_event_cb(btnMsgBack, msgBackEvent, LV_EVENT_CLICKED, NULL);
+    lv_obj_set_style_text_font(btnMsgBack, fontLarge, 0);
+    lv_obj_add_style(btnMsgBack, &styleBtn, 0);
+
+    btnMsgUpgrade = lv_msgbox_add_footer_button(msgBox, "UPGRADE");
+    lv_obj_add_event_cb(btnMsgUpgrade, msgUpgrdEvent, LV_EVENT_CLICKED, NULL); 
+    lv_obj_set_style_text_font(btnMsgUpgrade, fontLarge, 0);
+    lv_obj_add_style(btnMsgUpgrade, &styleBtn, 0);
+    lv_obj_add_flag(btnMsgUpgrade,LV_OBJ_FLAG_HIDDEN);
+}
\ No newline at end of file
diff --git a/lib/gui/src/upgradeScr.hpp b/lib/gui/src/upgradeScr.hpp
new file mode 100644
index 00000000..be0f2a49
--- /dev/null
+++ b/lib/gui/src/upgradeScr.hpp
@@ -0,0 +1,26 @@
+/**
+ * @file upgradeScr.hpp
+ * @author Jordi Gauchía (jgauchia@gmx.es)
+ * @brief  LVGL Firmware upgrade messages
+ * @version 0.1.9_alpha
+ * @date 2024-11
+ */
+
+#ifndef UPGRADESCR_HPP
+#define UPGRADESCR_HPP
+
+#include "lvgl.h"
+#include "firmUpgrade.hpp"
+#include "globalGuiDef.h"
+
+extern lv_obj_t *msgUpgrade;
+extern lv_obj_t *msgUprgdText;
+extern lv_obj_t *btnMsgBack;
+extern lv_obj_t *btnMsgUpgrade;
+extern lv_obj_t *contMeter;
+
+void msgBackEvent(lv_event_t *event);
+void msgUpgrdEvent(lv_event_t *event);
+void createMsgUpgrade();
+
+#endif
\ No newline at end of file
diff --git a/lib/upgrade/src/firmUpgrade.cpp b/lib/upgrade/src/firmUpgrade.cpp
new file mode 100644
index 00000000..6ca008d9
--- /dev/null
+++ b/lib/upgrade/src/firmUpgrade.cpp
@@ -0,0 +1,98 @@
+/**
+ * @file firmUpgrade.cpp
+ * @author Jordi Gauchía (jgauchia@gmx.es)
+ * @brief  Firmware upgrade from SD functions
+ * @version 0.1.9_alpha
+ * @date 2024-11
+ */
+
+ #include "firmUpgrade.hpp"
+
+/**
+ * @brief Check if firmware file exist
+ * 
+ * @return true/false
+ */
+bool checkFileUpgrade()
+{
+if (SD.exists(upgrdFile))
+    return true;
+else
+    return false;
+}
+
+/**
+ * @brief Firmware upgrade start callback
+ * 
+ */
+void onUpgrdStart()
+{
+    log_v("Try to upgrade firmware...");
+    File firmware = SD.open(upgrdFile);
+    Update.onProgress(onUpgrdProcess);
+    Update.begin(firmware.size(), U_FLASH);
+    Update.writeStream(firmware);
+    if (Update.end())
+    {
+        log_v("Upgrade finished!");
+    }
+    else
+    {
+        log_e("Upgrade error!");
+        lv_label_set_text_static(msgUprgdText, LV_SYMBOL_WARNING " Upgrade error!");
+        lv_obj_clear_flag(btnMsgBack,LV_OBJ_FLAG_HIDDEN);
+        lv_obj_add_flag(contMeter,LV_OBJ_FLAG_HIDDEN);
+    }
+    firmware.close();
+}
+
+/**
+ * @brief Draw progress bar
+ * 
+ * @param x -> X Position
+ * @param y -> Y Position
+ * @param w -> Bar width
+ * @param h -> Bar height
+ * @param percent -> Percent to show
+ * @param frameColor -> Bar frame color
+ * @param barColor -> Bar color
+ */
+void drawProgressBar(uint16_t x, uint16_t y, uint16_t w, uint16_t h, uint8_t percent, uint16_t frameColor, uint16_t barColor) 
+{
+  if (percent == 0)
+    tft.fillRoundRect(x, y, w, h, 3, TFT_BLACK);
+  uint8_t margin = 2;
+  uint16_t barHeight = h - 2 * margin;
+  uint16_t barWidth  = w - 2 * margin;
+  tft.drawRoundRect(x, y, w, h, 3, frameColor);
+  tft.fillRect(x + margin, y + margin, barWidth * percent / 100.0, barHeight, barColor);
+}
+
+/**
+ * @brief Firmware upgrade process callback
+ * 
+ * @param currSize -> Current size from file
+ * @param totalSize -> Total size from file
+ */
+void onUpgrdProcess(size_t currSize, size_t totalSize)
+{
+    float progress = (currSize * 100) / totalSize;
+    log_v("Firmware Upgrade process %d ...", (int)progress);
+    char strProgress[30];
+    sprintf(strProgress,"Upgrading... %d%%",(int)progress);
+    tft.drawCenterString(strProgress, tft.width() >> 1, (tft.height() >> 1)+25, &fonts::FreeSansBold9pt7b);
+    drawProgressBar(40,tft.height() >> 1,TFT_WIDTH - 80,20,(int)progress,TFT_WHITE,TFT_BLUE);
+    if ((int)progress == 100)
+        tft.drawCenterString("Upgrade complete", tft.width() >> 1, (tft.height() >> 1)+25, &fonts::FreeSansBold9pt7b);
+}
+
+/**
+ * @brief Firmware upgrade end callback
+ * 
+ */
+void onUpgrdEnd()
+{
+    delay(500);
+    log_i("Rebooting ESP32: ");
+    ESP.restart();
+}
\ No newline at end of file
diff --git a/lib/upgrade/src/firmUpgrade.hpp b/lib/upgrade/src/firmUpgrade.hpp
new file mode 100644
index 00000000..6e5f2b04
--- /dev/null
+++ b/lib/upgrade/src/firmUpgrade.hpp
@@ -0,0 +1,26 @@
+/**
+ * @file firmUpgrade.hpp
+ * @author Jordi Gauchía (jgauchia@gmx.es)
+ * @brief  Firmware upgrade from SD functions
+ * @version 0.1.9_alpha
+ * @date 2024-11
+ */
+
+#ifndef FIRMUPGRADE_HPP
+#define FIRMUPGRADE_HPP
+
+#include <Update.h>
+#include "tft.hpp"
+#include "lvgl.h"
+#include "upgradeScr.hpp"
+#include "SD.h"
+
+static const char *upgrdFile PROGMEM = "/firmware.bin"; // Firmware upgrade file
+
+bool checkFileUpgrade();
+void onUpgrdStart();
+void drawProgressBar(uint16_t x, uint16_t y, uint16_t w, uint16_t h, uint8_t percent, uint16_t frameColor, uint16_t barColor);
+void onUpgrdProcess(size_t currSize, size_t totalSize);
+void onUpgrdEnd();
+
+#endif
\ No newline at end of file
diff --git a/lib/webfile/src/webserver.h b/lib/webfile/src/webserver.h
index 9d35a22f..a50a8e49 100644
--- a/lib/webfile/src/webserver.h
+++ b/lib/webfile/src/webserver.h
@@ -572,7 +572,7 @@ void configureWebServer()
                     logMessage += " downloaded";
                     request->send(SD, path, "application/octet-stream");
                   }
-                  if (strcmp(fileAction, "deldir") == 0)
+                  else if (strcmp(fileAction, "deldir") == 0)
                   {
                     logMessage += " deleted";
                     deleteDirRecursive(path.c_str());

From 4b9a158acbeab19a1743a4bfd68fd329b1cbe157 Mon Sep 17 00:00:00 2001
From: jgauchia <jgauchia@gmx.es>
Date: Mon, 2 Dec 2024 19:49:51 +0100
Subject: [PATCH 39/55] fix(firmware): Fix upgrade progress typo

---
 lib/upgrade/src/firmUpgrade.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/upgrade/src/firmUpgrade.cpp b/lib/upgrade/src/firmUpgrade.cpp
index 6ca008d9..d5cb834e 100644
--- a/lib/upgrade/src/firmUpgrade.cpp
+++ b/lib/upgrade/src/firmUpgrade.cpp
@@ -80,10 +80,10 @@ void onUpgrdProcess(size_t currSize, size_t totalSize)
     log_v("Firmware Upgrade process %d ...", (int)progress);
     char strProgress[30];
     sprintf(strProgress,"Upgrading... %d%%",(int)progress);
-    tft.drawCenterString(strProgress, tft.width() >> 1, (tft.height() >> 1)+25, &fonts::FreeSansBold9pt7b);
+    tft.drawCenterString(strProgress, tft.width() >> 1, (tft.height() >> 1)+25, &fonts::FreeSans9pt7b);
     drawProgressBar(40,tft.height() >> 1,TFT_WIDTH - 80,20,(int)progress,TFT_WHITE,TFT_BLUE);
     if ((int)progress == 100)
-        tft.drawCenterString("Upgrade complete", tft.width() >> 1, (tft.height() >> 1)+25, &fonts::FreeSansBold9pt7b);
+        tft.drawCenterString("Upgrade complete", tft.width() >> 1, (tft.height() >> 1)+25, &fonts::FreeSans9pt7b);
 }
 
 /**

From 6167e27d96885b2f5d5bfa14be4c29410cb013fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jordi=20Gauch=C3=ADa?= <jgauchia@gmx.es>
Date: Mon, 2 Dec 2024 19:54:14 +0100
Subject: [PATCH 40/55] docs: Update README.md

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 1c31fcd8..f5a6863c 100644
--- a/README.md
+++ b/README.md
@@ -208,6 +208,8 @@ Please follow the instructions provided by [OSM_Extract](https://github.com/ares
 > pio run --target uploadfs
 > ```
 
+> [!TIP]
+> Optional, firmware upgrade is possible from SD Card, please see [PR #259](https://github.com/jgauchia/IceNav-v3/pull/259) for detailed instructions
 
 > [!TIP]
 > Optional, for map debugging with specific coordinates, or when you are in indoors, you are able to set the defaults coordinates, on two ways:

From f25a4d7055155686dec22bacbc5cca6068106317 Mon Sep 17 00:00:00 2001
From: jgauchia <jgauchia@gmx.es>
Date: Tue, 3 Dec 2024 20:23:55 +0100
Subject: [PATCH 41/55] feat(widgets): Add sunrise/sunset widget

---
 data/sunrise.bin                   | Bin 0 -> 1612 bytes
 data/sunset.bin                    | Bin 0 -> 1612 bytes
 images/dev/compass.jpg             | Bin 20884 -> 25779 bytes
 lib/gps/gps.cpp                    |   4 +--
 lib/gps/gps.hpp                    |   2 ++
 lib/gui/src/mainScr.cpp            |  10 ++++++++
 lib/gui/src/widgets.cpp            |  39 +++++++++++++++++++++++++++++
 lib/gui/src/widgets.hpp            |  13 +++++++---
 lib/lvgl/lv_conf.h                 |   2 +-
 lib/preferences/preferences-keys.h |   2 ++
 lib/settings/settings.cpp          |   6 +++++
 lib/settings/settings.hpp          |   2 ++
 src/main.cpp                       |   8 +++---
 13 files changed, 77 insertions(+), 11 deletions(-)
 create mode 100644 data/sunrise.bin
 create mode 100644 data/sunset.bin

diff --git a/data/sunrise.bin b/data/sunrise.bin
new file mode 100644
index 0000000000000000000000000000000000000000..6a70faa7806712604eba8963f1edae4586ae4fc4
GIT binary patch
literal 1612
zcmb2-VqlN}Lk0$)0(XYb(-b~4O#gp?VcP#ApQkG10@)6qrzv&-=>{O~xL7LL@M(&I
zKTuuXmud2bpQb7P{W3+~0Lb?IG)>{R_3QutFO^CDXPEK-KTzL)###UW3#|YDUuy6F
z|Hk+K|L0rt|G(u+Aietke<L7Ydf)&5{Of=;P#y>vM)7DEjHZEsNdpYj2iz=J&Eyy0
z1(rJ)fQL~;gpm(Jn1O{&M1&2iNg^VcszD;S#IdVpU|{FKD#I=;j4r{-&d$yx3<S(T
z1}j1rP^qw}n7Fu@D3HO9A}%Q*2m~_HXyTGmAYnm4DQRT&Orl`bAPE^!X1F=*!eSsH
g2#|xj3TUe=OjJ-%9_n09AuNECfdQ8|+!o3h09NPrfdBvi

literal 0
HcmV?d00001

diff --git a/data/sunset.bin b/data/sunset.bin
new file mode 100644
index 0000000000000000000000000000000000000000..7985c285ef0b36fe585943cb3735d703f80edee8
GIT binary patch
literal 1612
zcmb2-VqlN}Lk0$)0(XYb(-b~`o~jtbF#Z1lAa?jXRU!A&G=*{?y8(zhE|y9*FiiV@
z<kJ)d|1VSI4Zcj1H~chB@h_0}1giUO{rdm^OJ$P(8D{+d|9P6?f5ut={|l`D|6gkF
z|NqAK|NrM(^Z&o)OCY`a|9>MOUwR)91LgSF{RaVtQ9K$3qiJAZ(f|YXfrtopGqH;^
zv5APVF=6W9WfT!%<iQkY;1}TI#v;tXz{-kM7^fgR2UaO|VPSL$7It=aW?>-U0y0<-
zx`0ZBMa9I$#YBM&b`)_*2|*x`kwz1jlmZD03Q9>Mt7jGks|HEPhyn{|C}0;B0|`NZ
fJls`4TV-LQf`W2T=W+^R0h|mBxWr+WP)Gv+Z5{Sv

literal 0
HcmV?d00001

diff --git a/images/dev/compass.jpg b/images/dev/compass.jpg
index 1bc9290d4516d0a0d863373321e0b4fecf913ee8..952c33af60644b611f7f63ac2e3565a248ff0574 100644
GIT binary patch
literal 25779
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

literal 20884
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

diff --git a/lib/gps/gps.cpp b/lib/gps/gps.cpp
index d3d50d74..307d8351 100644
--- a/lib/gps/gps.cpp
+++ b/lib/gps/gps.cpp
@@ -143,8 +143,8 @@ void getGPSData()
     // Calculate Sunrise and Sunset only one time when date & time was valid
     if (calcSun)
     {
-       calculateSun();
-       calcSun = false;
+      calculateSun();
+      calcSun = false;
     }
   }
 
diff --git a/lib/gps/gps.hpp b/lib/gps/gps.hpp
index 2d936ac3..fb890c6c 100644
--- a/lib/gps/gps.hpp
+++ b/lib/gps/gps.hpp
@@ -74,6 +74,8 @@ struct GPSDATA
   float    pdop;
   float    vdop;
   uint8_t  satInView;
+  char     sunriseHour[6];
+  char     sunsetHour[6];
 };
 
 extern GPSDATA gpsData;
diff --git a/lib/gui/src/mainScr.cpp b/lib/gui/src/mainScr.cpp
index dab9ec3f..57df19d0 100644
--- a/lib/gui/src/mainScr.cpp
+++ b/lib/gui/src/mainScr.cpp
@@ -60,6 +60,10 @@ void updateCompassScr(lv_event_t * event)
     lv_label_set_text_fmt(obj, "%4d m.", gpsData.altitude);
   if (obj==speedLabel)
     lv_label_set_text_fmt(obj, "%3d Km/h", gpsData.speed);
+  if (obj==sunriseLabel)
+    lv_label_set_text_static(obj, gpsData.sunriseHour);
+  if (obj==sunsetLabel)
+    lv_label_set_text_static(obj, gpsData.sunsetHour);
 }
 
 /**
@@ -158,6 +162,8 @@ void updateMainScreen(lv_timer_t *t)
         lv_obj_send_event(longitude, LV_EVENT_VALUE_CHANGED, NULL);
         lv_obj_send_event(altitude, LV_EVENT_VALUE_CHANGED, NULL);
         lv_obj_send_event(speedLabel, LV_EVENT_VALUE_CHANGED, NULL);
+        lv_obj_send_event(sunriseLabel, LV_EVENT_VALUE_CHANGED, NULL);
+        lv_obj_send_event(sunsetLabel, LV_EVENT_VALUE_CHANGED, NULL);
         break;
       
       case MAP:
@@ -448,6 +454,8 @@ void createMainScr()
   altitudeWidget(compassTile);
   // Speed widget
   speedWidget(compassTile);
+  // Sunrise/Sunset widget
+  sunWidget(compassTile);
   
   // Compass Tile Events
   lv_obj_add_event_cb(compassHeading, updateCompassScr, LV_EVENT_VALUE_CHANGED, NULL);
@@ -455,6 +463,8 @@ void createMainScr()
   lv_obj_add_event_cb(longitude, updateCompassScr, LV_EVENT_VALUE_CHANGED, NULL);
   lv_obj_add_event_cb(altitude, updateCompassScr, LV_EVENT_VALUE_CHANGED, NULL);
   lv_obj_add_event_cb(speedLabel, updateCompassScr, LV_EVENT_VALUE_CHANGED, NULL);
+  lv_obj_add_event_cb(sunriseLabel, updateCompassScr, LV_EVENT_VALUE_CHANGED, NULL);
+  lv_obj_add_event_cb(sunsetLabel, updateCompassScr, LV_EVENT_VALUE_CHANGED, NULL);
  
   // Map Tile Toolbar
   btnFullScreen = lv_btn_create(mapTile);
diff --git a/lib/gui/src/widgets.cpp b/lib/gui/src/widgets.cpp
index a1885e78..2c39a0e4 100644
--- a/lib/gui/src/widgets.cpp
+++ b/lib/gui/src/widgets.cpp
@@ -14,6 +14,8 @@ lv_obj_t *latitude;
 lv_obj_t *longitude;
 lv_obj_t *altitude;
 lv_obj_t *speedLabel;
+lv_obj_t *sunriseLabel;
+lv_obj_t *sunsetLabel;
 
 /**
  * @brief Edit Screen Event (drag widgets)
@@ -211,4 +213,41 @@ void speedWidget(_lv_obj_t *screen)
     lv_obj_add_event_cb(obj, editWidget, LV_EVENT_LONG_PRESSED, NULL);
     lv_obj_add_event_cb(obj, dragWidget, LV_EVENT_PRESSING, (char *)"Speed_");
     lv_obj_add_event_cb(obj, unselectWidget, LV_EVENT_RELEASED, (char *)"Speed_");
+}
+
+/**
+ * @brief Sunrise/Sunset widget
+ *
+ * @param screen 
+ */
+void sunWidget(_lv_obj_t *screen)
+{
+  lv_obj_t *obj = lv_obj_create(screen);
+  lv_obj_set_size(obj, 70 * scale, 60 * scale);
+  lv_obj_set_pos(obj, sunPosX, sunPosY);
+  lv_obj_clear_flag(obj, LV_OBJ_FLAG_SCROLLABLE);
+
+  sunriseLabel = lv_label_create(obj);
+  lv_obj_align(sunriseLabel, LV_ALIGN_TOP_RIGHT, 16, -2);
+  lv_label_set_text_static(sunriseLabel, "");
+  sunsetLabel = lv_label_create(obj);
+  lv_obj_align(sunsetLabel,LV_ALIGN_BOTTOM_RIGHT, 16, 10);
+  lv_label_set_text_static(sunsetLabel, "");
+
+  lv_obj_t *img;
+  img = lv_img_create(obj);
+  lv_img_set_src(img, sunriseIconFile);
+  lv_img_set_zoom(img,iconScale);
+  lv_obj_update_layout(img);
+  lv_obj_align(img, LV_ALIGN_TOP_LEFT, -10, -10);
+  img = lv_img_create(obj);
+  lv_img_set_src(img, sunsetIconFile);
+  lv_img_set_zoom(img,iconScale);
+  lv_obj_update_layout(img);
+  lv_obj_align(img, LV_ALIGN_BOTTOM_LEFT, -10, 10);
+
+  objUnselect(obj);
+  lv_obj_add_event_cb(obj, editWidget, LV_EVENT_LONG_PRESSED, NULL);
+  lv_obj_add_event_cb(obj, dragWidget, LV_EVENT_PRESSING, (char *)"Sun_");
+  lv_obj_add_event_cb(obj, unselectWidget, LV_EVENT_RELEASED, (char *)"Sun_");
 }
\ No newline at end of file
diff --git a/lib/gui/src/widgets.hpp b/lib/gui/src/widgets.hpp
index 5e15f6ee..d7131ec8 100644
--- a/lib/gui/src/widgets.hpp
+++ b/lib/gui/src/widgets.hpp
@@ -24,6 +24,8 @@ extern lv_obj_t *compassHeading;
 extern lv_obj_t *compassImg;
 extern lv_obj_t *altitude;
 extern lv_obj_t *speedLabel;
+extern lv_obj_t *sunriseLabel;
+extern lv_obj_t *sunsetLabel;
 
 void editWidget(lv_event_t *event);
 void dragWidget(lv_event_t *event);
@@ -34,14 +36,17 @@ static bool canMoveWidget = false;
 static lv_coord_t newX = 0;
 static lv_coord_t newY = 0;
 
-static const char *arrowIconFile PROGMEM = "/arrow.bin";    // Compass Arrow Icon
-static const char *positionIconFile PROGMEM = "/pin.bin";   // Position Icon
-static const char *altitudeIconFile PROGMEM = "/altit.bin"; // Altitude Icon
-static const char *speedIconFile PROGMEM = "/speed.bin";    // Speed Icon
+static const char *arrowIconFile PROGMEM = "/arrow.bin";     // Compass Arrow Icon
+static const char *positionIconFile PROGMEM = "/pin.bin";    // Position Icon
+static const char *altitudeIconFile PROGMEM = "/altit.bin";  // Altitude Icon
+static const char *speedIconFile PROGMEM = "/speed.bin";     // Speed Icon
+static const char *sunriseIconFile PROGMEM = "/sunrise.bin"; // Sunrise Icon
+static const char *sunsetIconFile PROGMEM = "/sunset.bin";   // Sunset Icon
 
 void positionWidget(_lv_obj_t *screen);
 void compassWidget(_lv_obj_t *screen);
 void altitudeWidget(_lv_obj_t *screen);
 void speedWidget(_lv_obj_t *screen);
+void sunWidget(_lv_obj_t *screen);
 
 #endif
\ No newline at end of file
diff --git a/lib/lvgl/lv_conf.h b/lib/lvgl/lv_conf.h
index 84b997c7..a7cf51cd 100644
--- a/lib/lvgl/lv_conf.h
+++ b/lib/lvgl/lv_conf.h
@@ -369,7 +369,7 @@
 
 /** Default number of image header cache entries. The cache is used to store the headers of images
  *  The main logic is like `LV_CACHE_DEF_SIZE` but for image headers. */
-#define LV_IMAGE_HEADER_CACHE_DEF_CNT 10
+#define LV_IMAGE_HEADER_CACHE_DEF_CNT 15
 
 /** Number of stops allowed per gradient. Increase this to allow more stops.
  *  This adds (sizeof(lv_color_t) + 1) bytes per additional stop. */
diff --git a/lib/preferences/preferences-keys.h b/lib/preferences/preferences-keys.h
index 6adddf0e..3ad63447 100644
--- a/lib/preferences/preferences-keys.h
+++ b/lib/preferences/preferences-keys.h
@@ -13,6 +13,8 @@
   X(KALTITUDE_Y, "Altitude_Y", INT)      \
   X(KSPEED_X, "Speed_X", INT)            \
   X(KSPEED_Y, "Speed_Y", INT)            \
+  X(KSUN_X, "Sun_X", INT)                \
+  X(KSUN_Y, "Sun_Y", INT)                \
   X(KCOMP_OFFSET_X, "C_offset_x", FLOAT) \
   X(KCOMP_OFFSET_Y, "C_offset_y", FLOAT) \
   X(KCOMP_ROT, "Compass_rot", BOOL)      \
diff --git a/lib/settings/settings.cpp b/lib/settings/settings.cpp
index 7a92c9c0..bda2fd24 100644
--- a/lib/settings/settings.cpp
+++ b/lib/settings/settings.cpp
@@ -48,6 +48,8 @@ uint16_t altitudePosX = 0;    // Altitude widget position X
 uint16_t altitudePosY = 0;    // Altitude widget position Y
 uint16_t speedPosX = 0;       // Speed widget position X
 uint16_t speedPosY = 0;       // Speed widget position Y
+uint16_t sunPosX = 0;         // Sunrise/sunset position X
+uint16_t sunPosY = 0;         // Sunrise/sunset position Y
 bool enableWeb = true;        // Enable/disable web file server
 bool showToolBar = false;     // Show Map Toolbar
 int8_t tempOffset = 0;        // BME Temperature offset
@@ -83,6 +85,8 @@ void loadPreferences()
   altitudePosY = cfg.getInt(PKEYS::KALTITUDE_Y, TFT_HEIGHT - 170);
   speedPosX = cfg.getInt(PKEYS::KSPEED_X, 1);
   speedPosY = cfg.getInt(PKEYS::KSPEED_Y, TFT_HEIGHT - 130);
+  sunPosX = cfg.getInt(PKEYS::KSUN_X, 170);
+  sunPosY = cfg.getInt(PKEYS::KSUN_Y, TFT_HEIGHT - 170 );
   isVectorMap = cfg.getBool(PKEYS::KMAP_VECTOR, false);
   defBright = cfg.getUInt(PKEYS::KDEF_BRIGT, 254);
   defGMT = cfg.getInt(PKEYS::KGMT_OFFS, 1);
@@ -115,6 +119,8 @@ void loadPreferences()
   altitudePosY = cfg.isKey(CONFKEYS::KALTITUDE_Y) ? cfg.getInt(CONFKEYS::KALTITUDE_Y, altitudePosY) : 57;
   speedPosX = cfg.isKey(CONFKEYS::KSPEED_X) ? cfg.getInt(CONFKEYS::KSPEED_X, speedPosX) : 3;
   speedPosY = cfg.isKey(CONFKEYS::KSPEED_Y) ? cfg.getInt(CONFKEYS::KSPEED_Y, speedPosY) : 94;
+  sunPosX = cfg.isKey(CONFKEYS::KSUN_X) ? cfg.getInt(CONFKEYS::KSPEED_X, speedPosX) : 3;
+  sunPosY = cfg.isKey(CONFKEYS::KSUN_Y) ? cfg.getInt(CONFKEYS::KSPEED_Y, speedPosY) : 110;
   #endif
 
   battery.setBatteryLevels(cfg.getFloat(PKEYS::KVMAX_BATT,4.2),cfg.getFloat(PKEYS::KVMIN_BATT,3.6));
diff --git a/lib/settings/settings.hpp b/lib/settings/settings.hpp
index 88e321f5..06726325 100644
--- a/lib/settings/settings.hpp
+++ b/lib/settings/settings.hpp
@@ -41,6 +41,8 @@ extern uint16_t altitudePosX; // Altitude widget position X
 extern uint16_t altitudePosY; // Altitude widget position Y
 extern uint16_t speedPosX;    // Speed widget position X
 extern uint16_t speedPosY;    // Speed widget position Y
+extern uint16_t sunPosX;      // Sunrise/sunset position X
+extern uint16_t sunPosY;      // Sunrise/sunset position Y
 extern bool enableWeb;        // Enable/disable web file server
 extern int8_t tempOffset;     // BME Temperature offset
 extern String defDST;         // default DST zone
diff --git a/src/main.cpp b/src/main.cpp
index 336a9092..e1324256 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -71,11 +71,11 @@ void calculateSun()
   calcSunriseSunset(2000 + localTime.year, localTime.month, localTime.date, 
                     gpsData.latitude, gpsData.longitude, 
                     transit, sunrise, sunset);
-
-  char str[6];
   log_v("%d/%d/%d",2000 + localTime.year, localTime.month, localTime.date);
-  log_v("Sunrise: %s",hoursToString(sunrise + defGMT, str));
-  log_v("Sunset: %s", hoursToString(sunset + defGMT, str));
+  hoursToString(sunrise + defGMT, gpsData.sunriseHour);
+  hoursToString(sunset + defGMT, gpsData.sunsetHour);
+  log_v("Sunrise: %s",gpsData.sunriseHour);
+  log_v("Sunset: %s",gpsData.sunsetHour);
 }
 
 /**

From 69ea970bbcf4d9cb1d5ec4998640db65d523eb62 Mon Sep 17 00:00:00 2001
From: jgauchia <jgauchia@gmx.es>
Date: Wed, 4 Dec 2024 18:38:19 +0100
Subject: [PATCH 42/55] fix(main): Fix splash screen memory free info

---
 src/main.cpp | 45 ++++++++++++++++++++++-----------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index e1324256..baff4734 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -134,7 +134,28 @@ void setup()
   initGPS();
   initLVGL();
 
-  
+  #ifndef DISABLE_CLI
+    initCLI();
+    initCLITask();
+  #endif
+
+  if (WiFi.status() == WL_CONNECTED)
+  {
+    if (!MDNS.begin(hostname))       
+      log_e("nDNS init error");
+
+    log_i("mDNS initialized");
+  }
+
+  if (WiFi.status() == WL_CONNECTED && enableWeb)
+  {
+    configureWebServer();
+    server.begin();
+  }
+
+  if(WiFi.getMode() == WIFI_OFF)
+    ESP_ERROR_CHECK(esp_event_loop_create_default());
+
   // Reserve PSRAM for buffer map
   mapTempSprite.deleteSprite();
   mapTempSprite.createSprite(TILE_WIDTH, TILE_HEIGHT);
@@ -157,28 +178,6 @@ void setup()
   initGpsTask();
 
   lv_screen_load(searchSatScreen);
-
-  #ifndef DISABLE_CLI
-    initCLI();
-    initCLITask();
-  #endif
-
-  if (WiFi.status() == WL_CONNECTED)
-  {
-    if (!MDNS.begin(hostname))       
-      log_e("nDNS init error");
-
-    log_i("mDNS initialized");
-  }
-
-  if (WiFi.status() == WL_CONNECTED && enableWeb)
-  {
-    configureWebServer();
-    server.begin();
-  }
-
-  if(WiFi.getMode() == WIFI_OFF)
-    ESP_ERROR_CHECK(esp_event_loop_create_default());
 }
 
 /**

From e1475c2bdb636ae6fd55393c49e25de07e2eed22 Mon Sep 17 00:00:00 2001
From: jgauchia <jgauchia@gmx.es>
Date: Wed, 4 Dec 2024 19:30:19 +0100
Subject: [PATCH 43/55] fix(vectormap): Fix memory free after map is loaded

---
 lib/maps/src/vectorMaps.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/maps/src/vectorMaps.cpp b/lib/maps/src/vectorMaps.cpp
index b6e5339b..c7a78b07 100644
--- a/lib/maps/src/vectorMaps.cpp
+++ b/lib/maps/src/vectorMaps.cpp
@@ -66,7 +66,6 @@ void getPosition(double lat, double lon)
   Coord pos;
   pos.lat = lat;
   pos.lng = lon;
-
   if (abs(pos.lat - prevLat) > 0.00005 && abs(pos.lng - prevLng) > 0.00005)
   {
     point.x = lon2x(pos.lng);
@@ -571,6 +570,10 @@ void generateVectorMap(ViewPort &viewPort, MemCache &memCache, TFT_eSprite &map)
     //     TILE_WIDTH / 2, TILE_HEIGHT / 2 - 6,
     //     RED);
     log_d("Draw done! %i", millis());
+
+    MapBlock *firstBlock = memCache.blocks.front();
+    delete firstBlock;   
+    memCache.blocks.erase(memCache.blocks.begin()); 
   }
   else
   {

From 787a0a1d0165fef8995e9c787c83a34536aa58cf Mon Sep 17 00:00:00 2001
From: jgauchia <jgauchia@gmx.es>
Date: Wed, 4 Dec 2024 19:34:39 +0100
Subject: [PATCH 44/55] feat(vectormap): Preload vectorized map

---
 src/main.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/main.cpp b/src/main.cpp
index baff4734..48542fc8 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -167,6 +167,15 @@ void setup()
   // Preload Map
   if (isVectorMap)
   {
+    getPosition(gpsData.latitude, gpsData.longitude);
+    tileSize = VECTOR_TILE_SIZE;
+    viewPort.setCenter(point);
+
+    getMapBlocks(viewPort.bbox, memCache);
+              
+    generateVectorMap(viewPort, memCache, mapTempSprite); 
+    
+    isPosMoved = false;
   }
   else
   {

From 1a2471364d5c64fdcb33f4818a60ba62e19705b5 Mon Sep 17 00:00:00 2001
From: jgauchia <jgauchia@gmx.es>
Date: Wed, 4 Dec 2024 19:49:38 +0100
Subject: [PATCH 45/55] fix(gps): Fix GPS Task init order

---
 lib/gps/gps.cpp |  6 +-----
 src/main.cpp    | 12 ++++++------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/lib/gps/gps.cpp b/lib/gps/gps.cpp
index 307d8351..6b2c67ca 100644
--- a/lib/gps/gps.cpp
+++ b/lib/gps/gps.cpp
@@ -141,11 +141,7 @@ void getGPSData()
     adjustTime( fix.dateTime );
     localTime = fix.dateTime;
     // Calculate Sunrise and Sunset only one time when date & time was valid
-    if (calcSun)
-    {
-      calculateSun();
-      calcSun = false;
-    }
+    calculateSun();
   }
 
   // Altitude
diff --git a/src/main.cpp b/src/main.cpp
index 48542fc8..9e01d702 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -134,6 +134,12 @@ void setup()
   initGPS();
   initLVGL();
 
+  // Get init Latitude and Longitude
+  gpsData.latitude = getLat();
+  gpsData.longitude = getLon();
+
+  initGpsTask();
+
   #ifndef DISABLE_CLI
     initCLI();
     initCLITask();
@@ -160,10 +166,6 @@ void setup()
   mapTempSprite.deleteSprite();
   mapTempSprite.createSprite(TILE_WIDTH, TILE_HEIGHT);
 
-  // Get init Latitude and Longitude
-  gpsData.latitude = getLat();
-  gpsData.longitude = getLon();
-
   // Preload Map
   if (isVectorMap)
   {
@@ -184,8 +186,6 @@ void setup()
   }
   
   splashScreen();
-  initGpsTask();
-
   lv_screen_load(searchSatScreen);
 }
 

From bad4e38c7012023df61bb4d75204dcea24d02a77 Mon Sep 17 00:00:00 2001
From: jgauchia <jgauchia@gmx.es>
Date: Wed, 4 Dec 2024 20:35:48 +0100
Subject: [PATCH 46/55] fix(gps): Fix GPS time, sunrise and sunset acquire

---
 lib/gps/gps.cpp | 11 ++++++++---
 src/main.cpp    |  3 ---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/gps/gps.cpp b/lib/gps/gps.cpp
index 6b2c67ca..7f4dfe49 100644
--- a/lib/gps/gps.cpp
+++ b/lib/gps/gps.cpp
@@ -138,10 +138,15 @@ void getGPSData()
   // Time and Date
   if (fix.valid.time && fix.valid.date)
   {
-    adjustTime( fix.dateTime );
+    adjustTime( fix.dateTime );   
     localTime = fix.dateTime;
-    // Calculate Sunrise and Sunset only one time when date & time was valid
-    calculateSun();
+    if (calcSun)
+    {
+      // Calculate Sunrise and Sunset only one time when date & time was valid
+      calculateSun();
+      log_v("Get date, time, Sunrise and Sunset");  
+      calcSun = false;
+    }
   }
 
   // Altitude
diff --git a/src/main.cpp b/src/main.cpp
index 9e01d702..647e4c0b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -71,11 +71,8 @@ void calculateSun()
   calcSunriseSunset(2000 + localTime.year, localTime.month, localTime.date, 
                     gpsData.latitude, gpsData.longitude, 
                     transit, sunrise, sunset);
-  log_v("%d/%d/%d",2000 + localTime.year, localTime.month, localTime.date);
   hoursToString(sunrise + defGMT, gpsData.sunriseHour);
   hoursToString(sunset + defGMT, gpsData.sunsetHour);
-  log_v("Sunrise: %s",gpsData.sunriseHour);
-  log_v("Sunset: %s",gpsData.sunsetHour);
 }
 
 /**

From c2787c2a5ae64f88a07ed833ce333a9577d5720d Mon Sep 17 00:00:00 2001
From: jgauchia <jgauchia@gmx.es>
Date: Sat, 7 Dec 2024 19:57:26 +0100
Subject: [PATCH 47/55] feat(vectormap): Add boundaries for vectorized map

---
 lib/gui/src/mainScr.cpp     | 2 +-
 lib/maps/src/vectorMaps.cpp | 8 ++++++++
 lib/maps/src/vectorMaps.hpp | 2 ++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/gui/src/mainScr.cpp b/lib/gui/src/mainScr.cpp
index 57df19d0..427525de 100644
--- a/lib/gui/src/mainScr.cpp
+++ b/lib/gui/src/mainScr.cpp
@@ -228,7 +228,7 @@ void updateMap(lv_event_t *event)
       viewPort.setCenter(point);
 
       getMapBlocks(viewPort.bbox, memCache);
-               
+             
       generateVectorMap(viewPort, memCache, mapTempSprite); 
       
       isPosMoved = false;
diff --git a/lib/maps/src/vectorMaps.cpp b/lib/maps/src/vectorMaps.cpp
index c7a78b07..276c99f6 100644
--- a/lib/maps/src/vectorMaps.cpp
+++ b/lib/maps/src/vectorMaps.cpp
@@ -574,6 +574,14 @@ void generateVectorMap(ViewPort &viewPort, MemCache &memCache, TFT_eSprite &map)
     MapBlock *firstBlock = memCache.blocks.front();
     delete firstBlock;   
     memCache.blocks.erase(memCache.blocks.begin()); 
+
+    totalBounds.lat_min = mercatorY2lat(viewPort.bbox.min.y);
+    totalBounds.lat_max = mercatorY2lat(viewPort.bbox.max.y);
+    totalBounds.lon_min = mercatorX2lon(viewPort.bbox.min.x);
+    totalBounds.lon_max = mercatorX2lon(viewPort.bbox.max.x);
+    
+    log_i("Total Bounds: Lat Min: %f, Lat Max: %f, Lon Min: %f, Lon Max: %f",
+      totalBounds.lat_min, totalBounds.lat_max, totalBounds.lon_min, totalBounds.lon_max);
   }
   else
   {
diff --git a/lib/maps/src/vectorMaps.hpp b/lib/maps/src/vectorMaps.hpp
index 2fa746d6..ca149824 100644
--- a/lib/maps/src/vectorMaps.hpp
+++ b/lib/maps/src/vectorMaps.hpp
@@ -54,6 +54,8 @@ const int32_t MAPFOLDER_MASK = pow(2, MAPFOLDER_SIZE_BITS) - 1; // ...00001111
 
 static double lat2y(double lat) { return log(tan(DEG2RAD(lat) / 2 + M_PI / 4)) * EARTH_RADIUS; }
 static double lon2x(double lon) { return DEG2RAD(lon) * EARTH_RADIUS; }
+static double mercatorX2lon(double x) { return (x / EARTH_RADIUS) * (180.0 / M_PI); }
+static double mercatorY2lat(double y) { return (atan(sinh(y / EARTH_RADIUS))) * (180.0 / M_PI); }
 
 /**
  * @brief Point in 16 bits projected coordinates (x,y)

From dcc59e630d5317ac52d2ca69ec192d9525493b9c Mon Sep 17 00:00:00 2001
From: jgauchia <jgauchia@gmx.es>
Date: Sat, 7 Dec 2024 20:15:42 +0100
Subject: [PATCH 48/55] feat(vectormap): Add waypoint mark in vectorized map

---
 lib/maps/src/globalMapsDef.h |  6 ++++++
 lib/maps/src/mapsDrawFunc.h  |  3 +++
 lib/maps/src/renderMaps.hpp  |  3 ---
 lib/maps/src/vectorMaps.cpp  | 10 +++++++++-
 lib/maps/src/vectorMaps.hpp  |  3 ++-
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/lib/maps/src/globalMapsDef.h b/lib/maps/src/globalMapsDef.h
index 92f4a19f..2b3d91b0 100644
--- a/lib/maps/src/globalMapsDef.h
+++ b/lib/maps/src/globalMapsDef.h
@@ -133,5 +133,11 @@ struct tileBounds
  */
 extern tileBounds totalBounds;
 
+/**
+ * @brief Waypoint destination latitude and longitude
+ *
+ */
+extern double destLat;
+extern double destLon;
 
 #endif
diff --git a/lib/maps/src/mapsDrawFunc.h b/lib/maps/src/mapsDrawFunc.h
index b8428995..a6cb2563 100644
--- a/lib/maps/src/mapsDrawFunc.h
+++ b/lib/maps/src/mapsDrawFunc.h
@@ -183,7 +183,10 @@ static void displayMap(uint16_t tileSize)
     }
 
     if (tileSize == VECTOR_TILE_SIZE)
+    {
+      mapTempSprite.pushImage(wptPosX-8, wptPosY-8, 16 ,16 ,(uint16_t*)waypoint, TFT_BLACK);
       mapTempSprite.setPivot(tileSize , tileSize );
+    }
 
     mapTempSprite.pushRotated(&mapSprite, 360 - mapHeading, TFT_TRANSPARENT);
     //mapTempSprite.pushRotated(&mapSprite, 0, TFT_TRANSPARENT);
diff --git a/lib/maps/src/renderMaps.hpp b/lib/maps/src/renderMaps.hpp
index e225b12b..9e69b53b 100644
--- a/lib/maps/src/renderMaps.hpp
+++ b/lib/maps/src/renderMaps.hpp
@@ -30,9 +30,6 @@ extern MapTile oldMapTile;     // Old Map tile coordinates and zoom
 extern MapTile currentMapTile; // Current Map tile coordinates and zoom
 extern MapTile roundMapTile;   // Boundaries Map tiles
 
-extern double destLat;
-extern double destLon;
-
 uint32_t lon2tilex(double f_lon, uint8_t zoom);
 uint32_t lat2tiley(double f_lat, uint8_t zoom);
 double tilex2lon(uint32_t tileX, uint8_t zoom);
diff --git a/lib/maps/src/vectorMaps.cpp b/lib/maps/src/vectorMaps.cpp
index 276c99f6..b90b1037 100644
--- a/lib/maps/src/vectorMaps.cpp
+++ b/lib/maps/src/vectorMaps.cpp
@@ -579,9 +579,17 @@ void generateVectorMap(ViewPort &viewPort, MemCache &memCache, TFT_eSprite &map)
     totalBounds.lat_max = mercatorY2lat(viewPort.bbox.max.y);
     totalBounds.lon_min = mercatorX2lon(viewPort.bbox.min.x);
     totalBounds.lon_max = mercatorX2lon(viewPort.bbox.max.x);
-    
+
     log_i("Total Bounds: Lat Min: %f, Lat Max: %f, Lon Min: %f, Lon Max: %f",
       totalBounds.lat_min, totalBounds.lat_max, totalBounds.lon_min, totalBounds.lon_max);
+
+    if(isCoordInBounds(destLat,destLon,totalBounds))
+      coords2map(destLat, destLon, totalBounds, &wptPosX, &wptPosY);
+    else
+    {
+      wptPosX = -1;
+      wptPosY = -1;
+    }
   }
   else
   {
diff --git a/lib/maps/src/vectorMaps.hpp b/lib/maps/src/vectorMaps.hpp
index ca149824..6403be93 100644
--- a/lib/maps/src/vectorMaps.hpp
+++ b/lib/maps/src/vectorMaps.hpp
@@ -13,6 +13,7 @@
 #include <vector>
 #include <map>
 #include "globalMapsDef.h"
+#include "renderMaps.hpp"
 #include "gpsMath.hpp"
 #include "settings.hpp"
 
@@ -182,7 +183,7 @@ struct MemBlocks
 };
 
 /**
- * @brief Point in geografic (lat,lon) coordinates and other gps data
+ * @brief Point in geographic (lat,lon) coordinates and other gps data
  *
  */
 struct Coord

From 750bd838d8b30d80d7451a034f4ae84d8c295ba0 Mon Sep 17 00:00:00 2001
From: jgauchia <jgauchia@gmx.es>
Date: Sun, 8 Dec 2024 11:22:22 +0100
Subject: [PATCH 49/55] fix(vectormap): Fix vectormap refresh after waypoint
 selected

---
 lib/gui/src/waypointListScr.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/gui/src/waypointListScr.cpp b/lib/gui/src/waypointListScr.cpp
index b726e052..717f38de 100644
--- a/lib/gui/src/waypointListScr.cpp
+++ b/lib/gui/src/waypointListScr.cpp
@@ -56,6 +56,8 @@ void waypointListEvent(lv_event_t * event)
                         else 
                             lv_obj_add_flag(navTile,LV_OBJ_FLAG_HIDDEN);
 
+                        isPosMoved = true;
+                        
                         loadMainScreen();
                         break;
                     case WPT_EDIT:

From c0b4e93fc0873c6c79a89c6bf3cfed45a76531be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jordi=20Gauch=C3=ADa?= <jgauchia@gmx.es>
Date: Sun, 8 Dec 2024 19:42:45 +0100
Subject: [PATCH 50/55] docs: Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 076bde87..f0fc0bef 100644
--- a/README.md
+++ b/README.md
@@ -368,4 +368,4 @@ To access the Web File Server, simply use any browser and go to the following ad
 ---
 Map data is available thanks to the great OpenStreetMap project and contributors. The map data is available under the Open Database License.
 
-© OpenStreetMap contributors
+[© OpenStreetMap contributors](https://www.openstreetmap.org/copyright)

From daf695b83200c7f47f525ba46fba2650ada06a9c Mon Sep 17 00:00:00 2001
From: jgauchia <jgauchia@gmx.es>
Date: Sun, 8 Dec 2024 21:12:06 +0100
Subject: [PATCH 51/55] fix(splashscr): Add OpenStreetMap attribution

---
 lib/gui/src/splashScr.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/gui/src/splashScr.cpp b/lib/gui/src/splashScr.cpp
index 01a18a7d..61aed5bd 100644
--- a/lib/gui/src/splashScr.cpp
+++ b/lib/gui/src/splashScr.cpp
@@ -25,9 +25,15 @@ void splashScreen()
 
   getPngSize(logoFile,&pngWidth,&pngHeight);
   tft.drawPngFile(logoFile, (tft.width() / 2) - (pngWidth/2), (tft.height() / 2) - pngHeight);
+  
+  tft.setTextSize(1);
+  tft.setTextColor(TFT_WHITE, TFT_BLACK);
+
+  tft.drawString("Map data from OpenStreetMap.",0, TFT_HEIGHT - 120 );
+  tft.drawString("(c) OpenStreetMap",0, TFT_HEIGHT - 110 );
+  tft.drawString("(c) OpenStreetMap contributors",0, TFT_HEIGHT - 100 );
 
   char statusString[50] = "";
-  tft.setTextSize(1);
   tft.setTextColor(TFT_YELLOW, TFT_BLACK);
 
   memset(&statusString[0], 0, sizeof(statusString));
@@ -63,6 +69,10 @@ void splashScreen()
       ;
   }
 
+  millisActual = millis();
+  while (millis() < millisActual + 100)
+    ;
+
   for (uint8_t fadeOut = maxBrightness; fadeOut > 0; fadeOut--)
   {
     tft.setBrightness(fadeOut);

From 74fc51ffa19a1dc6280f69cf4160828052d40d98 Mon Sep 17 00:00:00 2001
From: jgauchia <jgauchia@gmx.es>
Date: Sun, 8 Dec 2024 21:43:17 +0100
Subject: [PATCH 52/55] fix(splashscr): Center attribution text

---
 lib/gui/src/splashScr.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/gui/src/splashScr.cpp b/lib/gui/src/splashScr.cpp
index 61aed5bd..bb65bebc 100644
--- a/lib/gui/src/splashScr.cpp
+++ b/lib/gui/src/splashScr.cpp
@@ -29,9 +29,9 @@ void splashScreen()
   tft.setTextSize(1);
   tft.setTextColor(TFT_WHITE, TFT_BLACK);
 
-  tft.drawString("Map data from OpenStreetMap.",0, TFT_HEIGHT - 120 );
-  tft.drawString("(c) OpenStreetMap",0, TFT_HEIGHT - 110 );
-  tft.drawString("(c) OpenStreetMap contributors",0, TFT_HEIGHT - 100 );
+  tft.drawCenterString("Map data from OpenStreetMap.",tft.width() >> 1, TFT_HEIGHT - 120 );
+  tft.drawCenterString("(c) OpenStreetMap",tft.width() >> 1, TFT_HEIGHT - 110 );
+  tft.drawCenterString("(c) OpenStreetMap contributors",tft.width() >> 1, TFT_HEIGHT - 100 );
 
   char statusString[50] = "";
   tft.setTextColor(TFT_YELLOW, TFT_BLACK);

From be2f89c573a6843cf01ec1679b5f54f7a8d0d375 Mon Sep 17 00:00:00 2001
From: jgauchia <jgauchia@gmx.es>
Date: Wed, 11 Dec 2024 18:37:16 +0100
Subject: [PATCH 53/55] fix(lvgl): Fix touch width screen when rotated

---
 lib/lvgl/src/lvglSetup.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/lvgl/src/lvglSetup.cpp b/lib/lvgl/src/lvglSetup.cpp
index c1c0396c..67279d5f 100644
--- a/lib/lvgl/src/lvglSetup.cpp
+++ b/lib/lvgl/src/lvglSetup.cpp
@@ -59,7 +59,7 @@ void IRAM_ATTR touchRead(lv_indev_t *indev_driver, lv_indev_data_t *data)
     }
     else if (lv_display_get_rotation(display) == LV_DISPLAY_ROTATION_270)
     {
-      data->point.x = 320 - touchY;
+      data->point.x = TFT_WIDTH - touchY;
       data->point.y = touchX;
     }
     data->state = LV_INDEV_STATE_PRESSED;

From bdf355835d473a2b3a66d70a5278bbb9587d9724 Mon Sep 17 00:00:00 2001
From: jgauchia <jgauchia@gmx.es>
Date: Wed, 11 Dec 2024 18:45:36 +0100
Subject: [PATCH 54/55] chore: Update version

---
 include/hal.hpp                   | 4 ++--
 lib/battery/battery.cpp           | 4 ++--
 lib/battery/battery.hpp           | 4 ++--
 lib/bme/bme.cpp                   | 4 ++--
 lib/bme/bme.hpp                   | 4 ++--
 lib/cli/cli.cpp                   | 2 +-
 lib/cli/cli.hpp                   | 2 +-
 lib/cli/utils.h                   | 4 ++--
 lib/compass/compass.cpp           | 4 ++--
 lib/compass/compass.hpp           | 4 ++--
 lib/gps/gps.cpp                   | 4 ++--
 lib/gps/gps.hpp                   | 4 ++--
 lib/gps/timezone.hpp              | 4 ++--
 lib/gpx/src/addWaypoint.cpp       | 4 ++--
 lib/gpx/src/addWaypoint.hpp       | 4 ++--
 lib/gpx/src/deleteWaypoint.cpp    | 4 ++--
 lib/gpx/src/deleteWaypoint.hpp    | 4 ++--
 lib/gpx/src/editWaypoint.cpp      | 4 ++--
 lib/gpx/src/editWaypoint.hpp      | 4 ++--
 lib/gpx/src/globalGpxDef.h        | 4 ++--
 lib/gpx/src/loadWaypoint.cpp      | 4 ++--
 lib/gpx/src/loadWaypoint.hpp      | 4 ++--
 lib/gui/src/buttonBar.cpp         | 4 ++--
 lib/gui/src/buttonBar.hpp         | 4 ++--
 lib/gui/src/deviceSettingsScr.cpp | 4 ++--
 lib/gui/src/deviceSettingsScr.hpp | 4 ++--
 lib/gui/src/globalGuiDef.h        | 4 ++--
 lib/gui/src/mainScr.cpp           | 4 ++--
 lib/gui/src/mainScr.hpp           | 4 ++--
 lib/gui/src/mapSettingsScr.cpp    | 4 ++--
 lib/gui/src/mapSettingsScr.hpp    | 4 ++--
 lib/gui/src/navScr.cpp            | 4 ++--
 lib/gui/src/navScr.hpp            | 4 ++--
 lib/gui/src/notifyBar.cpp         | 4 ++--
 lib/gui/src/notifyBar.hpp         | 4 ++--
 lib/gui/src/satInfoScr.cpp        | 4 ++--
 lib/gui/src/satInfoScr.hpp        | 4 ++--
 lib/gui/src/searchSatScr.cpp      | 4 ++--
 lib/gui/src/searchSatScr.hpp      | 4 ++--
 lib/gui/src/settingsScr.cpp       | 4 ++--
 lib/gui/src/settingsScr.hpp       | 4 ++--
 lib/gui/src/splashScr.cpp         | 4 ++--
 lib/gui/src/splashScr.hpp         | 4 ++--
 lib/gui/src/upgradeScr.cpp        | 4 ++--
 lib/gui/src/upgradeScr.hpp        | 4 ++--
 lib/gui/src/waypointListScr.cpp   | 4 ++--
 lib/gui/src/waypointListScr.hpp   | 4 ++--
 lib/gui/src/waypointScr.cpp       | 4 ++--
 lib/gui/src/waypointScr.hpp       | 4 ++--
 lib/gui/src/widgets.cpp           | 4 ++--
 lib/gui/src/widgets.hpp           | 4 ++--
 lib/lvgl/src/lvglFuncs.cpp        | 4 ++--
 lib/lvgl/src/lvglFuncs.hpp        | 4 ++--
 lib/lvgl/src/lvglSetup.cpp        | 4 ++--
 lib/lvgl/src/lvglSetup.hpp        | 4 ++--
 lib/maps/src/globalMapsDef.h      | 4 ++--
 lib/maps/src/mapsDrawFunc.h       | 4 ++--
 lib/maps/src/renderMaps.cpp       | 4 ++--
 lib/maps/src/renderMaps.hpp       | 4 ++--
 lib/maps/src/vectorMaps.cpp       | 4 ++--
 lib/maps/src/vectorMaps.hpp       | 4 ++--
 lib/panel/ICENAV_BOARD.hpp        | 4 ++--
 lib/panel/ILI9341_XPT2046_SPI.hpp | 4 ++--
 lib/panel/ILI9488_FT5x06_16B.hpp  | 4 ++--
 lib/panel/ILI9488_FT5x06_SPI.hpp  | 4 ++--
 lib/panel/ILI9488_NOTOUCH_8B.hpp  | 4 ++--
 lib/panel/ILI9488_XPT2046_SPI.hpp | 4 ++--
 lib/panel/LILYGO_TDECK.hpp        | 4 ++--
 lib/power/power.cpp               | 4 ++--
 lib/power/power.hpp               | 4 ++--
 lib/settings/settings.cpp         | 4 ++--
 lib/settings/settings.hpp         | 4 ++--
 lib/storage/storage.cpp           | 4 ++--
 lib/storage/storage.hpp           | 4 ++--
 lib/tasks/tasks.cpp               | 4 ++--
 lib/tasks/tasks.hpp               | 4 ++--
 lib/tft/tft.cpp                   | 4 ++--
 lib/tft/tft.hpp                   | 4 ++--
 lib/upgrade/src/firmUpgrade.cpp   | 4 ++--
 lib/upgrade/src/firmUpgrade.hpp   | 4 ++--
 lib/utils/src/gpsMath.cpp         | 4 ++--
 lib/utils/src/gpsMath.hpp         | 4 ++--
 lib/webfile/src/webpage.h         | 4 ++--
 lib/webfile/src/webserver.h       | 4 ++--
 platformio.ini                    | 4 ++--
 src/main.cpp                      | 4 ++--
 86 files changed, 170 insertions(+), 170 deletions(-)

diff --git a/include/hal.hpp b/include/hal.hpp
index a45074a8..d96d0f30 100644
--- a/include/hal.hpp
+++ b/include/hal.hpp
@@ -2,8 +2,8 @@
  * @file hal.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Boards Pin definitions
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #ifndef HAL_HPP
diff --git a/lib/battery/battery.cpp b/lib/battery/battery.cpp
index 473306bd..fc9baecd 100644
--- a/lib/battery/battery.cpp
+++ b/lib/battery/battery.cpp
@@ -2,8 +2,8 @@
  * @file battery.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Battery monitor definition and functions
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 
diff --git a/lib/battery/battery.hpp b/lib/battery/battery.hpp
index 072f360e..70f729db 100644
--- a/lib/battery/battery.hpp
+++ b/lib/battery/battery.hpp
@@ -2,8 +2,8 @@
  * @file battery.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Battery monitor definition and functions
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #ifndef BATTERY_HPP
diff --git a/lib/bme/bme.cpp b/lib/bme/bme.cpp
index 5df81cc6..e85c31ac 100644
--- a/lib/bme/bme.cpp
+++ b/lib/bme/bme.cpp
@@ -2,8 +2,8 @@
  * @file bme.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  BME280 Sensor functions
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #include "bme.hpp"
diff --git a/lib/bme/bme.hpp b/lib/bme/bme.hpp
index c4d3a0e2..b7e404b8 100644
--- a/lib/bme/bme.hpp
+++ b/lib/bme/bme.hpp
@@ -2,8 +2,8 @@
  * @file bme.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  BME280 Sensor functions
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #ifndef BME_HPP
diff --git a/lib/cli/cli.cpp b/lib/cli/cli.cpp
index e0be1bd6..860f0e35 100644
--- a/lib/cli/cli.cpp
+++ b/lib/cli/cli.cpp
@@ -3,7 +3,7 @@
  * @author @Hpsaturn
  * @brief  Network CLI and custom internal commands
  * @version Using https://github.com/hpsaturn/esp32-wifi-cli.git
- * @date 2024-11
+ * @date 2024-12
  */
 
 #ifndef DISABLE_CLI
diff --git a/lib/cli/cli.hpp b/lib/cli/cli.hpp
index 88d87a2c..6dcf0586 100644
--- a/lib/cli/cli.hpp
+++ b/lib/cli/cli.hpp
@@ -3,7 +3,7 @@
  * @author @Hpsaturn
  * @brief  Network CLI and custom internal commands
  * @version Using https://github.com/hpsaturn/esp32-wifi-cli.git
- * @date 2024-11
+ * @date 2024-12
  */
 
 #ifndef CLI_HPP
diff --git a/lib/cli/utils.h b/lib/cli/utils.h
index 51f0043f..4fb9b613 100644
--- a/lib/cli/utils.h
+++ b/lib/cli/utils.h
@@ -2,8 +2,8 @@
  * @file utils.h
  * @author @Hpsaturn
  * @brief  Network CLI and custom internal commands
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #ifndef UTILS_H
diff --git a/lib/compass/compass.cpp b/lib/compass/compass.cpp
index 43f83d40..8ab3893d 100644
--- a/lib/compass/compass.cpp
+++ b/lib/compass/compass.cpp
@@ -2,8 +2,8 @@
  * @file compass.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Compass definition and functions
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #include "compass.hpp"
diff --git a/lib/compass/compass.hpp b/lib/compass/compass.hpp
index f9b56c03..2a747622 100644
--- a/lib/compass/compass.hpp
+++ b/lib/compass/compass.hpp
@@ -2,8 +2,8 @@
  * @file compass.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Compass definition and functions
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #ifndef COMPASS_HPP
diff --git a/lib/gps/gps.cpp b/lib/gps/gps.cpp
index 7f4dfe49..e7bdf80c 100644
--- a/lib/gps/gps.cpp
+++ b/lib/gps/gps.cpp
@@ -2,8 +2,8 @@
  * @file gps.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  GPS definition and functions
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #include "gps.hpp"
diff --git a/lib/gps/gps.hpp b/lib/gps/gps.hpp
index fb890c6c..aa03bdb7 100644
--- a/lib/gps/gps.hpp
+++ b/lib/gps/gps.hpp
@@ -2,8 +2,8 @@
  * @file gps.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  GPS definition and functions
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #ifndef GPS_HPP
diff --git a/lib/gps/timezone.hpp b/lib/gps/timezone.hpp
index 3890e20b..95951e66 100644
--- a/lib/gps/timezone.hpp
+++ b/lib/gps/timezone.hpp
@@ -2,8 +2,8 @@
  * @file timezone.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Time zone adjust
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #ifndef TIMEZONE_HPP
diff --git a/lib/gpx/src/addWaypoint.cpp b/lib/gpx/src/addWaypoint.cpp
index b2355171..4bd29f64 100644
--- a/lib/gpx/src/addWaypoint.cpp
+++ b/lib/gpx/src/addWaypoint.cpp
@@ -2,8 +2,8 @@
  * @file addWaypoint.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Add Waypoint functions
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #include "addWaypoint.hpp"
diff --git a/lib/gpx/src/addWaypoint.hpp b/lib/gpx/src/addWaypoint.hpp
index 2ae526cf..c97ffdc8 100644
--- a/lib/gpx/src/addWaypoint.hpp
+++ b/lib/gpx/src/addWaypoint.hpp
@@ -2,8 +2,8 @@
  * @file addWaypoint.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Add Waypoint functions
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #ifndef ADDWAYPOINT_HPP
diff --git a/lib/gpx/src/deleteWaypoint.cpp b/lib/gpx/src/deleteWaypoint.cpp
index ce9175f4..b93ebd5d 100644
--- a/lib/gpx/src/deleteWaypoint.cpp
+++ b/lib/gpx/src/deleteWaypoint.cpp
@@ -2,8 +2,8 @@
  * @file deleteWaypoint.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Delete Waypoint functions
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
  #include "deleteWaypoint.hpp"
diff --git a/lib/gpx/src/deleteWaypoint.hpp b/lib/gpx/src/deleteWaypoint.hpp
index a610cf04..49b73b59 100644
--- a/lib/gpx/src/deleteWaypoint.hpp
+++ b/lib/gpx/src/deleteWaypoint.hpp
@@ -2,8 +2,8 @@
  * @file deleteWaypoint.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Delete Waypoint functions
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #ifndef DELETEWAYPOINT_HPP
diff --git a/lib/gpx/src/editWaypoint.cpp b/lib/gpx/src/editWaypoint.cpp
index 155689ed..8802c56f 100644
--- a/lib/gpx/src/editWaypoint.cpp
+++ b/lib/gpx/src/editWaypoint.cpp
@@ -2,8 +2,8 @@
  * @file editWaypoint.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Edit Waypoint functions
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
  #include "editWaypoint.hpp"
diff --git a/lib/gpx/src/editWaypoint.hpp b/lib/gpx/src/editWaypoint.hpp
index e8b9ee31..939833c6 100644
--- a/lib/gpx/src/editWaypoint.hpp
+++ b/lib/gpx/src/editWaypoint.hpp
@@ -2,8 +2,8 @@
  * @file editWaypoint.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Edit Waypoint functions
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #ifndef EDITWAYPOINT_HPP
diff --git a/lib/gpx/src/globalGpxDef.h b/lib/gpx/src/globalGpxDef.h
index 5f43c37e..2dc545ec 100644
--- a/lib/gpx/src/globalGpxDef.h
+++ b/lib/gpx/src/globalGpxDef.h
@@ -2,8 +2,8 @@
  * @file globalGpxDef.h
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Global GPX Variables
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 
diff --git a/lib/gpx/src/loadWaypoint.cpp b/lib/gpx/src/loadWaypoint.cpp
index 1152b58b..c14ae479 100644
--- a/lib/gpx/src/loadWaypoint.cpp
+++ b/lib/gpx/src/loadWaypoint.cpp
@@ -2,8 +2,8 @@
  * @file loadWaypoint.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Load Waypoint functions
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
  #include "loadWaypoint.hpp"
diff --git a/lib/gpx/src/loadWaypoint.hpp b/lib/gpx/src/loadWaypoint.hpp
index 1fcfadf7..182ee6d6 100644
--- a/lib/gpx/src/loadWaypoint.hpp
+++ b/lib/gpx/src/loadWaypoint.hpp
@@ -2,8 +2,8 @@
  * @file loadWaypoint.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Load Waypoint functions
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #ifndef LOADWAYPOINT_HPP
diff --git a/lib/gui/src/buttonBar.cpp b/lib/gui/src/buttonBar.cpp
index f7bc133e..26552b77 100644
--- a/lib/gui/src/buttonBar.cpp
+++ b/lib/gui/src/buttonBar.cpp
@@ -2,8 +2,8 @@
  * @file buttonBar.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL - Button Bar 
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #include "buttonBar.hpp"
diff --git a/lib/gui/src/buttonBar.hpp b/lib/gui/src/buttonBar.hpp
index 30a579f3..5ff40902 100644
--- a/lib/gui/src/buttonBar.hpp
+++ b/lib/gui/src/buttonBar.hpp
@@ -2,8 +2,8 @@
  * @file buttonBar.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL - Button Bar
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #ifndef BUTTONBAR_HPP
diff --git a/lib/gui/src/deviceSettingsScr.cpp b/lib/gui/src/deviceSettingsScr.cpp
index dab1bda3..970aae4a 100644
--- a/lib/gui/src/deviceSettingsScr.cpp
+++ b/lib/gui/src/deviceSettingsScr.cpp
@@ -2,8 +2,8 @@
  * @file deviceSettingsScr.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL - Device Settings Screen
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #include "deviceSettingsScr.hpp"
diff --git a/lib/gui/src/deviceSettingsScr.hpp b/lib/gui/src/deviceSettingsScr.hpp
index 66adb6ff..e7a2b15e 100644
--- a/lib/gui/src/deviceSettingsScr.hpp
+++ b/lib/gui/src/deviceSettingsScr.hpp
@@ -2,8 +2,8 @@
  * @file deviceSettingsScr.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL - Device Settings Screen
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #ifndef DEVICESETTINGSCR_HPP
diff --git a/lib/gui/src/globalGuiDef.h b/lib/gui/src/globalGuiDef.h
index 858caf17..6ee0d2b7 100644
--- a/lib/gui/src/globalGuiDef.h
+++ b/lib/gui/src/globalGuiDef.h
@@ -1,8 +1,8 @@
 /**
  * @file globalGuiDef.h
  * @brief  Global GUI Variables
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #ifndef GLOBALGUIDEF_H
diff --git a/lib/gui/src/mainScr.cpp b/lib/gui/src/mainScr.cpp
index 427525de..8a8dc58a 100644
--- a/lib/gui/src/mainScr.cpp
+++ b/lib/gui/src/mainScr.cpp
@@ -2,8 +2,8 @@
  * @file mainScr.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL - Main Screen
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #include "mainScr.hpp"
diff --git a/lib/gui/src/mainScr.hpp b/lib/gui/src/mainScr.hpp
index 06f3eb82..0b401472 100644
--- a/lib/gui/src/mainScr.hpp
+++ b/lib/gui/src/mainScr.hpp
@@ -2,8 +2,8 @@
  * @file mainScr.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL - Main Screen
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #ifndef MAINSCR_HPP
diff --git a/lib/gui/src/mapSettingsScr.cpp b/lib/gui/src/mapSettingsScr.cpp
index 29db0312..e646df29 100644
--- a/lib/gui/src/mapSettingsScr.cpp
+++ b/lib/gui/src/mapSettingsScr.cpp
@@ -2,8 +2,8 @@
  * @file mapSettingsScr.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL - Map Settings screen
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #include "mapSettingsScr.hpp"
diff --git a/lib/gui/src/mapSettingsScr.hpp b/lib/gui/src/mapSettingsScr.hpp
index 6168abf5..7cf4e78a 100644
--- a/lib/gui/src/mapSettingsScr.hpp
+++ b/lib/gui/src/mapSettingsScr.hpp
@@ -2,8 +2,8 @@
  * @file mapSettingsScr.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL - Map Settings screen
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #ifndef MAPSETTINGSCR_HPP
diff --git a/lib/gui/src/navScr.cpp b/lib/gui/src/navScr.cpp
index 3e8754e6..58537641 100644
--- a/lib/gui/src/navScr.cpp
+++ b/lib/gui/src/navScr.cpp
@@ -2,8 +2,8 @@
  * @file navScr.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL - Navigation screen 
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
  #include "navScr.hpp"
diff --git a/lib/gui/src/navScr.hpp b/lib/gui/src/navScr.hpp
index 5fea2489..efbfb179 100644
--- a/lib/gui/src/navScr.hpp
+++ b/lib/gui/src/navScr.hpp
@@ -2,8 +2,8 @@
  * @file navScr.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL - Navigation screen 
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #ifndef NAVSCR_HPP
diff --git a/lib/gui/src/notifyBar.cpp b/lib/gui/src/notifyBar.cpp
index 507d67fd..408bf0b1 100644
--- a/lib/gui/src/notifyBar.cpp
+++ b/lib/gui/src/notifyBar.cpp
@@ -2,8 +2,8 @@
  * @file notifyBar.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief LVGL - Notify Bar Screen
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #include "notifyBar.hpp"
diff --git a/lib/gui/src/notifyBar.hpp b/lib/gui/src/notifyBar.hpp
index cb7c5e7b..6243b975 100644
--- a/lib/gui/src/notifyBar.hpp
+++ b/lib/gui/src/notifyBar.hpp
@@ -2,8 +2,8 @@
  * @file notifyBar.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief LVGL - Notify Bar Screen
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #ifndef NOTIFYBAR_HPP
diff --git a/lib/gui/src/satInfoScr.cpp b/lib/gui/src/satInfoScr.cpp
index cfd41f9b..cff1159e 100644
--- a/lib/gui/src/satInfoScr.cpp
+++ b/lib/gui/src/satInfoScr.cpp
@@ -2,8 +2,8 @@
  * @file satInfoScr.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL - Satellite info screen 
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #include "satInfoScr.hpp"
diff --git a/lib/gui/src/satInfoScr.hpp b/lib/gui/src/satInfoScr.hpp
index ac98ccfd..be90d78e 100644
--- a/lib/gui/src/satInfoScr.hpp
+++ b/lib/gui/src/satInfoScr.hpp
@@ -2,8 +2,8 @@
  * @file satInfoScr.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL - Satellite info screen 
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #ifndef SATINFOSCR_HPP
diff --git a/lib/gui/src/searchSatScr.cpp b/lib/gui/src/searchSatScr.cpp
index 29856b36..baba24d8 100644
--- a/lib/gui/src/searchSatScr.cpp
+++ b/lib/gui/src/searchSatScr.cpp
@@ -2,8 +2,8 @@
  * @file searchSatScr.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL - GPS satellite search screen
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #include "searchSatScr.hpp"
diff --git a/lib/gui/src/searchSatScr.hpp b/lib/gui/src/searchSatScr.hpp
index 5f211cac..93b98a47 100644
--- a/lib/gui/src/searchSatScr.hpp
+++ b/lib/gui/src/searchSatScr.hpp
@@ -2,8 +2,8 @@
  * @file searchSatScr.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL - GPS satellite search screen
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #ifndef SEARCHSATSCR_HPP
diff --git a/lib/gui/src/settingsScr.cpp b/lib/gui/src/settingsScr.cpp
index 518fda83..fd38ced0 100644
--- a/lib/gui/src/settingsScr.cpp
+++ b/lib/gui/src/settingsScr.cpp
@@ -2,8 +2,8 @@
  * @file settingsScr.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL - Settings Screen
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #include "settingsScr.hpp"
diff --git a/lib/gui/src/settingsScr.hpp b/lib/gui/src/settingsScr.hpp
index c68ee7bf..e02f9d43 100644
--- a/lib/gui/src/settingsScr.hpp
+++ b/lib/gui/src/settingsScr.hpp
@@ -2,8 +2,8 @@
  * @file settingsScr.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL - Settings Screen
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #ifndef SETTINGSSCR_HPP
diff --git a/lib/gui/src/splashScr.cpp b/lib/gui/src/splashScr.cpp
index bb65bebc..98557039 100644
--- a/lib/gui/src/splashScr.cpp
+++ b/lib/gui/src/splashScr.cpp
@@ -2,8 +2,8 @@
  * @file splashScr.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Splash screen - NOT LVGL
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #include "splashScr.hpp"
diff --git a/lib/gui/src/splashScr.hpp b/lib/gui/src/splashScr.hpp
index 61d22b61..298d60e5 100644
--- a/lib/gui/src/splashScr.hpp
+++ b/lib/gui/src/splashScr.hpp
@@ -2,8 +2,8 @@
  * @file splashScr.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Splash screen - NOT LVGL
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #ifndef SPLASHSCR_HPP
diff --git a/lib/gui/src/upgradeScr.cpp b/lib/gui/src/upgradeScr.cpp
index 984a3f87..76c8e509 100644
--- a/lib/gui/src/upgradeScr.cpp
+++ b/lib/gui/src/upgradeScr.cpp
@@ -2,8 +2,8 @@
  * @file upgradeScr.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL Firmware upgrade messages
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
  #include "upgradeScr.hpp"
diff --git a/lib/gui/src/upgradeScr.hpp b/lib/gui/src/upgradeScr.hpp
index be0f2a49..3fef0e70 100644
--- a/lib/gui/src/upgradeScr.hpp
+++ b/lib/gui/src/upgradeScr.hpp
@@ -2,8 +2,8 @@
  * @file upgradeScr.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL Firmware upgrade messages
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #ifndef UPGRADESCR_HPP
diff --git a/lib/gui/src/waypointListScr.cpp b/lib/gui/src/waypointListScr.cpp
index 717f38de..2c495408 100644
--- a/lib/gui/src/waypointListScr.cpp
+++ b/lib/gui/src/waypointListScr.cpp
@@ -2,8 +2,8 @@
  * @file waypointListScr.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL - Waypoint list screen
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #include "waypointListScr.hpp"
diff --git a/lib/gui/src/waypointListScr.hpp b/lib/gui/src/waypointListScr.hpp
index db3599b9..f24fbcc8 100644
--- a/lib/gui/src/waypointListScr.hpp
+++ b/lib/gui/src/waypointListScr.hpp
@@ -2,8 +2,8 @@
  * @file waypointListScr.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL - Waypoint list screen
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #ifndef WAYPOINTLISTSCR_HPP
diff --git a/lib/gui/src/waypointScr.cpp b/lib/gui/src/waypointScr.cpp
index aed687a0..d9ecaad0 100644
--- a/lib/gui/src/waypointScr.cpp
+++ b/lib/gui/src/waypointScr.cpp
@@ -2,8 +2,8 @@
  * @file waypointScr.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL - Waypoint Screen
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #include "waypointScr.hpp"
diff --git a/lib/gui/src/waypointScr.hpp b/lib/gui/src/waypointScr.hpp
index 4a2fff4d..166350cc 100644
--- a/lib/gui/src/waypointScr.hpp
+++ b/lib/gui/src/waypointScr.hpp
@@ -2,8 +2,8 @@
  * @file waypointScr.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL - Add Waypoint Screen
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #ifndef waypointScr_HPP
diff --git a/lib/gui/src/widgets.cpp b/lib/gui/src/widgets.cpp
index 2c39a0e4..16fd2c89 100644
--- a/lib/gui/src/widgets.cpp
+++ b/lib/gui/src/widgets.cpp
@@ -2,8 +2,8 @@
  * @file widgets.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL - Widgets
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #include "widgets.hpp"
diff --git a/lib/gui/src/widgets.hpp b/lib/gui/src/widgets.hpp
index d7131ec8..1319a2a8 100644
--- a/lib/gui/src/widgets.hpp
+++ b/lib/gui/src/widgets.hpp
@@ -2,8 +2,8 @@
  * @file widgets.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL - Widgets
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #ifndef WIDGETS_HPP
diff --git a/lib/lvgl/src/lvglFuncs.cpp b/lib/lvgl/src/lvglFuncs.cpp
index 59196ff2..ce08fea9 100644
--- a/lib/lvgl/src/lvglFuncs.cpp
+++ b/lib/lvgl/src/lvglFuncs.cpp
@@ -2,8 +2,8 @@
  * @file lvglFuncs.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL custom functions
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #include "lvglFuncs.hpp"
diff --git a/lib/lvgl/src/lvglFuncs.hpp b/lib/lvgl/src/lvglFuncs.hpp
index 0df59194..3edf2803 100644
--- a/lib/lvgl/src/lvglFuncs.hpp
+++ b/lib/lvgl/src/lvglFuncs.hpp
@@ -2,8 +2,8 @@
  * @file lvglFuncs.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL custom functions
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #ifndef LVGLFUNCS_HPP
diff --git a/lib/lvgl/src/lvglSetup.cpp b/lib/lvgl/src/lvglSetup.cpp
index 67279d5f..2cb234ac 100644
--- a/lib/lvgl/src/lvglSetup.cpp
+++ b/lib/lvgl/src/lvglSetup.cpp
@@ -2,8 +2,8 @@
  * @file lvglSetup.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL Screen implementation
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #include "lvglSetup.hpp"
diff --git a/lib/lvgl/src/lvglSetup.hpp b/lib/lvgl/src/lvglSetup.hpp
index 386e02d9..32d3d341 100644
--- a/lib/lvgl/src/lvglSetup.hpp
+++ b/lib/lvgl/src/lvglSetup.hpp
@@ -2,8 +2,8 @@
  * @file lvglSetup.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LVGL Screen implementation
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #ifndef LVGLSETUP_HPP
diff --git a/lib/maps/src/globalMapsDef.h b/lib/maps/src/globalMapsDef.h
index 2b3d91b0..baaee1f4 100644
--- a/lib/maps/src/globalMapsDef.h
+++ b/lib/maps/src/globalMapsDef.h
@@ -1,8 +1,8 @@
 /**
  * @file globalMapsDef.h
  * @brief  Global Maps Variables
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #ifndef GLOBALMAPSDEF_H
diff --git a/lib/maps/src/mapsDrawFunc.h b/lib/maps/src/mapsDrawFunc.h
index a6cb2563..0db1ed15 100644
--- a/lib/maps/src/mapsDrawFunc.h
+++ b/lib/maps/src/mapsDrawFunc.h
@@ -1,8 +1,8 @@
 /**
  * @file mapsDrawFunc.h
  * @brief  Extra Draw functions for maps
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #ifndef MAPSDRAWFUNC_H
diff --git a/lib/maps/src/renderMaps.cpp b/lib/maps/src/renderMaps.cpp
index fe8ef46a..8a4c1168 100644
--- a/lib/maps/src/renderMaps.cpp
+++ b/lib/maps/src/renderMaps.cpp
@@ -2,8 +2,8 @@
  * @file renderMaps.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Render maps draw functions
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #include "renderMaps.hpp"
diff --git a/lib/maps/src/renderMaps.hpp b/lib/maps/src/renderMaps.hpp
index 9e69b53b..d61a9be0 100644
--- a/lib/maps/src/renderMaps.hpp
+++ b/lib/maps/src/renderMaps.hpp
@@ -2,8 +2,8 @@
  * @file renderMaps.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Render maps draw functions
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #ifndef RENDERMAPS_HPP
diff --git a/lib/maps/src/vectorMaps.cpp b/lib/maps/src/vectorMaps.cpp
index b90b1037..230ef737 100644
--- a/lib/maps/src/vectorMaps.cpp
+++ b/lib/maps/src/vectorMaps.cpp
@@ -2,8 +2,8 @@
  * @file vectorMaps.cpp
  * @author @aresta - https://github.com/aresta/ESP32_GPS
  * @brief  Vector maps draw functions
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #include "vectorMaps.hpp"
diff --git a/lib/maps/src/vectorMaps.hpp b/lib/maps/src/vectorMaps.hpp
index 6403be93..ff507ed1 100644
--- a/lib/maps/src/vectorMaps.hpp
+++ b/lib/maps/src/vectorMaps.hpp
@@ -2,8 +2,8 @@
  * @file vectorMaps.hpp
  * @author @aresta - https://github.com/aresta/ESP32_GPS
  * @brief  Vector maps draw functions
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #ifndef VECTORMAPS_HPP
diff --git a/lib/panel/ICENAV_BOARD.hpp b/lib/panel/ICENAV_BOARD.hpp
index 04790821..6e4e2ac4 100644
--- a/lib/panel/ICENAV_BOARD.hpp
+++ b/lib/panel/ICENAV_BOARD.hpp
@@ -2,8 +2,8 @@
  * @file ICENAV_BOARD.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LOVYANGFX TFT driver for IceNaV board
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #ifndef ICENAV_BOARD_HPP
diff --git a/lib/panel/ILI9341_XPT2046_SPI.hpp b/lib/panel/ILI9341_XPT2046_SPI.hpp
index 97fc0003..a810e5b2 100644
--- a/lib/panel/ILI9341_XPT2046_SPI.hpp
+++ b/lib/panel/ILI9341_XPT2046_SPI.hpp
@@ -2,8 +2,8 @@
 //  * @file ILI9341_XPT2046_SPI.hpp
 //  * @author Jordi Gauchía (jgauchia@gmx.es)
 //  * @brief  LOVYANGFX TFT driver for ILI9341 SPI With XPT2046 Touch controller
-//  * @version 0.1.9_alpha
-//  * @date 2024-11
+//  * @version 0.1.9
+//  * @date 2024-12
 //  */
 
 #ifndef ILI9341_XPT2046_SPI_HPP
diff --git a/lib/panel/ILI9488_FT5x06_16B.hpp b/lib/panel/ILI9488_FT5x06_16B.hpp
index 5c886792..60f08979 100644
--- a/lib/panel/ILI9488_FT5x06_16B.hpp
+++ b/lib/panel/ILI9488_FT5x06_16B.hpp
@@ -2,8 +2,8 @@
  * @file ILI9488_FT5x06_16B.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LOVYANGFX TFT driver for ILI9488 16 Bits parallel  With FT5x06 Touch controller
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #ifndef ILI9488_FT5x06_16B_HPP
diff --git a/lib/panel/ILI9488_FT5x06_SPI.hpp b/lib/panel/ILI9488_FT5x06_SPI.hpp
index 00d37723..c1ec522a 100644
--- a/lib/panel/ILI9488_FT5x06_SPI.hpp
+++ b/lib/panel/ILI9488_FT5x06_SPI.hpp
@@ -2,8 +2,8 @@
  * @file ILI9488_XPT2046_SPI.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LOVYANGFX TFT driver for ILI9488 SPI With XPT2046 Touch controller
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #ifndef ILI9488_XPT2046_SPI_HPP
diff --git a/lib/panel/ILI9488_NOTOUCH_8B.hpp b/lib/panel/ILI9488_NOTOUCH_8B.hpp
index 9ca36f08..e9d4edff 100644
--- a/lib/panel/ILI9488_NOTOUCH_8B.hpp
+++ b/lib/panel/ILI9488_NOTOUCH_8B.hpp
@@ -2,8 +2,8 @@
  * @file ILI9488_NOTOUCH_8B.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LOVYANGFX TFT driver for ILI9488 8 Bits parallel  Without Touch controller
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #ifndef ILI9488_NOTOUCH_8B_HPP
diff --git a/lib/panel/ILI9488_XPT2046_SPI.hpp b/lib/panel/ILI9488_XPT2046_SPI.hpp
index c43300e8..f7b90152 100644
--- a/lib/panel/ILI9488_XPT2046_SPI.hpp
+++ b/lib/panel/ILI9488_XPT2046_SPI.hpp
@@ -2,8 +2,8 @@
  * @file ILI9488_XPT2046_SPI.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  LOVYANGFX TFT driver for ILI9488 SPI With XPT2046 Touch controller
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #ifndef ILI9488_XPT2046_SPI_HPP
diff --git a/lib/panel/LILYGO_TDECK.hpp b/lib/panel/LILYGO_TDECK.hpp
index 9e1a5f09..0428757b 100644
--- a/lib/panel/LILYGO_TDECK.hpp
+++ b/lib/panel/LILYGO_TDECK.hpp
@@ -2,8 +2,8 @@
  * @file LILYGO_TDECK.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es) and Antonio Vanegas @Hpsturn
  * @brief  LOVYANGFX TFT driver for ST7789 SPI With GT911 Touch controller
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #ifndef LILYGO_TDECK_HPP
diff --git a/lib/power/power.cpp b/lib/power/power.cpp
index 62bdb978..26b09aaf 100644
--- a/lib/power/power.cpp
+++ b/lib/power/power.cpp
@@ -2,8 +2,8 @@
  * @file power.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  ESP32 Power Management functions
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #include "power.hpp"
diff --git a/lib/power/power.hpp b/lib/power/power.hpp
index 3c421a4d..caf37a18 100644
--- a/lib/power/power.hpp
+++ b/lib/power/power.hpp
@@ -2,8 +2,8 @@
  * @file power.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  ESP32 Power Management functions
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #ifndef POWER_HPP
diff --git a/lib/settings/settings.cpp b/lib/settings/settings.cpp
index bda2fd24..9abb2ad2 100644
--- a/lib/settings/settings.cpp
+++ b/lib/settings/settings.cpp
@@ -2,8 +2,8 @@
  * @file settings.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Settings functions
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #include "settings.hpp"
diff --git a/lib/settings/settings.hpp b/lib/settings/settings.hpp
index 06726325..8501c63f 100644
--- a/lib/settings/settings.hpp
+++ b/lib/settings/settings.hpp
@@ -2,8 +2,8 @@
  * @file settings.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Settings functions
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #ifndef SETTINGS_HPP
diff --git a/lib/storage/storage.cpp b/lib/storage/storage.cpp
index df920ad6..d784369b 100644
--- a/lib/storage/storage.cpp
+++ b/lib/storage/storage.cpp
@@ -2,8 +2,8 @@
  * @file storage.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Storage definition and functions
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #include "storage.hpp"
diff --git a/lib/storage/storage.hpp b/lib/storage/storage.hpp
index b6e88cba..01d688b6 100644
--- a/lib/storage/storage.hpp
+++ b/lib/storage/storage.hpp
@@ -2,8 +2,8 @@
  * @file storage.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Storage definition and functions
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #ifndef STORAGE_HPP
diff --git a/lib/tasks/tasks.cpp b/lib/tasks/tasks.cpp
index 37296df7..95643cee 100644
--- a/lib/tasks/tasks.cpp
+++ b/lib/tasks/tasks.cpp
@@ -2,8 +2,8 @@
  * @file tasks.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Core Tasks functions
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #include "tasks.hpp"
diff --git a/lib/tasks/tasks.hpp b/lib/tasks/tasks.hpp
index df460316..25c4648e 100644
--- a/lib/tasks/tasks.hpp
+++ b/lib/tasks/tasks.hpp
@@ -2,8 +2,8 @@
  * @file tasks.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Core Tasks functions
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #ifndef TASKS_HPP
diff --git a/lib/tft/tft.cpp b/lib/tft/tft.cpp
index 565fb761..0e85f065 100644
--- a/lib/tft/tft.cpp
+++ b/lib/tft/tft.cpp
@@ -2,8 +2,8 @@
  * @file tft.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief TFT definition and functions
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #include "tft.hpp"
diff --git a/lib/tft/tft.hpp b/lib/tft/tft.hpp
index e94c0672..97600ec7 100644
--- a/lib/tft/tft.hpp
+++ b/lib/tft/tft.hpp
@@ -2,8 +2,8 @@
  * @file tft.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief TFT definition and functions
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #ifndef TFT_HPP
diff --git a/lib/upgrade/src/firmUpgrade.cpp b/lib/upgrade/src/firmUpgrade.cpp
index d5cb834e..1a96d9d7 100644
--- a/lib/upgrade/src/firmUpgrade.cpp
+++ b/lib/upgrade/src/firmUpgrade.cpp
@@ -2,8 +2,8 @@
  * @file firmUpgrade.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Firmware upgrade from SD functions
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
  #include "firmUpgrade.hpp"
diff --git a/lib/upgrade/src/firmUpgrade.hpp b/lib/upgrade/src/firmUpgrade.hpp
index 6e5f2b04..8c7a5d7c 100644
--- a/lib/upgrade/src/firmUpgrade.hpp
+++ b/lib/upgrade/src/firmUpgrade.hpp
@@ -2,8 +2,8 @@
  * @file firmUpgrade.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Firmware upgrade from SD functions
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #ifndef FIRMUPGRADE_HPP
diff --git a/lib/utils/src/gpsMath.cpp b/lib/utils/src/gpsMath.cpp
index b168ec5a..2c371fa3 100644
--- a/lib/utils/src/gpsMath.cpp
+++ b/lib/utils/src/gpsMath.cpp
@@ -2,8 +2,8 @@
  * @file gpsMath.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Math and various functions
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #include "gpsMath.hpp"
diff --git a/lib/utils/src/gpsMath.hpp b/lib/utils/src/gpsMath.hpp
index e5242300..6766f231 100644
--- a/lib/utils/src/gpsMath.hpp
+++ b/lib/utils/src/gpsMath.hpp
@@ -2,8 +2,8 @@
  * @file gpsMath.hpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  Math and various functions
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #ifndef GPSMATH_HPP
diff --git a/lib/webfile/src/webpage.h b/lib/webfile/src/webpage.h
index 0b39d1c2..0fc0fefa 100644
--- a/lib/webfile/src/webpage.h
+++ b/lib/webfile/src/webpage.h
@@ -2,8 +2,8 @@
  * @file webpage.h
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief Web file server page
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 
diff --git a/lib/webfile/src/webserver.h b/lib/webfile/src/webserver.h
index a50a8e49..58d99c79 100644
--- a/lib/webfile/src/webserver.h
+++ b/lib/webfile/src/webserver.h
@@ -2,8 +2,8 @@
  * @file webserver.h
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief Web file server functions
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #include "SPIFFS.h"
diff --git a/platformio.ini b/platformio.ini
index 1a7a8b0c..5fe3e8f1 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -15,8 +15,8 @@ default_envs = ICENAV_BOARD
 [common]
 platform = espressif32@6.9.0
 framework = arduino
-version = 0.1.9_alpha
-revision = 82
+version = 0.1.9
+revision = 83
 monitor_speed = 115200
 ;monitor_rts = 0
 ;monitor_dtr = 0
diff --git a/src/main.cpp b/src/main.cpp
index 647e4c0b..af90edef 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2,8 +2,8 @@
  * @file main.cpp
  * @author Jordi Gauchía (jgauchia@gmx.es)
  * @brief  ESP32 GPS Navigation main code
- * @version 0.1.9_alpha
- * @date 2024-11
+ * @version 0.1.9
+ * @date 2024-12
  */
 
 #include <Arduino.h>

From 1bf0a321140ab518e262c516b3afd39c85ea1c99 Mon Sep 17 00:00:00 2001
From: jgauchia <jgauchia@gmx.es>
Date: Wed, 11 Dec 2024 18:51:45 +0100
Subject: [PATCH 55/55] chore: Change debug level

---
 platformio.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platformio.ini b/platformio.ini
index 5fe3e8f1..871edbaa 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -25,7 +25,7 @@ monitor_filters =
 extra_scripts = pre:prebuild.py
 build_flags = 
   -D LV_CONF_PATH="${PROJECT_DIR}/lib/lvgl/lv_conf.h"
-  -D CORE_DEBUG_LEVEL=5
+  -D CORE_DEBUG_LEVEL=0
   -D USE_LINE_BUFFER=1
   -D DISABLE_RADIO=1
   -D BAUDRATE=115200