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
@@ -16,7 +16,7 @@ struct BootMode {
|
||||
uint32_t flag = 0;
|
||||
};
|
||||
|
||||
static Mode currentMode = ModeDefault;
|
||||
static Mode currentMode = Mode::Default;
|
||||
static RTC_NOINIT_ATTR BootMode bootMode;
|
||||
|
||||
sdmmc_card_t* _Nullable getCard() {
|
||||
@@ -47,7 +47,7 @@ sdmmc_card_t* _Nullable getCard() {
|
||||
}
|
||||
|
||||
static bool canStartNewMode() {
|
||||
return isSupported() && (currentMode == ModeDefault || currentMode == ModeNone);
|
||||
return isSupported() && (currentMode == Mode::Default || currentMode == Mode::None);
|
||||
}
|
||||
|
||||
bool isSupported() {
|
||||
@@ -65,7 +65,7 @@ bool startMassStorageWithSdmmc() {
|
||||
TT_LOG_E(TAG, "Failed to init mass storage: %s", esp_err_to_name(result));
|
||||
return false;
|
||||
} else {
|
||||
currentMode = ModeMassStorageSdmmc;
|
||||
currentMode = Mode::MassStorageSdmmc;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -77,7 +77,7 @@ void stop() {
|
||||
|
||||
tusbStop();
|
||||
|
||||
currentMode = ModeNone;
|
||||
currentMode = Mode::None;
|
||||
}
|
||||
|
||||
Mode getMode() {
|
||||
|
||||
Reference in New Issue
Block a user