Merge develop into main (#167)
- WiFi Connect app is now hidden by default, but accessible at the bottom of the WiFi Manage app when WiFi is turned on. - WiFi service now turns on WiFi when calling connect() and WiFi is not on. - Removed `blocking` option for `service::loader::startApp()`. This feature was unused and complex. - Various apps: Moved private headers into Private/ folder. - Various apps: created start() function for easy starting. - Added documentation to all TactilityC APIs - Refactored various `enum` into `class enum` - Refactor M5Stack `initBoot()` (but VBus is still 0V for some reason)
This commit is contained in:
committed by
GitHub
parent
3ca0f8cf97
commit
3ea02d912f
@@ -127,7 +127,7 @@ bool SpiSdCard::unmount() {
|
||||
// TODO: Refactor to "bool getStatus(Status* status)" method so that it can fail when the lvgl lock fails
|
||||
tt::hal::SdCard::State SpiSdCard::getState() const {
|
||||
if (card == nullptr) {
|
||||
return StateUnmounted;
|
||||
return State::Unmounted;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -139,7 +139,7 @@ tt::hal::SdCard::State SpiSdCard::getState() const {
|
||||
bool locked = config->lockable->lock(50); // TODO: Refactor to a more reliable locking mechanism
|
||||
if (!locked) {
|
||||
TT_LOG_E(TAG, LOG_MESSAGE_MUTEX_LOCK_FAILED_FMT, "LVGL");
|
||||
return StateUnknown;
|
||||
return State::Unknown;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -150,9 +150,9 @@ tt::hal::SdCard::State SpiSdCard::getState() const {
|
||||
}
|
||||
|
||||
if (result) {
|
||||
return StateMounted;
|
||||
return State::Mounted;
|
||||
} else {
|
||||
return StateError;
|
||||
return State::Error;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user