Skip to content

Update performance with more colors #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
victorlin wants to merge 10 commits into
base: main
Choose a base branch
from
Draft

Update performance with more colors #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e09dbd0
fixed excessive RAM usage bug
ChaosNuggets Feb 10, 2024
3c1ee65
Start scene numbering at 1
victorlin Feb 17, 2024
d9e46f6
Limit file handle scope
victorlin Feb 17, 2024
844e2e9
Update code generation script to use switch/case
victorlin Feb 17, 2024
7999ccb
Merge pull request #1: Fixed excessive RAM usage bug
victorlin Feb 17, 2024
126aacd
Fix last scene
victorlin Feb 17, 2024
20b46e2
Support disabled clips from FCP
victorlin Feb 17, 2024
11c69ff
Update for 2/17 show
victorlin Feb 17, 2024
b67ee9f
Rename performance program and make a copy
victorlin Feb 17, 2024
556f4c7
genshin-fountain: Alternate tosses on 2nd program
victorlin Feb 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ A collection of programs using [ChaosNuggets/Diabolo_Light](https://github.com/C

PlatformIO is configured to upload a `src/main.cpp` file. Choose which program to use by symlinking:

ln -Fs performance.cpp src/main.cpp
ln -Fs single_color.cpp src/main.cpp

## `src/color_lab.cpp`

Expand All @@ -16,9 +16,9 @@ This program is used to pick colors that look good on the LED kit.

This program shows a color on initial button press, and will turn off on the 2nd press.

## `src/performance.cpp`
## `src/genshin-fountain-*.cpp`

This program defines a performance consisting of scenes which are defined by colors and transitions between colors. Contains generic structs which I hope to pull out into a separate file eventually.
These programs are used to create a performance consisting of scenes which are defined by colors and transitions between colors. Contains generic structs which I hope to pull out into a separate file eventually.

I use Final Cut Pro's Export XML functionality and a custom script `src/read_fcp_xml.py` to facilitate definition of scenes for this program. Not enough time to document now, but here's a screenshot:

Expand Down
1 change: 1 addition & 0 deletions src/color_lab.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ typedef uint32_t Color;

static Color colors[] = {
pixels.Color(255, 0 , 0 ), // red
pixels.Color(255, 32 , 0 ), // orange
pixels.Color(255, 64 , 0 ), // orange
pixels.Color(255, 128, 0 ), // warm yellow
pixels.Color(255, 192, 0 ), // yellow-green
Expand Down
146 changes: 146 additions & 0 deletions src/genshin-fountain-1.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,146 @@
#include <Arduino.h>
#include <Diabolo_Light.h>
#include <Adafruit_NeoPixel.h>

Adafruit_NeoPixel pixels(
Diabolo_Light::NUM_LEDS,
Diabolo_Light::LED_PIN,
Diabolo_Light::LED_TYPE
);

typedef uint8_t DiodeBrightness;
typedef int8_t DiodeBrightnessOffset;

struct Color {
const DiodeBrightness r;
const DiodeBrightness g;
const DiodeBrightness b;

Color(DiodeBrightness r, DiodeBrightness g, DiodeBrightness b)
: r(r), g(g), b(b) {}

bool operator==(const Color& other) const {
return r == other.r && g == other.g && b == other.b;
}
};

const static Color WHITE_1 = Color(20 , 20 , 20 );
const static Color WHITE_3 = Color(255, 255, 255);
const static Color RED_3 = Color(255, 0 , 0 );
const static Color GREEN_3 = Color(128, 255, 0 );
const static Color BLUE_3 = Color(0 , 64 , 255);
const static Color YELLOW_3 = Color(255, 128, 0 );
const static Color ORANGE_3 = Color(255, 32 , 0 );
const static Color BLUE_2 = Color(0 , 128, 255);

struct Scene {
const Color& start;
const Color& end;
uint32_t duration;
// TODO: add types of transitions. R/G/B balanced transition or R+G+B combined transition

Scene(const Color& start, const Color& end, uint32_t duration)
: start(start), end(end), duration(duration) {}
};

Scene get_current_scene(uint8_t scene_num) {
switch (scene_num) {
case 1: return Scene(WHITE_1, WHITE_1, 6683);
case 2: return Scene(WHITE_1, YELLOW_3, 1166);
case 3: return Scene(YELLOW_3, YELLOW_3, 20966);
case 4: return Scene(YELLOW_3, BLUE_2, 816); // toss up
case 5: return Scene(BLUE_2, YELLOW_3, 816); // toss down
case 6: return Scene(YELLOW_3, YELLOW_3, 1016); // before umbrella
case 7: return Scene(YELLOW_3, BLUE_2, 816); // toss up
case 8: return Scene(BLUE_2, YELLOW_3, 816); // toss down
case 9: return Scene(YELLOW_3, YELLOW_3, 933);
case 10: return Scene(YELLOW_3, WHITE_3, 1283); // before umbrella
case 11: return Scene(WHITE_3, WHITE_3, 1250); // before umbrella
case 12: return Scene(WHITE_3, BLUE_2, 816); // toss up
case 13: return Scene(BLUE_2, WHITE_3, 816); // toss down
case 14: return Scene(WHITE_3, WHITE_3, 950); // before umbrella
case 15: return Scene(WHITE_3, WHITE_3, 5333); // flower
case 16: return Scene(RED_3, RED_3, 333); // umbrella
case 17: return Scene(YELLOW_3, YELLOW_3, 316); // umbrella
case 18: return Scene(RED_3, RED_3, 333); // umbrella
case 19: return Scene(YELLOW_3, YELLOW_3, 316); // umbrella
case 20: return Scene(RED_3, RED_3, 333); // umbrella
case 21: return Scene(YELLOW_3, YELLOW_3, 316); // umbrella
case 22: return Scene(RED_3, RED_3, 333); // umbrella
case 23: return Scene(YELLOW_3, YELLOW_3, 316); // umbrella
case 24: return Scene(RED_3, RED_3, 333); // umbrella
case 25: return Scene(YELLOW_3, YELLOW_3, 316); // umbrella
case 26: return Scene(RED_3, RED_3, 333); // umbrella
case 27: return Scene(YELLOW_3, YELLOW_3, 316); // umbrella
case 28: return Scene(RED_3, RED_3, 333); // umbrella
case 29: return Scene(YELLOW_3, YELLOW_3, 316); // umbrella
case 30: return Scene(RED_3, ORANGE_3, 650); // umbrella
case 31: return Scene(ORANGE_3, ORANGE_3, 21200); // after umbrella
case 32: return Scene(ORANGE_3, BLUE_3, 2733); // transition
case 33: return Scene(BLUE_3, BLUE_3, 17950); // around the world
case 34: return Scene(BLUE_3, YELLOW_3, 2733); // transition
case 35: return Scene(YELLOW_3, RED_3, 1483); // transition
case 36: return Scene(RED_3, RED_3, 17850); // dragon
case 37: return Scene(RED_3, WHITE_3, 2916); // transition
case 38: return Scene(WHITE_3, WHITE_3, 251016);
}
}

const static uint8_t TOTAL_SCENES = 38;
uint8_t scene_num = 1;
unsigned long past_scene_durations = 0;

void set_all_pixels(uint32_t color) {
for (unsigned int i = 0; i < Diabolo_Light::NUM_LEDS; i++) {
pixels.setPixelColor(i, color);
}
pixels.show();
}

void setup() {
pixels.begin();

Diabolo_Light::begin(1, 0, [](){
scene_num = 1;
past_scene_durations = 0;
});
}

void loop() {
Diabolo_Light::handle_button();

if (Diabolo_Light::get_current_mode() != 1) return;

Scene scene = get_current_scene(scene_num);

// Progress within current scene, from 0-1
double progress =
static_cast<double>(Diabolo_Light::awake_time() - past_scene_durations)
/ scene.duration;

// Go to next scene
if (progress >= 1) {
past_scene_durations = past_scene_durations + scene.duration;
scene_num++;

// Turn off after last scene
if (scene_num > TOTAL_SCENES) {
Diabolo_Light::set_current_mode(0);
}
}

if (scene.start == scene.end) {
set_all_pixels(pixels.Color(
scene.start.r,
scene.start.g,
scene.start.b
));
}
else {
set_all_pixels(pixels.Color(
scene.start.r + static_cast<DiodeBrightnessOffset>((scene.end.r - scene.start.r) * progress),
scene.start.g + static_cast<DiodeBrightnessOffset>((scene.end.g - scene.start.g) * progress),
scene.start.b + static_cast<DiodeBrightnessOffset>((scene.end.b - scene.start.b) * progress)
));
}
}
146 changes: 146 additions & 0 deletions src/genshin-fountain-2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,146 @@
#include <Arduino.h>
#include <Diabolo_Light.h>
#include <Adafruit_NeoPixel.h>

Adafruit_NeoPixel pixels(
Diabolo_Light::NUM_LEDS,
Diabolo_Light::LED_PIN,
Diabolo_Light::LED_TYPE
);

typedef uint8_t DiodeBrightness;
typedef int8_t DiodeBrightnessOffset;

struct Color {
const DiodeBrightness r;
const DiodeBrightness g;
const DiodeBrightness b;

Color(DiodeBrightness r, DiodeBrightness g, DiodeBrightness b)
: r(r), g(g), b(b) {}

bool operator==(const Color& other) const {
return r == other.r && g == other.g && b == other.b;
}
};

const static Color WHITE_1 = Color(20 , 20 , 20 );
const static Color WHITE_3 = Color(255, 255, 255);
const static Color RED_3 = Color(255, 0 , 0 );
const static Color GREEN_3 = Color(128, 255, 0 );
const static Color BLUE_3 = Color(0 , 64 , 255);
const static Color YELLOW_3 = Color(255, 128, 0 );
const static Color ORANGE_3 = Color(255, 32 , 0 );
const static Color BLUE_2 = Color(0 , 128, 255);

struct Scene {
const Color& start;
const Color& end;
uint32_t duration;
// TODO: add types of transitions. R/G/B balanced transition or R+G+B combined transition

Scene(const Color& start, const Color& end, uint32_t duration)
: start(start), end(end), duration(duration) {}
};

Scene get_current_scene(uint8_t scene_num) {
switch (scene_num) {
case 1: return Scene(WHITE_1, WHITE_1, 6683);
case 2: return Scene(WHITE_1, YELLOW_3, 1166);
case 3: return Scene(YELLOW_3, YELLOW_3, 20966);
case 4: return Scene(YELLOW_3, YELLOW_3, 1233); // before umbrella
case 5: return Scene(YELLOW_3, BLUE_2, 816); // toss up
case 6: return Scene(BLUE_2, YELLOW_3, 816); // toss down
case 7: return Scene(YELLOW_3, YELLOW_3, 1066); // before umbrella
case 8: return Scene(YELLOW_3, BLUE_2, 816); // toss up
case 9: return Scene(BLUE_2, YELLOW_3, 816); // toss down
case 10: return Scene(YELLOW_3, WHITE_3, 933); // before umbrella
case 11: return Scene(WHITE_3, WHITE_3, 1250); // before umbrella
case 12: return Scene(WHITE_3, BLUE_2, 816); // toss up
case 13: return Scene(BLUE_2, WHITE_3, 816); // toss down
case 14: return Scene(WHITE_3, WHITE_3, 950); // before umbrella
case 15: return Scene(WHITE_3, WHITE_3, 5333); // flower
case 16: return Scene(RED_3, RED_3, 333); // umbrella
case 17: return Scene(YELLOW_3, YELLOW_3, 316); // umbrella
case 18: return Scene(RED_3, RED_3, 333); // umbrella
case 19: return Scene(YELLOW_3, YELLOW_3, 316); // umbrella
case 20: return Scene(RED_3, RED_3, 333); // umbrella
case 21: return Scene(YELLOW_3, YELLOW_3, 316); // umbrella
case 22: return Scene(RED_3, RED_3, 333); // umbrella
case 23: return Scene(YELLOW_3, YELLOW_3, 316); // umbrella
case 24: return Scene(RED_3, RED_3, 333); // umbrella
case 25: return Scene(YELLOW_3, YELLOW_3, 316); // umbrella
case 26: return Scene(RED_3, RED_3, 333); // umbrella
case 27: return Scene(YELLOW_3, YELLOW_3, 316); // umbrella
case 28: return Scene(RED_3, RED_3, 333); // umbrella
case 29: return Scene(YELLOW_3, YELLOW_3, 316); // umbrella
case 30: return Scene(RED_3, ORANGE_3, 650); // umbrella
case 31: return Scene(ORANGE_3, ORANGE_3, 21200); // after umbrella
case 32: return Scene(ORANGE_3, BLUE_3, 2733); // transition
case 33: return Scene(BLUE_3, BLUE_3, 17950); // around the world
case 34: return Scene(BLUE_3, YELLOW_3, 2733); // transition
case 35: return Scene(YELLOW_3, RED_3, 1483); // transition
case 36: return Scene(RED_3, RED_3, 17850); // dragon
case 37: return Scene(RED_3, WHITE_3, 2916); // transition
case 38: return Scene(WHITE_3, WHITE_3, 251016);
}
}

const static uint8_t TOTAL_SCENES = 38;
uint8_t scene_num = 1;
unsigned long past_scene_durations = 0;

void set_all_pixels(uint32_t color) {
for (unsigned int i = 0; i < Diabolo_Light::NUM_LEDS; i++) {
pixels.setPixelColor(i, color);
}
pixels.show();
}

void setup() {
pixels.begin();

Diabolo_Light::begin(1, 0, [](){
scene_num = 1;
past_scene_durations = 0;
});
}

void loop() {
Diabolo_Light::handle_button();

if (Diabolo_Light::get_current_mode() != 1) return;

Scene scene = get_current_scene(scene_num);

// Progress within current scene, from 0-1
double progress =
static_cast<double>(Diabolo_Light::awake_time() - past_scene_durations)
/ scene.duration;

// Go to next scene
if (progress >= 1) {
past_scene_durations = past_scene_durations + scene.duration;
scene_num++;

// Turn off after last scene
if (scene_num > TOTAL_SCENES) {
Diabolo_Light::set_current_mode(0);
}
}

if (scene.start == scene.end) {
set_all_pixels(pixels.Color(
scene.start.r,
scene.start.g,
scene.start.b
));
}
else {
set_all_pixels(pixels.Color(
scene.start.r + static_cast<DiodeBrightnessOffset>((scene.end.r - scene.start.r) * progress),
scene.start.g + static_cast<DiodeBrightnessOffset>((scene.end.g - scene.start.g) * progress),
scene.start.b + static_cast<DiodeBrightnessOffset>((scene.end.b - scene.start.b) * progress)
));
}
}
Loading