some led work

This commit is contained in:
Robert McMahon 2025-12-22 15:19:10 -08:00
parent 64446be628
commit 98b013569d
2 changed files with 49 additions and 23 deletions

View File

@ -45,56 +45,80 @@ static bool s_is_rgb = false;
static int s_gpio_pin = -1; static int s_gpio_pin = -1;
static volatile led_state_t s_current_state = LED_STATE_NO_CONFIG; static volatile led_state_t s_current_state = LED_STATE_NO_CONFIG;
// Helper to set color safely
static void set_color(uint8_t r, uint8_t g, uint8_t b) { static void set_color(uint8_t r, uint8_t g, uint8_t b) {
if (s_is_rgb && s_led_strip) { if (s_is_rgb && s_led_strip) {
led_strip_set_pixel(s_led_strip, 0, r, g, b); led_strip_set_pixel(s_led_strip, 0, r, g, b);
led_strip_refresh(s_led_strip); led_strip_refresh(s_led_strip);
} else if (!s_is_rgb && s_gpio_pin >= 0) { } else if (!s_is_rgb && s_gpio_pin >= 0) {
// Simple LED: On if any color component is > 0 // Simple LED logic: If any color is requested, turn ON.
gpio_set_level(s_gpio_pin, (r+g+b) > 0); // NOTE: If your LED is active-low (VCC->LED->Pin), invert this to !((r+g+b)>0)
gpio_set_level(s_gpio_pin, (r + g + b) > 0 ? 1 : 0);
} }
} }
static void led_task(void *arg) { static void led_task(void *arg) {
int toggle = 0; int toggle = 0;
// --- Startup Diagnostic Sequence ---
// Cycle R -> G -> B to prove hardware is working
ESP_LOGW(TAG, "Running LED Diagnostic Sequence on GPIO %d...", s_gpio_pin);
set_color(50, 0, 0); // Red
vTaskDelay(pdMS_TO_TICKS(300));
set_color(0, 50, 0); // Green
vTaskDelay(pdMS_TO_TICKS(300));
set_color(0, 0, 50); // Blue
vTaskDelay(pdMS_TO_TICKS(300));
set_color(0, 0, 0); // Off
vTaskDelay(pdMS_TO_TICKS(100));
while (1) { while (1) {
// Brightness set to 30-50 (out of 255) for visibility
switch (s_current_state) { switch (s_current_state) {
case LED_STATE_NO_CONFIG: // Yellow (Solid for RGB, Blink for Single) case LED_STATE_NO_CONFIG: // Yellow (Solid RGB / Blink Simple)
if (s_is_rgb) { set_color(20, 20, 0); vTaskDelay(pdMS_TO_TICKS(1000)); } if (s_is_rgb) {
else { set_color(1,1,1); vTaskDelay(pdMS_TO_TICKS(100)); set_color(0,0,0); vTaskDelay(pdMS_TO_TICKS(100)); } set_color(40, 30, 0);
vTaskDelay(pdMS_TO_TICKS(1000));
} else {
set_color(1,1,1); vTaskDelay(pdMS_TO_TICKS(100));
set_color(0,0,0); vTaskDelay(pdMS_TO_TICKS(100));
}
break; break;
case LED_STATE_WAITING: // Blue Blink (Searching) case LED_STATE_WAITING: // Blue Blink
set_color(0, 0, toggle ? 50 : 0); set_color(0, 0, toggle ? 50 : 0);
toggle = !toggle; toggle = !toggle;
vTaskDelay(pdMS_TO_TICKS(500)); vTaskDelay(pdMS_TO_TICKS(500));
break; break;
case LED_STATE_CONNECTED: // Green Solid (Idle) case LED_STATE_CONNECTED: // Green Solid
set_color(0, 20, 0); set_color(0, 30, 0);
vTaskDelay(pdMS_TO_TICKS(1000)); vTaskDelay(pdMS_TO_TICKS(1000));
break; break;
case LED_STATE_MONITORING: // Blue Solid (Sniffer Mode) case LED_STATE_MONITORING: // Cyan Solid
set_color(0, 0, 50); set_color(0, 30, 30);
vTaskDelay(pdMS_TO_TICKS(1000)); vTaskDelay(pdMS_TO_TICKS(1000));
break; break;
case LED_STATE_TRANSMITTING: // Fast Purple Flash (Busy) case LED_STATE_TRANSMITTING: // Purple Fast Flash
set_color(toggle ? 50 : 0, 0, toggle ? 50 : 0); set_color(toggle ? 40 : 0, 0, toggle ? 40 : 0);
toggle = !toggle; toggle = !toggle;
vTaskDelay(pdMS_TO_TICKS(200)); vTaskDelay(pdMS_TO_TICKS(100));
break; break;
case LED_STATE_TRANSMITTING_SLOW: // Slow Purple Pulse (Pacing) case LED_STATE_TRANSMITTING_SLOW: // Purple Slow Pulse
set_color(toggle ? 50 : 0, 0, toggle ? 50 : 0); set_color(toggle ? 40 : 0, 0, toggle ? 40 : 0);
toggle = !toggle; toggle = !toggle;
vTaskDelay(pdMS_TO_TICKS(250)); vTaskDelay(pdMS_TO_TICKS(500));
break; break;
case LED_STATE_STALLED: // Purple Solid (Stalled) case LED_STATE_STALLED: // Red/Purple Solid
set_color(50, 0, 50); set_color(50, 0, 20);
vTaskDelay(pdMS_TO_TICKS(1000)); vTaskDelay(pdMS_TO_TICKS(1000));
break; break;
case LED_STATE_FAILED: // Red Blink (Error) case LED_STATE_FAILED: // Red Blink
set_color(toggle ? 50 : 0, 0, 0); set_color(toggle ? 50 : 0, 0, 0);
toggle = !toggle; toggle = !toggle;
vTaskDelay(pdMS_TO_TICKS(200)); vTaskDelay(pdMS_TO_TICKS(200));
break; break;
default:
vTaskDelay(pdMS_TO_TICKS(100));
break;
} }
} }
} }
@ -103,18 +127,19 @@ void status_led_init(int gpio_pin, bool is_rgb_strip) {
s_gpio_pin = gpio_pin; s_gpio_pin = gpio_pin;
s_is_rgb = is_rgb_strip; s_is_rgb = is_rgb_strip;
ESP_LOGI(TAG, "Initializing LED on GPIO %d (RGB=%d)", gpio_pin, is_rgb_strip); ESP_LOGI(TAG, "Initializing Status LED: GPIO=%d, Type=%s",
gpio_pin, is_rgb_strip ? "RGB Strip (WS2812)" : "Simple GPIO");
if (s_is_rgb) { if (s_is_rgb) {
led_strip_config_t s_cfg = { led_strip_config_t s_cfg = {
.strip_gpio_num = gpio_pin, .strip_gpio_num = gpio_pin,
.max_leds = 1, .max_leds = 1,
.led_pixel_format = LED_PIXEL_FORMAT_GRB, // Standard for WS2812 .led_pixel_format = LED_PIXEL_FORMAT_GRB,
.led_model = LED_MODEL_WS2812, // Specific model .led_model = LED_MODEL_WS2812,
.flags.invert_out = false, .flags.invert_out = false,
}; };
led_strip_rmt_config_t r_cfg = { led_strip_rmt_config_t r_cfg = {
.resolution_hz = 10 * 1000 * 1000, // 10MHz .resolution_hz = 10 * 1000 * 1000,
.flags.with_dma = false, .flags.with_dma = false,
}; };

View File

@ -175,6 +175,7 @@ void app_main(void) {
// 4. Hardware Init // 4. Hardware Init
status_led_init(RGB_LED_GPIO, HAS_RGB_LED); status_led_init(RGB_LED_GPIO, HAS_RGB_LED);
status_led_set_state(LED_STATE_FAILED); // Force Red Blink
#ifdef CONFIG_ESP_WIFI_CSI_ENABLED #ifdef CONFIG_ESP_WIFI_CSI_ENABLED
ESP_ERROR_CHECK(csi_log_init()); ESP_ERROR_CHECK(csi_log_init());
csi_mgr_init(); csi_mgr_init();