MrUnknownDE/OpenIris-ESPIDF
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/OpenIris-ESPIDF.git synced 2026-05-04 21:26:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix: ensure SerialManager task handle is stored correctly for timer callback

Browse Source 
- Replaced TaskHandle_t* with TaskHandle_t to allow xTaskCreate() to store the task handle
- Passed the actual handle to the start_video_streaming timer callback
- Prevented potential null/invalid handle issues when deleting the SerialManager task
This commit is contained in:
PhosphorosVR
2025-08-08 21:37:57 +02:00
parent 2346d0ec6c
commit 5c5d32b083
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/openiris_main.cpp
+16 -5
View File
@@ -78,6 +78,8 @@ void disable_serial_manager_task(TaskHandle_t serialManagerHandle) {
// if we get anything on the serial, we stop the timer and reset it after the commands are done // if we get anything on the serial, we stop the timer and reset it after the commands are done
// this is done to ensure the user has enough time to configure the board if need be // this is done to ensure the user has enough time to configure the board if need be
void start_video_streaming(void *arg) { void start_video_streaming(void *arg) {
TaskHandle_t serialTaskHandle = (TaskHandle_t)arg; // retrieve task handle from arg
// if we're in auto-mode, we can decide which streaming helper to start based on the // if we're in auto-mode, we can decide which streaming helper to start based on the
// presence of Wi-Fi credentials // presence of Wi-Fi credentials
ESP_LOGI("[MAIN]", "Setup window expired, starting streaming services, quitting serial manager."); ESP_LOGI("[MAIN]", "Setup window expired, starting streaming services, quitting serial manager.");
@@ -102,8 +104,9 @@ void start_video_streaming(void *arg) {
break; break;
} }
const auto serialTaskHandle = static_cast<TaskHandle_t>(arg); if (serialTaskHandle != nullptr) {
disable_serial_manager_task(serialTaskHandle); disable_serial_manager_task(serialTaskHandle);
}
} }
esp_timer_handle_t createStartVideoStreamingTimer(void *pvParameter) { esp_timer_handle_t createStartVideoStreamingTimer(void *pvParameter) {
@@ -122,7 +125,12 @@ esp_timer_handle_t createStartVideoStreamingTimer(void *pvParameter) {
} }
extern "C" void app_main(void) { extern "C" void app_main(void) {
TaskHandle_t *serialManagerHandle = nullptr; // --- FIX: Use a real TaskHandle_t variable instead of a pointer ---
// Previously: TaskHandle_t* serialManagerHandle = nullptr;
// This caused xTaskCreate() to never store a valid handle,
// leading to random failures when deleting the task in the timer callback.
TaskHandle_t serialManagerHandle = nullptr;
dependencyRegistry->registerService<ProjectConfig>(DependencyType::project_config, deviceConfig); dependencyRegistry->registerService<ProjectConfig>(DependencyType::project_config, deviceConfig);
dependencyRegistry->registerService<CameraManager>(DependencyType::camera_manager, cameraHandler); dependencyRegistry->registerService<CameraManager>(DependencyType::camera_manager, cameraHandler);
// uvc plan // uvc plan
@@ -197,13 +205,15 @@ extern "C" void app_main(void) {
deviceConfig->load(); deviceConfig->load();
serialManager->setup(); serialManager->setup();
// Pass address of variable so xTaskCreate() stores the actual task handle
xTaskCreate( xTaskCreate(
HandleSerialManagerTask, HandleSerialManagerTask,
"HandleSerialManagerTask", "HandleSerialManagerTask",
1024 * 6, 1024 * 6,
serialManager, serialManager,
1, // we only rely on the serial manager during provisioning, we can run it slower 1, // we only rely on the serial manager during provisioning, we can run it slower
serialManagerHandle); &serialManagerHandle
);
wifiManager.Begin(); wifiManager.Begin();
mdnsManager.start(); mdnsManager.start();
@@ -218,7 +228,8 @@ extern "C" void app_main(void) {
1, // it's the rest API, we only serve commands over it so we don't really need a higher priority 1, // it's the rest API, we only serve commands over it so we don't really need a higher priority
nullptr); nullptr);
timerHandle = createStartVideoStreamingTimer(serialManagerHandle); // Pass the actual TaskHandle_t value into the timer
timerHandle = createStartVideoStreamingTimer((void*)serialManagerHandle);
if (timerHandle != nullptr) { if (timerHandle != nullptr) {
esp_timer_start_once(timerHandle, 30000000); // 30s esp_timer_start_once(timerHandle, 30000000); // 30s
} }