diff --git a/README.md b/README.md index 76acc42b..0bcfa139 100644 --- a/README.md +++ b/README.md @@ -75,6 +75,12 @@ export ICENAV3_LON=13.4049 pio run --target upload ``` +If the GPS module supports multiple GNSS, uncomment the following flag in the platformio.ini file under the build_flags section + +```bash +-D MULTI_GNSS=1 +``` + ## Specifications * ESP32 WROVER with 4Mb PSRAM / 16 Mb Flash diff --git a/lib/customboard/LGFX_CUSTOMBOARD.hpp b/lib/customboard/LGFX_CUSTOMBOARD.hpp index 44d96381..2c6f4a6c 100644 --- a/lib/customboard/LGFX_CUSTOMBOARD.hpp +++ b/lib/customboard/LGFX_CUSTOMBOARD.hpp @@ -2,8 +2,8 @@ * @file LGFX_CUSTOMBOARD.hpp * @author Jordi Gauchía (jgauchia@jgauchia.com) * @brief LOVYANGFX TFT driver for CUSTOMBOARD - * @version 0.1.4 - * @date 2023-05-23 + * @version 0.1.5 + * @date 2023-06-04 */ #define LGFX_USE_V1 diff --git a/lib/makefabs-esp32s3parallel/LGFX_MakerFabs_Parallel_S3.hpp b/lib/makefabs-esp32s3parallel/LGFX_MakerFabs_Parallel_S3.hpp index e61b49ce..6e9523a6 100644 --- a/lib/makefabs-esp32s3parallel/LGFX_MakerFabs_Parallel_S3.hpp +++ b/lib/makefabs-esp32s3parallel/LGFX_MakerFabs_Parallel_S3.hpp @@ -2,8 +2,8 @@ * @file LGFX_MakerFabs_Parallel_S3.hpp * @author Jordi Gauchía (jgauchia@jgauchia.com) * @brief LOVYANGFX TFT driver for MAKERF_ESP32S3 - * @version 0.1.4 - * @date 2023-05-23 + * @version 0.1.5 + * @date 2023-06-04 */ #define LGFX_USE_V1 diff --git a/platformio.ini b/platformio.ini index 117314e1..c3bdc992 100644 --- a/platformio.ini +++ b/platformio.ini @@ -15,7 +15,7 @@ default_envs = CUSTOMBOARD [common] platform = espressif32 framework = arduino -version = 0.1.4 +version = 0.1.5 revision = 25 monitor_speed = 115200 monitor_rts = 0 diff --git a/src/gui/events/compass.h b/src/gui/events/compass.h index 4242896b..534bf30b 100644 --- a/src/gui/events/compass.h +++ b/src/gui/events/compass.h @@ -2,8 +2,8 @@ * @file compass.h * @author Jordi Gauchía (jgauchia@jgauchia.com) * @brief Compass screen events - * @version 0.1.4 - * @date 2023-05-23 + * @version 0.1.5 + * @date 2023-06-04 */ /** diff --git a/src/gui/events/main_screen.h b/src/gui/events/main_screen.h index deb0e2f7..df7f5259 100644 --- a/src/gui/events/main_screen.h +++ b/src/gui/events/main_screen.h @@ -2,8 +2,8 @@ * @file main_screen.h * @author Jordi Gauchía (jgauchia@jgauchia.com) * @brief Main screen events - * @version 0.1.4 - * @date 2023-05-23 + * @version 0.1.5 + * @date 2023-06-04 */ /** diff --git a/src/gui/events/map.h b/src/gui/events/map.h index a7640890..9b97c133 100644 --- a/src/gui/events/map.h +++ b/src/gui/events/map.h @@ -2,8 +2,8 @@ * @file map.h * @author Jordi Gauchía (jgauchia@jgauchia.com) * @brief Map screen events - * @version 0.1.4 - * @date 2023-05-23 + * @version 0.1.5 + * @date 2023-06-04 */ /** diff --git a/src/gui/events/notify_bar.h b/src/gui/events/notify_bar.h index a9bdcc56..75b44816 100644 --- a/src/gui/events/notify_bar.h +++ b/src/gui/events/notify_bar.h @@ -2,8 +2,8 @@ * @file notify_bar.h * @author Jordi Gauchía (jgauchia@jgauchia.com) * @brief Notify Bar Events - * @version 0.1.4 - * @date 2023-05-23 + * @version 0.1.5 + * @date 2023-06-04 */ /** diff --git a/src/gui/events/sattrack.h b/src/gui/events/sattrack.h index 52f9a5af..77d81f0b 100644 --- a/src/gui/events/sattrack.h +++ b/src/gui/events/sattrack.h @@ -2,8 +2,8 @@ * @file sattrack.h * @author Jordi Gauchía (jgauchia@jgauchia.com) * @brief Satellite Tracking events - * @version 0.1.4 - * @date 2023-05-23 + * @version 0.1.5 + * @date 2023-06-04 */ /** diff --git a/src/gui/lvgl.h b/src/gui/lvgl.h index 455131ab..a4ef7467 100644 --- a/src/gui/lvgl.h +++ b/src/gui/lvgl.h @@ -2,8 +2,8 @@ * @file lvgl.h * @author Jordi Gauchía (jgauchia@jgauchia.com) * @brief LVGL Screen implementation - * @version 0.1.4 - * @date 2023-05-23 + * @version 0.1.5 + * @date 2023-06-04 */ #include diff --git a/src/gui/screens-lvgl/main_scr.h b/src/gui/screens-lvgl/main_scr.h index 11ce1fa4..a4a1e8c1 100644 --- a/src/gui/screens-lvgl/main_scr.h +++ b/src/gui/screens-lvgl/main_scr.h @@ -2,8 +2,8 @@ * @file main_scr.h * @author Jordi Gauchía (jgauchia@jgauchia.com) * @brief LVGL - Main Screen - * @version 0.1.4 - * @date 2023-05-23 + * @version 0.1.5 + * @date 2023-06-04 */ /** diff --git a/src/gui/screens-lvgl/notify_bar.h b/src/gui/screens-lvgl/notify_bar.h index 6f70ae6c..2c1899ac 100644 --- a/src/gui/screens-lvgl/notify_bar.h +++ b/src/gui/screens-lvgl/notify_bar.h @@ -2,8 +2,8 @@ * @file notify_bar.h * @author Jordi Gauchía (jgauchia@jgauchia.com) * @brief LVGL - Notify Bar - * @version 0.1.4 - * @date 2023-05-23 + * @version 0.1.5 + * @date 2023-06-04 */ /** diff --git a/src/gui/screens-lvgl/search_sat_scr.h b/src/gui/screens-lvgl/search_sat_scr.h index 435d3e56..e8064dd2 100644 --- a/src/gui/screens-lvgl/search_sat_scr.h +++ b/src/gui/screens-lvgl/search_sat_scr.h @@ -2,8 +2,8 @@ * @file search_sat_scr.h * @author Jordi Gauchía (jgauchia@jgauchia.com) * @brief LVGL - GPS satellite search screen - * @version 0.1.4 - * @date 2023-05-23 + * @version 0.1.5 + * @date 2023-06-04 */ #define UPDATE_SEARCH_PERIOD 1000 diff --git a/src/gui/screens-lvgl/splash_scr.h b/src/gui/screens-lvgl/splash_scr.h index 310a1bd7..e965d99f 100644 --- a/src/gui/screens-lvgl/splash_scr.h +++ b/src/gui/screens-lvgl/splash_scr.h @@ -2,8 +2,8 @@ * @file splash_scr.h * @author Jordi Gauchía (jgauchia@jgauchia.com) * @brief Splash screen - NOT LVGL - * @version 0.1.4 - * @date 2023-05-23 + * @version 0.1.5 + * @date 2023-06-04 */ /** diff --git a/src/hardware/battery.h b/src/hardware/battery.h index f4d1f96f..c07a08dc 100644 --- a/src/hardware/battery.h +++ b/src/hardware/battery.h @@ -2,8 +2,8 @@ * @file battery.h * @author Jordi Gauchía (jgauchia@jgauchia.com) * @brief Battery monitor definition and functions - * @version 0.1.4 - * @date 2023-05-23 + * @version 0.1.5 + * @date 2023-06-04 */ #include diff --git a/src/hardware/bme.h b/src/hardware/bme.h index a702ab3e..224ab4dd 100644 --- a/src/hardware/bme.h +++ b/src/hardware/bme.h @@ -2,8 +2,8 @@ * @file bme.h * @author Jordi Gauchía (jgauchia@jgauchia.com) * @brief BME280 Sensor functions - * @version 0.1.4 - * @date 2023-05-23 + * @version 0.1.5 + * @date 2023-06-04 */ #include diff --git a/src/hardware/compass.h b/src/hardware/compass.h index 58343c0b..b96cca69 100644 --- a/src/hardware/compass.h +++ b/src/hardware/compass.h @@ -2,8 +2,8 @@ * @file compass.h * @author Jordi Gauchía (jgauchia@jgauchia.com) * @brief Compass definition and functions - * @version 0.1.4 - * @date 2023-05-23 + * @version 0.1.5 + * @date 2023-06-04 */ diff --git a/src/hardware/gps.h b/src/hardware/gps.h index 4dd8373f..acca60bd 100644 --- a/src/hardware/gps.h +++ b/src/hardware/gps.h @@ -2,8 +2,8 @@ * @file gps.h * @author Jordi Gauchía (jgauchia@jgauchia.com) * @brief GPS definition and functions - * @version 0.1.4 - * @date 2023-05-23 + * @version 0.1.5 + * @date 2023-06-04 */ #include diff --git a/src/hardware/hal.h b/src/hardware/hal.h index 45924d62..06269e9e 100644 --- a/src/hardware/hal.h +++ b/src/hardware/hal.h @@ -2,8 +2,8 @@ * @file hal.h * @author Jordi Gauchía (jgauchia@jgauchia.com) * @brief Pin definitions - * @version 0.1.4 - * @date 2023-05-23 + * @version 0.1.5 + * @date 2023-06-04 */ #ifdef CUSTOMBOARD diff --git a/src/hardware/power.h b/src/hardware/power.h index 0983d5f1..97136d07 100644 --- a/src/hardware/power.h +++ b/src/hardware/power.h @@ -2,8 +2,8 @@ * @file power.h * @author Jordi Gauchía (jgauchia@jgauchia.com) * @brief ESP32 Power Management functions - * @version 0.1.4 - * @date 2023-05-23 + * @version 0.1.5 + * @date 2023-06-04 */ #include diff --git a/src/hardware/sdcard.h b/src/hardware/sdcard.h index b57631d1..6ec68806 100644 --- a/src/hardware/sdcard.h +++ b/src/hardware/sdcard.h @@ -2,8 +2,8 @@ * @file sdcard.h * @author Jordi Gauchía (jgauchia@jgauchia.com) * @brief SD Card definition and functions - * @version 0.1.4 - * @date 2023-05-23 + * @version 0.1.5 + * @date 2023-06-04 */ #include diff --git a/src/hardware/serial.h b/src/hardware/serial.h index 625ddfd0..80077782 100644 --- a/src/hardware/serial.h +++ b/src/hardware/serial.h @@ -2,8 +2,8 @@ * @file serial.h * @author Jordi Gauchía (jgauchia@jgauchia.com) * @brief Serial output functions (debug) - * @version 0.1.4 - * @date 2023-05-23 + * @version 0.1.5 + * @date 2023-06-04 */ HardwareSerial *debug = &Serial; diff --git a/src/hardware/tft.h b/src/hardware/tft.h index 3bc1dfda..64464ca3 100644 --- a/src/hardware/tft.h +++ b/src/hardware/tft.h @@ -2,8 +2,8 @@ * @file tft.h * @author Jordi Gauchía (jgauchia@jgauchia.com) * @brief TFT definition and functions - * @version 0.1.4 - * @date 2023-05-23 + * @version 0.1.5 + * @date 2023-06-04 */ #ifdef CUSTOMBOARD diff --git a/src/main.cpp b/src/main.cpp index 8917cef3..bc632e64 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2,8 +2,8 @@ * @file main.cpp * @author Jordi Gauchía (jgauchia@jgauchia.com) * @brief ESP32 GPS Naviation main code - * @version 0.1.4 - * @date 2023-05-23 + * @version 0.1.5 + * @date 2023-06-04 */ #define CALIBRATION_FILE "/TouchCalData1" diff --git a/src/tasks.h b/src/tasks.h index 468b6949..a5f93afe 100644 --- a/src/tasks.h +++ b/src/tasks.h @@ -2,8 +2,8 @@ * @file tasks.h * @author Jordi Gauchía (jgauchia@jgauchia.com) * @brief Core Tasks functions - * @version 0.1.4 - * @date 2023-05-23 + * @version 0.1.5 + * @date 2023-06-04 */ /** diff --git a/src/utils/gps_maps.h b/src/utils/gps_maps.h index 560c8c6d..e6ad8269 100644 --- a/src/utils/gps_maps.h +++ b/src/utils/gps_maps.h @@ -2,8 +2,8 @@ * @file gps_maps.h * @author Jordi Gauchía (jgauchia@jgauchia.com) * @brief GPS Maps functions - * @version 0.1.4 - * @date 2023-05-23 + * @version 0.1.5 + * @date 2023-06-04 */ /** diff --git a/src/utils/gps_math.h b/src/utils/gps_math.h index 319bf3e9..761db1bd 100644 --- a/src/utils/gps_math.h +++ b/src/utils/gps_math.h @@ -2,8 +2,8 @@ * @file gps_math.h * @author Jordi Gauchía (jgauchia@jgauchia.com) * @brief Math and various functions - * @version 0.1.4 - * @date 2023-05-23 + * @version 0.1.5 + * @date 2023-06-04 */ /** diff --git a/src/utils/lv_sd_fs.h b/src/utils/lv_sd_fs.h index 7b482f6d..3ad6e033 100644 --- a/src/utils/lv_sd_fs.h +++ b/src/utils/lv_sd_fs.h @@ -2,8 +2,8 @@ * @file lv_sd_fs.h * @author Jordi Gauchía (jgauchia@jgauchia.com) * @brief SD file functions for LVGL - * @version 0.1.4 - * @date 2023-05-23 + * @version 0.1.5 + * @date 2023-06-04 */ #include "lvgl.h" diff --git a/src/utils/lv_spiffs_fs.h b/src/utils/lv_spiffs_fs.h index cce3f915..1a855c75 100644 --- a/src/utils/lv_spiffs_fs.h +++ b/src/utils/lv_spiffs_fs.h @@ -2,8 +2,8 @@ * @file lv_spiffs_fs.h * @author Jordi Gauchía (jgauchia@jgauchia.com) * @brief SPIFFS file functions for LVGL - * @version 0.1.4 - * @date 2023-05-23 + * @version 0.1.5 + * @date 2023-06-04 */ #include "lvgl.h" diff --git a/src/utils/sat_info.h b/src/utils/sat_info.h index dba171c4..769144d0 100644 --- a/src/utils/sat_info.h +++ b/src/utils/sat_info.h @@ -2,8 +2,8 @@ * @file sat_info.h * @author Jordi Gauchía (jgauchia@jgauchia.com) * @brief Satellites info screen functions - * @version 0.1.4 - * @date 2023-05-23 + * @version 0.1.5 + * @date 2023-06-04 */ #include diff --git a/src/utils/time_zone.h b/src/utils/time_zone.h index 24e4788a..4b3340ee 100644 --- a/src/utils/time_zone.h +++ b/src/utils/time_zone.h @@ -2,8 +2,8 @@ * @file time_zone.h * @author Jordi Gauchía (jgauchia@jgauchia.com) * @brief Timezone Library (Daylight Saving) - * @version 0.1.4 - * @date 2023-05-23 + * @version 0.1.5 + * @date 2023-06-04 */ /**