From e513fc1083cc8916c28ab82db42324353e50fe81 Mon Sep 17 00:00:00 2001 From: XANTRONIX Development Date: Fri, 14 Jun 2019 01:11:08 -0500 Subject: [PATCH] Dumb stuff --- include/hexagram/speedo.h | 2 ++ src/cluster.c | 2 +- src/gauge.c | 5 +++-- src/speedo.c | 6 ++++-- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/include/hexagram/speedo.h b/include/hexagram/speedo.h index 86588bd..bb56e7d 100644 --- a/include/hexagram/speedo.h +++ b/include/hexagram/speedo.h @@ -5,6 +5,8 @@ #include +#define HEXAGRAM_SPEEDO_MAX_KPH 289.682 + typedef struct _hexagram_speedo { hexagram_gauge gauge; } hexagram_speedo; diff --git a/src/cluster.c b/src/cluster.c index 77b6f7b..325ca27 100644 --- a/src/cluster.c +++ b/src/cluster.c @@ -126,7 +126,7 @@ void hexagram_cluster_draw_fg(hexagram_cluster *cluster, cluster->state.rpm); hexagram_speedo_draw_needle(&cluster->speedo, cr, - (2.00152 * cluster->state.rps * 3600) / 1000.0); + cluster->state.rps); hexagram_thermo_draw_needle(&cluster->thermo, cr, cluster->state.temp); diff --git a/src/gauge.c b/src/gauge.c index ee39342..7d8924d 100644 --- a/src/gauge.c +++ b/src/gauge.c @@ -66,7 +66,7 @@ void hexagram_gauge_draw_needle(hexagram_gauge *gauge, /* * Draw the gauge pivot */ - cairo_set_source_rgb(cr, 0.1, 0.1, 0.1); + cairo_set_source_rgb(cr, 0.4, 0.4, 0.4); cairo_arc(cr, gauge->x, @@ -78,7 +78,8 @@ void hexagram_gauge_draw_needle(hexagram_gauge *gauge, cairo_stroke(cr); /* - * Draw the needle above the pivot */ + * Draw the needle above the pivot + */ cairo_move_to(cr, gauge->x, gauge->y); cairo_set_source_rgb(cr, 0, 0.25, 1.0); diff --git a/src/speedo.c b/src/speedo.c index dc811aa..8fceb95 100644 --- a/src/speedo.c +++ b/src/speedo.c @@ -60,7 +60,9 @@ void hexagram_speedo_draw_face(hexagram_speedo *speedo, void hexagram_speedo_draw_needle(hexagram_speedo *speedo, cairo_t *cr, - double kph) { + double rps) { + double kph = (2.00152 * rps * 3600) / 1000.0; + if (kph < 0) { kph = 0; } else if (kph > 290) { @@ -70,5 +72,5 @@ void hexagram_speedo_draw_needle(hexagram_speedo *speedo, hexagram_gauge_draw_needle(&speedo->gauge, cr, 0.8, - kph / 289.682); + kph / HEXAGRAM_SPEEDO_MAX_KPH); }