Move random utility macros into utils.h

[log-plotter] / data.c

diff --git a/data.c b/data.c
index 99e03ae530f515bab0ba26fc90c49513dc56b4a2..fa370729b0c8a242b4efa053cc569a9dcfa4f632 100644 (file)
--- a/data.c
+++ b/data.c
@@ -10,9 +10,9 @@
 #include <math.h>
 
 #include "data.h"
-#include "debug.h"
+#include "trace.h"
+#include "utils.h"
 
-#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 
 static int separate_entries(char *buf, char *entries[], int max_entries)
 {
@@ -175,8 +175,10 @@ static void print_status_line(struct charger_data *data)
        }
        cell_avg /= (double)active_cells;
 
-       pr_info("\r\033[K%8s Ubat: %.3fV Ucell avg: %.3fV ",
-               time_str, data->charging_voltage, cell_avg);
+       pr_info("\r\033[K%8s Ubat: %.3fV Ucell avg: %.3fV "
+               "Current: %.2fA Charge %.0fmAh ",
+               time_str, data->charging_voltage, cell_avg,
+               data->charging_current, data->total_charge);
 
        fflush(stdout);