From 5a1977ef00d1e0fa8ac43b17f7ca783285de5dce Mon Sep 17 00:00:00 2001
From: Sebastian Krzyszkowiak <dos@dosowisko.net>
Date: Tue, 4 Mar 2025 21:14:00 +0100
Subject: [PATCH] branding
---
components/st3m/st3m_gfx.c | 188 +++++-------------------------------
components/st3m/st3m_mode.c | 10 +-
main/main.c | 6 +-
3 files changed, 32 insertions(+), 172 deletions(-)
diff --git a/components/st3m/st3m_gfx.c b/components/st3m/st3m_gfx.c
index 84cd846663..ee4c977081 100644
--- a/components/st3m/st3m_gfx.c
+++ b/components/st3m/st3m_gfx.c
@@ -674,172 +674,31 @@ void st3m_gfx_flow3r_logo(Ctx *ctx, float x, float y, float dim) {
static int frameno = 0;
static int dir = 1;
frameno += dir;
- if (frameno > 7 || frameno < -6) {
- dir *= -1;
- frameno += dir;
+ if (frameno > 60) {
+ frameno = 0;
}
- ctx_save(ctx);
- ctx_translate(ctx, x, y);
- ctx_scale(ctx, dim, dim);
- ctx_translate(ctx, -0.5f, -0.5f);
- ctx_linear_gradient(ctx, 0.18f - frameno * 0.02, 0.5f,
- 0.95f + frameno * 0.02, 0.5f);
- ctx_gradient_add_stop(ctx, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f);
- ctx_gradient_add_stop(ctx, 0.2f, 1.0f, 1.0f, 0.0f, 1.0f);
- ctx_gradient_add_stop(ctx, 0.4f, 0.0f, 1.0f, 0.0f, 1.0f);
- ctx_gradient_add_stop(ctx, 0.65f, 0.0f, 1.0f, 1.0f, 1.0f);
- ctx_gradient_add_stop(ctx, 0.8f, 0.0f, 0.0f, 1.0f, 1.0f);
- ctx_gradient_add_stop(ctx, 1.0f, 1.0f, 0.0f, 1.0f, 1.0f);
ctx_save(ctx);
- ctx_scale(ctx, 1 / 30.0f, 1 / 30.0f);
- ctx_translate(ctx, 0.0f, 10.0f);
- ctx_move_to(ctx, 6.185f, 0.0f);
- ctx_curve_to(ctx, 5.514f, 0.021f, 4.852f, 0.234f, 4.210f, 0.560f);
- ctx_curve_to(ctx, 2.740f, 1.360f, 1.969f, 2.589f, 1.939f, 4.269f);
- ctx_curve_to(ctx, 1.969f, 4.479f, 1.950f, 4.649f, 1.980f, 4.849f);
- ctx_curve_to(ctx, 1.980f, 5.089f, 1.890f, 5.209f, 1.660f, 5.269f);
- ctx_curve_to(ctx, 1.260f, 5.319f, 0.849f, 5.370f, 0.419f, 5.460f);
- ctx_curve_to(ctx, 0.129f, 5.530f, -0.0704f, 5.870f, 0.0195f, 6.060f);
- ctx_curve_to(ctx, 0.109f, 6.260f, 0.319f, 6.289f, 0.589f, 6.259f);
- ctx_curve_to(ctx, 0.999f, 6.209f, 1.370f, 6.199f, 1.740f, 6.119f);
- ctx_curve_to(ctx, 2.150f, 6.069f, 2.470f, 6.199f, 2.650f, 6.519f);
- ctx_curve_to(ctx, 2.950f, 6.989f, 3.379f, 7.379f, 3.859f, 7.699f);
- ctx_curve_to(ctx, 4.339f, 8.009f, 4.530f, 8.469f, 4.660f, 8.929f);
- ctx_curve_to(ctx, 4.880f, 9.589f, 4.429f, 10.16f, 3.760f, 10.240f);
- ctx_curve_to(ctx, 2.949f, 10.340f, 2.320f, 10.220f, 1.730f, 9.640f);
- ctx_curve_to(ctx, 1.380f, 9.300f, 1.090f, 8.889f, 0.900f, 8.439f);
- ctx_curve_to(ctx, 0.800f, 8.169f, 0.700f, 7.909f, 0.570f, 7.689f);
- ctx_curve_to(ctx, 0.520f, 7.589f, 0.379f, 7.539f, 0.279f, 7.590f);
- ctx_curve_to(ctx, 0.219f, 7.599f, 0.070f, 7.719f, 0.070f, 7.789f);
- ctx_curve_to(ctx, 0.150f, 8.229f, 0.240f, 8.659f, 0.390f, 9.019f);
- ctx_curve_to(ctx, 0.790f, 9.999f, 1.391f, 10.731f, 2.451f, 11.011f);
- ctx_curve_to(ctx, 3.028f, 11.163f, 3.616f, 11.365f, 4.301f, 11.269f);
- ctx_curve_to(ctx, 5.110f, 11.002f, 5.599f, 10.219f, 5.789f, 9.269f);
- ctx_curve_to(ctx, 5.969f, 8.500f, 5.430f, 8.019f, 4.960f, 7.529f);
- ctx_line_to(ctx, 4.650f, 7.289f);
- ctx_curve_to(ctx, 4.338f, 7.043f, 3.646f, 6.725f, 3.519f, 6.160f);
- ctx_curve_to(ctx, 3.889f, 6.080f, 4.260f, 6.000f, 4.630f, 6.00f);
- ctx_curve_to(ctx, 5.240f, 5.980f, 5.870f, 6.029f, 6.480f, 6.029f);
- ctx_curve_to(ctx, 6.820f, 6.059f, 7.120f, 5.990f, 7.330f, 5.720f);
- ctx_curve_to(ctx, 7.390f, 5.640f, 7.429f, 5.499f, 7.429f, 5.429f);
- ctx_curve_to(ctx, 7.379f, 5.269f, 7.260f, 5.109f, 7.150f, 5.089f);
- ctx_curve_to(ctx, 6.860f, 4.999f, 6.559f, 5.0f, 6.25f, 5.0f);
- ctx_curve_to(ctx, 5.330f, 5.02f, 4.410f, 5.099f, 3.490f, 5.109f);
- ctx_curve_to(ctx, 2.980f, 5.139f, 2.859f, 4.989f, 2.859f, 4.439f);
- ctx_curve_to(ctx, 2.889f, 3.239f, 3.519f, 2.330f, 4.429f, 1.640f);
- ctx_curve_to(ctx, 5.049f, 1.150f, 5.849f, 0.979f, 6.619f, 1.089f);
- ctx_curve_to(ctx, 7.379f, 1.199f, 8.070f, 1.489f, 8.380f, 2.339f);
- ctx_curve_to(ctx, 8.440f, 2.569f, 8.810f, 2.489f, 8.919f, 2.269f);
- ctx_curve_to(ctx, 9.089f, 1.979f, 9.129f, 1.700f, 8.949f, 1.380f);
- ctx_curve_to(ctx, 8.679f, 0.860f, 8.239f, 0.580f, 7.759f, 0.330f);
- ctx_curve_to(ctx, 7.234f, 0.080f, 6.707f, -0.0170f, 6.185f, 0.0f);
- ctx_fill(ctx);
-
- ctx_move_to(ctx, 24.390f, 3.050f);
- ctx_curve_to(ctx, 23.745f, 3.058f, 23.089f, 3.252f, 22.419f, 3.449f);
- ctx_curve_to(ctx, 22.349f, 3.459f, 22.340f, 3.630f, 22.320f, 3.740f);
- ctx_curve_to(ctx, 22.350f, 4.010f, 22.539f, 4.160f, 22.779f, 4.160f);
- ctx_curve_to(ctx, 23.389f, 4.150f, 24.029f, 4.100f, 24.619f, 4.130f);
- ctx_curve_to(ctx, 24.859f, 4.130f, 25.149f, 4.229f, 25.369f, 4.339f);
- ctx_curve_to(ctx, 25.619f, 4.479f, 25.799f, 4.799f, 25.689f, 5.019f);
- ctx_curve_to(ctx, 25.609f, 5.199f, 25.459f, 5.390f, 25.269f, 5.480f);
- ctx_curve_to(ctx, 25.009f, 5.580f, 24.700f, 5.590f, 24.400f, 5.660f);
- ctx_curve_to(ctx, 24.130f, 5.690f, 23.860f, 5.719f, 23.630f, 5.789f);
- ctx_curve_to(ctx, 23.400f, 5.859f, 23.280f, 6.010f, 23.310f, 6.210f);
- ctx_curve_to(ctx, 23.370f, 6.380f, 23.500f, 6.600f, 23.640f, 6.650f);
- ctx_curve_to(ctx, 23.860f, 6.760f, 24.070f, 6.810f, 24.310f, 6.810f);
- ctx_curve_to(ctx, 24.650f, 6.840f, 25.029f, 6.819f, 25.439f, 6.839f);
- ctx_curve_to(ctx, 25.779f, 6.859f, 26.040f, 7.000f, 26.150f, 7.330f);
- ctx_curve_to(ctx, 26.540f, 8.300f, 25.899f, 9.468f, 24.859f, 9.628f);
- ctx_curve_to(ctx, 24.449f, 9.688f, 24.0f, 9.619f, 23.600f, 9.669f);
- ctx_curve_to(ctx, 23.399f, 9.699f, 23.189f, 9.729f, 23.029f, 9.779f);
- ctx_curve_to(ctx, 22.799f, 9.839f, 22.640f, 10.200f, 22.720f, 10.330f);
- ctx_curve_to(ctx, 22.902f, 10.577f, 23.018f, 10.732f, 23.320f, 10.730f);
- ctx_curve_to(ctx, 23.940f, 10.720f, 24.580f, 10.680f, 25.150f, 10.570f);
- ctx_curve_to(ctx, 27.220f, 10.170f, 27.830f, 7.660f, 26.740f, 6.330f);
- ctx_curve_to(ctx, 26.540f, 6.120f, 26.519f, 5.920f, 26.619f, 5.630f);
- ctx_curve_to(ctx, 27.005f, 4.795f, 26.709f, 4.028f, 25.880f, 3.460f);
- ctx_curve_to(ctx, 25.388f, 3.152f, 24.892f, 3.044f, 24.390f, 3.050f);
- ctx_fill(ctx);
-
- ctx_move_to(ctx, 9.294f, 3.687f);
- ctx_curve_to(ctx, 9.198f, 3.690f, 9.092f, 3.7307f, 9.00f, 3.800f);
- ctx_curve_to(ctx, 8.739f, 4.010f, 8.740f, 4.3091f, 8.740f, 4.619f);
- ctx_curve_to(ctx, 8.780f, 6.289f, 8.789f, 7.999f, 8.589f, 9.669f);
- ctx_curve_to(ctx, 8.599f, 9.979f, 8.529f, 10.289f, 8.599f, 10.589f);
- ctx_curve_to(ctx, 8.659f, 10.819f, 8.789f, 11.049f, 8.919f, 11.269f);
- ctx_curve_to(ctx, 9.019f, 11.469f, 9.379f, 11.389f, 9.589f, 11.119f);
- ctx_curve_to(ctx, 9.700f, 10.399f, 9.747f, 9.754f, 9.800f, 8.970f);
- ctx_curve_to(ctx, 10.00f, 7.610f, 9.860f, 6.219f, 9.830f, 4.859f);
- ctx_curve_to(ctx, 9.790f, 4.529f, 9.680f, 4.199f, 9.570f, 3.869f);
- ctx_curve_to(ctx, 9.530f, 3.739f, 9.419f, 3.683f, 9.294f, 3.687f);
- ctx_fill(ctx);
- ctx_move_to(ctx, 30.595f, 5.626f);
- ctx_curve_to(ctx, 30.542f, 5.629f, 30.486f, 5.634f, 30.429f, 5.640f);
- ctx_curve_to(ctx, 30.252f, 5.654f, 29.879f, 5.879f, 29.589f, 6.019f);
- ctx_curve_to(ctx, 29.329f, 6.119f, 29.129f, 6.149f, 28.859f, 5.939f);
- ctx_curve_to(ctx, 28.549f, 5.699f, 28.159f, 5.889f, 28.109f, 6.269f);
- ctx_curve_to(ctx, 28.109f, 6.439f, 28.089f, 6.620f, 28.109f, 6.75f);
- ctx_curve_to(ctx, 28.199f, 7.729f, 28.319f, 8.669f, 28.199f, 9.609f);
- ctx_curve_to(ctx, 28.189f, 9.779f, 28.209f, 9.920f, 28.259f, 10.080f);
- ctx_curve_to(ctx, 28.309f, 10.170f, 28.39f, 10.300f, 28.5f, 10.320f);
- ctx_curve_to(ctx, 28.54f, 10.350f, 28.699f, 10.300f, 28.759f, 10.220f);
- ctx_curve_to(ctx, 28.899f, 9.960f, 29.110f, 9.699f, 29.140f, 9.419f);
- ctx_curve_to(ctx, 29.260f, 9.019f, 29.239f, 8.579f, 29.259f, 8.169f);
- ctx_curve_to(ctx, 29.289f, 7.819f, 29.400f, 7.609f, 29.640f, 7.369f);
- ctx_curve_to(ctx, 29.980f, 7.089f, 30.329f, 6.869f, 30.769f, 6.849f);
- ctx_curve_to(ctx, 31.009f, 6.859f, 31.320f, 6.849f, 31.550f, 6.789f);
- ctx_curve_to(ctx, 31.790f, 6.719f, 31.899f, 6.569f, 31.839f, 6.339f);
- ctx_curve_to(ctx, 31.773f, 5.973f, 31.395f, 5.593f, 30.595f, 5.626f);
- ctx_fill(ctx);
- ctx_move_to(ctx, 21.314f, 6.205f);
- ctx_curve_to(ctx, 21.242f, 6.202f, 21.158f, 6.230f, 21.060f, 6.300f);
- ctx_curve_to(ctx, 20.870f, 6.460f, 20.759f, 6.610f, 20.789f, 6.880f);
- ctx_curve_to(ctx, 20.829f, 7.220f, 20.879f, 7.550f, 20.849f, 7.900f);
- ctx_curve_to(ctx, 20.809f, 8.420f, 20.729f, 8.909f, 20.619f, 9.369f);
- ctx_curve_to(ctx, 20.599f, 9.469f, 20.340f, 9.640f, 20.210f, 9.660f);
- ctx_curve_to(ctx, 20.000f, 9.690f, 19.779f, 9.579f, 19.699f, 9.449f);
- ctx_curve_to(ctx, 19.549f, 9.329f, 19.55f, 9.089f, 19.5f, 8.929f);
- ctx_curve_to(ctx, 19.43f, 8.700f, 19.430f, 8.389f, 19.300f, 8.169f);
- ctx_curve_to(ctx, 19.210f, 8.039f, 19.027f, 7.841f, 18.845f, 7.859f);
- ctx_curve_to(ctx, 18.685f, 7.845f, 18.489f, 8.029f, 18.439f, 8.169f);
- ctx_curve_to(ctx, 18.349f, 8.349f, 18.389f, 8.620f, 18.349f, 8.830f);
- ctx_curve_to(ctx, 18.289f, 9.150f, 18.289f, 9.450f, 18.189f, 9.740f);
- ctx_curve_to(ctx, 18.129f, 9.810f, 17.969f, 9.929f, 17.839f, 9.949f);
- ctx_curve_to(ctx, 17.779f, 9.959f, 17.559f, 9.850f, 17.509f, 9.75f);
- ctx_curve_to(ctx, 17.199f, 9.200f, 17.050f, 8.600f, 17.050f, 7.990f);
- ctx_curve_to(ctx, 17.050f, 7.690f, 17.080f, 7.409f, 17.080f, 7.099f);
- ctx_curve_to(ctx, 17.090f, 6.860f, 16.930f, 6.670f, 16.650f, 6.640f);
- ctx_curve_to(ctx, 16.450f, 6.660f, 16.219f, 6.790f, 16.189f, 7.070f);
- ctx_curve_to(ctx, 16.069f, 8.010f, 16.049f, 8.970f, 16.439f, 9.880f);
- ctx_curve_to(ctx, 16.889f, 10.960f, 17.680f, 11.269f, 18.630f, 10.669f);
- ctx_curve_to(ctx, 18.980f, 10.450f, 19.250f, 10.420f, 19.570f, 10.550f);
- ctx_curve_to(ctx, 20.300f, 10.870f, 20.840f, 10.559f, 21.320f, 10.019f);
- ctx_line_to(ctx, 21.320f, 10.030f);
- ctx_curve_to(ctx, 21.430f, 9.819f, 21.610f, 9.590f, 21.640f, 9.310f);
- ctx_curve_to(ctx, 21.870f, 8.390f, 21.790f, 7.480f, 21.640f, 6.570f);
- ctx_curve_to(ctx, 21.630f, 6.478f, 21.529f, 6.212f, 21.314f, 6.205f);
- ctx_fill(ctx);
-
- ctx_move_to(ctx, 13.375f, 6.542f);
- ctx_curve_to(ctx, 12.980f, 6.538f, 12.576f, 6.627f, 12.199f, 6.820f);
- ctx_curve_to(ctx, 11.591f, 7.294f, 10.740f, 7.913f, 10.669f, 9.099f);
- ctx_curve_to(ctx, 10.691f, 10.877f, 12.662f, 11.652f, 14.699f, 10.650f);
- ctx_curve_to(ctx, 15.399f, 10.220f, 15.729f, 9.630f, 15.699f, 8.810f);
- ctx_curve_to(ctx, 15.654f, 7.408f, 14.557f, 6.556f, 13.375f, 6.542f);
+ ctx_rgba(ctx, 0.1, 0.4, 0.3, 0.42);
+ ctx_translate(ctx, 0, 0);
+ ctx_scale(ctx, 0.5, 0.5);
+ ctx_rotate(ctx, frameno * 2.0 * 3.1415 / 60.0);
+ ctx_translate(ctx, -74, -74);
+ ctx_begin_path(ctx);
+ ctx_move_to(ctx, 76.221727, 3.9788409);
+ ctx_curve_to(ctx, 94.027758, 31.627675, 91.038918, 37.561293, 94.653428, 48.340473);
+ ctx_rel_curve_to(ctx, 25.783102, -3.90214, 30.783332, -1.52811, 47.230192, 4.252451);
+ ctx_rel_curve_to(ctx, -11.30184, 19.609496, -21.35729, 20.701768, -35.31018, 32.087063);
+ ctx_rel_curve_to(ctx, 5.56219, 12.080061, 12.91196, 25.953973, 9.98735, 45.917643);
+ ctx_rel_curve_to(ctx, -19.768963, -4.59388, -22.879866, -10.12216, -40.896842, -23.93099);
+ ctx_rel_curve_to(ctx, -11.463256, 10.23025, -17.377386, 18.2378, -41.515124, 25.03533);
+ ctx_rel_curve_to(ctx, 0.05756, -29.49286, 4.71903, -31.931936, 10.342734, -46.700913);
+ ctx_curve_to(ctx, 33.174997, 77.048676, 19.482194, 71.413009, 8.8631648, 52.420793);
+ ctx_curve_to(ctx, 27.471602, 45.126773, 38.877997, 45.9184, 56.349456, 48.518302);
+ ctx_curve_to(ctx, 59.03275, 31.351935, 64.893201, 16.103886, 76.221727, 3.9788409);
ctx_close_path(ctx);
- ctx_move_to(ctx, 13.357f, 7.556f);
- ctx_curve_to(ctx, 13.758f, 7.552f, 14.152f, 7.715f, 14.400f, 7.990f);
- ctx_curve_to(ctx, 14.720f, 8.360f, 14.769f, 9.240f, 14.509f, 9.650f);
- ctx_curve_to(ctx, 13.936f, 10.261f, 13.290f, 10.362f, 12.359f, 10.230f);
- ctx_curve_to(ctx, 11.899f, 10.120f, 11.610f, 9.709f, 11.720f, 9.25f);
- ctx_curve_to(ctx, 11.869f, 8.568f, 11.925f, 8.145f, 12.820f, 7.669f);
- ctx_curve_to(ctx, 12.992f, 7.594f, 13.175f, 7.558f, 13.357f, 7.556f);
ctx_fill(ctx);
ctx_restore(ctx);
-
- ctx_restore(ctx);
}
void st3m_gfx_splash(const char *text) {
@@ -865,18 +724,21 @@ void st3m_gfx_show_textview(st3m_gfx_textview_t *tv) {
ctx_save(ctx);
// Draw background.
- ctx_rgb(ctx, 0, 0, 0);
+ ctx_linear_gradient(ctx, -120, -120, 120, 120);
+ ctx_gradient_add_stop_u8(ctx, 0.0, 94, 0, 0, 255);
+ ctx_gradient_add_stop_u8(ctx, 1.0, 51, 0, 0, 255);
ctx_rectangle(ctx, -120, -120, 240, 240);
ctx_fill(ctx);
st3m_gfx_flow3r_logo(ctx, 0, -30, 150);
- int y = 20;
+ int y = 0;
ctx_gray(ctx, 1.0);
ctx_text_align(ctx, CTX_TEXT_ALIGN_CENTER);
ctx_text_baseline(ctx, CTX_TEXT_BASELINE_MIDDLE);
ctx_font_size(ctx, 20.0);
+ ctx_font(ctx, "Camp Font 3");
// Draw title, if any.
if (tv->title != NULL) {
@@ -900,10 +762,12 @@ void st3m_gfx_show_textview(st3m_gfx_textview_t *tv) {
}
// Draw version.
+ /*
ctx_font_size(ctx, 15.0);
ctx_gray(ctx, 0.6);
ctx_move_to(ctx, 0, 90);
ctx_text(ctx, st3m_version);
+ */
ctx_restore(ctx);
diff --git a/components/st3m/st3m_mode.c b/components/st3m/st3m_mode.c
index d9efc97a4f..6e4ed14f66 100644
--- a/components/st3m/st3m_mode.c
+++ b/components/st3m/st3m_mode.c
@@ -129,8 +129,7 @@ void st3m_mode_update_display(bool *restartable) {
case st3m_mode_kind_disk_sd:
case st3m_mode_kind_disk_flash: {
const char *lines[] = {
- (st3m_io_app_button_is_left()) ? "Press right shoulder button"
- : "Press left shoulder button",
+ "Touch the back button",
"to restart.",
NULL,
};
@@ -147,9 +146,7 @@ void st3m_mode_update_display(bool *restartable) {
_mode.shown = true;
const char *lines[] = {
"Send Ctrl-D over USB",
- (st3m_io_app_button_is_left())
- ? "or press right shoulder button"
- : "or press left shoulder button",
+ "or touch the back button",
"to restart.",
NULL,
};
@@ -168,8 +165,7 @@ void st3m_mode_update_display(bool *restartable) {
}
const char *lines[] = {
msg,
- (st3m_io_app_button_is_left()) ? "Press right shoulder button"
- : "Press left shoulder button",
+ "Touch the back button",
"to restart.",
NULL,
};
diff --git a/main/main.c b/main/main.c
index ca4c5194a9..2d98ad0485 100644
--- a/main/main.c
+++ b/main/main.c
@@ -98,7 +98,7 @@ void flow3r_startup(void) {
flow3r_bsp_display_set_backlight(100);
st3m_mode_init();
- st3m_mode_set(st3m_mode_kind_starting, "core1");
+ st3m_mode_set(st3m_mode_kind_starting, ""); //"core1");
st3m_mode_update_display(NULL);
xTaskCreatePinnedToCore(_init_core1, "core1-init", 4096, NULL,
@@ -107,13 +107,13 @@ void flow3r_startup(void) {
bool done;
xQueueReceive(_core1_init_done_q, &done, portMAX_DELAY);
- st3m_mode_set(st3m_mode_kind_starting, "core0");
+ st3m_mode_set(st3m_mode_kind_starting, ""); //"core0");
st3m_mode_update_display(NULL);
st3m_scope_init();
st3m_audio_init();
st3m_badgenet_init();
- st3m_mode_set(st3m_mode_kind_starting, "micropython");
+ st3m_mode_set(st3m_mode_kind_starting, ""); //"micropython");
st3m_mode_update_display(NULL);
}
--
GitLab