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

- Changed return; to return ESP_FAIL; to match esp_err_t return type

Browse Source 
- Prevent build errors by properly handling missing wired mode configuration
This commit is contained in:
PhosphorosVR
2025-08-09 20:42:36 +02:00
parent 46f91124fe
commit 4c2e183f11
5 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/UVCStream/UVCStream/UVCStream.cpp
+1 -1
View File
@@ -111,7 +111,7 @@ esp_err_t UVCStreamManager::setup()
#ifndef CONFIG_GENERAL_WIRED_MODE #ifndef CONFIG_GENERAL_WIRED_MODE
ESP_LOGE(UVC_STREAM_TAG, "The board does not support UVC, please, setup WiFi connection."); ESP_LOGE(UVC_STREAM_TAG, "The board does not support UVC, please, setup WiFi connection.");
return; return ESP_FAIL;
#endif #endif
ESP_LOGI(UVC_STREAM_TAG, "Setting up UVC Stream"); ESP_LOGI(UVC_STREAM_TAG, "Setting up UVC Stream");
main/openiris_main.cpp
+8
View File
@@ -90,13 +90,21 @@ void start_video_streaming(void *arg) {
ESP_LOGI("[MAIN]", "WiFi setup detected, starting WiFi streaming."); ESP_LOGI("[MAIN]", "WiFi setup detected, starting WiFi streaming.");
streamServer.startStreamServer(); streamServer.startStreamServer();
} else { } else {
#ifdef CONFIG_GENERAL_WIRED_MODE
ESP_LOGI("[MAIN]", "UVC setup detected, starting UVC streaming."); ESP_LOGI("[MAIN]", "UVC setup detected, starting UVC streaming.");
uvcStream.setup(); uvcStream.setup();
#else
ESP_LOGW("[MAIN]", "UVC streaming not supported in this configuration.");
#endif
} }
break; break;
case StreamingMode::UVC: case StreamingMode::UVC:
#ifdef CONFIG_GENERAL_WIRED_MODE
ESP_LOGI("[MAIN]", "Device set to UVC Mode, starting UVC streaming."); ESP_LOGI("[MAIN]", "Device set to UVC Mode, starting UVC streaming.");
uvcStream.setup(); uvcStream.setup();
#else
ESP_LOGW("[MAIN]", "UVC streaming not supported in this configuration.");
#endif
break; break;
case StreamingMode::WIFI: case StreamingMode::WIFI:
ESP_LOGI("[MAIN]", "Device set to Wi-Fi mode, starting WiFi streaming."); ESP_LOGI("[MAIN]", "Device set to Wi-Fi mode, starting WiFi streaming.");
sdkconfig.board.facefocusvr_eye
+2 -1
View File
@@ -58,4 +58,5 @@ CONFIG_LED_EXTERNAL_CONTROL=y
CONFIG_LED_EXTERNAL_GPIO=9 CONFIG_LED_EXTERNAL_GPIO=9
CONFIG_LED_EXTERNAL_PWM_FREQ=20000 CONFIG_LED_EXTERNAL_PWM_FREQ=20000
CONFIG_LED_EXTERNAL_PWM_DUTY_CYCLE=50 CONFIG_LED_EXTERNAL_PWM_DUTY_CYCLE=50
CONFIG_Camera_USB_XCLK_FREQ=23000000 CONFIG_Camera_USB_XCLK_FREQ=23000000
CONFIG_GENERAL_WIRED_MODE=y
sdkconfig.board.facefocusvr_face
+2 -1
View File
@@ -58,4 +58,5 @@ CONFIG_LED_EXTERNAL_CONTROL=y
CONFIG_LED_EXTERNAL_GPIO=9 CONFIG_LED_EXTERNAL_GPIO=9
CONFIG_LED_EXTERNAL_PWM_FREQ=20000 CONFIG_LED_EXTERNAL_PWM_FREQ=20000
CONFIG_LED_EXTERNAL_PWM_DUTY_CYCLE=100 CONFIG_LED_EXTERNAL_PWM_DUTY_CYCLE=100
CONFIG_Camera_USB_XCLK_FREQ=23000000 CONFIG_Camera_USB_XCLK_FREQ=23000000
CONFIG_GENERAL_WIRED_MODE=y
sdkconfig.board.project_babble
+2 -1
View File
@@ -50,4 +50,5 @@ CONFIG_LED_EXTERNAL_CONTROL=y
CONFIG_LED_EXTERNAL_PWM_FREQ=5000 CONFIG_LED_EXTERNAL_PWM_FREQ=5000
CONFIG_LED_EXTERNAL_PWM_DUTY_CYCLE=100 CONFIG_LED_EXTERNAL_PWM_DUTY_CYCLE=100
CONFIG_LED_EXTERNAL_GPIO=1 CONFIG_LED_EXTERNAL_GPIO=1
CONFIG_Camera_USB_XCLK_FREQ=23000000 # NOT TESTED CONFIG_Camera_USB_XCLK_FREQ=23000000 # NOT TESTED
CONFIG_GENERAL_WIRED_MODE=y