firmware: Finished (?) none state

This commit is contained in:
Jack O'Sullivan 2024-12-13 14:06:00 +00:00
parent 76d8557f36
commit 4fa183ab2d
2 changed files with 20 additions and 10 deletions

View File

@ -27,8 +27,8 @@
done
'';
gen-imgs.exec = ''
magick assets/moon_orig.png -resize 180x180 assets/moon.png
magick assets/star_orig.png -resize 180x180 assets/star.png
magick assets/moon_orig.png -resize 120x120 assets/moon.png
magick assets/star_orig.png -resize 120x120 assets/star.png
${genImgsPy}/bin/python gen-imgs.py
'';

View File

@ -2,6 +2,8 @@
#include "ui.h"
static const char* M_VAL_TIME = "VAL TIME?";
static const lv_font_t *font_normal = &lv_font_montserrat_24;
static lv_color_t color_primary, color_secondary;
@ -57,6 +59,9 @@ static void setup_next_state() {
at_active = lv_anim_timeline_create();
}
static void anim_x_cb(void *var, int32_t v) {
lv_obj_set_x(var, v);
}
static void anim_y_cb(void *var, int32_t v) {
lv_obj_set_y(var, v);
}
@ -64,7 +69,7 @@ static void anim_opa_cb(void *var, int32_t v) {
lv_obj_set_style_opa(var, v, 0);
}
static void anim_val_time_text(lv_anim_t *anim) {
lv_label_set_text_static(anim->var, "VAL TIME?");
lv_label_set_text_static(anim->var, M_VAL_TIME);
}
void val_ui_none() {
@ -73,7 +78,7 @@ void val_ui_none() {
lv_obj_t *l_main = lv_label_create(o_active);
lv_obj_add_style(l_main, &s_hero, 0);
lv_obj_center(l_main);
lv_label_set_text_static(l_main, "HELLO \U0001F319\u2B50!");
lv_label_set_text_static(l_main, M_VAL_TIME);
lv_obj_t *l_subtitle = lv_label_create(o_active);
lv_obj_add_style(l_subtitle, &s_subtitle, 0);
@ -82,7 +87,12 @@ void val_ui_none() {
lv_obj_update_layout(o_active);
lv_obj_set_pos(
l_subtitle, -(lv_obj_get_width(l_main) - lv_obj_get_width(l_subtitle)) / 2, lv_obj_get_height(l_main) / 2);
l_subtitle,
-(lv_obj_get_width(l_main) - lv_obj_get_width(l_subtitle)) / 2,
(lv_obj_get_height(l_main) + lv_obj_get_height(l_subtitle)) / 2 + 5);
lv_label_set_text_static(l_main, "HELLO \U0001F319\u2B50!");
lv_obj_update_layout(o_active);
// Animations
lv_anim_t a_hello_in;
@ -122,10 +132,10 @@ void val_ui_none() {
lv_anim_set_duration(&a_val, 500);
lv_anim_timeline_add(at_active, 0, &a_hello_in);
lv_anim_timeline_add(at_active, 0, &a_sub);
lv_anim_timeline_add(at_active, 750, &a_hello_out);
lv_anim_timeline_add(at_active, 1000, &a_val);
// lv_anim_timeline_start(at_active);
lv_anim_timeline_add(at_active, 3000, &a_hello_out);
lv_anim_timeline_add(at_active, 3250, &a_val);
lv_anim_timeline_add(at_active, 3750, &a_sub);
lv_anim_timeline_start(at_active);
}
void val_lvgl_ui(lv_display_t *disp) {
@ -142,7 +152,7 @@ void val_lvgl_ui(lv_display_t *disp) {
font_normal);
// lv_sysmon_hide_performance(disp);
lv_font_t *f_hero_emoji = lv_imgfont_create(180, imgfont_get_path, NULL);
lv_font_t *f_hero_emoji = lv_imgfont_create(120, imgfont_get_path, NULL);
assert(f_hero_emoji);
f_hero_emoji->fallback = &lv_font_tungsten_180;