xan/hexagram
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make hexagram_cluster_init() take fewer args

Browse source
This commit is contained in:
XANTRONIX Development 2024-01-18 12:59:54 -05:00
parent 074554e03f
commit 9b4d3f4ae0
3 changed files with 15 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/hexagram-app.c
View file

@ -110,7 +110,7 @@ int main(int argc, char **argv) {
return 1; return 1;
} }
if ((cluster = hexagram_cluster_new(1200, 6500, 8000)) == NULL) { if ((cluster = hexagram_cluster_new()) == NULL) {
perror("hexagram_cluster_new()"); perror("hexagram_cluster_new()");
return 1; return 1;

9
include/hexagram/cluster.h
View file

@ -36,16 +36,11 @@ typedef struct _hexagram_cluster {
hexagram_gauge *gauges[HEXAGRAM_CLUSTER_GAUGE_COUNT]; hexagram_gauge *gauges[HEXAGRAM_CLUSTER_GAUGE_COUNT];
} hexagram_cluster; } hexagram_cluster;
int hexagram_cluster_init(hexagram_cluster *cluster, int hexagram_cluster_init(hexagram_cluster *cluster);
double rpm_min,
double rpm_redline,
double rpm_max);
void hexagram_cluster_cleanup(hexagram_cluster *cluster); void hexagram_cluster_cleanup(hexagram_cluster *cluster);
hexagram_cluster *hexagram_cluster_new(double rpm_min, hexagram_cluster *hexagram_cluster_new(void);
double rpm_redline,
double rpm_max);
void hexagram_cluster_destroy(hexagram_cluster *cluster); void hexagram_cluster_destroy(hexagram_cluster *cluster);

24
src/cluster.c
View file

@ -6,6 +6,11 @@
#define CLUSTER_WIDTH 1280 #define CLUSTER_WIDTH 1280
#define CLUSTER_HEIGHT 480 #define CLUSTER_HEIGHT 480
#define RPM_SHIFT_MIN 2000
#define RPM_SHIFT_MAX 6500
#define RPM_REDLINE 6500
#define RPM_MAX 8000
#define SHIFT_INDICATOR_X 392 #define SHIFT_INDICATOR_X 392
#define SHIFT_INDICATOR_Y 24 #define SHIFT_INDICATOR_Y 24
@ -80,10 +85,7 @@ int hexagram_cluster_filter_can_if(hexagram_can_if *can_if) {
sizeof(filters)); sizeof(filters));
} }
int hexagram_cluster_init(hexagram_cluster *cluster, int hexagram_cluster_init(hexagram_cluster *cluster) {
double rpm_min,
double rpm_redline,
double rpm_max) {
cluster->width = CLUSTER_WIDTH; cluster->width = CLUSTER_WIDTH;
cluster->height = CLUSTER_HEIGHT; cluster->height = CLUSTER_HEIGHT;
@ -116,8 +118,8 @@ int hexagram_cluster_init(hexagram_cluster *cluster,
CLUSTER_WIDTH - CLUSTER_HEIGHT / 2, CLUSTER_WIDTH - CLUSTER_HEIGHT / 2,
CLUSTER_HEIGHT / 2, CLUSTER_HEIGHT / 2,
CLUSTER_HEIGHT / 2, CLUSTER_HEIGHT / 2,
rpm_redline, RPM_REDLINE,
rpm_max) < 0) { RPM_MAX) < 0) {
goto error_tacho_init; goto error_tacho_init;
} }
@ -155,8 +157,8 @@ int hexagram_cluster_init(hexagram_cluster *cluster,
if (hexagram_tacho_shift_indicator_init(&cluster->shift_indicator, if (hexagram_tacho_shift_indicator_init(&cluster->shift_indicator,
SHIFT_INDICATOR_X, SHIFT_INDICATOR_X,
SHIFT_INDICATOR_Y, SHIFT_INDICATOR_Y,
rpm_min, RPM_SHIFT_MIN,
rpm_redline) < 0) { RPM_SHIFT_MAX) < 0) {
goto error_tacho_shift_indicator_init; goto error_tacho_shift_indicator_init;
} }
@ -203,16 +205,14 @@ void hexagram_cluster_cleanup(hexagram_cluster *cluster) {
hexagram_pattern_cleanup(&cluster->pattern); hexagram_pattern_cleanup(&cluster->pattern);
} }
hexagram_cluster *hexagram_cluster_new(double rpm_min, hexagram_cluster *hexagram_cluster_new(void) {
double rpm_redline,
double rpm_max) {
hexagram_cluster *cluster; hexagram_cluster *cluster;
if ((cluster = malloc(sizeof(*cluster))) == NULL) { if ((cluster = malloc(sizeof(*cluster))) == NULL) {
goto error_malloc_cluster; goto error_malloc_cluster;
} }
hexagram_cluster_init(cluster, rpm_min, rpm_redline, rpm_max); hexagram_cluster_init(cluster);
return cluster; return cluster;