feat: CURLService (portduino map HTTP downloads)

.github/workflows/ci.yml

@@ -36,6 +36,7 @@ jobs:
             python3-pip \
             build-essential \
             openssl \
+            libcurl4-openssl-dev \
             libssl-dev \
             libgpiod-dev \
             libyaml-cpp-dev \

CMakeLists.txt

@@ -40,13 +40,23 @@ include(LovyanGFX)
 include(LVGL)
 include(protobuf)
 include(nanopb)
+include(PNGdec)
 include(Doctest)
 
+find_package(CURL REQUIRED)
+
 file(GLOB_RECURSE sources      source/* generated/* portduino/* locale/* generated/${GENERATED_VIEW}/*)
 file(GLOB_RECURSE sources_test tests/*.cpp)
 
 add_library(DeviceUI ${sources})
-target_link_libraries(DeviceUI PRIVATE lvgl::lvgl LovyanGFX Portduino Protobufs)
+target_link_libraries(DeviceUI PRIVATE lvgl::lvgl LovyanGFX Portduino Protobufs CURL::libcurl)
+
+# Handle Windows Static linking dependencies if applicable
+if(WIN32)
+    target_compile_definitions(DeviceUI PRIVATE CURL_STATICLIB)
+    target_link_libraries(DeviceUI PRIVATE ws2_32 crypt32 wldap32 normaliz)
+endif()
+
 target_compile_options(DeviceUI PUBLIC -Wall -Wno-format -Wfloat-conversion)
 
 target_include_directories(DeviceUI PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})

cmake/LovyanGFX.cmake

@@ -2,7 +2,7 @@ message(STATUS "Fetching LovyanGFX ...")
 FetchContent_Declare(
     LovyanGFX
     GIT_REPOSITORY "https://github.com/lovyan03/LovyanGFX"
-    GIT_TAG  1.2.21
+    GIT_TAG  1.2.26
 )
 FetchContent_MakeAvailable(LovyanGFX)
 include_directories(${lovyangfx_SOURCE_DIR}/src)

cmake/PNGdec.cmake

@@ -0,0 +1,13 @@
+message(STATUS "Fetching PNGdec ...")
+FetchContent_Declare(
+    PNGdec
+    GIT_REPOSITORY "https://github.com/mverch67/PNGdec"
+    GIT_TAG  d88b6fe2ec8d49c2b097a529b34d1d615ca5cf1b
+)
+FetchContent_MakeAvailable(PNGdec)
+include_directories(${pngdec_SOURCE_DIR}/src)
+
+# Add the LovyanGFX library
+file(GLOB_RECURSE PNGDEC_SOURCES ${pngdec_SOURCE_DIR}/src/*.cpp)
+add_library(PNGdec STATIC ${PNGDEC_SOURCES})
+target_include_directories(PNGdec PUBLIC ${pngdec_SOURCE_DIR}/src)

generated/ui_240x320/actions.h

@@ -1,18 +1,16 @@
-#ifndef EEZ_LVGL_UI_EVENTS_H
-#define EEZ_LVGL_UI_EVENTS_H
-
-#include "lvgl.h"
-
-#include <lvgl.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-
-#ifdef __cplusplus
-}
-#endif
-
+#ifndef EEZ_LVGL_UI_EVENTS_H
+#define EEZ_LVGL_UI_EVENTS_H
+
+#include "lvgl.h"
+
+#include <lvgl.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /*EEZ_LVGL_UI_EVENTS_H*/

generated/ui_240x320/fonts.h

@@ -1,22 +1,31 @@
-#ifndef EEZ_LVGL_UI_FONTS_H
-#define EEZ_LVGL_UI_FONTS_H
-
-#include "lvgl.h"
-
-#include <lvgl.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
+#ifndef EEZ_LVGL_UI_FONTS_H
+#define EEZ_LVGL_UI_FONTS_H
+
+#include "lvgl.h"
+
+#include <lvgl.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 extern const lv_font_t ui_font_montserrat_12;
 extern const lv_font_t ui_font_montserrat_14;
 extern const lv_font_t ui_font_montserrat_16;
 extern const lv_font_t ui_font_montserrat_20;
-
-
-#ifdef __cplusplus
-}
-#endif
-
+
+#ifndef EXT_FONT_DESC_T
+#define EXT_FONT_DESC_T
+typedef struct _ext_font_desc_t {
+    const char *name;
+    const void *font_ptr;
+} ext_font_desc_t;
+#endif
+
+extern ext_font_desc_t fonts[];
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /*EEZ_LVGL_UI_FONTS_H*/

generated/ui_240x320/images.c

@@ -1,6 +1,6 @@
 #include "images.h"
 
-const ext_img_desc_t images[88] = {
+const ext_img_desc_t images[89] = {
     { "battery_full_image", &img_battery_full_image },
     { "bluetooth_on_image", &img_bluetooth_on_image },
     { "debug_log_image", &img_debug_log_image },
@@ -89,4 +89,5 @@ const ext_img_desc_t images[88] = {
     { "unmessagable_image", &img_unmessagable_image },
     { "no_tile_image", &img_no_tile_image },
     { "circle_image", &img_circle_image },
-};
+    { "map_google_logo_image", &img_map_google_logo_image },
+};

generated/ui_240x320/images.h

@@ -1,14 +1,14 @@
-#ifndef EEZ_LVGL_UI_IMAGES_H
-#define EEZ_LVGL_UI_IMAGES_H
-
-#include "lvgl.h"
-
-#include <lvgl.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
+#ifndef EEZ_LVGL_UI_IMAGES_H
+#define EEZ_LVGL_UI_IMAGES_H
+
+#include "lvgl.h"
+
+#include <lvgl.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 extern const lv_img_dsc_t img_battery_full_image;
 extern const lv_img_dsc_t img_bluetooth_on_image;
 extern const lv_img_dsc_t img_debug_log_image;
@@ -97,6 +97,7 @@ extern const lv_img_dsc_t img_lock_slash_image;
 extern const lv_img_dsc_t img_unmessagable_image;
 extern const lv_img_dsc_t img_no_tile_image;
 extern const lv_img_dsc_t img_circle_image;
+extern const lv_img_dsc_t img_map_google_logo_image;
 
 #ifndef EXT_IMG_DESC_T
 #define EXT_IMG_DESC_T
@@ -106,11 +107,10 @@ typedef struct _ext_img_desc_t {
 } ext_img_desc_t;
 #endif
 
-extern const ext_img_desc_t images[88];
-
-
-#ifdef __cplusplus
-}
-#endif
-
+extern const ext_img_desc_t images[89];
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /*EEZ_LVGL_UI_IMAGES_H*/