Merge pull request #310 from jgauchia/devel_features

Fix vector maps rendering
Fix mass file copy script
Update libraries

Author: jgauchia

data/LOGO_NEW.png

@@ -204,7 +204,7 @@ void createMapSettingsScr()
 	checkCompass = lv_checkbox_create(list);
 	lv_obj_align_to(checkCompass, list, LV_ALIGN_RIGHT_MID, 0, 0);
 	lv_checkbox_set_text(checkCompass, " ");
-	lv_obj_add_state(checkCompass, mapSet.showMapCompass);
+	lv_obj_add_state(checkCompass, (lv_state_t)mapSet.showMapCompass);
 	lv_obj_add_event_cb(checkCompass, mapSettingsEvents, LV_EVENT_VALUE_CHANGED, NULL);
 
 	// Compass Rotation
@@ -215,7 +215,7 @@ void createMapSettingsScr()
 	checkCompassRot = lv_checkbox_create(list);
 	lv_obj_align_to(checkCompassRot, list, LV_ALIGN_RIGHT_MID, 0, 0);
 	lv_checkbox_set_text(checkCompassRot, " ");
-	lv_obj_add_state(checkCompassRot, mapSet.compassRotation);
+	lv_obj_add_state(checkCompassRot, (lv_state_t)mapSet.compassRotation);
 	lv_obj_add_event_cb(checkCompassRot, mapSettingsEvents, LV_EVENT_VALUE_CHANGED, NULL);
 
 	// Show Speed
@@ -226,7 +226,7 @@ void createMapSettingsScr()
 	checkSpeed = lv_checkbox_create(list);
 	lv_obj_align_to(checkSpeed, list, LV_ALIGN_RIGHT_MID, 0, 0);
 	lv_checkbox_set_text(checkSpeed, " ");
-	lv_obj_add_state(checkSpeed, mapSet.showMapSpeed);
+	lv_obj_add_state(checkSpeed, (lv_state_t)mapSet.showMapSpeed);
 	lv_obj_add_event_cb(checkSpeed, mapSettingsEvents, LV_EVENT_VALUE_CHANGED, NULL);
 
 	// Show Map Scale
@@ -237,7 +237,7 @@ void createMapSettingsScr()
 	checkScale = lv_checkbox_create(list);
 	lv_obj_align_to(checkScale, list, LV_ALIGN_RIGHT_MID, 0, 0);
 	lv_checkbox_set_text(checkScale, " ");
-	lv_obj_add_state(checkScale, mapSet.showMapScale);
+	lv_obj_add_state(checkScale, (lv_state_t)mapSet.showMapScale);
 	lv_obj_add_event_cb(checkScale, mapSettingsEvents, LV_EVENT_VALUE_CHANGED, NULL);
 
 	// Back button

lib/gui/src/mapSettingsScr.cpp

@@ -12,19 +12,77 @@ static unsigned long millisActual = 0; /**< Current value of the system timer in
 extern Maps mapView;
 extern Gps gps;
 
+/**
+ * @brief Create LVGL Splash Screen
+ *
+ * @details Creates the LVGL splash screen object and canvas.
+ */
+void createLVGLSplashScreen()
+{
+	splashScr  = lv_obj_create(NULL);  
+	splashCanvas = lv_canvas_create(splashScr);
+
+	lv_obj_t *osmInfo = lv_obj_create(splashScr);
+	lv_obj_set_width(osmInfo, tft.width());
+	lv_obj_set_height(osmInfo,50 * scale);
+	lv_obj_clear_flag(osmInfo, LV_OBJ_FLAG_SCROLLABLE);
+    lv_obj_set_flex_flow(osmInfo, LV_FLEX_FLOW_COLUMN);
+    lv_obj_set_flex_align(osmInfo, LV_FLEX_ALIGN_SPACE_AROUND, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_CENTER);
+    lv_obj_set_style_bg_opa(osmInfo, 0, 0);
+    lv_obj_set_style_border_opa(osmInfo, 0, 0);
+	lv_obj_t *label;
+	label = lv_label_create(osmInfo);
+	lv_obj_set_style_text_font(label, &lv_font_montserrat_12, 0);
+	lv_label_set_text(label, "Map data from OpenStreetMap - (c)OpenStreetMap");
+	label = lv_label_create(osmInfo);
+	lv_obj_set_style_text_font(label, &lv_font_montserrat_12, 0);
+	lv_label_set_text(label, "(c)OpenStreetMap contributors");
+	lv_obj_set_align(osmInfo, LV_ALIGN_BOTTOM_MID);
+	label = lv_label_create(splashScr);
+	lv_obj_set_style_text_font(label, &lv_font_montserrat_18, 0);
+	lv_label_set_text_fmt(label,statusLine4, String(VERSION).c_str(), String(REVISION).c_str());
+	lv_obj_set_align(label, LV_ALIGN_CENTER);
+	lv_obj_set_y(label, -130 * scale);
+}
+
 /**
  * @brief Splash screen
  *
  * @details Displays the splash screen with logo, device information, Preloads the map and initializes display settings.
  */
 void splashScreen()
 {
+	setTime = false;
+
 	// Preload Map
 	mapView.currentMapTile = mapView.getMapTile(gps.gpsData.longitude, gps.gpsData.latitude, zoom, 0, 0);
 	mapView.generateMap(zoom);
 
-	setTime = false;
+#ifdef ICENAV_BOARD
+	millisActual = millis();
+
+	tft.setBrightness(defBright);
 
+	TFT_eSprite splashSprite = TFT_eSprite(&tft); 
+	void *splashBuffer = splashSprite.createSprite(tft.width(), tft.height());
+	splashSprite.drawPngFile(logoFile, 0, 0);
+	lv_canvas_set_buffer(splashCanvas, splashBuffer, tft.width(), tft.height(), LV_COLOR_FORMAT_RGB565_SWAPPED);
+	splashSprite.deleteSprite();
+
+	lv_screen_load_anim(splashScr, LV_SCR_LOAD_ANIM_FADE_OUT, 2500, 0, false);	
+	for( int i=0; i < 1000; i++ )
+	{
+		lv_task_handler();  
+		vTaskDelay(5);
+	}     
+	lv_obj_fade_out(splashScr, 2500,0);
+	for( int i=0; i < 300; i++ )
+	{
+		lv_task_handler();  
+		vTaskDelay(5);
+	}     
+	lv_obj_delete(splashScr);
+#else
 	tft.fillScreen(TFT_BLACK);
 	millisActual = millis();
 	tft.setBrightness(0);
@@ -78,6 +136,7 @@ void splashScreen()
 	}
 
 	millisActual = millis();
+
 	while (millis() < millisActual + 100);
 
 	for (uint8_t fadeOut = maxBrightness; fadeOut > 0; fadeOut--)
@@ -92,4 +151,5 @@ void splashScreen()
 	while (millis() < millisActual + 100);
 
 	tft.setBrightness(defBright);
+#endif
 }

lib/gui/src/splashScr.cpp

@@ -14,7 +14,11 @@
 #include "gps.hpp"
 
 #ifdef LARGE_SCREEN
-    static const char* logoFile PROGMEM = "/spiffs/LOGO_LARGE.png"; /**< Path to the large logo image for large screens */
+    #ifdef ICENAV_BOARD
+        static const char* logoFile PROGMEM = "/spiffs/LOGO_NEW.png"; /**< Path to the large logo image for large screens */  
+    #else
+        static const char* logoFile PROGMEM = "/spiffs/LOGO_LARGE.png"; /**< Path to the large logo image for large screens */
+    #endif
 #else
     static const char* logoFile PROGMEM = "/spiffs/LOGO_SMALL.png"; /**< Path to the small logo image for smaller screens */
 #endif
@@ -25,4 +29,8 @@ static const char* statusLine3 PROGMEM = "PSRAM: %d - Used PSRAM: %d"; /**< Form
 static const char* statusLine4 PROGMEM = "Firmware v.%s rev.%s";       /**< Format string for firmware version and revision */
 static const char* statusLine5 PROGMEM = "ENV: %s";                    /**< Format string for environment information */
 
+extern lv_obj_t *splashScr;
+static lv_obj_t *splashCanvas;
+
+void createLVGLSplashScreen();
 void splashScreen();

lib/gui/src/splashScr.hpp

@@ -172,7 +172,7 @@ void compassWidget(lv_obj_t *screen)
     lv_obj_align_to(compassImg, obj, LV_ALIGN_CENTER, 0, 0);   
     lv_img_set_pivot(compassImg, 100, 100) ;
     compassHeading = lv_label_create(obj);
-    lv_obj_set_height(compassHeading,38);
+    lv_obj_set_height(compassHeading,45);
     lv_obj_align(compassHeading, LV_ALIGN_CENTER, 0, 20);
     lv_obj_set_style_text_font(compassHeading, fontVeryLarge, 0);
     lv_label_set_text_static(compassHeading, "---\xC2\xB0");
@@ -420,4 +420,4 @@ void turnByTurnWidget(lv_obj_t *screen)
     lv_label_set_text_static(obj,"m.");
 
     lv_obj_add_flag(turnByTurn,LV_OBJ_FLAG_HIDDEN);
-}
+}

lib/gui/src/widgets.cpp

@@ -412,8 +412,8 @@
 
 /* Enable assertion failures if an operation fails or invalid data is found.
  * If LV_USE_LOG is enabled, an error message will be printed on failure. */
-#define LV_USE_ASSERT_NULL          1   /**< Check if the parameter is NULL. (Very fast, recommended) */
-#define LV_USE_ASSERT_MALLOC        1   /**< Checks is the memory is successfully allocated or no. (Very fast, recommended) */
+#define LV_USE_ASSERT_NULL          0   /**< Check if the parameter is NULL. (Very fast, recommended) */
+#define LV_USE_ASSERT_MALLOC        0   /**< Checks is the memory is successfully allocated or no. (Very fast, recommended) */
 #define LV_USE_ASSERT_STYLE         0   /**< Check if the styles are properly initialized. (Very fast, recommended) */
 #define LV_USE_ASSERT_MEM_INTEGRITY 0   /**< Check the integrity of `lv_mem` after critical operations. (Slow) */
 #define LV_USE_ASSERT_OBJ           0   /**< Check the object's type and existence (e.g. not deleted). (Slow) */

lib/lvgl/lv_conf.h

@@ -11,6 +11,7 @@
 lv_display_t *display; /**< LVGL display driver */
 
 lv_obj_t *searchSatScreen; /**< Search Satellite Screen object. */
+lv_obj_t *splashScr;       /**< Splash Screen object. */
 lv_style_t styleThemeBkg;  /**< Main background style object. */
 lv_style_t styleObjectBkg; /**< Object background style. */
 lv_style_t styleObjectSel; /**< Object selected style. */
@@ -402,6 +403,9 @@ void initLVGL()
 	modifyTheme();
 
 	//  Create Screens
+	#ifdef ICENAV_BOARD
+		createLVGLSplashScreen();
+	#endif
 	createSearchSatScr();
 	createMainScr();
 	createNotifyBar();
@@ -411,7 +415,7 @@ void initLVGL()
 	createButtonBarScr();
 	createGpxDetailScreen();
 	createGpxListScreen();
-	
+
 	// Create and start a periodic timer interrupt to call lv_tick_inc 
 	const esp_timer_create_args_t periodic_timer_args = { .callback = &lv_tick_task, .name = "periodic_gui" };
 	esp_timer_handle_t periodic_timer;