mirror of
https://github.com/ByteWelder/Tactility.git
synced 2026-02-18 10:53:17 +00:00
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:🎶: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
86 lines
1.8 KiB
C++
86 lines
1.8 KiB
C++
#include "Tactility/CpuAffinity.h"
|
|
|
|
#include <Tactility/Check.h>
|
|
|
|
namespace tt {
|
|
|
|
#ifdef ESP_PLATFORM
|
|
|
|
static CpuAffinity getEspWifiAffinity() {
|
|
#ifdef CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0
|
|
return 0;
|
|
#elif defined(CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_1)
|
|
return 1;
|
|
#endif
|
|
}
|
|
|
|
// Warning: Must watch ESP WiFi, as this task is used by WiFi
|
|
static CpuAffinity getEspMainSchedulerAffinity() {
|
|
#ifdef CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0
|
|
return 0;
|
|
#elif defined(CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_1)
|
|
return 1;
|
|
#endif
|
|
}
|
|
|
|
static CpuAffinity getFreeRtosTimerAffinity() {
|
|
#if defined(CONFIG_FREERTOS_TIMER_TASK_NO_AFFINITY)
|
|
return None;
|
|
#elif defined(CONFIG_FREERTOS_TIMER_TASK_AFFINITY_CPU0)
|
|
return 0;
|
|
#elif defined(CONFIG_FREERTOS_TIMER_TASK_AFFINITY_CPU1)
|
|
return 1;
|
|
#else
|
|
static_assert(false);
|
|
#endif
|
|
}
|
|
|
|
#if CONFIG_FREERTOS_NUMBER_OF_CORES == 1
|
|
static const CpuAffinityConfiguration esp = {
|
|
.system = 0,
|
|
.graphics = 0,
|
|
.wifi = 0,
|
|
.mainDispatcher = 0,
|
|
.apps = 0,
|
|
.timer = getFreeRtosTimerAffinity()
|
|
};
|
|
#elif CONFIG_FREERTOS_NUMBER_OF_CORES == 2
|
|
static const CpuAffinityConfiguration esp = {
|
|
.system = 0,
|
|
.graphics = 1,
|
|
.wifi = getEspWifiAffinity(),
|
|
.mainDispatcher = getEspMainSchedulerAffinity(),
|
|
.apps = 1,
|
|
.timer = getFreeRtosTimerAffinity()
|
|
};
|
|
#endif
|
|
|
|
#else
|
|
|
|
static const CpuAffinityConfiguration simulator = {
|
|
.system = None,
|
|
.graphics = None,
|
|
.wifi = None,
|
|
.mainDispatcher = 0,
|
|
.apps = None,
|
|
.timer = None
|
|
};
|
|
|
|
#endif
|
|
|
|
const CpuAffinityConfiguration& getCpuAffinityConfiguration() {
|
|
#ifdef ESP_PLATFORM
|
|
|
|
#if CONFIG_FREERTOS_NUMBER_OF_CORES == 2
|
|
// WiFi uses the main dispatcher to defer operations in the background
|
|
assert(esp.wifi == esp.mainDispatcher);
|
|
#endif // CORES
|
|
return esp;
|
|
|
|
#else
|
|
return simulator;
|
|
#endif
|
|
}
|
|
|
|
}
|