Преглед изворни кода

fix: 原来根文件系统的使用情况一直没实现-_-

Wendal Chen пре 2 година
родитељ
комит
79179f0710
2 измењених фајлова са 17 додато и 7 уклоњено
  1. 14 4
      luatos/components/luat/port/luat_fs_idf5.c
  2. 3 3
      luatos/partitions.4m_1mfs.csv

+ 14 - 4
luatos/components/luat/port/luat_fs_idf5.c

@@ -265,10 +265,20 @@ int luat_vfs_spiffs_rmdir(void* userdata, char const* dir) {
 }
 int luat_vfs_spiffs_info(void* userdata, const char* path, luat_fs_info_t *conf) {
     memcpy(conf->filesystem, "spiffs", strlen("spiffs")+1);
-    conf->type = 0;
-    conf->total_block = 0;
-    conf->block_used = 0;
-    conf->block_size = 512;
+    size_t total_bytes = 0;
+    size_t used_bytes = 0;
+    if (esp_spiffs_info(NULL, &total_bytes, &used_bytes) == 0) {
+        conf->type = 0;
+        conf->total_block = total_bytes / 512;
+        conf->block_used = used_bytes / 512;
+        conf->block_size = 512;
+    }
+    else {
+        conf->type = 0;
+        conf->total_block = 0;
+        conf->block_used = 0;
+        conf->block_size = 512;
+    }
     return 0;
 }
 

+ 3 - 3
luatos/partitions.4m_1mfs.csv

@@ -1,6 +1,6 @@
 # Name,   Type, SubType, Offset,  Size, Flags
 nvs,      data, nvs,     0x9000,    0x7000,
-app0,     app,  ota_0,   0x10000, 0x1C0000,
-script,   0x5A, 0x5A,   0x1D0000,  0x20000,
-spiffs,   data, spiffs, 0x1F0000, 0x200000,
+app0,     app,  ota_0,   0x10000, 0x2C0000,
+script,   0x5A, 0x5A,   0x2D0000,  0x20000,
+spiffs,   data, spiffs, 0x2F0000, 0x100000,
 fdb,      0x5A, 0x5B,   0x3F0000,  0x10000,