mirror of
https://github.com/ByteWelder/Tactility.git
synced 2026-02-18 19:03:16 +00:00
c98cb2bf10
This commit contains @josemalm32 's implementation for the Guition JC1060P470CIWY (see https://github.com/ByteWelder/Tactility/issues/427) I've added these changes: - Updated the branch for the new logging method - Updated the branch for the PR that I mentioned in the above linked issue - Replaced the manually pasted in esp_lcd_jd9165 driver with the one from the component registry - Updated Spanish to English - Updated all drivers' mutexes/locks - Fixed the display color format - Fixed bug in power deinit - Renamed I2C bus in config - Added device to continuous integration - Renamed several Guition devices from CYD to Guition - Fix for `EspLcdDisplayV2` init for when features are not supported - Pin esp_wifi_remote to version 1.2.3 - Fix in `WifiManage` logging - Fix for `WifiEsp.cpp`'s check for wifi presence - Fix for `WifiEsp`'s scan list logging - Fix for `gcc_soft_float_symbols` in TactiltyC
109 lines
2.3 KiB
C++
109 lines
2.3 KiB
C++
#ifdef ESP_PLATFORM
|
|
#include <sdkconfig.h>
|
|
#endif
|
|
|
|
#include "Tactility/CpuAffinity.h"
|
|
|
|
#include <Tactility/Check.h>
|
|
|
|
namespace tt {
|
|
|
|
#ifdef ESP_PLATFORM
|
|
|
|
#ifdef CONFIG_ESP_WIFI_ENABLED
|
|
|
|
static CpuAffinity getEspWifiAffinity() {
|
|
#if CONFIG_FREERTOS_NUMBER_OF_CORES == 1
|
|
return 0;
|
|
#elif defined(CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_0)
|
|
return 0;
|
|
#elif defined(CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_1)
|
|
return 1;
|
|
#else // Assume core 0 (risky, but safer than "None")
|
|
return 0;
|
|
#endif
|
|
}
|
|
|
|
#endif
|
|
|
|
// Warning: Must watch ESP WiFi, as this task is used by WiFi
|
|
static CpuAffinity getEspMainSchedulerAffinity() {
|
|
#if CONFIG_FREERTOS_NUMBER_OF_CORES == 1
|
|
return 0;
|
|
#elif defined(CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_0)
|
|
return 0;
|
|
#elif defined(CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_1)
|
|
return 1;
|
|
#else
|
|
// Default to core 0 when no explicit WiFi pinning is configured
|
|
return 0;
|
|
#endif
|
|
}
|
|
|
|
static CpuAffinity getFreeRtosTimerAffinity() {
|
|
#if CONFIG_FREERTOS_NUMBER_OF_CORES == 1
|
|
return 0;
|
|
#elif 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,
|
|
#ifdef CONFIG_ESP_WIFI_ENABLED
|
|
.wifi = getEspWifiAffinity(),
|
|
#else
|
|
.wifi = 0,
|
|
#endif
|
|
.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
|
|
}
|
|
|
|
}
|