- Added sdcard service: it updates a statusbar icon and it can auto-unmount sdcards that were physically ejected by the user. - Added `is_mounted` check for sdcard drivers - Refactored assets: moved them from `tactility-esp/` to `data/` - Made assets work with sim build - Refactored wifi statusbar icons - Refactored wifi_manage app access point icons - Support not having an initial image icon when registering a new icon in statusbars. When a statusbar icon is added, it is now visible/invisible depending on whether an image was specified. - Keep track of app memory on app start to find memory leaks (needs fine-tuning in the future) - `tt_init()` assigns `config_instance` earlier, so it can be used during service init
80 lines
2.3 KiB
C
80 lines
2.3 KiB
C
#include "sdcard.h"
|
|
#include "check.h"
|
|
#include "log.h"
|
|
#include "config.h"
|
|
|
|
#include "esp_vfs_fat.h"
|
|
#include "sdmmc_cmd.h"
|
|
|
|
#define TAG "twodotfour_sdcard"
|
|
|
|
typedef struct {
|
|
const char* mount_point;
|
|
sdmmc_card_t* card;
|
|
} MountData;
|
|
|
|
static void* sdcard_mount(const char* mount_point) {
|
|
TT_LOG_I(TAG, "Mounting %s", mount_point);
|
|
|
|
esp_vfs_fat_sdmmc_mount_config_t mount_config = {
|
|
.format_if_mount_failed = TWODOTFOUR_SDCARD_FORMAT_ON_MOUNT_FAILED,
|
|
.max_files = TWODOTFOUR_SDCARD_MAX_OPEN_FILES,
|
|
.allocation_unit_size = TWODOTFOUR_SDCARD_ALLOC_UNIT_SIZE,
|
|
.disk_status_check_enable = TWODOTFOUR_SDCARD_STATUS_CHECK_ENABLED
|
|
};
|
|
|
|
sdmmc_card_t* card;
|
|
|
|
// Init without card detect (CD) and write protect (WD)
|
|
sdspi_device_config_t slot_config = SDSPI_DEVICE_CONFIG_DEFAULT();
|
|
slot_config.gpio_cs = TWODOTFOUR_SDCARD_PIN_CS;
|
|
slot_config.host_id = TWODOTFOUR_SDCARD_SPI_HOST;
|
|
|
|
sdmmc_host_t host = SDSPI_HOST_DEFAULT();
|
|
host.max_freq_khz = TWODOTFOUR_SDCARD_SPI_FREQUENCY;
|
|
esp_err_t ret = esp_vfs_fat_sdspi_mount(mount_point, &host, &slot_config, &mount_config, &card);
|
|
|
|
if (ret != ESP_OK) {
|
|
if (ret == ESP_FAIL) {
|
|
TT_LOG_E(TAG, "Mounting failed. Ensure the card is formatted with FAT.");
|
|
} else {
|
|
TT_LOG_E(TAG, "Mounting failed (%s)", esp_err_to_name(ret));
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
MountData* data = malloc(sizeof(MountData));
|
|
*data = (MountData) {
|
|
.card = card,
|
|
.mount_point = mount_point
|
|
};
|
|
|
|
sdmmc_card_print_info(stdout, data->card);
|
|
|
|
return data;
|
|
}
|
|
|
|
static void sdcard_unmount(void* context) {
|
|
MountData* data = (MountData*)context;
|
|
TT_LOG_I(TAG, "Unmounting %s", data->mount_point);
|
|
|
|
tt_assert(data != NULL);
|
|
if (esp_vfs_fat_sdcard_unmount(data->mount_point, data->card) != ESP_OK) {
|
|
TT_LOG_E(TAG, "Unmount failed for %s", data->mount_point);
|
|
}
|
|
|
|
free(data);
|
|
}
|
|
|
|
static bool sdcard_is_mounted(void* context) {
|
|
MountData* data = (MountData*)context;
|
|
return (data != NULL) && (sdmmc_get_status(data->card) == ESP_OK);
|
|
}
|
|
|
|
const SdCard twodotfour_sdcard = {
|
|
.mount = &sdcard_mount,
|
|
.unmount = &sdcard_unmount,
|
|
.is_mounted = &sdcard_is_mounted,
|
|
.mount_behaviour = SDCARD_MOUNT_BEHAVIOUR_ANYTIME
|
|
};
|