From 731af368a2f5c4c6921d6ba2a3ab83539c0f8bbb Mon Sep 17 00:00:00 2001 From: "Aaron Tulino (Aaronjamt)" Date: Sun, 22 Mar 2026 00:29:58 -0700 Subject: [PATCH] Remove redundant `canvas_set_font` calls --- .../can_commander/views/dashboard/dashboard_metric.c | 1 - .../can_commander/views/dashboard/dashboard_read.c | 7 ------- 2 files changed, 8 deletions(-) diff --git a/CAN_Commander_FlipperZero/can_commander/views/dashboard/dashboard_metric.c b/CAN_Commander_FlipperZero/can_commander/views/dashboard/dashboard_metric.c index 438d980..5acbf3e 100644 --- a/CAN_Commander_FlipperZero/can_commander/views/dashboard/dashboard_metric.c +++ b/CAN_Commander_FlipperZero/can_commander/views/dashboard/dashboard_metric.c @@ -1519,7 +1519,6 @@ void dashboard_metric_draw(Canvas* canvas, const AppDashboardModel* dashboard) { canvas_draw_rframe(canvas, 2, 12, 124, 50, 4); - canvas_set_font(canvas, FontSecondary); canvas_draw_str_aligned(canvas, 64, 18, AlignCenter, AlignTop, dashboard->label); const bool use_big_value = (strlen(dashboard->value) <= 10U); diff --git a/CAN_Commander_FlipperZero/can_commander/views/dashboard/dashboard_read.c b/CAN_Commander_FlipperZero/can_commander/views/dashboard/dashboard_read.c index 04a77e7..3070b17 100644 --- a/CAN_Commander_FlipperZero/can_commander/views/dashboard/dashboard_read.c +++ b/CAN_Commander_FlipperZero/can_commander/views/dashboard/dashboard_read.c @@ -156,7 +156,6 @@ bool dashboard_read_draw(Canvas* canvas, const AppDashboardModel* dashboard) { if(dashboard->read_overload) { char fps_text[24] = {0}; snprintf(fps_text, sizeof(fps_text), "Rate: %lu fps", (unsigned long)dashboard->read_rate_fps); - canvas_set_font(canvas, FontSecondary); canvas_draw_str_aligned(canvas, 64, 24, AlignCenter, AlignCenter, "Input overload"); canvas_draw_str_aligned(canvas, 64, 34, AlignCenter, AlignCenter, fps_text); canvas_draw_str_aligned(canvas, 64, 45, AlignCenter, AlignCenter, "Rendering paused >1000"); @@ -166,7 +165,6 @@ bool dashboard_read_draw(Canvas* canvas, const AppDashboardModel* dashboard) { const AppDashFrameEntry* entry = dashboard_read_get_selected(dashboard); if(!entry) { - canvas_set_font(canvas, FontSecondary); canvas_draw_str_aligned(canvas, 64, 26, AlignCenter, AlignCenter, "Waiting for CAN frames"); canvas_draw_str_aligned(canvas, 64, 63, AlignCenter, AlignBottom, "OK Hold L/R Pg U/D Nav"); return true; @@ -181,7 +179,6 @@ bool dashboard_read_draw(Canvas* canvas, const AppDashboardModel* dashboard) { dashboard_format_hex_bytes(entry->data, 4U, 8U, entry->dlc, row_b, sizeof(row_b)); snprintf(ts_line, sizeof(ts_line), "t=%lums", (unsigned long)entry->ts_ms); - canvas_set_font(canvas, FontSecondary); canvas_draw_str_aligned(canvas, 64, 13, AlignCenter, AlignTop, header); canvas_draw_str_aligned(canvas, 64, 22, AlignCenter, AlignTop, ts_line); @@ -202,7 +199,6 @@ bool dashboard_read_draw(Canvas* canvas, const AppDashboardModel* dashboard) { } else if(page == 1U) { canvas_draw_str_aligned(canvas, 64, 2, AlignCenter, AlignTop, "Recent Frames"); if(dashboard->read_count == 0U) { - canvas_set_font(canvas, FontSecondary); canvas_draw_str_aligned(canvas, 64, 26, AlignCenter, AlignCenter, "No frames yet"); canvas_draw_str_aligned(canvas, 64, 63, AlignCenter, AlignBottom, "L/R Pg OK Hold"); return true; @@ -237,11 +233,9 @@ bool dashboard_read_draw(Canvas* canvas, const AppDashboardModel* dashboard) { (offset == selected) ? '>' : ' ', preview); - canvas_set_font(canvas, FontSecondary); canvas_draw_str(canvas, 2, (int32_t)(22 + line * 10U), row); } - canvas_set_font(canvas, FontSecondary); canvas_draw_str_aligned(canvas, 64, 63, AlignCenter, AlignBottom, "U/D Sel L/R Pg"); } else { canvas_draw_str_aligned(canvas, 64, 2, AlignCenter, AlignTop, "Stats"); @@ -273,7 +267,6 @@ bool dashboard_read_draw(Canvas* canvas, const AppDashboardModel* dashboard) { snprintf(line4, sizeof(line4), "Feed:%s", dashboard->read_hold ? "Hold" : "Live"); } - canvas_set_font(canvas, FontSecondary); canvas_draw_str(canvas, 2, 20, line1); canvas_draw_str(canvas, 2, 31, line2); canvas_draw_str(canvas, 2, 42, line3);