Merge develop into main branch (#137)

* SdCard HAL refactored (#135) - Refactor SdCard HAL - introduce Lockable * Screenshot and FatFS improvements (#136) - Fix screenshots on ESP32 - Improve Screenshot service - Convert Screenshot app to class-based instead of structs - Screenshot app now automatically updates when task is finished - Enable FatFS long filename support * Re-use common log messages (#138) For consistency and binary size reduction * Toolbar spinner should get margin to the right * More TactilityC features (#139) * Rewrote Loader - Simplified Loader by removing custom threa - Created DispatcherThread - Move auto-starting apps to Boot app - Fixed Dispatcher bug where it could get stuck not processing new messages * Hide AP settings if the AP is not saved * Missing from previous commit * Replace LV_EVENT_CLICKED with LV_EVENT_SHORT_CLICKED * Refactored files app and created InputDialog (#140) - Changed Files app so that it has a View and State - Files app now allows for long-pressing on files to perform actions - Files app now has rename and delete actions - Created InputDialog app - Improved AlertDialog app layout
2024-12-27 22:12:39 +00:00
parent 9033daa6dd
commit 50bd6e8bf6
144 changed files with 3244 additions and 2038 deletions
@@ -0,0 +1,80 @@
+#ifdef ESP_PLATFORM
+
+#pragma once
+
+#include "hal/SdCard.h"
+
+#include <sd_protocol_types.h>
+#include <utility>
+#include <vector>
+#include <hal/spi_types.h>
+#include <soc/gpio_num.h>
+
+namespace tt::hal {
+
+/**
+ * SD card interface at the default SPI interface
+ */
+class SpiSdCard : public tt::hal::SdCard {
+public:
+    struct Config {
+        Config(
+            int spiFrequency,
+            gpio_num_t spiPinCs,
+            gpio_num_t spiPinCd,
+            gpio_num_t spiPinWp,
+            gpio_num_t spiPinInt,
+            MountBehaviour mountBehaviourAtBoot,
+            std::shared_ptr<Lockable> lockable = nullptr,
+            std::vector<gpio_num_t> csPinWorkAround = std::vector<gpio_num_t>(),
+            spi_host_device_t spiHost = SPI2_HOST
+        ) : spiFrequency(spiFrequency),
+            spiPinCs(spiPinCs),
+            spiPinCd(spiPinCd),
+            spiPinWp(spiPinWp),
+            spiPinInt(spiPinInt),
+            mountBehaviourAtBoot(mountBehaviourAtBoot),
+            lockable(std::move(lockable)),
+            csPinWorkAround(std::move(csPinWorkAround)),
+            spiHost(spiHost)
+        {}
+
+        int spiFrequency;
+        gpio_num_t spiPinCs; // Clock
+        gpio_num_t spiPinCd; // Card detect
+        gpio_num_t spiPinWp; // Write-protect
+        gpio_num_t spiPinInt; // Interrupt
+        SdCard::MountBehaviour mountBehaviourAtBoot;
+        std::shared_ptr<Lockable> _Nullable lockable;
+        std::vector<gpio_num_t> csPinWorkAround;
+        spi_host_device_t spiHost;
+        bool formatOnMountFailed = false;
+        uint16_t maxOpenFiles = 4;
+        uint16_t allocUnitSize = 16 * 1024;
+        bool statusCheckEnabled = false;
+    };
+
+private:
+
+    std::string mountPoint;
+    sdmmc_card_t* card = nullptr;
+    std::shared_ptr<Config> config;
+
+    bool applyGpioWorkAround();
+    bool mountInternal(const char* mount_point);
+
+public:
+
+    explicit SpiSdCard(std::unique_ptr<Config> config) :
+        SdCard(config->mountBehaviourAtBoot),
+        config(std::move(config))
+    {}
+
+    bool mount(const char* mountPath) override;
+    bool unmount() override;
+    State getState() const override;
+};
+
+}
+
+#endif