Add proper support for Babble illuminator LEDS

components/LEDManager/LEDManager/LEDManager.cpp

@@ -45,11 +45,7 @@ LEDManager::ledStateMap_t LEDManager::ledStateMap = {
 std::vector<LEDStates_e> LEDManager::keepAliveStates = {
     LEDStates_e::_WebServerState_Error, LEDStates_e::_Camera_Error};
 
-LEDManager::LEDManager(gpio_num_t pin) : blink_led_pin(pin), state(false) {}
-
-#ifdef CONFIG_USE_ILLUMNATIOR_PIN
-LEDManager::LEDManager(gpio_num_t pin, gpio_num_t illumninator_led_pin) : blink_led_pin(pin), illumninator_led_pin(illumninator_led_pin) state(false) {}
-#endif
+LEDManager::LEDManager(gpio_num_t pin, gpio_num_t illumninator_led_pin) : blink_led_pin(pin), illumninator_led_pin(illumninator_led_pin), state(false) {}
 
 void LEDManager::setup()
 {
@@ -65,9 +61,8 @@ void LEDManager::setup()
   this->toggleLED(pattern.state);
   this->nextStateChangeMillis = pattern.delayTime;
 
-#ifdef CONFIG_USE_ILLUMNATIOR_PIN
+#ifdef CONFIG_SUPPORTS_EXTERNAL_LED_CONTROL
   ESP_LOGD(LED_MANAGER_TAG, "Setting up illuminator led.");
-  const int ledPin = 1; // Replace this with a command endpoint eventually.
   const int freq = 5000;
   const auto resolution = LEDC_TIMER_8_BIT;
   const int dutyCycle = 255;

components/LEDManager/LEDManager/LEDManager.hpp

@@ -4,7 +4,7 @@
 
 #include "driver/gpio.h"
 
-#ifdef CONFIG_USE_ILLUMNATIOR_PIN
+#ifdef CONFIG_SUPPORTS_EXTERNAL_LED_CONTROL
 #include "driver/ledc.h"
 #endif
 
@@ -19,18 +19,15 @@
 class LEDManager
 {
 public:
-  LEDManager(gpio_num_t blink_led_pin);
-
-#ifdef CONFIG_USE_ILLUMNATIOR_PIN
-  gpio_num_t illumninator_led_pin;
   LEDManager(gpio_num_t blink_led_pin, gpio_num_t illumninator_led_pin);
-#endif
 
   void setup();
   void handleLED();
 
 private:
   gpio_num_t blink_led_pin;
+  gpio_num_t illumninator_led_pin;
+
   unsigned long nextStateChangeMillis = 0;
   bool state = false;
 

main/Kconfig.projbuild

@@ -10,16 +10,25 @@ menu "OpenIris basic configuration"
             GPIO number (IOxx) to blink on and off the LED.
             Some GPIOs are used for other purposes (flash connections, etc.) and cannot be used to blink.
 
+    config SUPPORTS_EXTERNAL_LED_CONTROL
+        bool "Tick if your board supports the control of external IR leds (Project Babble)"
+        default false
+        help
+            GPIO number (IOxx) to the pin controlling the LEDs found on Babble boards.
+        
+    config LED_C_PIN
+        int "Pin number of the pin controlling the external leds (Project Babble)"
+        range ENV_GPIO_RANGE_MIN ENV_GPIO_OUT_RANGE_MAX
+        default 1
+        help
+            GPIO number (IOxx) to the pin controlling the LEDs found on Babble boards.
+    
     config BLINK_PERIOD
         int "Blink period in ms"
         range 10 3600000
         default 1000
         help
             Define the blinking period in milliseconds.
-    
-    config ILLUMINATOR_PIN
-        int "Project Babble Illuminator Pin Number"
-        default 1
 
     config WIRED_MODE
         bool "WIred mode"

main/openiris_main.cpp

@@ -27,6 +27,7 @@
 #endif
 
 #define BLINK_GPIO (gpio_num_t) CONFIG_BLINK_GPIO
+#define CONFIG_LED_C_PIN_GPIO (gpio_num_t) CONFIG_LED_C_PIN
 
 static const char *TAG = "[MAIN]";
 
@@ -49,11 +50,7 @@ RestAPI restAPI("http://0.0.0.0:81", commandManager);
 UVCStreamManager uvcStream;
 #endif
 
-#ifdef CONFIG_USE_ILLUMNATIOR_PIN
-LEDManager ledManager(BLINK_GPIO, CONFIG_ILLUMINATOR_PIN);
-#else
-LEDManager ledManager(BLINK_GPIO);
-#endif
+LEDManager ledManager(BLINK_GPIO, CONFIG_LED_C_PIN_GPIO);
 
 static void initNVSStorage()
 {

sdkconfig.base_defaults

@@ -545,13 +545,14 @@ CONFIG_ENV_GPIO_IN_RANGE_MAX=48
 CONFIG_ENV_GPIO_OUT_RANGE_MAX=48
 CONFIG_BLINK_GPIO=38
 CONFIG_BLINK_PERIOD=1000
-CONFIG_ILLUMINATOR_PIN=1
 CONFIG_WIRED_MODE=y
 CONFIG_MDNS_HOSTNAME="openiristracker"
 CONFIG_WIFI_SSID="UPC7878684"
 CONFIG_WIFI_PASSOWRD="j3ttQPpfvhep"
 CONFIG_AP_WIFI_SSID="EyeTrackVR"
 CONFIG_AP_WIFI_PASSWORD="12345678"
+# CONFIG_SUPPORTS_EXTERNAL_LED_CONTROL is not set
+CONFIG_LED_C_PIN=1
 # end of OpenIris basic configuration
 
 #

sdkconfig.board.project_babble

@@ -45,4 +45,5 @@ CONFIG_SPIRAM_CS_IO=26
 # CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
 # CONFIG_SPIRAM_RODATA is not set
 # CONFIG_SPIRAM_SPEED_120M is not set
-CONFIG_SPIRAM_SPEED_80M=y
+CONFIG_SPIRAM_SPEED_80M=y
+CONFIG_SUPPORTS_EXTERNAL_LED_CONTROL=y

sdkconfig.board.xiao-esp32s3

@@ -53,4 +53,5 @@ CONFIG_SPIRAM_SPEED_80M=y
 # CONFIG_SPIRAM_RODATA is not set
 # CONFIG_SPIRAM_SPEED_120M is not set
 CONFIG_SPIRAM_SPEED=80
-CONFIG_SPIRAM_SPEED_80M=y
+CONFIG_SPIRAM_SPEED_80M=y
+# CONFIG_SUPPORTS_EXTERNAL_LED_CONTROL is not set

sdkconfig.old

@@ -544,6 +544,8 @@ CONFIG_ENV_GPIO_RANGE_MAX=48
 CONFIG_ENV_GPIO_IN_RANGE_MAX=48
 CONFIG_ENV_GPIO_OUT_RANGE_MAX=48
 CONFIG_BLINK_GPIO=38
+# CONFIG_SUPPORTS_EXTERNAL_LED_CONTROL is not set
+CONFIG_LED_C_PIN=1
 CONFIG_BLINK_PERIOD=1000
 CONFIG_ILLUMINATOR_PIN=1
 CONFIG_WIRED_MODE=y
@@ -2235,199 +2237,3 @@ CONFIG_UVC_CAM1_TASK_CORE=-1
 # end of Component config
 
 # CONFIG_IDF_EXPERIMENTAL_FEATURES is not set
-
-# Deprecated options for backward compatibility
-# CONFIG_APP_BUILD_TYPE_ELF_RAM is not set
-# CONFIG_NO_BLOBS is not set
-# CONFIG_LOG_BOOTLOADER_LEVEL_NONE is not set
-# CONFIG_LOG_BOOTLOADER_LEVEL_ERROR is not set
-# CONFIG_LOG_BOOTLOADER_LEVEL_WARN is not set
-CONFIG_LOG_BOOTLOADER_LEVEL_INFO=y
-# CONFIG_LOG_BOOTLOADER_LEVEL_DEBUG is not set
-# CONFIG_LOG_BOOTLOADER_LEVEL_VERBOSE is not set
-CONFIG_LOG_BOOTLOADER_LEVEL=3
-# CONFIG_APP_ROLLBACK_ENABLE is not set
-# CONFIG_FLASH_ENCRYPTION_ENABLED is not set
-CONFIG_FLASHMODE_QIO=y
-# CONFIG_FLASHMODE_QOUT is not set
-# CONFIG_FLASHMODE_DIO is not set
-# CONFIG_FLASHMODE_DOUT is not set
-CONFIG_MONITOR_BAUD=115200
-# CONFIG_OPTIMIZATION_LEVEL_DEBUG is not set
-# CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG is not set
-# CONFIG_COMPILER_OPTIMIZATION_DEFAULT is not set
-# CONFIG_OPTIMIZATION_LEVEL_RELEASE is not set
-# CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE is not set
-CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED=y
-# CONFIG_OPTIMIZATION_ASSERTIONS_SILENT is not set
-# CONFIG_OPTIMIZATION_ASSERTIONS_DISABLED is not set
-CONFIG_OPTIMIZATION_ASSERTION_LEVEL=2
-# CONFIG_CXX_EXCEPTIONS is not set
-CONFIG_STACK_CHECK_NONE=y
-# CONFIG_STACK_CHECK_NORM is not set
-# CONFIG_STACK_CHECK_STRONG is not set
-# CONFIG_STACK_CHECK_ALL is not set
-# CONFIG_WARN_WRITE_STRINGS is not set
-# CONFIG_ESP32_APPTRACE_DEST_TRAX is not set
-CONFIG_ESP32_APPTRACE_DEST_NONE=y
-CONFIG_ESP32_APPTRACE_LOCK_ENABLE=y
-# CONFIG_EXTERNAL_COEX_ENABLE is not set
-# CONFIG_ESP_WIFI_EXTERNAL_COEXIST_ENABLE is not set
-# CONFIG_MCPWM_ISR_IN_IRAM is not set
-# CONFIG_EVENT_LOOP_PROFILING is not set
-CONFIG_POST_EVENTS_FROM_ISR=y
-CONFIG_POST_EVENTS_FROM_IRAM_ISR=y
-CONFIG_GDBSTUB_SUPPORT_TASKS=y
-CONFIG_GDBSTUB_MAX_TASKS=32
-# CONFIG_OTA_ALLOW_HTTP is not set
-CONFIG_ESP32S3_DEEP_SLEEP_WAKEUP_DELAY=2000
-CONFIG_ESP_SLEEP_DEEP_SLEEP_WAKEUP_DELAY=2000
-CONFIG_ESP32S3_RTC_CLK_SRC_INT_RC=y
-# CONFIG_ESP32S3_RTC_CLK_SRC_EXT_CRYS is not set
-# CONFIG_ESP32S3_RTC_CLK_SRC_EXT_OSC is not set
-# CONFIG_ESP32S3_RTC_CLK_SRC_INT_8MD256 is not set
-CONFIG_ESP32S3_RTC_CLK_CAL_CYCLES=1024
-CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE=y
-# CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION is not set
-CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER=20
-CONFIG_ESP32_PHY_MAX_TX_POWER=20
-# CONFIG_REDUCE_PHY_TX_POWER is not set
-# CONFIG_ESP32_REDUCE_PHY_TX_POWER is not set
-CONFIG_ESP_SYSTEM_PM_POWER_DOWN_CPU=y
-CONFIG_PM_POWER_DOWN_TAGMEM_IN_LIGHT_SLEEP=y
-CONFIG_ESP32S3_SPIRAM_SUPPORT=y
-CONFIG_DEFAULT_PSRAM_CLK_IO=30
-CONFIG_DEFAULT_PSRAM_CS_IO=26
-# CONFIG_ESP32S3_DEFAULT_CPU_FREQ_80 is not set
-# CONFIG_ESP32S3_DEFAULT_CPU_FREQ_160 is not set
-CONFIG_ESP32S3_DEFAULT_CPU_FREQ_240=y
-CONFIG_ESP32S3_DEFAULT_CPU_FREQ_MHZ=240
-CONFIG_SYSTEM_EVENT_QUEUE_SIZE=32
-CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=2304
-CONFIG_MAIN_TASK_STACK_SIZE=3584
-CONFIG_CONSOLE_UART_DEFAULT=y
-# CONFIG_CONSOLE_UART_CUSTOM is not set
-# CONFIG_CONSOLE_UART_NONE is not set
-# CONFIG_ESP_CONSOLE_UART_NONE is not set
-CONFIG_CONSOLE_UART=y
-CONFIG_CONSOLE_UART_NUM=0
-CONFIG_CONSOLE_UART_BAUDRATE=115200
-CONFIG_INT_WDT=y
-CONFIG_INT_WDT_TIMEOUT_MS=300
-CONFIG_INT_WDT_CHECK_CPU1=y
-CONFIG_TASK_WDT=y
-CONFIG_ESP_TASK_WDT=y
-# CONFIG_TASK_WDT_PANIC is not set
-CONFIG_TASK_WDT_TIMEOUT_S=5
-CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0=y
-CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU1=y
-# CONFIG_ESP32_DEBUG_STUBS_ENABLE is not set
-CONFIG_ESP32S3_DEBUG_OCDAWARE=y
-CONFIG_BROWNOUT_DET=y
-CONFIG_ESP32S3_BROWNOUT_DET=y
-CONFIG_ESP32S3_BROWNOUT_DET=y
-CONFIG_BROWNOUT_DET_LVL_SEL_7=y
-CONFIG_ESP32S3_BROWNOUT_DET_LVL_SEL_7=y
-# CONFIG_BROWNOUT_DET_LVL_SEL_6 is not set
-# CONFIG_ESP32S3_BROWNOUT_DET_LVL_SEL_6 is not set
-# CONFIG_BROWNOUT_DET_LVL_SEL_5 is not set
-# CONFIG_ESP32S3_BROWNOUT_DET_LVL_SEL_5 is not set
-# CONFIG_BROWNOUT_DET_LVL_SEL_4 is not set
-# CONFIG_ESP32S3_BROWNOUT_DET_LVL_SEL_4 is not set
-# CONFIG_BROWNOUT_DET_LVL_SEL_3 is not set
-# CONFIG_ESP32S3_BROWNOUT_DET_LVL_SEL_3 is not set
-# CONFIG_BROWNOUT_DET_LVL_SEL_2 is not set
-# CONFIG_ESP32S3_BROWNOUT_DET_LVL_SEL_2 is not set
-# CONFIG_BROWNOUT_DET_LVL_SEL_1 is not set
-# CONFIG_ESP32S3_BROWNOUT_DET_LVL_SEL_1 is not set
-CONFIG_BROWNOUT_DET_LVL=7
-CONFIG_ESP32S3_BROWNOUT_DET_LVL=7
-CONFIG_IPC_TASK_STACK_SIZE=1280
-CONFIG_TIMER_TASK_STACK_SIZE=3584
-CONFIG_ESP32_WIFI_ENABLED=y
-CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=10
-CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=32
-CONFIG_ESP32_WIFI_STATIC_TX_BUFFER=y
-CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=0
-CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM=16
-CONFIG_ESP32_WIFI_CACHE_TX_BUFFER_NUM=32
-# CONFIG_ESP32_WIFI_CSI_ENABLED is not set
-CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y
-CONFIG_ESP32_WIFI_TX_BA_WIN=6
-CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
-CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
-CONFIG_ESP32_WIFI_RX_BA_WIN=6
-CONFIG_ESP32_WIFI_RX_BA_WIN=6
-# CONFIG_ESP32_WIFI_AMSDU_TX_ENABLED is not set
-CONFIG_ESP32_WIFI_NVS_ENABLED=y
-CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0=y
-# CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_1 is not set
-CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN=752
-CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32
-CONFIG_ESP32_WIFI_IRAM_OPT=y
-CONFIG_ESP32_WIFI_RX_IRAM_OPT=y
-CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE=y
-CONFIG_ESP32_WIFI_ENABLE_WPA3_OWE_STA=y
-CONFIG_WPA_MBEDTLS_CRYPTO=y
-CONFIG_WPA_MBEDTLS_TLS_CLIENT=y
-# CONFIG_WPA_WAPI_PSK is not set
-# CONFIG_WPA_SUITE_B_192 is not set
-# CONFIG_WPA_11KV_SUPPORT is not set
-# CONFIG_WPA_MBO_SUPPORT is not set
-# CONFIG_WPA_DPP_SUPPORT is not set
-# CONFIG_WPA_11R_SUPPORT is not set
-# CONFIG_WPA_WPS_SOFTAP_REGISTRAR is not set
-# CONFIG_WPA_WPS_STRICT is not set
-# CONFIG_WPA_DEBUG_PRINT is not set
-# CONFIG_WPA_TESTING_OPTIONS is not set
-# CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH is not set
-# CONFIG_ESP32_ENABLE_COREDUMP_TO_UART is not set
-CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y
-CONFIG_TIMER_TASK_PRIORITY=1
-CONFIG_TIMER_TASK_STACK_DEPTH=2048
-CONFIG_TIMER_QUEUE_LENGTH=10
-# CONFIG_ENABLE_STATIC_TASK_CLEAN_UP_HOOK is not set
-# CONFIG_HAL_ASSERTION_SILIENT is not set
-# CONFIG_L2_TO_L3_COPY is not set
-CONFIG_ESP_GRATUITOUS_ARP=y
-CONFIG_GARP_TMR_INTERVAL=60
-CONFIG_TCPIP_RECVMBOX_SIZE=32
-CONFIG_TCP_MAXRTX=12
-CONFIG_TCP_SYNMAXRTX=12
-CONFIG_TCP_MSS=1440
-CONFIG_TCP_MSL=60000
-CONFIG_TCP_SND_BUF_DEFAULT=5760
-CONFIG_TCP_WND_DEFAULT=5760
-CONFIG_TCP_RECVMBOX_SIZE=6
-CONFIG_TCP_QUEUE_OOSEQ=y
-CONFIG_TCP_OVERSIZE_MSS=y
-# CONFIG_TCP_OVERSIZE_QUARTER_MSS is not set
-# CONFIG_TCP_OVERSIZE_DISABLE is not set
-CONFIG_UDP_RECVMBOX_SIZE=6
-CONFIG_TCPIP_TASK_STACK_SIZE=3072
-CONFIG_TCPIP_TASK_AFFINITY_NO_AFFINITY=y
-# CONFIG_TCPIP_TASK_AFFINITY_CPU0 is not set
-# CONFIG_TCPIP_TASK_AFFINITY_CPU1 is not set
-CONFIG_TCPIP_TASK_AFFINITY=0x7FFFFFFF
-# CONFIG_PPP_SUPPORT is not set
-CONFIG_ESP32S3_TIME_SYSCALL_USE_RTC_SYSTIMER=y
-CONFIG_ESP32S3_TIME_SYSCALL_USE_RTC_FRC1=y
-# CONFIG_ESP32S3_TIME_SYSCALL_USE_RTC is not set
-# CONFIG_ESP32S3_TIME_SYSCALL_USE_SYSTIMER is not set
-# CONFIG_ESP32S3_TIME_SYSCALL_USE_FRC1 is not set
-# CONFIG_ESP32S3_TIME_SYSCALL_USE_NONE is not set
-CONFIG_ESP32_PTHREAD_TASK_PRIO_DEFAULT=5
-CONFIG_ESP32_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072
-CONFIG_ESP32_PTHREAD_STACK_MIN=768
-CONFIG_ESP32_DEFAULT_PTHREAD_CORE_NO_AFFINITY=y
-# CONFIG_ESP32_DEFAULT_PTHREAD_CORE_0 is not set
-# CONFIG_ESP32_DEFAULT_PTHREAD_CORE_1 is not set
-CONFIG_ESP32_PTHREAD_TASK_CORE_DEFAULT=-1
-CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT="pthread"
-CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ABORTS=y
-# CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_FAILS is not set
-# CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ALLOWED is not set
-CONFIG_SUPPRESS_SELECT_DEBUG_OUTPUT=y
-CONFIG_SUPPORT_TERMIOS=y
-CONFIG_SEMIHOSTFS_MAX_MOUNT_POINTS=1
-# End of deprecated options