From 8f46908d387cc4fe3f911bc0ca517719238418ed Mon Sep 17 00:00:00 2001
From: Tim Keller <geekboy1011@gmail.com>
Date: Tue, 26 Oct 2021 03:42:34 +0000
Subject: Fix lvgl_open to respect littlefs open errors

---
 src/components/ble/FSService.cpp |  6 ++----
 src/components/fs/FS.cpp         | 15 ++++++++-------
 2 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/components/ble/FSService.cpp b/src/components/ble/FSService.cpp
index c784a8c4..0230ea15 100644
--- a/src/components/ble/FSService.cpp
+++ b/src/components/ble/FSService.cpp
@@ -156,7 +156,7 @@ int FSService::FSCommandHandler(uint16_t connectionHandle, os_mbuf* om) {
       resp.command = commands::WRITE_PACING;
       resp.offset = header->offset;
       resp.modTime = 0;
-      int res = fs.FileOpen(&f, filepath, LFS_O_RDWR | LFS_O_CREAT);
+      int res = fs.FileOpen(&f, filepath, LFS_O_WRONLY | LFS_O_CREAT);
       resp.status = res ? 0x02 : 0x01;
       fs.FileClose(&f);
       resp.freespace = std::min(fs.getSize() - (fs.GetFSSize() * fs.getBlockSize()), fileSize - header->offset);
@@ -177,7 +177,6 @@ int FSService::FSCommandHandler(uint16_t connectionHandle, os_mbuf* om) {
       fs.FileWrite(&f, header->data, header->dataSize);
       fs.FileClose(&f);
       resp.freespace = std::min(fs.getSize() - (fs.GetFSSize() * fs.getBlockSize()), fileSize - header->offset);
-      // NRF_LOG_INFO('[FS_S] Used Blocks -> %u',resp.freespace);
       auto* om = ble_hs_mbuf_from_flat(&resp, sizeof(WriteResponse));
       ble_gattc_notify_custom(connectionHandle, transferCharacteristicHandle, om);
       break;
@@ -222,14 +221,13 @@ int FSService::FSCommandHandler(uint16_t connectionHandle, os_mbuf* om) {
       resp.status = 1;
       resp.totalentries = 0;
       resp.entry = 0;
-      resp.modification_time = 0; // TODO Does LFS actually support TS?
+      resp.modification_time = 0;
       if (fs.DirOpen(path, &dir) != 0) {
         resp.status = 0x02;
         auto* om = ble_hs_mbuf_from_flat(&resp, sizeof(ListDirResponse));
         ble_gattc_notify_custom(connectionHandle, transferCharacteristicHandle, om);
         break;
       };
-      // Count Total files in directory.
       while (fs.DirRead(&dir, &info)) {
         resp.totalentries++;
       }
diff --git a/src/components/fs/FS.cpp b/src/components/fs/FS.cpp
index 79fb2222..78b0f5cb 100644
--- a/src/components/fs/FS.cpp
+++ b/src/components/fs/FS.cpp
@@ -141,16 +141,17 @@ int FS::SectorRead(const struct lfs_config* c, lfs_block_t block, lfs_off_t off,
 
 namespace {
   lv_fs_res_t lvglOpen(lv_fs_drv_t* drv, void* file_p, const char* path, lv_fs_mode_t mode) {
-
     lfs_file_t* file = static_cast<lfs_file_t*>(file_p);
     FS* filesys = static_cast<FS*>(drv->user_data);
-    filesys->FileOpen(file, path, LFS_O_RDONLY);
-
-    if (file->type == 0) {
-      return LV_FS_RES_FS_ERR;
-    } else {
-      return LV_FS_RES_OK;
+    int res = filesys->FileOpen(file, path, LFS_O_RDONLY);
+    if (res == 0) {
+      if (file->type == 0) {
+        return LV_FS_RES_FS_ERR;
+      } else {
+        return LV_FS_RES_OK;
+      }
     }
+    return LV_FS_RES_NOT_EX;
   }
 
   lv_fs_res_t lvglClose(lv_fs_drv_t* drv, void* file_p) {
-- 
cgit v1.2.3