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
This commit is contained in:
committed by
GitHub
parent
9033daa6dd
commit
50bd6e8bf6
@@ -37,33 +37,22 @@ Timer::~Timer() {
|
||||
tt_check(xTimerDelete(timerHandle, portMAX_DELAY) == pdPASS);
|
||||
}
|
||||
|
||||
TtStatus Timer::start(uint32_t ticks) {
|
||||
bool Timer::start(uint32_t intervalTicks) {
|
||||
tt_assert(!kernel::isIrq());
|
||||
tt_assert(ticks < portMAX_DELAY);
|
||||
|
||||
if (xTimerChangePeriod(timerHandle, ticks, portMAX_DELAY) == pdPASS) {
|
||||
return TtStatusOk;
|
||||
} else {
|
||||
return TtStatusErrorResource;
|
||||
}
|
||||
tt_assert(intervalTicks < portMAX_DELAY);
|
||||
return xTimerChangePeriod(timerHandle, intervalTicks, portMAX_DELAY) == pdPASS;
|
||||
}
|
||||
|
||||
TtStatus Timer::restart(uint32_t ticks) {
|
||||
bool Timer::restart(uint32_t intervalTicks) {
|
||||
tt_assert(!kernel::isIrq());
|
||||
tt_assert(ticks < portMAX_DELAY);
|
||||
|
||||
if (xTimerChangePeriod(timerHandle, ticks, portMAX_DELAY) == pdPASS &&
|
||||
xTimerReset(timerHandle, portMAX_DELAY) == pdPASS) {
|
||||
return TtStatusOk;
|
||||
} else {
|
||||
return TtStatusErrorResource;
|
||||
}
|
||||
tt_assert(intervalTicks < portMAX_DELAY);
|
||||
return xTimerChangePeriod(timerHandle, intervalTicks, portMAX_DELAY) == pdPASS &&
|
||||
xTimerReset(timerHandle, portMAX_DELAY) == pdPASS;
|
||||
}
|
||||
|
||||
TtStatus Timer::stop() {
|
||||
bool Timer::stop() {
|
||||
tt_assert(!kernel::isIrq());
|
||||
tt_check(xTimerStop(timerHandle, portMAX_DELAY) == pdPASS);
|
||||
return TtStatusOk;
|
||||
return xTimerStop(timerHandle, portMAX_DELAY) == pdPASS;
|
||||
}
|
||||
|
||||
bool Timer::isRunning() {
|
||||
@@ -76,17 +65,15 @@ uint32_t Timer::getExpireTime() {
|
||||
return (uint32_t)xTimerGetExpiryTime(timerHandle);
|
||||
}
|
||||
|
||||
void Timer::pendingCallback(PendingCallback callback, void* callbackContext, uint32_t arg) {
|
||||
BaseType_t ret = pdFAIL;
|
||||
bool Timer::setPendingCallback(PendingCallback callback, void* callbackContext, uint32_t arg) {
|
||||
if (kernel::isIrq()) {
|
||||
ret = xTimerPendFunctionCallFromISR(callback, callbackContext, arg, nullptr);
|
||||
return xTimerPendFunctionCallFromISR(callback, callbackContext, arg, nullptr) == pdPASS;
|
||||
} else {
|
||||
ret = xTimerPendFunctionCall(callback, callbackContext, arg, TtWaitForever);
|
||||
return xTimerPendFunctionCall(callback, callbackContext, arg, TtWaitForever) == pdPASS;
|
||||
}
|
||||
tt_assert(ret == pdPASS);
|
||||
}
|
||||
|
||||
void Timer::setThreadPriority(TimerThreadPriority priority) {
|
||||
void Timer::setThreadPriority(ThreadPriority priority) {
|
||||
tt_assert(!kernel::isIrq());
|
||||
|
||||
TaskHandle_t task_handle = xTimerGetTimerDaemonTaskHandle();
|
||||
|
||||
Reference in New Issue
Block a user