10 Commits

Author SHA1 Message Date
284553f3f8 C3 Demo 2026-01-17 23:15:51 +01:00
e25971af89 port to ESP32C3 2026-01-09 13:24:19 +01:00
5796b28e1a improve navigation animation 2026-01-06 23:02:54 +01:00
12a8710a2f cleanup 2026-01-06 22:44:36 +01:00
468d2cba74 fix chase rgb animation 2026-01-06 22:39:44 +01:00
d2d5d7dc4b fix chase animation 2026-01-06 22:33:28 +01:00
f1aac6611d fix random animation 2026-01-06 22:21:33 +01:00
733b05eaeb fix confetti animation 2026-01-06 22:06:02 +01:00
715d50c255 enable rainbow with glitter animation 2026-01-06 21:58:11 +01:00
883fff95dd fix rainbow animation 2026-01-06 21:55:00 +01:00
6 changed files with 700 additions and 581 deletions

1
.gitignore vendored
View File

@ -291,3 +291,4 @@ dkms.conf
.vscode/settings.json
sdkconfig.defaults
.clangd

View File

@ -42,12 +42,6 @@ static int16_t beatsin16(uint8_t bpm, int16_t min_val, int16_t max_val)
return result;
}
// Beat calculation helper (beatsin8 variant)
static uint8_t beatsin8(uint8_t bpm, uint8_t min_val, uint8_t max_val)
{
return (uint8_t)beatsin16(bpm, min_val, max_val);
}
// Random helper
static uint8_t random8(void)
{
@ -102,17 +96,21 @@ static void anim_rainbow(void)
// Rainbow generator
uint16_t num_leds_a = led_get_num_leds_a();
uint16_t num_leds_b = led_get_num_leds_b();
uint16_t num_leds = num_leds_a + num_leds_b;
for (uint16_t i = 0; i < num_leds_a; i++)
for (uint16_t i = 0; i < num_leds; i++)
{
hsv_t hsv = {(uint8_t)(global_hue + (i * 7)), 255, 255};
led_set_pixel_a(i, led_hsv_to_rgb(hsv));
rgb_t color = led_hsv_to_rgb(hsv);
if (i < num_leds_a)
{
led_set_pixel_a(num_leds_a - i - 1, color);
}
for (uint16_t i = 0; i < num_leds_b; i++)
else
{
hsv_t hsv = {(uint8_t)(global_hue + (i * 7)), 255, 255};
led_set_pixel_b(i, led_hsv_to_rgb(hsv));
led_set_pixel_b(i - num_leds_a, color);
}
}
}
@ -138,7 +136,7 @@ static void add_glitter(uint8_t chance_of_glitter)
static void anim_rainbow_glitter(void)
{
anim_rainbow();
add_glitter(80);
add_glitter(255);
}
static void anim_confetti(void)
@ -149,16 +147,16 @@ static void anim_confetti(void)
uint16_t num_leds = led_get_num_leds_a() + led_get_num_leds_b();
uint16_t pos = random16(num_leds);
hsv_t hsv = {(uint8_t)(global_hue + random8()), 200, 255};
hsv_t hsv = {(uint8_t)(global_hue + random8()), 255, 255};
rgb_t color = led_hsv_to_rgb(hsv);
if (pos < led_get_num_leds_a())
{
led_add_pixel_a(pos, color);
led_set_pixel_a(led_get_num_leds_a() - pos - 1, color);
}
else
{
led_add_pixel_b(pos - led_get_num_leds_a(), color);
led_set_pixel_b(pos - led_get_num_leds_a(), color);
}
}
@ -183,40 +181,14 @@ static void anim_sinelon(void)
}
}
static void anim_bpm(void)
{
// Colored stripes pulsing at 33 BPM
uint8_t bpm = 33;
uint8_t beat = beatsin8(bpm, 64, 255);
uint16_t num_leds_a = led_get_num_leds_a();
uint16_t num_leds_b = led_get_num_leds_b();
// PartyColors palette simulation
const uint8_t palette_colors[] = {
170, 240, 90, 150, 210, 30, 180, 0,
210, 255, 150, 240, 255, 60, 255, 120};
for (uint16_t i = 0; i < num_leds_a; i++)
{
uint8_t color_index = (global_hue + (i * 2)) & 0x0F;
uint8_t brightness = beat - global_hue + (i * 10);
hsv_t hsv = {palette_colors[color_index], 255, brightness};
led_set_pixel_a(i, led_hsv_to_rgb(hsv));
}
for (uint16_t i = 0; i < num_leds_b; i++)
{
uint8_t color_index = (global_hue + ((i + num_leds_a) * 2)) & 0x0F;
uint8_t brightness = beat - global_hue + ((i + num_leds_a) * 10);
hsv_t hsv = {palette_colors[color_index], 255, brightness};
led_set_pixel_b(i, led_hsv_to_rgb(hsv));
}
}
static void anim_navigation(void)
{
// Navigation lights: left red, right green
// Aviation navigation lights with strobe overlay:
// - Red: Port (left) wingtip - steady
// - Green: Starboard (right) wingtip - steady
// - White strobe: Overlays outer nav lights with bright flashes
static uint8_t strobe_counter = 0;
led_clear_all();
uint16_t num_leds_a = led_get_num_leds_a();
@ -224,22 +196,34 @@ static void anim_navigation(void)
rgb_t red = {255, 0, 0};
rgb_t green = {0, 255, 0};
rgb_t white = {255, 255, 255};
// Side red (last 3 LEDs of strip A)
// Anti-collision strobe pattern: Double flash at ~1 Hz
// Flash duration: 3 frames (~50ms) for high-intensity effect
bool first_flash = (strobe_counter < 3);
bool second_flash = (strobe_counter >= 7 && strobe_counter < 10);
bool strobe_active = (first_flash || second_flash);
// Port (left) - Red navigation light OR white strobe (outer 3 LEDs of strip A)
if (num_leds_a >= 3)
{
led_set_pixel_a(num_leds_a - 1, red);
rgb_t color_a = strobe_active ? white : red;
led_set_pixel_a(num_leds_a - 1, color_a);
led_set_pixel_a(num_leds_a - 2, red);
led_set_pixel_a(num_leds_a - 3, red);
}
// Side green (last 3 LEDs of strip B)
// Starboard (right) - Green navigation light OR white strobe (outer 3 LEDs of strip B)
if (num_leds_b >= 3)
{
led_set_pixel_b(num_leds_b - 1, green);
rgb_t color_b = strobe_active ? white : green;
led_set_pixel_b(num_leds_b - 1, color_b);
led_set_pixel_b(num_leds_b - 2, green);
led_set_pixel_b(num_leds_b - 3, green);
}
// Strobe cycle: 90 frames = 1.5 second at 60 FPS
strobe_counter = (strobe_counter + 1) % 90;
}
static void anim_chase(void)
@ -247,25 +231,45 @@ static void anim_chase(void)
// Red dot sweeping with trailing dots
led_clear_all();
uint16_t num_leds = led_get_num_leds_a() + led_get_num_leds_b();
int16_t pos = beatsin16(40, 0, num_leds - 1);
uint16_t num_leds_a = led_get_num_leds_a();
uint16_t num_leds_b = led_get_num_leds_b();
uint16_t total_leds = num_leds_a + num_leds_b;
// Get oscillating position across both strips
int16_t center_pos = beatsin16(40, 0, total_leds - 1);
rgb_t red = {255, 0, 0};
// Set main dot and trailing dots
for (int offset = -2; offset <= 2; offset++)
// Draw center dot with dimmed trailing dots (3 dots total: center ±1)
for (int8_t offset = -1; offset <= 1; offset++)
{
int16_t led_pos = pos + offset;
if (led_pos >= 0 && led_pos < num_leds)
int16_t led_pos = center_pos + offset;
// Skip if position is out of bounds
if (led_pos < 0 || led_pos >= total_leds)
continue;
// Calculate brightness based on distance from center
uint8_t brightness = (offset == 0) ? 255 : 32; // Center: full, trailing: 12%
// Create dimmed color
rgb_t dimmed_red = {
(red.r * brightness) / 255,
(red.g * brightness) / 255,
(red.b * brightness) / 255};
// Map virtual position to physical LED
if (led_pos < num_leds_a)
{
if (led_pos < led_get_num_leds_a())
{
led_set_pixel_a(led_pos, red);
// Strip A (mirrored: position 0 maps to last LED)
uint16_t strip_a_index = num_leds_a - led_pos - 1;
led_set_pixel_a(strip_a_index, dimmed_red);
}
else
{
led_set_pixel_b(led_pos - led_get_num_leds_a(), red);
}
// Strip B (direct mapping)
uint16_t strip_b_index = led_pos - num_leds_a;
led_set_pixel_b(strip_b_index, dimmed_red);
}
}
}
@ -275,26 +279,46 @@ static void anim_chase_rgb(void)
// RGB cycling dot sweeping with trailing dots
led_clear_all();
uint16_t num_leds = led_get_num_leds_a() + led_get_num_leds_b();
int16_t pos = beatsin16(40, 0, num_leds - 1);
uint16_t num_leds_a = led_get_num_leds_a();
uint16_t num_leds_b = led_get_num_leds_b();
uint16_t total_leds = num_leds_a + num_leds_b;
// Get oscillating position across both strips
int16_t center_pos = beatsin16(40, 0, total_leds - 1);
hsv_t hsv = {global_hue, 255, 192};
rgb_t color = led_hsv_to_rgb(hsv);
// Set main dot and trailing dots
for (int offset = -2; offset <= 2; offset++)
// Draw center dot with dimmed trailing dots (3 dots total: center ±1)
for (int8_t offset = -1; offset <= 1; offset++)
{
int16_t led_pos = pos + offset;
if (led_pos >= 0 && led_pos < num_leds)
int16_t led_pos = center_pos + offset;
// Skip if position is out of bounds
if (led_pos < 0 || led_pos >= total_leds)
continue;
// Calculate brightness based on distance from center
uint8_t brightness = (offset == 0) ? 255 : 32; // Center: full, trailing: 12%
// Create dimmed color
rgb_t dimmed_color = {
(color.r * brightness) / 255,
(color.g * brightness) / 255,
(color.b * brightness) / 255};
// Map virtual position to physical LED
if (led_pos < num_leds_a)
{
if (led_pos < led_get_num_leds_a())
{
led_add_pixel_a(led_pos, color);
// Strip A (mirrored: position 0 maps to last LED)
uint16_t strip_a_index = num_leds_a - led_pos - 1;
led_set_pixel_a(strip_a_index, dimmed_color);
}
else
{
led_add_pixel_b(led_pos - led_get_num_leds_a(), color);
}
// Strip B (direct mapping)
uint16_t strip_b_index = led_pos - num_leds_a;
led_set_pixel_b(strip_b_index, dimmed_color);
}
}
}
@ -305,18 +329,26 @@ static void anim_random(void)
uint16_t num_leds = led_get_num_leds_a() + led_get_num_leds_b();
uint16_t random_pos = random16(num_leds);
// Randomly clear all (rare event)
if (random_pos == num_leds - 1 && random8() > 200)
{
led_clear_all();
return;
}
// Set random LED to random color
rgb_t random_color = {
random8(),
random8(),
random8()};
0,
0,
0};
// Set random LED to random basis color
switch (random16(3))
{
case 0:
random_color.r = 255;
break;
case 1:
random_color.g = 255;
break;
case 2:
random_color.b = 255;
break;
default:
break;
}
if (random_pos < led_get_num_leds_a())
{
@ -379,31 +411,28 @@ void animation_update(void)
anim_white();
break;
case ANIM_RAINBOW:
// anim_rainbow();
anim_rainbow();
break;
case ANIM_RAINBOW_GLITTER:
// anim_rainbow_glitter();
anim_rainbow_glitter();
break;
case ANIM_CONFETTI:
// anim_confetti();
anim_confetti();
break;
case ANIM_SINELON:
anim_sinelon();
break;
case ANIM_BPM:
// anim_bpm();
break;
case ANIM_NAVIGATION:
anim_navigation();
break;
case ANIM_CHASE:
// anim_chase();
anim_chase();
break;
case ANIM_CHASE_RGB:
// anim_chase_rgb();
anim_chase_rgb();
break;
case ANIM_RANDOM:
// anim_random();
anim_random();
break;
default:
anim_black();
@ -425,7 +454,6 @@ const char *animation_get_mode_name(animation_mode_t mode)
"Rainbow with Glitter",
"Confetti",
"Sinelon",
"33BPM",
"Navigation",
"Chase",
"Chase RGB",

View File

@ -23,11 +23,10 @@ typedef enum {
ANIM_RAINBOW_GLITTER = 6, // Rainbow with glitter
ANIM_CONFETTI = 7, // Random colored speckles
ANIM_SINELON = 8, // Colored dot sweeping (RGB cycling)
ANIM_BPM = 9, // Colored stripes @ 33 BPM
ANIM_NAVIGATION = 10, // Navigation lights (red left, green right)
ANIM_CHASE = 11, // Red dot sweeping
ANIM_CHASE_RGB = 12, // RGB cycling dot sweeping
ANIM_RANDOM = 13, // Random mode
ANIM_NAVIGATION = 9, // Navigation lights (red left, green right)
ANIM_CHASE = 10, // Red dot sweeping
ANIM_CHASE_RGB = 11, // RGB cycling dot sweeping
ANIM_RANDOM = 12, // Random mode
ANIM_MODE_COUNT
} animation_mode_t;

View File

@ -22,12 +22,20 @@ static const char *TAG = "CONFIG";
#define HARDCODED_CONFIG
#ifdef HARDCODED_CONFIG
#define HARDCODED_CONFIG_LED_STRIP_A_PIN 12U
#define HARDCODED_CONFIG_LED_STRIP_B_PIN 14U
#define HARDCODED_CONFIG_LED_STRIP_A_COUNT 7U
#define HARDCODED_CONFIG_LED_STRIP_B_COUNT 7U
#define HARDCODED_CONFIG_PWM_PIN 13U
#define HARDCODED_CONFIG_LOCALBTN_PIN GPIO_NUM_0
#define HARDCODED_CONFIG_LED_STRIP_A_PIN 2U
#define HARDCODED_CONFIG_LED_STRIP_B_PIN 3U
#define HARDCODED_CONFIG_LED_STRIP_A_COUNT 1U
#define HARDCODED_CONFIG_LED_STRIP_B_COUNT 1U
#define HARDCODED_CONFIG_PWM_PIN 1U
#if defined(CONFIG_IDF_TARGET_ESP32C3)
#define HARDCODED_CONFIG_LOCALBTN_PIN 9
#elif defined(CONFIG_IDF_TARGET_ESP32)
#define HARDCODED_CONFIG_LOCALBTN_PIN 0
#else
#error "Unsupported target: BOOT button GPIO not defined"
#endif
#endif
// Global state

View File

@ -194,7 +194,13 @@ static esp_err_t init_strip(led_strip_t *strip, int8_t pin, uint16_t num_leds)
rmt_tx_channel_config_t tx_chan_config = {
.clk_src = RMT_CLK_SRC_DEFAULT,
.gpio_num = pin,
#if defined(CONFIG_IDF_TARGET_ESP32C3)
.mem_block_symbols = 48,
#elif defined(CONFIG_IDF_TARGET_ESP32)
.mem_block_symbols = 64,
#else
#error "Unsupported target: rmt block symbols undefined"
#endif
.resolution_hz = 80000000, // 80MHz
.trans_queue_depth = 4,
};

1011
sdkconfig

File diff suppressed because it is too large Load Diff