Ken Van Hoeylandt
ee5a5a7181
## New - Read property files with `PropertiesFile` - Support `boot.properties` so the user can specify the launcher app and an optional app to start after the launcher finishes. (see `BootProperties.cpp`) - Create registry for CPU affinity and update code to make use of it - `AppRegistration` and `ServiceRegistration` now also ensure that the `/data` directories always exist for all apps - `Notes` is now the default app for opening text files. `TextViewer` is removed entirely. Created `tt::app::notes::start(path)` function. - WiFi settings moved from NVS to properties file. - Specify `*.ap.properties` file on the SD card for automatic WiFi settings import on start-up. - Added `file::getLock(path)` and `file::withLock(path, function)` to do safe file operations on SD cards ## Improvements - Update TinyUSB to `1.7.6~1` - Improved `Boot.cpp` code. General code quality fixes and some restructuring to improve readability. - `tt::string` functionality improvements - Rename `AppRegistry` to `AppRegistration` - Rename `ServiceRegistry` to `ServiceRegistration` - Cleanup in `Notes.cpp` - `FileTest.cpp` fix for PC - Created `TestFile` helper class for tests, which automatically deletes files after the test. - Renamed `Partitions.h` to `MountPoints.h` - Created `std::string getMountPoints()` function for easy re-use - Other code quality improvements - `SdCardDevice`'s `getState()` and `isMounted()` now have a timeout argument ## Fixes - ELF loading now has a lock so to avoid a bug when 2 ELF apps are loaded in parallel
89 lines
2.4 KiB
C++
89 lines
2.4 KiB
C++
#include "Tactility/Timer.h"
|
|
|
|
#include "Tactility/Check.h"
|
|
#include "Tactility/RtosCompat.h"
|
|
#include "Tactility/kernel/Kernel.h"
|
|
|
|
namespace tt {
|
|
|
|
void Timer::onCallback(TimerHandle_t hTimer) {
|
|
auto* timer = static_cast<Timer*>(pvTimerGetTimerID(hTimer));
|
|
if (timer != nullptr) {
|
|
timer->callback();
|
|
}
|
|
}
|
|
|
|
static TimerHandle_t createTimer(Timer::Type type, void* timerId, TimerCallbackFunction_t callback) {
|
|
assert(timerId != nullptr);
|
|
assert(callback != nullptr);
|
|
|
|
UBaseType_t reload;
|
|
if (type == Timer::Type::Once) {
|
|
reload = pdFALSE;
|
|
} else {
|
|
reload = pdTRUE;
|
|
}
|
|
|
|
return xTimerCreate(nullptr, portMAX_DELAY, (BaseType_t)reload, timerId, callback);
|
|
}
|
|
|
|
Timer::Timer(Type type, Callback callback) :
|
|
callback(callback),
|
|
handle(createTimer(type, this, onCallback))
|
|
{
|
|
assert(!kernel::isIsr());
|
|
assert(handle != nullptr);
|
|
}
|
|
|
|
Timer::~Timer() {
|
|
assert(!kernel::isIsr());
|
|
}
|
|
|
|
bool Timer::start(TickType_t interval) {
|
|
assert(!kernel::isIsr());
|
|
assert(interval < portMAX_DELAY);
|
|
return xTimerChangePeriod(handle.get(), interval, portMAX_DELAY) == pdPASS;
|
|
}
|
|
|
|
bool Timer::restart(TickType_t interval) {
|
|
assert(!kernel::isIsr());
|
|
assert(interval < portMAX_DELAY);
|
|
return xTimerChangePeriod(handle.get(), interval, portMAX_DELAY) == pdPASS &&
|
|
xTimerReset(handle.get(), portMAX_DELAY) == pdPASS;
|
|
}
|
|
|
|
bool Timer::stop() {
|
|
assert(!kernel::isIsr());
|
|
return xTimerStop(handle.get(), portMAX_DELAY) == pdPASS;
|
|
}
|
|
|
|
bool Timer::isRunning() {
|
|
assert(!kernel::isIsr());
|
|
return xTimerIsTimerActive(handle.get()) == pdTRUE;
|
|
}
|
|
|
|
TickType_t Timer::getExpireTime() {
|
|
assert(!kernel::isIsr());
|
|
return xTimerGetExpiryTime(handle.get());
|
|
}
|
|
|
|
bool Timer::setPendingCallback(PendingCallback callback, void* callbackContext, uint32_t callbackArg, TickType_t timeout) {
|
|
if (kernel::isIsr()) {
|
|
assert(timeout == 0);
|
|
return xTimerPendFunctionCallFromISR(callback, callbackContext, callbackArg, nullptr) == pdPASS;
|
|
} else {
|
|
return xTimerPendFunctionCall(callback, callbackContext, callbackArg, timeout) == pdPASS;
|
|
}
|
|
}
|
|
|
|
void Timer::setThreadPriority(Thread::Priority priority) {
|
|
assert(!kernel::isIsr());
|
|
|
|
TaskHandle_t task_handle = xTimerGetTimerDaemonTaskHandle();
|
|
assert(task_handle); // Don't call this method before timer task start
|
|
|
|
vTaskPrioritySet(task_handle, static_cast<UBaseType_t>(priority));
|
|
}
|
|
|
|
} // namespace
|