Ken Van Hoeylandt 50bd6e8bf6
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
2024-12-27 23:12:39 +01:00

78 lines
1.9 KiB
C++

#include "Semaphore.h"
#include "Check.h"
#include "CoreDefines.h"
namespace tt {
Semaphore::Semaphore(uint32_t maxCount, uint32_t initialCount) {
tt_assert(!TT_IS_IRQ_MODE());
tt_assert((maxCount > 0U) && (initialCount <= maxCount));
if (maxCount == 1U) {
handle = xSemaphoreCreateBinary();
if ((handle != nullptr) && (initialCount != 0U)) {
if (xSemaphoreGive(handle) != pdPASS) {
vSemaphoreDelete(handle);
handle = nullptr;
}
}
} else {
handle = xSemaphoreCreateCounting(maxCount, initialCount);
}
tt_check(handle);
}
Semaphore::~Semaphore() {
tt_assert(!TT_IS_IRQ_MODE());
vSemaphoreDelete(handle);
}
bool Semaphore::acquire(uint32_t timeout) const {
if (TT_IS_IRQ_MODE()) {
if (timeout != 0U) {
return false;
} else {
BaseType_t yield = pdFALSE;
if (xSemaphoreTakeFromISR(handle, &yield) != pdPASS) {
return false;
} else {
portYIELD_FROM_ISR(yield);
return true;
}
}
} else {
return xSemaphoreTake(handle, (TickType_t)timeout) == pdPASS;
}
}
bool Semaphore::release() const {
if (TT_IS_IRQ_MODE()) {
BaseType_t yield = pdFALSE;
if (xSemaphoreGiveFromISR(handle, &yield) != pdTRUE) {
return false;
} else {
portYIELD_FROM_ISR(yield);
return true;
}
} else {
return xSemaphoreGive(handle) == pdPASS;
}
}
uint32_t Semaphore::getCount() const {
if (TT_IS_IRQ_MODE()) {
// TODO: uxSemaphoreGetCountFromISR is not supported on esp-idf 5.1.2 - perhaps later on?
#ifdef uxSemaphoreGetCountFromISR
return uxSemaphoreGetCountFromISR(handle);
#else
return uxQueueMessagesWaitingFromISR((QueueHandle_t)hSemaphore);
#endif
} else {
return uxSemaphoreGetCount(handle);
}
}
} // namespace