Merge from devel

jgauchia · Aug 24, 2024 · 96de234 · 96de234
1 parent f729ba6
commit 96de234
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 13 deletions.
diff --git a/lib/lvgl/lvgl_ICENAV_BOARD_conf.h b/lib/lvgl/lvgl_ICENAV_BOARD_conf.h
@@ -620,10 +620,10 @@
 #endif
 
 /*API for open, read, etc*/
-#define LV_USE_FS_POSIX 0
+#define LV_USE_FS_POSIX 1
 #if LV_USE_FS_POSIX
-    #define LV_FS_POSIX_LETTER '\0'     /*Set an upper cased letter on which the drive will accessible (e.g. 'A')*/
-    #define LV_FS_POSIX_PATH ""         /*Set the working directory. File/directory paths will be appended to it.*/
+    #define LV_FS_POSIX_LETTER 'F'     /*Set an upper cased letter on which the drive will accessible (e.g. 'A')*/
+    #define LV_FS_POSIX_PATH "/spiffs"         /*Set the working directory. File/directory paths will be appended to it.*/
     #define LV_FS_POSIX_CACHE_SIZE 0    /*>0 to cache this number of bytes in lv_fs_read()*/
 #endif
 

diff --git a/lib/storage/storage.hpp b/lib/storage/storage.hpp
@@ -31,12 +31,8 @@ extern bool isSdLoaded;
 
 
 void initSD();
-<<<<<<< HEAD
 esp_err_t initSPIFFS();
-=======
-void initSPIFFS();
 void adquireSdSPI();
 void releaseSdSPI();
->>>>>>> devel
 
 #endif
diff --git a/platformio.ini b/platformio.ini
@@ -15,13 +15,8 @@ default_envs = ICENAV_BOARD
 [common]
 platform = espressif32
 framework = arduino
-<<<<<<< HEAD
-version = 0.1.8_dev
-revision = 71
-=======
 version = 0.1.8_Alpha
-revision = 70
->>>>>>> devel
+revision = 71
 monitor_speed = 115200
 ;monitor_rts = 0
 ;monitor_dtr = 0