From 28c91aac82ed866f158f71a1a5d9fb96a24eeaf4 Mon Sep 17 00:00:00 2001 From: Ramakrishnan Muthukrishnan Date: Tue, 14 Nov 2023 22:02:14 +0530 Subject: [PATCH] remove magic-numbers for RIT/XIT display --- screen.h | 9 +++++++++ vfo.c | 14 +++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/screen.h b/screen.h index 8d71b8f..c07c84f 100644 --- a/screen.h +++ b/screen.h @@ -56,6 +56,8 @@ #define VFO_B_RENDER_FONT_SIZE (18) #define ACTIVE_VFO_INDICATION_SIZE (18) #define PS_RENDER_FONT_SIZE (12) +#define RIT_RENDER_FONT_SIZE (16) +#define XIT_RENDER_FONT_SIZE (16) // coordinates @@ -73,4 +75,11 @@ #define PS_X 130 #define PS_Y 50 + +#define RIT_X 220 +#define RIT_Y 40 + +#define XIT_X 220 +#define XIT_Y 20 + #endif // _SCREEN_H diff --git a/vfo.c b/vfo.c index 33ba206..ee625a0 100644 --- a/vfo.c +++ b/vfo.c @@ -1188,22 +1188,22 @@ void vfo_update(void) { if (vfo[id].rit_enabled == 0) { cairo_set_source_rgb(cr, GREY_R, GREY_G, GREY_B); } else { - cairo_set_source_rgb(cr, GREEN_R, GREEN_G, GREEN_B); + cairo_set_source_rgb(cr, RED_R, RED_G, RED_B); } sprintf(temp_text, "RIT: %lld", vfo[id].rit); - cairo_move_to(cr, 220, 40); - cairo_set_font_size(cr, 16); + cairo_move_to(cr, RIT_X, RIT_Y); + cairo_set_font_size(cr, RIT_RENDER_FONT_SIZE); cairo_show_text(cr, temp_text); if (can_transmit) { if (transmitter->xit_enabled == 0) { - cairo_set_source_rgb(cr, 0.7, 0.7, 0.7); + cairo_set_source_rgb(cr, GREY_R, GREY_G, GREY_B); } else { - cairo_set_source_rgb(cr, 1.0, 0.0, 0.0); + cairo_set_source_rgb(cr, RED_R, RED_G, RED_B); } sprintf(temp_text, "XIT: %lld", transmitter->xit); - cairo_move_to(cr, 220, 20); - cairo_set_font_size(cr, 16); + cairo_move_to(cr, XIT_X, XIT_Y); + cairo_set_font_size(cr, XIT_RENDER_FONT_SIZE); cairo_show_text(cr, temp_text); } -- 2.45.2