84049658db
## New features - Implemented support for app packaging in firmware and `tactility.py`: load `.app` files instead of `.elf` files. Install apps remotely or via `FileBrowser`. - Ensure headless mode works: all services that require LVGL can deal with the absence of a display - Service `onStart()` is now allowed to fail (return `bool` result) - Added and improved various file-related helper functions ## Improvements - Completely revamped the SystemInfo app UI - Improved Calculator UI of internal and external variant - Fix Chat UI and removed the emoji buttons for now - Fix for toolbar bottom padding issue in all apps ## Fixes - Fix for allowing recursive locking for certain SPI SD cards & more
88 lines
2.3 KiB
C++
88 lines
2.3 KiB
C++
#include <Tactility/service/ServiceContext.h>
|
|
#include <Tactility/service/ServiceRegistration.h>
|
|
|
|
#include <Tactility/Mutex.h>
|
|
#include <Tactility/Tactility.h>
|
|
#include <Tactility/Timer.h>
|
|
#include <Tactility/hal/sdcard/SdCardDevice.h>
|
|
|
|
namespace tt::service::sdcard {
|
|
|
|
constexpr auto* TAG = "SdcardService";
|
|
|
|
extern const ServiceManifest manifest;
|
|
|
|
class SdCardService final : public Service {
|
|
|
|
Mutex mutex;
|
|
std::unique_ptr<Timer> updateTimer;
|
|
hal::sdcard::SdCardDevice::State lastState = hal::sdcard::SdCardDevice::State::Unmounted;
|
|
|
|
bool lock(TickType_t timeout) const {
|
|
return mutex.lock(timeout);
|
|
}
|
|
|
|
void unlock() const {
|
|
mutex.unlock();
|
|
}
|
|
|
|
void update() {
|
|
// TODO: Support multiple SD cards
|
|
auto sdcard = hal::findFirstDevice<hal::sdcard::SdCardDevice>(hal::Device::Type::SdCard);
|
|
if (sdcard == nullptr) {
|
|
return;
|
|
}
|
|
|
|
if (lock(50)) {
|
|
auto new_state = sdcard->getState();
|
|
|
|
if (new_state == hal::sdcard::SdCardDevice::State::Error) {
|
|
TT_LOG_E(TAG, "Sdcard error - unmounting. Did you eject the card in an unsafe manner?");
|
|
sdcard->unmount();
|
|
}
|
|
|
|
if (new_state != lastState) {
|
|
lastState = new_state;
|
|
}
|
|
|
|
unlock();
|
|
} else {
|
|
TT_LOG_W(TAG, LOG_MESSAGE_MUTEX_LOCK_FAILED);
|
|
}
|
|
}
|
|
|
|
public:
|
|
|
|
bool onStart(ServiceContext& serviceContext) override {
|
|
if (hal::findFirstDevice<hal::sdcard::SdCardDevice>(hal::Device::Type::SdCard) == nullptr) {
|
|
TT_LOG_W(TAG, "No SD card device found - not starting Service");
|
|
return false;
|
|
}
|
|
|
|
auto service = findServiceById<SdCardService>(manifest.id);
|
|
updateTimer = std::make_unique<Timer>(Timer::Type::Periodic, [service]() {
|
|
service->update();
|
|
});
|
|
|
|
// We want to try and scan more often in case of startup or scan lock failure
|
|
updateTimer->start(1000);
|
|
|
|
return true;
|
|
}
|
|
|
|
void onStop(ServiceContext& serviceContext) override {
|
|
if (updateTimer != nullptr) {
|
|
// Stop thread
|
|
updateTimer->stop();
|
|
updateTimer = nullptr;
|
|
}
|
|
}
|
|
};
|
|
|
|
extern const ServiceManifest manifest = {
|
|
.id = "sdcard",
|
|
.createService = create<SdCardService>
|
|
};
|
|
|
|
} // namespace
|