From 1fc8513607aef7351ebd56bd41ae4f408e35b4ea Mon Sep 17 00:00:00 2001
From: XANTRONIX Development <dev@xantronix.com>
Date: Tue, 16 Jan 2024 22:23:52 -0500
Subject: [PATCH] Campaign of simplification

---
 src/tacho.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/tacho.c b/src/tacho.c
index 0bdd15b..bb5b7b9 100644
--- a/src/tacho.c
+++ b/src/tacho.c
@@ -4,14 +4,14 @@
 #include <hexagram/gauge.h>
 #include <hexagram/tacho.h>
 
-#define TACHO_ANGLE_MIN (232.0 * (M_PI / 180.0))
-#define TACHO_ANGLE_MAX (488.0 * (M_PI / 180.0))
+#define ANGLE_MIN (232.0 * (M_PI / 180.0))
+#define ANGLE_MAX (488.0 * (M_PI / 180.0))
 
-#define TACHO_INTERVAL_MARK    500
-#define TACHO_INTERVAL_LEGEND 1000
+#define INTERVAL_MARK    500
+#define INTERVAL_LEGEND 1000
 
-#define TACHO_FONT_FACE_LEGEND "Muli"
-#define TACHO_FONT_FACE_GEAR   "HEX:gon Bold Italic"
+#define FONT_FACE_LEGEND "Muli"
+#define FONT_FACE_GEAR   "HEX:gon Bold Italic"
 
 static int draw_bg(hexagram_gauge *gauge, cairo_t *cr) {
     hexagram_tacho *tacho = (hexagram_tacho *)gauge;
@@ -22,15 +22,15 @@ static int draw_bg(hexagram_gauge *gauge, cairo_t *cr) {
     }
 
     cairo_select_font_face(cr,
-                           TACHO_FONT_FACE_LEGEND,
+                           FONT_FACE_LEGEND,
                            CAIRO_FONT_SLANT_ITALIC,
                            CAIRO_FONT_WEIGHT_BOLD);
 
     cairo_set_font_size(cr, tacho->dial.radius * 0.15);
     cairo_set_source_rgb(cr, 1, 1, 1);
 
-    for (rpm=0; rpm<=(int)tacho->dial.max_value; rpm+=TACHO_INTERVAL_MARK) {
-        int large = (rpm % TACHO_INTERVAL_LEGEND) == 0? 1: 0;
+    for (rpm=0; rpm<=(int)tacho->dial.max_value; rpm+=INTERVAL_MARK) {
+        int large = (rpm % INTERVAL_LEGEND) == 0? 1: 0;
 
         if (rpm >= tacho->redline) {
             cairo_set_source_rgb(cr, 0.6, 0.1, 0.1);
@@ -43,14 +43,14 @@ static int draw_bg(hexagram_gauge *gauge, cairo_t *cr) {
 
     cairo_set_source_rgb(cr, 1, 1, 1);
 
-    for (rpm=0; rpm<=(int)tacho->dial.max_value; rpm+=TACHO_INTERVAL_LEGEND) {
+    for (rpm=0; rpm<=(int)tacho->dial.max_value; rpm+=INTERVAL_LEGEND) {
         char buf[8];
 
         if (rpm >= tacho->redline) {
             cairo_set_source_rgb(cr, 1.0, 0.1, 0.1);
         }
 
-        snprintf(buf, sizeof(buf), "%d", (int)(rpm / TACHO_INTERVAL_LEGEND));
+        snprintf(buf, sizeof(buf), "%d", (int)(rpm / INTERVAL_LEGEND));
 
         hexagram_dial_draw_legend(&tacho->dial, cr, rpm, buf);
     }
@@ -110,7 +110,7 @@ static int draw_fg(hexagram_gauge *gauge, cairo_t *cr) {
     }
 
     cairo_select_font_face(cr,
-                           TACHO_FONT_FACE_GEAR,
+                           FONT_FACE_GEAR,
                            CAIRO_FONT_SLANT_NORMAL,
                            CAIRO_FONT_WEIGHT_NORMAL);
 
@@ -143,8 +143,8 @@ int hexagram_tacho_init(hexagram_tacho *tacho,
                            x,
                            y,
                            radius,
-                           TACHO_ANGLE_MIN,
-                           TACHO_ANGLE_MAX,
+                           ANGLE_MIN,
+                           ANGLE_MAX,
                            0,
                            max_rpm) < 0) {
         goto error_dial_init;