remove magic-numbers for RIT/XIT display

diff --git a/screen.h b/screen.h
index 8d71b8f58cd8551138f38951ada3f73e658307d5..c07c84f31d96fe6731d514e6a572d862b94ff156 100644 (file)
--- 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 33ba206fa23518702f6c952f55855b1e75d8d860..ee625a0f43922ebf5827f1e4b36fab98994f8fbe 100644 (file)
--- 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);
         }